xy-map 1.1.54 → 1.1.55

package/package.json

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

package/xy-map.common.js

@@ -224,7 +224,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
 
 /***/ }),
 
-/***/ 9195:
+/***/ 9047:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -238,7 +238,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-32331762]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-32331762]{cursor:pointer}.right-fixed[data-v-32331762]{position:absolute;right:0;top:0;margin:15px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-54603de0]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-54603de0]{cursor:pointer}.right-fixed[data-v-54603de0]{position:absolute;right:0;top:0;margin:15px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -42891,19 +42891,19 @@ var update = add("4a7b31d4", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 4210:
+/***/ 6967:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(9195);
+var content = __webpack_require__(9047);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(7037)/* ["default"] */ .Z)
-var update = add("64ed7672", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("c1b1835a", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -70815,8 +70815,11 @@ const loadImage = (src, width = 24, height = 24) => {
   return new Promise(resolve => {
     if (src.indexOf('://') !== -1) {
       map.loadImage(src, (error, image) => {
-        if (error) throw error;
-        resolve(image);
+        if (error) {
+          reject(error);
+        } else {
+          resolve(image);
+        }
       });
     } else {
       const image = new Image(width, height);
@@ -70824,6 +70827,9 @@ const loadImage = (src, width = 24, height = 24) => {
       image.onload = () => {
         resolve(image);
       };
+      image.onerror = error => {
+        reject(error);
+      };
     }
   });
 };
@@ -71043,7 +71049,7 @@ const removeLayer = id => {
   let {
     map
   } = package_map;
-  map.removeLayer(id);
+  if (hasLayer(id)) map.removeLayer(id);
   let arr = getLayerAll();
   let layers = arr.filter(item => item.id.includes(id + '-'));
   layers.forEach(item => {
@@ -72632,6 +72638,9 @@ const addLayerImagePoint = async (option, layerId) => {
           }
           resolve();
         });
+      }).catch(error => {
+        console.warn(`图片 ${img.url} 加载失败`, error);
+        resolve();
       });
       await loadImg;
     }
@@ -81867,7 +81876,7 @@ function path_join() {
   });
   return parts.join(separator);
 }
-function resolve() {
+function path_resolve() {
   const paths = [];
   for (let _i = 0; _i < arguments.length; _i++) {
     paths[_i] = _i < 0 || arguments.length <= _i ? undefined : arguments[_i];
@@ -120449,8 +120458,8 @@ var mapStyle_component = normalizeComponent(
 )
 
 /* harmony default export */ var mapStyle = (mapStyle_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=32331762&scoped=true&
-var drawvue_type_template_id_32331762_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=54603de0&scoped=true&
+var drawvue_type_template_id_54603de0_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -120587,7 +120596,7 @@ var drawvue_type_template_id_32331762_scoped_true_render = function render() {
     staticClass: "right-fixed"
   }, [_vm._t("right-fixed")], 2)]);
 };
