gis-common 1.1.14 → 1.1.16

package/dist/resource.min.js

@@ -1111,8 +1111,67 @@ function splitWords(str) {
         return doc.children[0];
     }
 });
+// CONCATENATED MODULE: ./src/utils/MathUtils.js
+/* harmony default export */ var MathUtils = ({
+    DEG2RAD: Math.PI / 180,
+    RAD2DEG: 180 / Math.PI,
+    randInt: function randInt(low, high) {
+        return low + Math.floor(Math.random() * (high - low + 1));
+    },
+    randFloat: function randFloat(low, high) {
+        return low + Math.random() * (high - low);
+    },
+
+    /**
+     * 角度转弧度
+     *
+     * @param {*} degrees
+     * @returns {*}
+     */
+    degreesToRadians: function degreesToRadians(degrees) {
+        return degrees * this.DEG2RAD;
+    },
+
+    /**
+     * 角度转弧度
+     *
+     * @param {*} degrees
+     * @returns {*}
+     */
+    toRadians: function toRadians(degrees) {
+        return degrees * this.DEG2RAD;
+    },
+
+    /**
+     * 弧度转角度
+     *
+     * @param {*} radians
+     * @returns {*}
+     */
+    radiansToDegrees: function radiansToDegrees(radians) {
+        return radians * this.RAD2DEG;
+    },
+
+    /**
+     * 弧度转角度
+     *
+     * @param {*} radians
+     * @returns {*}
+     */
+    toDegrees: function toDegrees(radians) {
+        return radians * this.RAD2DEG;
+    },
+    formatFloat: function formatFloat(value) {
+        var n = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+
+        return Math.round(value * Math.pow(10, n)) / Math.pow(10, n);
+    }
+});
 // CONCATENATED MODULE: ./src/utils/GeoUtils.js
+
 /* harmony default export */ var GeoUtils = ({
+    toRadian: Math.PI / 180,
+    R: 6371393,
     /**
      * 验证经纬度坐标
      *
@@ -1282,6 +1341,55 @@ function splitWords(str) {
         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 };
+    },
+
+    /**
+     * 计算latlng2相对于latlng1的方位角和距离
+     *
+     * @param {*} latlng1
+     * @param {*} latlng2
+     * @returns {*}  {boolean}
+     */
+    calcBearAndDisByPoints: function calcBearAndDisByPoints(latlng1, latlng2) {
+        var f1 = parseFloat(latlng1.lat),
+            l1 = parseFloat(latlng1.lng),
+            f2 = parseFloat(latlng2.lat),
+            l2 = parseFloat(latlng2.lng);
+        var y = Math.sin((l2 - l1) * this.toRadian) * Math.cos(f2 * this.toRadian);
+        var x = Math.cos(f1 * this.toRadian) * Math.sin(f2 * this.toRadian) - Math.sin(f1 * this.toRadian) * Math.cos(f2 * this.toRadian) * Math.cos((l2 - l1) * this.toRadian);
+        var angle = Math.atan2(y, x) * (180 / Math.PI);
+        var deltaF = (f2 - f1) * this.toRadian;
+        var deltaL = (l2 - l1) * this.toRadian;
+        var a = Math.sin(deltaF / 2) * Math.sin(deltaF / 2) + Math.cos(f1 * this.toRadian) * Math.cos(f2 * this.toRadian) * Math.sin(deltaL / 2) * Math.sin(deltaL / 2);
+        var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        var distance = this.R * c;
+        return {
+            angle: angle,
+            distance: distance
+        };
+    },
+
+    /**
+     * 根据方位角和距离生成新的坐标
+     *
+     * @param {*} latlng
+     * @param {*} angle
+     * @param {*} distance
+     * @returns {*}
+     */
+    calcPointByBearAndDis: function calcPointByBearAndDis(latlng, angle, distance) {
+        var sLat = MathUtils.toRadians(parseFloat(latlng.lng));
+        var sLng = MathUtils.toRadians(parseFloat(latlng.lng));
+        angle = parseFloat(angle);
+        distance = parseFloat(distance);
+        var d = distance / this.R;
+        angle = MathUtils.toRadians(angle);
+        var lat = Math.asin(Math.sin(sLat) * Math.cos(d) + Math.cos(sLat) * Math.sin(d) * Math.cos(angle));
+        var lon = sLng + Math.atan2(Math.sin(angle) * Math.sin(d) * Math.cos(sLat), Math.cos(d) - Math.sin(sLat) * Math.sin(lat));
+        return {
+            lat: MathUtils.toDegrees(lat),
+            lng: MathUtils.toDegrees(lon)
+        };
     }
 });
 // CONCATENATED MODULE: ./src/utils/FileUtils.js
