gis-common 2.1.1 → 2.1.2

package/dist/resource.min.js

@@ -1466,16 +1466,16 @@ function splitWords(str) {
         };
     },
     mercatorTolonlat: function mercatorTolonlat(x, y) {
-        var lon = x / 20037508.34 * 180;
-        var lat = y / 20037508.34 * 180;
-        y = 180 / Math.PI * (2 * Math.atan(Math.exp(y * Math.PI / 180)) - Math.PI / 2);
-        return { lon: lon, lat: lat };
-    },
-    lonlatToMercator: function lonlatToMercator(lon, lat) {
-        var x = lon * 20037508.34 / 180;
-        var y = Math.log(Math.tan((90 + lat) * Math.PI / 360)) / (Math.PI / 180);
-
-        y = y * 20037508.34 / 180;
+        var lng = x / 20037508.34 * 180;
+        var mmy = y / 20037508.34 * 180;
+        var lat = 180 / Math.PI * (2 * Math.atan(Math.exp(mmy * Math.PI / 180)) - Math.PI / 2);
+        return { lng: lng, lat: lat };
+    },
+    lonlatToMercator: function lonlatToMercator(lng, lat) {
+        var earthRad = 6378137.0;
+        var x = lng * Math.PI / 180 * earthRad;
+        var a = lat * Math.PI / 180;
+        var y = earthRad / 2 * Math.log((1.0 + Math.sin(a)) / (1.0 - Math.sin(a)));
         return { x: x, y: y };
     }
 });

package/package.json

@@ -2,7 +2,7 @@
     "name": "gis-common",
     "description": "gis-common",
     "main": "dist/resource.min.js",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "author": "Guo.Yan <luv02@vip.qq.com>",
     "license": "MIT",
     "private": false,