-var drawvue_type_template_id_32331762_scoped_true_staticRenderFns = [];
+var drawvue_type_template_id_54603de0_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(6957);
@@ -121151,10 +121160,13 @@ var shpFile_component = normalizeComponent(
         if (keyCode == 46) {
           // 按下delete键
           console.log('删除锚点', this.selectPoint, this.activeFeatures[0].geometry.coordinates);
+          let isDelete = true;
           this.selectPoint.forEach(point => {
             if (type === 'Polygon') {
-              if (this.activeFeatures[0].geometry.coordinates[0].length == 3) {
+              if (this.activeFeatures[0].geometry.coordinates[0].length == 4) {
+                //面至少3个点，同时起止点重复，所以需要限制为4个点
                 this.$message.warning('面图层至少绘制3个点，无法删除！');
+                isDelete = false;
                 return;
               }
               this.activeFeatures[0].geometry.coordinates[0].forEach((item, index) => {
@@ -121166,6 +121178,7 @@ var shpFile_component = normalizeComponent(
             } else if (type === 'LineString') {
               if (this.activeFeatures[0].geometry.coordinates.length == 2) {
                 this.$message.warning('线图层至少绘制2个点，无法删除！');
+                isDelete = false;
                 return;
               }
               this.activeFeatures[0].geometry.coordinates.forEach((item, index) => {
@@ -121177,7 +121190,7 @@ var shpFile_component = normalizeComponent(
           });
           //更新绘制内容
           this.updateGeometry(this.activeFeatures[0]);
-          this.$emit('deletePoint', {
+          if (isDelete) this.$emit('deletePoint', {
             selectPoint: [...this.selectPoint],
             data: this.getDraw()
           });
@@ -121333,9 +121346,9 @@ var shpFile_component = normalizeComponent(
 });
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var package_drawvue_type_script_lang_js_ = (drawvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=32331762&prod&lang=scss&scoped=true&
-var drawvue_type_style_index_0_id_32331762_prod_lang_scss_scoped_true_ = __webpack_require__(4210);
-;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=32331762&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=54603de0&prod&lang=scss&scoped=true&
+var drawvue_type_style_index_0_id_54603de0_prod_lang_scss_scoped_true_ = __webpack_require__(6967);
+;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=54603de0&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue
 
@@ -121348,11 +121361,11 @@ var drawvue_type_style_index_0_id_32331762_prod_lang_scss_scoped_true_ = __webpa
 
 var draw_component = normalizeComponent(
   package_drawvue_type_script_lang_js_,
-  drawvue_type_template_id_32331762_scoped_true_render,
-  drawvue_type_template_id_32331762_scoped_true_staticRenderFns,
+  drawvue_type_template_id_54603de0_scoped_true_render,
+  drawvue_type_template_id_54603de0_scoped_true_staticRenderFns,
   false,
   null,
-  "32331762",
+  "54603de0",
   null
   
 )

package/xy-map.umd.js

@@ -234,7 +234,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
 
 /***/ }),
 
-/***/ 3833:
+/***/ 5521:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -248,7 +248,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-32331762]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-32331762]{cursor:pointer}.right-fixed[data-v-32331762]{position:absolute;right:0;top:0;margin:15px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-54603de0]{position:absolute;left:0;top:0;margin:15px;background-color:hsla(0,0%,100%,.9);padding:14px;border-radius:5px}.tools .tools-bar[data-v-54603de0]{cursor:pointer}.right-fixed[data-v-54603de0]{position:absolute;right:0;top:0;margin:15px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -42901,19 +42901,19 @@ var update = add("33a2ac54", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 8097:
+/***/ 6831:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(3833);
+var content = __webpack_require__(5521);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(208)/* ["default"] */ .Z)
-var update = add("1f604172", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("7c244e5a", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -70833,8 +70833,11 @@ const loadImage = (src, width = 24, height = 24) => {
   return new Promise(resolve => {
     if (src.indexOf('://') !== -1) {
       map.loadImage(src, (error, image) => {
-        if (error) throw error;
-        resolve(image);
+        if (error) {
+          reject(error);
+        } else {
+          resolve(image);
+        }
       });
     } else {
       const image = new Image(width, height);
@@ -70842,6 +70845,9 @@ const loadImage = (src, width = 24, height = 24) => {
       image.onload = () => {
         resolve(image);
       };
+      image.onerror = error => {
+        reject(error);
+      };
     }
   });
 };
@@ -71061,7 +71067,7 @@ const removeLayer = id => {
   let {
     map
   } = package_map;
-  map.removeLayer(id);
+  if (hasLayer(id)) map.removeLayer(id);
   let arr = getLayerAll();
   let layers = arr.filter(item => item.id.includes(id + '-'));
   layers.forEach(item => {
@@ -72650,6 +72656,9 @@ const addLayerImagePoint = async (option, layerId) => {
           }
           resolve();
         });
+      }).catch(error => {
+        console.warn(`图片 ${img.url} 加载失败`, error);
+        resolve();
       });
       await loadImg;
     }
@@ -81885,7 +81894,7 @@ function path_join() {
   });
   return parts.join(separator);
 }
-function resolve() {
+function path_resolve() {
   const paths = [];
   for (let _i = 0; _i < arguments.length; _i++) {
     paths[_i] = _i < 0 || arguments.length <= _i ? undefined : arguments[_i];
@@ -120467,8 +120476,8 @@ var mapStyle_component = normalizeComponent(
 )
 
 /* harmony default export */ var mapStyle = (mapStyle_component.exports);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=32331762&scoped=true&
-var drawvue_type_template_id_32331762_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=template&id=54603de0&scoped=true&
+var drawvue_type_template_id_54603de0_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -120605,7 +120614,7 @@ var drawvue_type_template_id_32331762_scoped_true_render = function render() {
     staticClass: "right-fixed"
   }, [_vm._t("right-fixed")], 2)]);
 };
-var drawvue_type_template_id_32331762_scoped_true_staticRenderFns = [];
+var drawvue_type_template_id_54603de0_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(5620);
@@ -121169,10 +121178,13 @@ var shpFile_component = normalizeComponent(
         if (keyCode == 46) {
           // 按下delete键
           console.log('删除锚点', this.selectPoint, this.activeFeatures[0].geometry.coordinates);
+          let isDelete = true;
           this.selectPoint.forEach(point => {
             if (type === 'Polygon') {
-              if (this.activeFeatures[0].geometry.coordinates[0].length == 3) {
+              if (this.activeFeatures[0].geometry.coordinates[0].length == 4) {
+                //面至少3个点，同时起止点重复，所以需要限制为4个点
                 this.$message.warning('面图层至少绘制3个点，无法删除！');
+                isDelete = false;
                 return;
               }
               this.activeFeatures[0].geometry.coordinates[0].forEach((item, index) => {
@@ -121184,6 +121196,7 @@ var shpFile_component = normalizeComponent(
             } else if (type === 'LineString') {
               if (this.activeFeatures[0].geometry.coordinates.length == 2) {
                 this.$message.warning('线图层至少绘制2个点，无法删除！');
+                isDelete = false;
                 return;
               }
               this.activeFeatures[0].geometry.coordinates.forEach((item, index) => {
@@ -121195,7 +121208,7 @@ var shpFile_component = normalizeComponent(
           });
           //更新绘制内容
           this.updateGeometry(this.activeFeatures[0]);
-          this.$emit('deletePoint', {
+          if (isDelete) this.$emit('deletePoint', {
             selectPoint: [...this.selectPoint],
             data: this.getDraw()
           });
@@ -121351,9 +121364,9 @@ var shpFile_component = normalizeComponent(
 });
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var package_drawvue_type_script_lang_js_ = (drawvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=32331762&prod&lang=scss&scoped=true&
-var drawvue_type_style_index_0_id_32331762_prod_lang_scss_scoped_true_ = __webpack_require__(8097);
-;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=32331762&prod&lang=scss&scoped=true&
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/index.vue?vue&type=style&index=0&id=54603de0&prod&lang=scss&scoped=true&
+var drawvue_type_style_index_0_id_54603de0_prod_lang_scss_scoped_true_ = __webpack_require__(6831);
+;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=54603de0&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue
 
@@ -121366,11 +121379,11 @@ var drawvue_type_style_index_0_id_32331762_prod_lang_scss_scoped_true_ = __webpa
 
 var draw_component = normalizeComponent(
   package_drawvue_type_script_lang_js_,
-  drawvue_type_template_id_32331762_scoped_true_render,
-  drawvue_type_template_id_32331762_scoped_true_staticRenderFns,
+  drawvue_type_template_id_54603de0_scoped_true_render,
+  drawvue_type_template_id_54603de0_scoped_true_staticRenderFns,
   false,
   null,
-  "32331762",
+  "54603de0",
   null
   
 )