gis-common 1.1.8 → 1.1.10

package/dist/resource.min.js

@@ -828,8 +828,8 @@ 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;
+        var bdLon = z * Math.cos(theta) + 0.0065;
+        var bdLat = z * Math.sin(theta) + 0.006;
         return { lat: bdLat, lon: bdLon };
     },
 
@@ -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, lon: x };
     },
 
     // Web mercator to WGS-84
@@ -868,18 +859,7 @@ 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, lon: x };
     },
 
     // two point's distance
@@ -1135,7 +1115,7 @@ function splitWords(str) {
      * @returns {*}  {boolean}
      */
     isLnglat: function isLnglat(lng, lat) {
-        return !!(+lat > 0 && +lat < 90 && +lng > 0 && +lng < 180);
+        return !!(+lat > -90 && +lat < 90 && +lng > -180 && +lng < 180);
     },
 
     /**
@@ -1151,13 +1131,7 @@ function splitWords(str) {
             var a = parseFloat(value);
             var degree = parseInt(a);
             var min = parseInt((a - degree) * 60);
-            if (min < 10) {
-                min = '0' + min;
-            }
-            var sec = parseInt((a - degree) * 3600 - min * 60);
-            if (sec < 10) {
-                sec = '0' + sec;
-            }
+            var sec = parseFloat((a - degree) * 3600 - min * 60);
             return degree + '°' + min + '′' + sec + '″';
         }
         if (lng && lat) {
@@ -1289,6 +1263,19 @@ function splitWords(str) {
         var fwdAz = Math.atan2(cosU2 * sinLambda, cosU1 * sinU2 - sinU1 * cosU2 * cosLambda);
         var revAz = Math.atan2(cosU1 * sinLambda, -sinU1 * cosU2 + cosU1 * sinU2 * cosLambda);
         return s;
+    },
+
+    /**
+     * P1绕一个坐标点P2旋转θ角度后,新的坐标的计算公式
+     *
+     * @param {*} p1
+     * @param {*} p2
+     * @param {*} θ 旋转角度，正：表示顺时针，负：表示逆时针
+     */
+    rotatePoint: function rotatePoint(p1, p2, θ) {
+        var x = (p1.x - p2.x) * Math.cos(Math.PI / 180 * -θ) - (p1.y - p2.y) * Math.sin(Math.PI / 180 * -θ) + p2.x;
+        var y = (p1.x - p2.x) * Math.sin(Math.PI / 180 * -θ) + (p1.y - p2.y) * Math.cos(Math.PI / 180 * -θ) + p2.y;
+        return { x: x, y: y };
     }
 });
 // CONCATENATED MODULE: ./src/utils/FileUtils.js

package/package.json

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