xy-map 1.1.54 → 1.1.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xy-map",
3
- "version": "1.1.54",
3
+ "version": "1.1.56",
4
4
  "description": "雄越地图",
5
5
  "main": "xy-map.umd.min.js",
6
6
  "scripts": {
package/xy-map.common.js CHANGED
@@ -224,7 +224,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
224
224
 
225
225
  /***/ }),
226
226
 
227
- /***/ 9195:
227
+ /***/ 8921:
228
228
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
229
229
 
230
230
  "use strict";
@@ -238,7 +238,7 @@ __webpack_require__.r(__webpack_exports__);
238
238
 
239
239
  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()));
240
240
  // Module
241
- ___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}", ""]);
241
+ ___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-4d022886]{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-4d022886]{cursor:pointer}.right-fixed[data-v-4d022886]{position:absolute;right:0;top:0;margin:15px}", ""]);
242
242
  // Exports
243
243
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
244
244
 
@@ -42891,19 +42891,19 @@ var update = add("4a7b31d4", content, true, {"sourceMap":false,"shadowMode":fals
42891
42891
 
42892
42892
  /***/ }),
42893
42893
 
42894
- /***/ 4210:
42894
+ /***/ 343:
42895
42895
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
42896
42896
 
42897
42897
  // style-loader: Adds some css to the DOM by adding a <style> tag
42898
42898
 
42899
42899
  // load the styles
42900
- var content = __webpack_require__(9195);
42900
+ var content = __webpack_require__(8921);
42901
42901
  if(content.__esModule) content = content.default;
42902
42902
  if(typeof content === 'string') content = [[module.id, content, '']];
42903
42903
  if(content.locals) module.exports = content.locals;
42904
42904
  // add the styles to the DOM
42905
42905
  var add = (__webpack_require__(7037)/* ["default"] */ .Z)
42906
- var update = add("64ed7672", content, true, {"sourceMap":false,"shadowMode":false});
42906
+ var update = add("531b6652", content, true, {"sourceMap":false,"shadowMode":false});
42907
42907
 
42908
42908
  /***/ }),
42909
42909
 
@@ -70815,8 +70815,11 @@ const loadImage = (src, width = 24, height = 24) => {
70815
70815
  return new Promise(resolve => {
70816
70816
  if (src.indexOf('://') !== -1) {
70817
70817
  map.loadImage(src, (error, image) => {
70818
- if (error) throw error;
70819
- resolve(image);
70818
+ if (error) {
70819
+ reject(error);
70820
+ } else {
70821
+ resolve(image);
70822
+ }
70820
70823
  });
70821
70824
  } else {
70822
70825
  const image = new Image(width, height);
@@ -70824,6 +70827,9 @@ const loadImage = (src, width = 24, height = 24) => {
70824
70827
  image.onload = () => {
70825
70828
  resolve(image);
70826
70829
  };
70830
+ image.onerror = error => {
70831
+ reject(error);
70832
+ };
70827
70833
  }
70828
70834
  });
70829
70835
  };
@@ -71043,7 +71049,7 @@ const removeLayer = id => {
71043
71049
  let {
71044
71050
  map
71045
71051
  } = package_map;
71046
- map.removeLayer(id);
71052
+ if (hasLayer(id)) map.removeLayer(id);
71047
71053
  let arr = getLayerAll();
71048
71054
  let layers = arr.filter(item => item.id.includes(id + '-'));
71049
71055
  layers.forEach(item => {
@@ -72632,6 +72638,9 @@ const addLayerImagePoint = async (option, layerId) => {
72632
72638
  }
72633
72639
  resolve();
72634
72640
  });
72641
+ }).catch(error => {
72642
+ console.warn(`图片 ${img.url} 加载失败`, error);
72643
+ resolve();
72635
72644
  });
72636
72645
  await loadImg;
72637
72646
  }
@@ -81867,7 +81876,7 @@ function path_join() {
81867
81876
  });
81868
81877
  return parts.join(separator);
81869
81878
  }
