xy-map 1.1.55 → 1.1.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-map",
-  "version": "1.1.55",
+  "version": "1.1.57",
   "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
 
 /***/ }),
 
-/***/ 9047:
+/***/ 8921:
 /***/ (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-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}", ""]);
+___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}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -42891,19 +42891,19 @@ var update = add("4a7b31d4", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 6967:
+/***/ 343:
 /***/ (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__(9047);
+var content = __webpack_require__(8921);
 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("c1b1835a", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("531b6652", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -70735,19 +70735,63 @@ const geometryCollectionToFeatureCollection = geometryCollection => {
 const wgs84ToGcj02 = coord => {
   // 输入检查
   if (!Array.isArray(coord) || coord.length !== 2) {
-    throw new Error('Input must be an array with [longitude, latitude]');
+    throw new Error('输入必须是包含经度和纬度的数组');
   }
   let [lng, lat] = coord.map(Number);
 
   // 检查输入是否为有效数字
   if (isNaN(lng) || isNaN(lat)) {
-    throw new Error('Coordinates must be valid numbers');
+    throw new Error('坐标必须是有效的数字');
   }
 
   // 如果不在中国范围内，直接返回原坐标
   if (outOfChina(lng, lat)) {
     return [lng, lat];
   }
+  // 使用迭代法求解，提高迭代次数以增加精度
+  let dLng = 0,
+    dLat = 0;
+  let mLng = lng,
+    mLat = lat;
+
+  // 增加迭代次数到10次提高精度
+  for (let i = 0; i < 10; i++) {
+    // 使用wgs84ToGcj02获取当前估计值对应的gcj02坐标
+    let [gcjLng, gcjLat] = wgs84ToGcj02([mLng, mLat]);
+    // 计算差值
+    dLng = gcjLng - lng;
+    dLat = gcjLat - lat;
+    // 更新估计值
+    mLng = mLng - dLng;
+    mLat = mLat - dLat;
+
+    // 如果精度已经足够高，提前退出循环
+    if (Math.abs(dLng) < 0.000000001 && Math.abs(dLat) < 0.000000001) {
+      break;
+    }
+  }
+  return [mLng, mLat];
+};
+
+//高德坐标系Gcj02转换 WGS84
+const gcj02ToWgs84 = coord => {
+  // 输入检查
+  if (!Array.isArray(coord) || coord.length !== 2) {
+    throw new Error('输入必须是包含经度和纬度的数组');
+  }
+  let [lng, lat] = coord.map(Number);
+
+  // 检查输入是否为有效数字
+  if (isNaN(lng) || isNaN(lat)) {
+    throw new Error('坐标必须是有效的数字');
+  }
+
+  // 如果不在中国范围内，直接返回原坐标
+  if (outOfChina(lng, lat)) {
+    return [lng, lat];
+  }
+
+  // 计算偏移量
   let dLat = transformLat(lng - 105.0, lat - 35.0);
   let dLng = transformLng(lng - 105.0, lat - 35.0);
   let radLat = lat / 180.0 * PI;
@@ -70756,9 +70800,11 @@ const wgs84ToGcj02 = coord => {
   let sqrtMagic = Math.sqrt(magic);
   dLat = dLat * 180.0 / (a * (1 - ee) / (magic * sqrtMagic) * PI);
   dLng = dLng * 180.0 / (a / sqrtMagic * Math.cos(radLat) * PI);
-  let gcjLat = lat + dLat;
-  let gcjLng = lng + dLng;
-  return [gcjLng, gcjLat];
+
+  // GCJ-02 to WGS-84
+  let wgsLat = lat - dLat;
+  let wgsLng = lng - dLng;
+  return [wgsLng, wgsLat];
 };
 
 // 3857墨卡托坐标系转换为4326 (WGS84)经纬度坐标
@@ -120458,8 +120504,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=54603de0&scoped=true&
-var drawvue_type_template_id_54603de0_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=4d022886&scoped=true&
+var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -120596,7 +120642,7 @@ var drawvue_type_template_id_54603de0_scoped_true_render = function render() {
     staticClass: "right-fixed"
   }, [_vm._t("right-fixed")], 2)]);
 };
-var drawvue_type_template_id_54603de0_scoped_true_staticRenderFns = [];
+var drawvue_type_template_id_4d022886_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(6957);
@@ -121251,6 +121297,7 @@ var shpFile_component = normalizeComponent(
       //   coordinates: [this.lng, this.lat]
       // }
       this.geoJson = geoJson;
+      if (!geoJson || !geoJson.features) return;
       geoJson.features.forEach(item => {
         this.draw.add(item.geometry);
       });
@@ -121346,9 +121393,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=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&
+// 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&
+var drawvue_type_style_index_0_id_4d022886_prod_lang_scss_scoped_true_ = __webpack_require__(343);
+;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=4d022886&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue
 
@@ -121361,11 +121408,11 @@ var drawvue_type_style_index_0_id_54603de0_prod_lang_scss_scoped_true_ = __webpa
 
 var draw_component = normalizeComponent(
   package_drawvue_type_script_lang_js_,
-  drawvue_type_template_id_54603de0_scoped_true_render,
-  drawvue_type_template_id_54603de0_scoped_true_staticRenderFns,
+  drawvue_type_template_id_4d022886_scoped_true_render,
+  drawvue_type_template_id_4d022886_scoped_true_staticRenderFns,
   false,
   null,
-  "54603de0",
+  "4d022886",
   null
   
 )
@@ -121584,8 +121631,8 @@ var point_component = normalizeComponent(
 )
 
 /* harmony default export */ var point = (point_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/line.vue?vue&type=template&id=9381e4bc&
-var linevue_type_template_id_9381e4bc_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/line.vue?vue&type=template&id=1e1a2862&
+var linevue_type_template_id_1e1a2862_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121640,7 +121687,7 @@ var linevue_type_template_id_9381e4bc_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var linevue_type_template_id_9381e4bc_staticRenderFns = [];
+var linevue_type_template_id_1e1a2862_staticRenderFns = [];
 
 ;// 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&
 
@@ -121738,7 +121785,7 @@ var linevue_type_template_id_9381e4bc_staticRenderFns = [];
       }
     },
     drawUpdate(data, autoZoom = false) {
-      if (!data) return;
+      if (!data || !data.features) return;
       this.geoJson = data;
       this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
       this.position = spArray(2, ...this.position); // 数组分割，两两一组
@@ -121787,8 +121834,8 @@ var linevue_type_template_id_9381e4bc_staticRenderFns = [];
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_9381e4bc_render,
-  linevue_type_template_id_9381e4bc_staticRenderFns,
+  linevue_type_template_id_1e1a2862_render,
+  linevue_type_template_id_1e1a2862_staticRenderFns,
   false,
   null,
   null,
@@ -121797,8 +121844,8 @@ var line_component = normalizeComponent(
 )
 
 /* harmony default export */ var draw_line = (line_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/polygon.vue?vue&type=template&id=7fe5b58b&
-var polygonvue_type_template_id_7fe5b58b_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/polygon.vue?vue&type=template&id=4c27d54b&
+var polygonvue_type_template_id_4c27d54b_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121853,7 +121900,7 @@ var polygonvue_type_template_id_7fe5b58b_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
+var polygonvue_type_template_id_4c27d54b_staticRenderFns = [];
 
 ;// 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&
 
@@ -121951,7 +121998,7 @@ var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
       }
     },
     drawUpdate(data, autoZoom = false) {
-      if (!data) return;
+      if (!data || !data.features) return;
       this.geoJson = data;
       this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
       this.position = spArray(2, ...this.position);
@@ -121999,8 +122046,8 @@ var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_7fe5b58b_render,
-  polygonvue_type_template_id_7fe5b58b_staticRenderFns,
+  polygonvue_type_template_id_4c27d54b_render,
+  polygonvue_type_template_id_4c27d54b_staticRenderFns,
   false,
   null,
   null,
@@ -122079,7 +122126,9 @@ const mapTools = {
   GeoAddress: GeoAddress,
   Geolocation: Geolocation,
   getElevation: getElevation,
-  geometryCollectionToFeatureCollection: geometryCollectionToFeatureCollection
+  geometryCollectionToFeatureCollection: geometryCollectionToFeatureCollection,
+  wgs84ToGcj02: wgs84ToGcj02,
+  gcj02ToWgs84: gcj02ToWgs84
 };
 
 // 地图事件

package/xy-map.umd.js

@@ -234,7 +234,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".snow[data-v-20664206]{position:absolu
 
 /***/ }),
 
-/***/ 5521:
+/***/ 8185:
 /***/ (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-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}", ""]);
+___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}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -42901,19 +42901,19 @@ var update = add("33a2ac54", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 6831:
+/***/ 8689:
 /***/ (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__(5521);
+var content = __webpack_require__(8185);
 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("7c244e5a", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("75e200d2", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -70753,19 +70753,63 @@ const geometryCollectionToFeatureCollection = geometryCollection => {
 const wgs84ToGcj02 = coord => {
   // 输入检查
   if (!Array.isArray(coord) || coord.length !== 2) {
-    throw new Error('Input must be an array with [longitude, latitude]');
+    throw new Error('输入必须是包含经度和纬度的数组');
   }
   let [lng, lat] = coord.map(Number);
 
   // 检查输入是否为有效数字
   if (isNaN(lng) || isNaN(lat)) {
-    throw new Error('Coordinates must be valid numbers');
+    throw new Error('坐标必须是有效的数字');
   }
 
   // 如果不在中国范围内，直接返回原坐标
   if (outOfChina(lng, lat)) {
     return [lng, lat];
   }
+  // 使用迭代法求解，提高迭代次数以增加精度
+  let dLng = 0,
+    dLat = 0;
+  let mLng = lng,
+    mLat = lat;
+
+  // 增加迭代次数到10次提高精度
+  for (let i = 0; i < 10; i++) {
+    // 使用wgs84ToGcj02获取当前估计值对应的gcj02坐标
+    let [gcjLng, gcjLat] = wgs84ToGcj02([mLng, mLat]);
+    // 计算差值
+    dLng = gcjLng - lng;
+    dLat = gcjLat - lat;
+    // 更新估计值
+    mLng = mLng - dLng;
+    mLat = mLat - dLat;
+
+    // 如果精度已经足够高，提前退出循环
+    if (Math.abs(dLng) < 0.000000001 && Math.abs(dLat) < 0.000000001) {
+      break;
+    }
+  }
+  return [mLng, mLat];
+};
+
+//高德坐标系Gcj02转换 WGS84
+const gcj02ToWgs84 = coord => {
+  // 输入检查
+  if (!Array.isArray(coord) || coord.length !== 2) {
+    throw new Error('输入必须是包含经度和纬度的数组');
+  }
+  let [lng, lat] = coord.map(Number);
+
+  // 检查输入是否为有效数字
+  if (isNaN(lng) || isNaN(lat)) {
+    throw new Error('坐标必须是有效的数字');
+  }
+
+  // 如果不在中国范围内，直接返回原坐标
+  if (outOfChina(lng, lat)) {
+    return [lng, lat];
+  }
+
+  // 计算偏移量
   let dLat = transformLat(lng - 105.0, lat - 35.0);
   let dLng = transformLng(lng - 105.0, lat - 35.0);
   let radLat = lat / 180.0 * PI;
@@ -70774,9 +70818,11 @@ const wgs84ToGcj02 = coord => {
   let sqrtMagic = Math.sqrt(magic);
   dLat = dLat * 180.0 / (a * (1 - ee) / (magic * sqrtMagic) * PI);
   dLng = dLng * 180.0 / (a / sqrtMagic * Math.cos(radLat) * PI);
-  let gcjLat = lat + dLat;
-  let gcjLng = lng + dLng;
-  return [gcjLng, gcjLat];
+
+  // GCJ-02 to WGS-84
+  let wgsLat = lat - dLat;
+  let wgsLng = lng - dLng;
+  return [wgsLng, wgsLat];
 };
 
 // 3857墨卡托坐标系转换为4326 (WGS84)经纬度坐标
@@ -120476,8 +120522,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=54603de0&scoped=true&
-var drawvue_type_template_id_54603de0_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=4d022886&scoped=true&
+var drawvue_type_template_id_4d022886_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -120614,7 +120660,7 @@ var drawvue_type_template_id_54603de0_scoped_true_render = function render() {
     staticClass: "right-fixed"
   }, [_vm._t("right-fixed")], 2)]);
 };
-var drawvue_type_template_id_54603de0_scoped_true_staticRenderFns = [];
+var drawvue_type_template_id_4d022886_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(5620);
@@ -121269,6 +121315,7 @@ var shpFile_component = normalizeComponent(
       //   coordinates: [this.lng, this.lat]
       // }
       this.geoJson = geoJson;
+      if (!geoJson || !geoJson.features) return;
       geoJson.features.forEach(item => {
         this.draw.add(item.geometry);
       });
@@ -121364,9 +121411,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=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&
+// 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&
+var drawvue_type_style_index_0_id_4d022886_prod_lang_scss_scoped_true_ = __webpack_require__(8689);
+;// CONCATENATED MODULE: ./src/package/draw/index.vue?vue&type=style&index=0&id=4d022886&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/index.vue
 
@@ -121379,11 +121426,11 @@ var drawvue_type_style_index_0_id_54603de0_prod_lang_scss_scoped_true_ = __webpa
 
 var draw_component = normalizeComponent(
   package_drawvue_type_script_lang_js_,
-  drawvue_type_template_id_54603de0_scoped_true_render,
-  drawvue_type_template_id_54603de0_scoped_true_staticRenderFns,
+  drawvue_type_template_id_4d022886_scoped_true_render,
+  drawvue_type_template_id_4d022886_scoped_true_staticRenderFns,
   false,
   null,
-  "54603de0",
+  "4d022886",
   null
   
 )
@@ -121602,8 +121649,8 @@ var point_component = normalizeComponent(
 )
 
 /* harmony default export */ var point = (point_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/line.vue?vue&type=template&id=9381e4bc&
-var linevue_type_template_id_9381e4bc_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/line.vue?vue&type=template&id=1e1a2862&
+var linevue_type_template_id_1e1a2862_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121658,7 +121705,7 @@ var linevue_type_template_id_9381e4bc_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var linevue_type_template_id_9381e4bc_staticRenderFns = [];
+var linevue_type_template_id_1e1a2862_staticRenderFns = [];
 
 ;// 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&
 
@@ -121756,7 +121803,7 @@ var linevue_type_template_id_9381e4bc_staticRenderFns = [];
       }
     },
     drawUpdate(data, autoZoom = false) {
-      if (!data) return;
+      if (!data || !data.features) return;
       this.geoJson = data;
       this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
       this.position = spArray(2, ...this.position); // 数组分割，两两一组
@@ -121805,8 +121852,8 @@ var linevue_type_template_id_9381e4bc_staticRenderFns = [];
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_9381e4bc_render,
-  linevue_type_template_id_9381e4bc_staticRenderFns,
+  linevue_type_template_id_1e1a2862_render,
+  linevue_type_template_id_1e1a2862_staticRenderFns,
   false,
   null,
   null,
@@ -121815,8 +121862,8 @@ var line_component = normalizeComponent(
 )
 
 /* harmony default export */ var draw_line = (line_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/polygon.vue?vue&type=template&id=7fe5b58b&
-var polygonvue_type_template_id_7fe5b58b_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/polygon.vue?vue&type=template&id=4c27d54b&
+var polygonvue_type_template_id_4c27d54b_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121871,7 +121918,7 @@ var polygonvue_type_template_id_7fe5b58b_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
+var polygonvue_type_template_id_4c27d54b_staticRenderFns = [];
 
 ;// 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&
 
@@ -121969,7 +122016,7 @@ var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
       }
     },
     drawUpdate(data, autoZoom = false) {
-      if (!data) return;
+      if (!data || !data.features) return;
       this.geoJson = data;
       this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
       this.position = spArray(2, ...this.position);
@@ -122017,8 +122064,8 @@ var polygonvue_type_template_id_7fe5b58b_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_7fe5b58b_render,
-  polygonvue_type_template_id_7fe5b58b_staticRenderFns,
+  polygonvue_type_template_id_4c27d54b_render,
+  polygonvue_type_template_id_4c27d54b_staticRenderFns,
   false,
   null,
   null,
@@ -122097,7 +122144,9 @@ const mapTools = {
   GeoAddress: GeoAddress,
   Geolocation: Geolocation,
   getElevation: getElevation,
-  geometryCollectionToFeatureCollection: geometryCollectionToFeatureCollection
+  geometryCollectionToFeatureCollection: geometryCollectionToFeatureCollection,
+  wgs84ToGcj02: wgs84ToGcj02,
+  gcj02ToWgs84: gcj02ToWgs84
 };
 
 // 地图事件