Merge branch 'fix-google-map-offsets-in-china' into fix-google-map-of…

…fsets-in-china
IITC-CE · Jan 17, 2019 · 555f025 · johnd0e · Jan 17, 2019 · johnd0e
2 parents ad23110 + b07f133
commit 555f025
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/external/Leaflet.GoogleMutant.js b/external/Leaflet.GoogleMutant.js
@@ -355,11 +355,13 @@ L.GridLayer.GoogleMutant = L.GridLayer.extend({
 		this._initContainer();
 	},
 
-	_update: function () {
+	_update: function (center) {
 		// zoom level check needs to happen before super's implementation (tile addition/creation)
 		// otherwise tiles may be missed if maxNativeZoom is not yet correctly determined
 		if (this._mutant) {
-			var center = this._map.getCenter();
+      if (center === undefined) {
+        var center = this._map.getCenter();
+      }
 			var _center = new google.maps.LatLng(center.lat, center.lng);
 
 			this._mutant.setCenter(_center);

diff --git a/plugins/fix-googlemap-china-offset.user.js b/plugins/fix-googlemap-china-offset.user.js
@@ -238,16 +238,16 @@ var PRCoords = window.plugin.fixChinaOffset.PRCoords = (function () {
   };
 })();
 
-// ///////// end WGS84 to GCJ-02 obfuscator /////////
+///////// end WGS84 to GCJ-02 obfuscator /////////
 
-// ///////// begin overwrited L.GridLayer /////////
+///////// begin overwrited L.GridLayer /////////
 
 L.GridLayer.prototype._getTiledPixelBounds = (function () {
-  return function (center) {
-    // >> edited here
+	return function (center) {
+	  ///// modified here ///
     center = window.plugin.fixChinaOffset.getLatLng(center, this.options.type);
-    //
-    var map = this._map,
+    ///////////////////////
+		var map = this._map,
       mapZoom = map._animatingZoom ? Math.max(map._animateToZoom, map.getZoom()) : map.getZoom(),
       scale = map.getZoomScale(mapZoom, this._tileZoom),
       pixelCenter = map.project(center, this._tileZoom).floor(),
@@ -260,11 +260,17 @@ L.GridLayer.prototype._getTiledPixelBounds = (function () {
 L.GridLayer.prototype._setZoomTransform = (function (original) {
   return function (level, center, zoom) {
     center = window.plugin.fixChinaOffset.getLatLng(center, this.options.type);
-    original.apply(this, arguments);
+    original.apply(this, [level, center, zoom]);
   };
 })(L.GridLayer.prototype._setZoomTransform);
 
-// ///////// end overwrited L.GridLayer /////////
+L.GridLayer.GoogleMutant.prototype._update = (function (original) {
+  return function () {
+    var center = this._map.getCenter();
+    center = window.plugin.fixChinaOffset.getLatLng(center, this.options.type);
+		original.apply(this, [center]);
+	}
+})(L.GridLayer.GoogleMutant.prototype._update);
 
 window.plugin.fixChinaOffset.getLatLng = function (pos, type) {
   // No offsets in satellite and hybrid maps