xy-map 1.1.16 → 1.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-map",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "description": "雄越地图",
   "main": "xy-map.umd.min.js",
   "scripts": {

package/xy-map.common.js

@@ -24206,14 +24206,6 @@ module.exports = "data:image/svg+xml;utf8,%3Csvg xmlns=\"http://www.w3.org/2000/
 "use strict";
 module.exports = "data:image/svg+xml;utf8,%3Csvg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\">%3Cpath d=\"m15 12.3v-4.6c.6-.3 1-1 1-1.7 0-1.1-.9-2-2-2-.7 0-1.4.4-1.7 1h-4.6c-.3-.6-1-1-1.7-1-1.1 0-2 .9-2 2 0 .7.4 1.4 1 1.7v4.6c-.6.3-1 1-1 1.7 0 1.1.9 2 2 2 .7 0 1.4-.4 1.7-1h4.6c.3.6 1 1 1.7 1 1.1 0 2-.9 2-2 0-.7-.4-1.4-1-1.7zm-8-.3v-4l1-1h4l1 1v4l-1 1h-4z\"/>%3C/svg>";
 
-/***/ }),
-
-/***/ 3048:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/marker.42b5782a.png";
-
 /***/ })
 
 /******/ 	});
@@ -48305,18 +48297,28 @@ const pointToGeoJson = (position = [0, 0]) => {
  * 加载图片
  */
 const loadImage = (src, width = 24, height = 24) => {
+  const {
+    map
+  } = package_map;
   return new Promise(resolve => {
-    let image = new Image(width, height);
-    image.src = src;
-    image.onload = () => {
-      resolve(image);
-    };
+    if (src.indexOf('://') !== -1) {
+      map.loadImage(src, (error, image) => {
+        if (error) throw error;
+        resolve(image);
+      });
+    } else {
+      const image = new Image(width, height);
+      image.src = src;
+      image.onload = () => {
+        resolve(image);
+      };
+    }
   });
 };
 
 // 测距
 const ranging = () => {
-  let {
+  const {
     map
   } = package_map;
   measureLineLength(map);
@@ -48324,7 +48326,7 @@ const ranging = () => {
 
 // 测面积
 const drawArea = () => {
-  let {
+  const {
     map
   } = package_map;
   measureArea(map);
@@ -48332,7 +48334,7 @@ const drawArea = () => {
 
 // 清除测量
 const clearDraw = () => {
-  let {
+  const {
     map
   } = package_map;
   closeMeasureLine(map);
@@ -48547,7 +48549,7 @@ const addLayerPoint = (option, layerId) => {
 const addFlashPoint = (option = {
   id: 'flash',
   data: [],
-  timer: 3000,
+  time: 0,
   // 闪烁时间
   size: 140 // 大小
 }, layerId) => {
@@ -48622,12 +48624,12 @@ const addFlashPoint = (option = {
   } else {
     addDiyPoint(opt, layerId);
   }
-  if (option.timer > 0) {
+  if (option.time > 0) {
     window.clearInterval(clock);
     clock = window.setInterval(() => {
       map.removeImage(imgId);
       window.clearInterval(clock);
-    }, option.timer);
+    }, option.time);
   }
 };
 
@@ -48796,6 +48798,7 @@ const addLayerImagePoint = async (option, layerId) => {
       mapClick(id, opt.click);
     }
   };
+
   //图像处理导入
   if (image.imageList && image.imageList.length > 0) {
     // 循环遍历图片，同步执行，避免layer重复创建
@@ -48815,7 +48818,7 @@ const addLayerImagePoint = async (option, layerId) => {
     }
     afterOperation();
   } else {
-    const img = image.src || __webpack_require__(3048);
+    const img = image.src || 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAMAAADW3miqAAAA9lBMVEUAAAAoAgAmAQAoAgAiAQD/FQj/FQj/FQgpAgD/FQgoAgAoAgAeAQD/Fgn/FAf/FQf/Fgj/FAgkAgAoAgAoAgD/FwkpAgD/GAr/FwooAgD/Fwr/GAv/Fgn/Fgr/FwqiCQD/FQj/FQj/Fgj/FQj/FQj/FQgoAgD/GAoQAAD/Fgn/FgkoAgAoAgD/FwomAQD/GAv0Fgj/Fgj/FAdaBQD/FQj/FwkpAgD/FggUAQD/FggWAQD/FQiUCQItAAD/Fgj/FQgpAgAoAgDKEgf/Fwn/Fwr/Fwv/LiL/MSX/HxL/KyD/KBz/IRX/HA7/Fwr/GQz/JRn/JBj/Kh6yT5MYAAAARnRSTlMAOB8yGt7TwXdMQQgE2cS9r3pSPC8jFRQRDwv58uHPq6WgkotzampeREIsLCgZEu/RpJaKhIODgXpycnFoX1pXTEpGNx4F30JWjQAAAVhJREFUOMuV0NdygzAQQFFJYBPALe6917ik996QAGHj//+ZKDyYERJkch81Z7Q7C/5fUx8VtPxgcpJgFv1TQlyX0O64GUPqg61vW5hlOSSrS81XmjBhBWHseMeyf1IuI4ewvZ2IKE8CEqq99xk1M2pFwrtsxHx3HCwo8sIjnTIjfKXx9xr6EmS37jmksWli9JxDWRnCJM+h1F6KNA51peNIgUOFnXSnEYceiYiw09E5VNnaWEDusAm4+i4WzuRVAN+6JaxOr0C0V8/G/LAcELsN1gpNqgYkHTMVmvQaSBuziQdTl5LgLwsHxg9niV0QHFyxXQEJ5Vz8e6AFSKrWZuei1yC5GcW7NPirnE8+EoFZReYTPduoaiOOZJAC4fzZ680NCJcxDBlw+X7z0Lu8m5aVEsxI0QaWFGN6xCoqsLSSI2Cichm+FYuGoqyqIK5MQ1URQqpaNbn3H0jshWLyT794AAAAAElFTkSuQmCC';
     loadImage(img, image.width, image.height).then(image => {
       if (map.hasImage(`${id}-marker`)) {
         map.updateImage(`${id}-marker`, image);

package/xy-map.umd.js

@@ -24218,14 +24218,6 @@ module.exports = "data:image/svg+xml;utf8,%3Csvg xmlns=\"http://www.w3.org/2000/
 
 /***/ }),
 
-/***/ 3048:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-module.exports = __webpack_require__.p + "img/marker.42b5782a.png";
-
-/***/ }),
-
 /***/ 7203:
 /***/ (function(module) {
 
@@ -48323,18 +48315,28 @@ const pointToGeoJson = (position = [0, 0]) => {
  * 加载图片
  */
 const loadImage = (src, width = 24, height = 24) => {
+  const {
+    map
+  } = package_map;
   return new Promise(resolve => {
-    let image = new Image(width, height);
-    image.src = src;
-    image.onload = () => {
-      resolve(image);
-    };
+    if (src.indexOf('://') !== -1) {
+      map.loadImage(src, (error, image) => {
+        if (error) throw error;
+        resolve(image);
+      });
+    } else {
+      const image = new Image(width, height);
+      image.src = src;
+      image.onload = () => {
+        resolve(image);
+      };
+    }
   });
 };
 
 // 测距
 const ranging = () => {
-  let {
+  const {
     map
   } = package_map;
   measureLineLength(map);
@@ -48342,7 +48344,7 @@ const ranging = () => {
 
 // 测面积
 const drawArea = () => {
-  let {
+  const {
     map
   } = package_map;
   measureArea(map);
@@ -48350,7 +48352,7 @@ const drawArea = () => {
 
 // 清除测量
 const clearDraw = () => {
-  let {
+  const {
     map
   } = package_map;
   closeMeasureLine(map);
@@ -48565,7 +48567,7 @@ const addLayerPoint = (option, layerId) => {
 const addFlashPoint = (option = {
   id: 'flash',
   data: [],
-  timer: 3000,
+  time: 0,
   // 闪烁时间
   size: 140 // 大小
 }, layerId) => {
@@ -48640,12 +48642,12 @@ const addFlashPoint = (option = {
   } else {
     addDiyPoint(opt, layerId);
   }
-  if (option.timer > 0) {
+  if (option.time > 0) {
     window.clearInterval(clock);
     clock = window.setInterval(() => {
       map.removeImage(imgId);
       window.clearInterval(clock);
-    }, option.timer);
+    }, option.time);
   }
 };
 
@@ -48814,6 +48816,7 @@ const addLayerImagePoint = async (option, layerId) => {
       mapClick(id, opt.click);
     }
   };
+
   //图像处理导入
   if (image.imageList && image.imageList.length > 0) {
     // 循环遍历图片，同步执行，避免layer重复创建
@@ -48833,7 +48836,7 @@ const addLayerImagePoint = async (option, layerId) => {
     }
     afterOperation();
   } else {
-    const img = image.src || __webpack_require__(3048);
+    const img = image.src || 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAMAAADW3miqAAAA9lBMVEUAAAAoAgAmAQAoAgAiAQD/FQj/FQj/FQgpAgD/FQgoAgAoAgAeAQD/Fgn/FAf/FQf/Fgj/FAgkAgAoAgAoAgD/FwkpAgD/GAr/FwooAgD/Fwr/GAv/Fgn/Fgr/FwqiCQD/FQj/FQj/Fgj/FQj/FQj/FQgoAgD/GAoQAAD/Fgn/FgkoAgAoAgD/FwomAQD/GAv0Fgj/Fgj/FAdaBQD/FQj/FwkpAgD/FggUAQD/FggWAQD/FQiUCQItAAD/Fgj/FQgpAgAoAgDKEgf/Fwn/Fwr/Fwv/LiL/MSX/HxL/KyD/KBz/IRX/HA7/Fwr/GQz/JRn/JBj/Kh6yT5MYAAAARnRSTlMAOB8yGt7TwXdMQQgE2cS9r3pSPC8jFRQRDwv58uHPq6WgkotzampeREIsLCgZEu/RpJaKhIODgXpycnFoX1pXTEpGNx4F30JWjQAAAVhJREFUOMuV0NdygzAQQFFJYBPALe6917ik996QAGHj//+ZKDyYERJkch81Z7Q7C/5fUx8VtPxgcpJgFv1TQlyX0O64GUPqg61vW5hlOSSrS81XmjBhBWHseMeyf1IuI4ewvZ2IKE8CEqq99xk1M2pFwrtsxHx3HCwo8sIjnTIjfKXx9xr6EmS37jmksWli9JxDWRnCJM+h1F6KNA51peNIgUOFnXSnEYceiYiw09E5VNnaWEDusAm4+i4WzuRVAN+6JaxOr0C0V8/G/LAcELsN1gpNqgYkHTMVmvQaSBuziQdTl5LgLwsHxg9niV0QHFyxXQEJ5Vz8e6AFSKrWZuei1yC5GcW7NPirnE8+EoFZReYTPduoaiOOZJAC4fzZ680NCJcxDBlw+X7z0Lu8m5aVEsxI0QaWFGN6xCoqsLSSI2Cichm+FYuGoqyqIK5MQ1URQqpaNbn3H0jshWLyT794AAAAAElFTkSuQmCC';
     loadImage(img, image.width, image.height).then(image => {
       if (map.hasImage(`${id}-marker`)) {
         map.updateImage(`${id}-marker`, image);