81870
- function resolve() {
81879
+ function path_resolve() {
81871
81880
  const paths = [];
81872
81881
  for (let _i = 0; _i < arguments.length; _i++) {
81873
81882
  paths[_i] = _i < 0 || arguments.length <= _i ? undefined : arguments[_i];
@@ -120449,8 +120458,8 @@ var mapStyle_component = normalizeComponent(
120449
120458
  )
120450
120459
 
120451
120460
  /* harmony default export */ var mapStyle = (mapStyle_component.exports);
120452
- ;// 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&
120453
- var drawvue_type_template_id_32331762_scoped_true_render = function render() {
120461
+ ;// 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=4d022886&scoped=true&
120462
+ var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
120454
120463
  var _vm = this,
120455
120464
  _c = _vm._self._c;
120456
120465
  return _c('div', [_c('div', {
@@ -120587,7 +120596,7 @@ var drawvue_type_template_id_32331762_scoped_true_render = function render() {
120587
120596
  staticClass: "right-fixed"
120588
120597
  }, [_vm._t("right-fixed")], 2)]);
120589
120598
  };
120590
- var drawvue_type_template_id_32331762_scoped_true_staticRenderFns = [];
120599
+ var drawvue_type_template_id_4d022886_scoped_true_staticRenderFns = [];
120591
120600
 
120592
120601
  // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
120593
120602
  var dist_mapbox_gl_draw = __webpack_require__(6957);
@@ -121151,10 +121160,13 @@ var shpFile_component = normalizeComponent(
121151
121160
  if (keyCode == 46) {
121152
121161
  // 按下delete键
121153
121162
  console.log('删除锚点', this.selectPoint, this.activeFeatures[0].geometry.coordinates);
121163
+ let isDelete = true;
121154
121164
  this.selectPoint.forEach(point => {
121155
121165
  if (type === 'Polygon') {
121156
- if (this.activeFeatures[0].geometry.coordinates[0].length == 3) {
121166
+ if (this.activeFeatures[0].geometry.coordinates[0].length == 4) {
121167
+ //面至少3个点,同时起止点重复,所以需要限制为4个点
121157
121168
  this.$message.warning('面图层至少绘制3个点,无法删除!');
121169
+ isDelete = false;
121158
121170
  return;
121159
121171
  }
121160
121172
  this.activeFeatures[0].geometry.coordinates[0].forEach((item, index) => {
@@ -121166,6 +121178,7 @@ var shpFile_component = normalizeComponent(
121166
121178
  } else if (type === 'LineString') {
121167
121179
  if (this.activeFeatures[0].geometry.coordinates.length == 2) {
121168
121180
  this.$message.warning('线图层至少绘制2个点,无法删除!');
121181
+ isDelete = false;
121169
121182
  return;
121170
121183
  }
121171
121184
  this.activeFeatures[0].geometry.coordinates.forEach((item, index) => {
@@ -121177,7 +121190,7 @@ var shpFile_component = normalizeComponent(
121177
121190
  });
121178
121191
  //更新绘制内容
121179
121192
  this.updateGeometry(this.activeFeatures[0]);
121180
- this.$emit('deletePoint', {
121193
+ if (isDelete) this.$emit('deletePoint', {
121181
121194
  selectPoint: [...this.selectPoint],
121182
121195
  data: this.getDraw()
121183
121196
  });
@@ -121238,6 +121251,7 @@ var shpFile_component = normalizeComponent(
121238
121251
  // coordinates: [this.lng, this.lat]
121239
121252
  // }
121240
121253
  this.geoJson = geoJson;
121254
+ if (!geoJson || !geoJson.features) return;
121241
121255
  geoJson.features.forEach(item => {
121242
121256
  this.draw.add(item.geometry);
121243
121257
  });
@@ -121333,9 +121347,9 @@ var shpFile_component = normalizeComponent(
121333
121347
  });
121334
121348
  ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=script&lang=js&
121335
121349
  /* harmony default export */ var package_drawvue_type_script_lang_js_ = (drawvue_type_script_lang_js_);
121336
- // 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&
121337
- var drawvue_type_style_index_0_id_32331762_prod_lang_scss_scoped_true_ = __webpack_require__(4210);
121338
- ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=32331762&prod&lang=scss&scoped=true&
121350
+ // 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=4d022886&prod&lang=scss&scoped=true&
121351
+ var drawvue_type_style_index_0_id_4d022886_prod_lang_scss_scoped_true_ = __webpack_require__(343);
121352
+ ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=4d022886&prod&lang=scss&scoped=true&
121339
121353
 
121340
121354
  ;// CONCATENATED MODULE: ./src/package/draw/index.vue
121341
121355
 
@@ -121348,11 +121362,11 @@ var drawvue_type_style_index_0_id_32331762_prod_lang_scss_scoped_true_ = __webpa
121348
121362
 
121349
121363
  var draw_component = normalizeComponent(
121350
121364
  package_drawvue_type_script_lang_js_,
121351
- drawvue_type_template_id_32331762_scoped_true_render,
121352
- drawvue_type_template_id_32331762_scoped_true_staticRenderFns,
121365
+ drawvue_type_template_id_4d022886_scoped_true_render,
121366
+ drawvue_type_template_id_4d022886_scoped_true_staticRenderFns,
121353
121367
  false,
121354
121368
  null,
121355
- "32331762",
121369
+ "4d022886",
121356
121370
  null
121357
121371
 
121358
121372
  )
@@ -121571,8 +121585,8 @@ var point_component = normalizeComponent(
121571
121585
  )
121572
121586
 
121573
121587
  /* harmony default export */ var point = (point_component.exports);
121574
- ;// 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/line.vue?vue&type=template&id=9381e4bc&
121575
- var linevue_type_template_id_9381e4bc_render = function render() {
121588
+ ;// 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/line.vue?vue&type=template&id=1e1a2862&
121589
+ var linevue_type_template_id_1e1a2862_render = function render() {
121576
121590
  var _vm = this,
121577
121591
  _c = _vm._self._c;
121578
121592
  return _c('div', {
@@ -121627,7 +121641,7 @@ var linevue_type_template_id_9381e4bc_render = function render() {
121627
121641
  }
121628
121642
  }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
121629
121643
  };
121630
- var linevue_type_template_id_9381e4bc_staticRenderFns = [];
121644
+ var linevue_type_template_id_1e1a2862_staticRenderFns = [];
121631
121645
 
121632
121646
  ;// 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/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=script&lang=js&
121633
121647
 
@@ -121725,7 +121739,7 @@ var linevue_type_template_id_9381e4bc_staticRenderFns = [];
121725
121739
  }
121726
121740
  },
121727
121741
  drawUpdate(data, autoZoom = false) {
121728
- if (!data) return;
121742
+ if (!data || !data.features) return;
121729
121743
  this.geoJson = data;
121730
121744
  this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
121731
121745
  this.position = spArray(2, ...this.position); // 数组分割,两两一组
@@ -121774,8 +121788,8 @@ var linevue_type_template_id_9381e4bc_staticRenderFns = [];
121774
121788
  ;
121775
121789
  var line_component = normalizeComponent(
121776
121790
  draw_linevue_type_script_lang_js_,
121777
- linevue_type_template_id_9381e4bc_render,
121778
- linevue_type_template_id_9381e4bc_staticRenderFns,
121791
+ linevue_type_template_id_1e1a2862_render,
121792
+ linevue_type_template_id_1e1a2862_staticRenderFns,
121779
121793
  false,
121780
121794
  null,
121781
121795
  null,
@@ -121784,8 +121798,8 @@ var line_component = normalizeComponent(
121784
121798
  )
121785
121799
 
121786
121800
  /* harmony default export */ var draw_line = (line_component.exports);
121787
- ;// 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/polygon.vue?vue&type=template&id=7fe5b58b&
121788
- var polygonvue_type_template_id_7fe5b58b_render = function render() {
121801
+ ;// 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/polygon.vue?vue&type=template&id=4c27d54b&
121802
+ var polygonvue_type_template_id_4c27d54b_render = function render() {
121789
121803
  var _vm = this,
121790
121804
  _c = _vm._self._c;
121791
121805
  return _c('div', {
@@ -121840,7 +121854,7 @@ var polygonvue_type_template_id_7fe5b58b_render = function render() {
121840
121854
  }
121841
121855
  }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
121842
121856
  };
121843
- var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
121857
+ var polygonvue_type_template_id_4c27d54b_staticRenderFns = [];
121844
121858
 
121845
121859
  ;// 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/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=script&lang=js&
121846
121860
 
@@ -121938,7 +121952,7 @@ var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
121938
121952
  }
121939
121953
  },
121940
121954
  drawUpdate(data, autoZoom = false) {
121941
- if (!data) return;
121955
+ if (!data || !data.features) return;
121942
121956
  this.geoJson = data;
121943
121957
  this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
121944
121958
  this.position = spArray(2, ...this.position);
@@ -121986,8 +122000,8 @@ var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
121986
122000
  ;
121987
122001
  var polygon_component = normalizeComponent(
121988
122002
  draw_polygonvue_type_script_lang_js_,
121989
- polygonvue_type_template_id_7fe5b58b_render,
121990
- polygonvue_type_template_id_7fe5b58b_staticRenderFns,
122003
+ polygonvue_type_template_id_4c27d54b_render,
122004
+ polygonvue_type_template_id_4c27d54b_staticRenderFns,
121991
122005
  false,
121992
122006
  null,
121993
122007
  null,
package/xy-map.umd.js CHANGED
@@ -234,7 +234,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
234
234
 
235
235
  /***/ }),
236
236
 
237
- /***/ 3833:
237
+ /***/ 8185:
238
238
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
239
239
 
240
240
  "use strict";
@@ -248,7 +248,7 @@ __webpack_require__.r(__webpack_exports__);
248
248
 
249
249
  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()));
250
250
  // Module
251
- ___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}", ""]);
251
+ ___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-4d022886]{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-4d022886]{cursor:pointer}.right-fixed[data-v-4d022886]{position:absolute;right:0;top:0;margin:15px}", ""]);
252
252
  // Exports
253
253
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
254
254
 
@@ -42901,19 +42901,19 @@ var update = add("33a2ac54", content, true, {"sourceMap":false,"shadowMode":fals
42901
42901
 
42902
42902
  /***/ }),
42903
42903
 
42904
- /***/ 8097:
42904
+ /***/ 8689:
42905
42905
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
42906
42906
 
42907
42907
  // style-loader: Adds some css to the DOM by adding a <style> tag
42908
42908
 
42909
42909
  // load the styles
42910
- var content = __webpack_require__(3833);
42910
+ var content = __webpack_require__(8185);
42911
42911
  if(content.__esModule) content = content.default;
42912
42912
  if(typeof content === 'string') content = [[module.id, content, '']];
42913
42913
  if(content.locals) module.exports = content.locals;
42914
42914
  // add the styles to the DOM
42915
42915
  var add = (__webpack_require__(208)/* ["default"] */ .Z)
42916
- var update = add("1f604172", content, true, {"sourceMap":false,"shadowMode":false});
42916
+ var update = add("75e200d2", content, true, {"sourceMap":false,"shadowMode":false});
42917
42917
 
42918
42918
  /***/ }),
42919
42919
 
@@ -70833,8 +70833,11 @@ const loadImage = (src, width = 24, height = 24) => {
70833
70833
  return new Promise(resolve => {
70834
70834
  if (src.indexOf('://') !== -1) {
70835
70835
  map.loadImage(src, (error, image) => {
70836
- if (error) throw error;
70837
- resolve(image);
70836
+ if (error) {
70837
+ reject(error);
70838
+ } else {
70839
+ resolve(image);
70840
+ }
70838
70841
  });
70839
70842
  } else {
70840
70843
  const image = new Image(width, height);
@@ -70842,6 +70845,9 @@ const loadImage = (src, width = 24, height = 24) => {
70842
70845
  image.onload = () => {
70843
70846
  resolve(image);
70844
70847
  };
70848
+ image.onerror = error => {
70849
+ reject(error);
70850
+ };
70845
70851
  }
70846
70852
  });
70847
70853
  };
@@ -71061,7 +71067,7 @@ const removeLayer = id => {
71061
71067
  let {
71062
71068
  map
71063
71069
  } = package_map;
71064
- map.removeLayer(id);
71070
+ if (hasLayer(id)) map.removeLayer(id);
71065
71071
  let arr = getLayerAll();
71066
71072
  let layers = arr.filter(item => item.id.includes(id + '-'));
71067
71073
  layers.forEach(item => {
@@ -72650,6 +72656,9 @@ const addLayerImagePoint = async (option, layerId) => {
72650
72656
  }
72651
72657
  resolve();
72652
72658
  });
72659
+ }).catch(error => {
72660
+ console.warn(`图片 ${img.url} 加载失败`, error);
72661
+ resolve();
72653
72662
  });
72654
72663
  await loadImg;
72655
72664
  }
@@ -81885,7 +81894,7 @@ function path_join() {
81885
81894
  });
81886
81895
  return parts.join(separator);
81887
81896
  }
81888
- function resolve() {
81897
+ function path_resolve() {
81889
81898
  const paths = [];
81890
81899
  for (let _i = 0; _i < arguments.length; _i++) {
81891
81900
  paths[_i] = _i < 0 || arguments.length <= _i ? undefined : arguments[_i];
@@ -120467,8 +120476,8 @@ var mapStyle_component = normalizeComponent(
120467
120476
  )
120468
120477
 
120469
120478
  /* harmony default export */ var mapStyle = (mapStyle_component.exports);
120470
- ;// 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&
120471
- var drawvue_type_template_id_32331762_scoped_true_render = function render() {
120479
+ ;// 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=4d022886&scoped=true&
120480
+ var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
120472
120481
  var _vm = this,
120473
120482
  _c = _vm._self._c;
120474
120483
  return _c('div', [_c('div', {
@@ -120605,7 +120614,7 @@ var drawvue_type_template_id_32331762_scoped_true_render = function render() {
120605
120614
  staticClass: "right-fixed"
120606
120615
  }, [_vm._t("right-fixed")], 2)]);
120607
120616
  };
120608
- var drawvue_type_template_id_32331762_scoped_true_staticRenderFns = [];
120617
+ var drawvue_type_template_id_4d022886_scoped_true_staticRenderFns = [];
120609
120618
 
120610
120619
  // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
120611
120620
  var dist_mapbox_gl_draw = __webpack_require__(5620);
@@ -121169,10 +121178,13 @@ var shpFile_component = normalizeComponent(
121169
121178
  if (keyCode == 46) {
121170
121179
  // 按下delete键
121171
121180
  console.log('删除锚点', this.selectPoint, this.activeFeatures[0].geometry.coordinates);
121181
+ let isDelete = true;
121172
121182
  this.selectPoint.forEach(point => {
121173
121183
  if (type === 'Polygon') {
121174
- if (this.activeFeatures[0].geometry.coordinates[0].length == 3) {
121184
+ if (this.activeFeatures[0].geometry.coordinates[0].length == 4) {
121185
+ //面至少3个点,同时起止点重复,所以需要限制为4个点
121175
121186
  this.$message.warning('面图层至少绘制3个点,无法删除!');
121187
+ isDelete = false;
121176
121188
  return;
121177
121189
  }
121178
121190
  this.activeFeatures[0].geometry.coordinates[0].forEach((item, index) => {
@@ -121184,6 +121196,7 @@ var shpFile_component = normalizeComponent(
121184
121196
  } else if (type === 'LineString') {
121185
121197
  if (this.activeFeatures[0].geometry.coordinates.length == 2) {
121186
121198
  this.$message.warning('线图层至少绘制2个点,无法删除!');
121199
+ isDelete = false;
121187
121200
  return;
121188
121201
  }
121189
121202
  this.activeFeatures[0].geometry.coordinates.forEach((item, index) => {
@@ -121195,7 +121208,7 @@ var shpFile_component = normalizeComponent(
121195
121208
  });
121196
121209
  //更新绘制内容
121197
121210
  this.updateGeometry(this.activeFeatures[0]);
121198
- this.$emit('deletePoint', {
121211
+ if (isDelete) this.$emit('deletePoint', {
121199
121212
  selectPoint: [...this.selectPoint],
121200
121213
  data: this.getDraw()
121201
121214
  });
@@ -121256,6 +121269,7 @@ var shpFile_component = normalizeComponent(
121256
121269
  // coordinates: [this.lng, this.lat]
121257
121270
  // }
121258
121271
  this.geoJson = geoJson;
121272
+ if (!geoJson || !geoJson.features) return;
121259
121273
  geoJson.features.forEach(item => {
121260
121274
  this.draw.add(item.geometry);
121261
121275
  });
@@ -121351,9 +121365,9 @@ var shpFile_component = normalizeComponent(
121351
121365
  });
121352
121366
  ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=script&lang=js&
121353
121367
  /* harmony default export */ var package_drawvue_type_script_lang_js_ = (drawvue_type_script_lang_js_);
121354
- // 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&
121355
- var drawvue_type_style_index_0_id_32331762_prod_lang_scss_scoped_true_ = __webpack_require__(8097);
121356
- ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=32331762&prod&lang=scss&scoped=true&
121368
+ // 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=4d022886&prod&lang=scss&scoped=true&
121369
+ var drawvue_type_style_index_0_id_4d022886_prod_lang_scss_scoped_true_ = __webpack_require__(8689);
121370
+ ;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=4d022886&prod&lang=scss&scoped=true&
121357
121371
 
121358
121372
  ;// CONCATENATED MODULE: ./src/package/draw/index.vue
121359
121373
 
@@ -121366,11 +121380,11 @@ var drawvue_type_style_index_0_id_32331762_prod_lang_scss_scoped_true_ = __webpa
121366
121380
 
121367
121381
  var draw_component = normalizeComponent(
121368
121382
  package_drawvue_type_script_lang_js_,
121369
- drawvue_type_template_id_32331762_scoped_true_render,
121370
- drawvue_type_template_id_32331762_scoped_true_staticRenderFns,
121383
+ drawvue_type_template_id_4d022886_scoped_true_render,
121384
+ drawvue_type_template_id_4d022886_scoped_true_staticRenderFns,
121371
121385
  false,
121372
121386
  null,
121373
- "32331762",
121387
+ "4d022886",
121374
121388
  null
121375
121389
 
121376
121390
  )
@@ -121589,8 +121603,8 @@ var point_component = normalizeComponent(
121589
121603
  )
121590
121604
 
121591
121605
  /* harmony default export */ var point = (point_component.exports);
121592
- ;// 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/line.vue?vue&type=template&id=9381e4bc&
121593
- var linevue_type_template_id_9381e4bc_render = function render() {
121606
+ ;// 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/line.vue?vue&type=template&id=1e1a2862&
121607
+ var linevue_type_template_id_1e1a2862_render = function render() {
121594
121608
  var _vm = this,
121595
121609
  _c = _vm._self._c;
121596
121610
  return _c('div', {
@@ -121645,7 +121659,7 @@ var linevue_type_template_id_9381e4bc_render = function render() {
121645
121659
  }
121646
121660
  }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
121647
121661
  };
121648
- var linevue_type_template_id_9381e4bc_staticRenderFns = [];
121662
+ var linevue_type_template_id_1e1a2862_staticRenderFns = [];
121649
121663
 
121650
121664
  ;// 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/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=script&lang=js&
121651
121665
 
@@ -121743,7 +121757,7 @@ var linevue_type_template_id_9381e4bc_staticRenderFns = [];
121743
121757
  }
121744
121758
  },
121745
121759
  drawUpdate(data, autoZoom = false) {
121746
- if (!data) return;
121760
+ if (!data || !data.features) return;
121747
121761
  this.geoJson = data;
121748
121762
  this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
121749
121763
  this.position = spArray(2, ...this.position); // 数组分割,两两一组
@@ -121792,8 +121806,8 @@ var linevue_type_template_id_9381e4bc_staticRenderFns = [];
121792
121806
  ;
121793
121807
  var line_component = normalizeComponent(
121794
121808
  draw_linevue_type_script_lang_js_,
121795
- linevue_type_template_id_9381e4bc_render,
121796
- linevue_type_template_id_9381e4bc_staticRenderFns,
121809
+ linevue_type_template_id_1e1a2862_render,
121810
+ linevue_type_template_id_1e1a2862_staticRenderFns,
121797
121811
  false,
121798
121812
  null,
121799
121813
  null,
@@ -121802,8 +121816,8 @@ var line_component = normalizeComponent(
121802
121816
  )
121803
121817
 
121804
121818
  /* harmony default export */ var draw_line = (line_component.exports);
121805
- ;// 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/polygon.vue?vue&type=template&id=7fe5b58b&
121806
- var polygonvue_type_template_id_7fe5b58b_render = function render() {
121819
+ ;// 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/polygon.vue?vue&type=template&id=4c27d54b&
121820
+ var polygonvue_type_template_id_4c27d54b_render = function render() {
121807
121821
  var _vm = this,
121808
121822
  _c = _vm._self._c;
121809
121823
  return _c('div', {
@@ -121858,7 +121872,7 @@ var polygonvue_type_template_id_7fe5b58b_render = function render() {
121858
121872
  }
121859
121873
  }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
121860
121874
  };
121861
- var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
121875
+ var polygonvue_type_template_id_4c27d54b_staticRenderFns = [];
121862
121876
 
121863
121877
  ;// 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/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=script&lang=js&
121864
121878
 
@@ -121956,7 +121970,7 @@ var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
121956
121970
  }
121957
121971
  },
121958
121972
  drawUpdate(data, autoZoom = false) {
121959
- if (!data) return;
121973
+ if (!data || !data.features) return;
121960
121974
  this.geoJson = data;
121961
121975
  this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
121962
121976
  this.position = spArray(2, ...this.position);
@@ -122004,8 +122018,8 @@ var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
122004
122018
  ;
122005
122019
  var polygon_component = normalizeComponent(
122006
122020
  draw_polygonvue_type_script_lang_js_,
122007
- polygonvue_type_template_id_7fe5b58b_render,
122008
- polygonvue_type_template_id_7fe5b58b_staticRenderFns,
122021
+ polygonvue_type_template_id_4c27d54b_render,
122022
+ polygonvue_type_template_id_4c27d54b_staticRenderFns,
122009
122023
  false,
122010
122024
  null,
122011
122025
  null,