gis-common 1.1.9 → 1.1.11

package/dist/resource.min.js

@@ -756,38 +756,38 @@ Array.prototype.clear = function () {
 /* harmony default export */ var CoordsUtils = ({
     PI: 3.14159265358979324,
     XPI: 3.14159265358979324 * 3000.0 / 180.0,
-    delta: function delta(lat, lon) {
+    delta: function delta(lat, lng) {
         var a = 6378245.0; //  a: 卫星椭球坐标投影到平面地图坐标系的投影因子。
         var ee = 0.00669342162296594323; //  ee: 椭球的偏心率。
-        var dLat = this.transformLat(lon - 105.0, lat - 35.0);
-        var dLon = this.transformLon(lon - 105.0, lat - 35.0);
+        var dLat = this.transformLat(lng - 105.0, lat - 35.0);
+        var dLon = this.transformLon(lng - 105.0, lat - 35.0);
         var radLat = lat / 180.0 * this.PI;
         var magic = Math.sin(radLat);
         magic = 1 - ee * magic * magic;
         var sqrtMagic = Math.sqrt(magic);
         dLat = dLat * 180.0 / (a * (1 - ee) / (magic * sqrtMagic) * this.PI);
         dLon = dLon * 180.0 / (a / sqrtMagic * Math.cos(radLat) * this.PI);
-        return { lat: dLat, lon: dLon };
+        return { lat: dLat, lng: dLon };
     },
 
     // WGS-84 to GCJ-02
     gcjEncrypt: function gcjEncrypt(wgsLat, wgsLon) {
         if (this.outOfChina(wgsLat, wgsLon)) {
-            return { lat: wgsLat, lon: wgsLon };
+            return { lat: wgsLat, lng: wgsLon };
         }
 
         var d = this.delta(wgsLat, wgsLon);
-        return { lat: wgsLat + d.lat, lon: wgsLon + d.lon };
+        return { lat: wgsLat + d.lat, lng: wgsLon + d.lng };
     },
 
     // GCJ-02 to WGS-84
     gcjDecrypt: function gcjDecrypt(gcjLat, gcjLon) {
         if (this.outOfChina(gcjLat, gcjLon)) {
-            return { lat: gcjLat, lon: gcjLon };
+            return { lat: gcjLat, lng: gcjLon };
         }
 
         var d = this.delta(gcjLat, gcjLon);
-        return { lat: gcjLat - d.lat, lon: gcjLon - d.lon };
+        return { lat: gcjLat - d.lat, lng: gcjLon - d.lng };
     },
 
     // GCJ-02 to WGS-84 exactly
@@ -808,7 +808,7 @@ Array.prototype.clear = function () {
             wgsLon = (mLon + pLon) / 2;
             var tmp = this.gcj_encrypt(wgsLat, wgsLon);
             dLat = tmp.lat - gcjLat;
-            dLon = tmp.lon - gcjLon;
+            dLon = tmp.lng - gcjLon;
             if (Math.abs(dLat) < threshold && Math.abs(dLon) < threshold) {
                 break;
             }
@@ -819,7 +819,7 @@ Array.prototype.clear = function () {
             if (++i > 10000) break;
         }
         // console.log(i);
-        return { lat: wgsLat, lon: wgsLon };
+        return { lat: wgsLat, lng: wgsLon };
     },
 
     // GCJ-02 to BD-09
@@ -828,9 +828,9 @@ Array.prototype.clear = function () {
         var y = gcjLat;
         var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * this.XPI);
         var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * this.XPI);
-        bdLon = z * Math.cos(theta) + 0.0065;
-        bdLat = z * Math.sin(theta) + 0.006;
-        return { lat: bdLat, lon: bdLon };
+        var bdLon = z * Math.cos(theta) + 0.0065;
+        var bdLat = z * Math.sin(theta) + 0.006;
+        return { lat: bdLat, lng: bdLon };
     },
 
     // BD-09 to GCJ-02
@@ -841,7 +841,7 @@ Array.prototype.clear = function () {
         var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * this.XPI);
         var gcjLon = z * Math.cos(theta);
         var gcjLat = z * Math.sin(theta);
-        return { lat: gcjLat, lon: gcjLon };
+        return { lat: gcjLat, lng: gcjLon };
     },
 
     // WGS-84 to Web mercator
@@ -850,16 +850,7 @@ Array.prototype.clear = function () {
         var x = wgsLon * 20037508.34 / 180.0;
         var y = Math.log(Math.tan((90.0 + wgsLat) * this.PI / 360.0)) / (this.PI / 180.0);
         y = y * 20037508.34 / 180.0;
-        return { lat: y, lon: x
-            /*
-            if ((Math.abs(wgsLon) > 180 || Math.abs(wgsLat) > 90))
-            return null;
-            var x = 6378137.0 * wgsLon * 0.017453292519943295;
-            var a = wgsLat * 0.017453292519943295;
-            var y = 3189068.5 * Math.log((1.0 + Math.sin(a)) / (1.0 - Math.sin(a)));
-            return {'lat' : y, 'lon' : x};
-            // */
-        };
+        return { lat: y, lng: x };
     },
 
     // Web mercator to WGS-84
@@ -868,24 +859,13 @@ Array.prototype.clear = function () {
         var x = mercatorLon / 20037508.34 * 180.0;
         var y = mercatorLat / 20037508.34 * 180.0;
         y = 180 / this.PI * (2 * Math.atan(Math.exp(y * this.PI / 180.0)) - this.PI / 2);
-        return { lat: y, lon: x
-            /*
-            if (Math.abs(mercatorLon) < 180 && Math.abs(mercatorLat) < 90)
-            return null;
-            if ((Math.abs(mercatorLon) > 20037508.3427892) || (Math.abs(mercatorLat) > 20037508.3427892))
-            return null;
-            var a = mercatorLon / 6378137.0 * 57.295779513082323;
-            var x = a - (Math.floor(((a + 180.0) / 360.0)) * 360.0);
-            var y = (1.5707963267948966 - (2.0 * Math.atan(Math.exp((-1.0 * mercatorLat) / 6378137.0)))) * 57.295779513082323;
-            return {'lat' : y, 'lon' : x};
-            // */
-        };
+        return { lat: y, lng: x };
     },
 
     // two point's distance
-    distance: function distance(latA, lonA, latB, lonB) {
+    distance: function distance(latA, lngA, latB, lngB) {
         var earthR = 6371000.0;
-        var x = Math.cos(latA * this.PI / 180.0) * Math.cos(latB * this.PI / 180.0) * Math.cos((lonA - lonB) * this.PI / 180);
+        var x = Math.cos(latA * this.PI / 180.0) * Math.cos(latB * this.PI / 180.0) * Math.cos((lngA - lngB) * this.PI / 180);
         var y = Math.sin(latA * this.PI / 180.0) * Math.sin(latB * this.PI / 180.0);
         var s = x + y;
         if (s > 1) s = 1;
@@ -894,8 +874,8 @@ Array.prototype.clear = function () {
         var distance = alpha * earthR;
         return distance;
     },
-    outOfChina: function outOfChina(lat, lon) {
-        if (lon < 72.004 || lon > 137.8347) {
+    outOfChina: function outOfChina(lat, lng) {
+        if (lng < 72.004 || lng > 137.8347) {
             return true;
         }
         if (lat < 0.8293 || lat > 55.8271) {

package/package.json

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