@@ -1395,42 +1503,6 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         window.URL.revokeObjectURL(link.href);
     }
 });
-// CONCATENATED MODULE: ./src/utils/MathUtils.js
-/* harmony default export */ var MathUtils = ({
-    DEG2RAD: Math.PI / 180,
-    RAD2DEG: 180 / Math.PI,
-    randInt: function randInt(low, high) {
-        return low + Math.floor(Math.random() * (high - low + 1));
-    },
-    randFloat: function randFloat(low, high) {
-        return low + Math.random() * (high - low);
-    },
-
-    /**
-     * 角度转弧度
-     *
-     * @param {*} degrees
-     * @returns {*}
-     */
-    degreesToRadians: function degreesToRadians(degrees) {
-        return degrees * this.DEG2RAD;
-    },
-
-    /**
-     * 弧度转角度
-     *
-     * @param {*} radians
-     * @returns {*}
-     */
-    radiansToDegrees: function radiansToDegrees(radians) {
-        return radians * this.RAD2DEG;
-    },
-    formatFloat: function formatFloat(value) {
-        var n = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
-
-        return Math.round(value * Math.pow(10, n)) / Math.pow(10, n);
-    }
-});
 // CONCATENATED MODULE: ./src/utils/OptimizeUtils.js
 /* harmony default export */ var OptimizeUtils = ({
     /**
@@ -2400,10 +2472,12 @@ function DevicePixelRatio_classCallCheck(instance, Constructor) { if (!(instance
 
 var DevicePixelRatio = function () {
     function DevicePixelRatio() {
+        var magnification = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+
         DevicePixelRatio_classCallCheck(this, DevicePixelRatio);
-    }
-    // this.flag = false;
 
+        this.magnification = magnification;
+    }
     // 获取系统类型
 
 
@@ -2460,19 +2534,19 @@ var DevicePixelRatio = function () {
                 // 当前页面宽度相对于 750 宽的缩放比例，可根据自己需要修改。
                 var scale = document.documentElement.clientWidth / pageWidth;
                 // 设置页面根节点字体大小
-                document.documentElement.style.fontSize = baseSize * Math.min(scale, 2) + 'px';
+                document.documentElement.style.fontSize = this.magnification * baseSize * Math.min(scale, 2) + 'px';
             } else if (pageWidth > 750 && pageWidth <= 1200) {
                 var _baseSize = 85;
                 // 当前页面宽度相对于 750 宽的缩放比例，可根据自己需要修改。
                 var _scale = document.documentElement.clientWidth / pageWidth;
                 // 设置页面根节点字体大小
-                document.documentElement.style.fontSize = _baseSize * Math.min(_scale, 2) + 'px';
+                document.documentElement.style.fontSize = this.magnification * _baseSize * Math.min(_scale, 2) + 'px';
             } else {
                 var _baseSize2 = 100;
                 // 当前页面宽度相对于 750 宽的缩放比例，可根据自己需要修改。
                 var _scale2 = document.documentElement.clientWidth / 1920;
                 // 设置页面根节点字体大小
-                document.documentElement.style.fontSize = _baseSize2 * Math.min(_scale2, 2) + 'px';
+                document.documentElement.style.fontSize = this.magnification * _baseSize2 * Math.min(_scale2, 2) + 'px';
             }
         }
         // 监听页面缩放

package/package.json

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