xy-map 1.1.28 → 1.1.30

package/package.json

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

package/xy-map.common.js

@@ -266,7 +266,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".tools[data-v-551ff8b1]{position:absol
 
 /***/ }),
 
-/***/ 2915:
+/***/ 6732:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -280,14 +280,14 @@ __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, ".upload[data-v-18d75a4e]{position:relative}.upload input[data-v-18d75a4e]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-57aca7b6]{position:relative}.upload input[data-v-57aca7b6]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
 
 /***/ }),
 
-/***/ 3973:
+/***/ 56:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -301,7 +301,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, ".upload[data-v-0f36a3d8]{position:relative}.upload input[data-v-0f36a3d8]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".upload[data-v-3bd5e448]{position:relative}.upload input[data-v-3bd5e448]{position:absolute;width:100%;height:100%;left:0;top:0;opacity:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -24468,35 +24468,35 @@ var update = add("18261548", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 2412:
+/***/ 9993:
 /***/ (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__(2915);
+var content = __webpack_require__(6732);
 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("4e2bfa31", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("31c9ba70", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
-/***/ 1811:
+/***/ 6054:
 /***/ (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__(3973);
+var content = __webpack_require__(56);
 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("6d5c4a29", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("0cdb53b5", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -49176,6 +49176,28 @@ const arcGisToGeoJson = Json => {
   return data;
 };
 
+// 3857墨卡托坐标系转换为4326 (WGS84)经纬度坐标
+const mercatorTolonlat = Json => {
+  Json.features.forEach(item => {
+    item.geometry.coordinates.forEach(geometry => {
+      geometry.forEach(mercator => {
+        mercator = to84(mercator);
+        // console.log(mercator)
+      });
+    });
+  });
+
+  function to84(mercator) {
+    const coord = [];
+    let lng = mercator[0] / 20037508.34 * 180;
+    let lat = mercator[1] / 20037508.34 * 180;
+    lat = 180 / Math.PI * (2 * Math.atan(Math.exp(lat * Math.PI / 180)) - Math.PI / 2);
+    coord.push(lng);
+    coord.push(lat);
+    return coord;
+  }
+};
+
 /**
  * 加载图片
  */
@@ -49318,6 +49340,20 @@ const mapTools_transformTranslate = (type, data, x, y) => {
 const pointToCircleGeoJson = (center, radius) => {
   return turf.circle(center, radius);
 };
+
+/**
+ * 数组分割
+ * count 几个为一组
+ * arr 一维数组
+ */
+const spArray = function (count, arr) {
+  let R = [];
+  let F;
+  for (F = 0; F < arr.length;) {
+    R.push(arr.slice(F, F += count));
+  }
+  return R;
+};
 ;// CONCATENATED MODULE: ./src/package/layers/Point.js
 
 
@@ -60207,8 +60243,8 @@ var mapbox_gl_draw = __webpack_require__(5884);
 var mapbox_gl_draw_default = /*#__PURE__*/__webpack_require__.n(mapbox_gl_draw);
 // EXTERNAL MODULE: ./node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css
 var dist_mapbox_gl_draw = __webpack_require__(6957);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=template&id=18d75a4e&scoped=true&
-var jsonFilevue_type_template_id_18d75a4e_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/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=template&id=57aca7b6&scoped=true&
+var jsonFilevue_type_template_id_57aca7b6_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -60228,10 +60264,11 @@ var jsonFilevue_type_template_id_18d75a4e_scoped_true_render = function render()
     }
   })]);
 };
-var jsonFilevue_type_template_id_18d75a4e_scoped_true_staticRenderFns = [];
+var jsonFilevue_type_template_id_57aca7b6_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=script&lang=js&
 
+
 /* harmony default export */ var jsonFilevue_type_script_lang_js_ = ({
   data() {
     return {};
@@ -60249,6 +60286,11 @@ var jsonFilevue_type_template_id_18d75a4e_scoped_true_staticRenderFns = [];
             if (!json.features) {
               json = arcGisToGeoJson(json);
             }
+            const bbox = es(json);
+            if (bbox.length > 0 && bbox[0] > 180) {
+              // 墨卡托坐标需要转换
+              return this.$message.error('不属于WGS84坐标系，请使用其他工具进行数据转换');
+            }
             this.$emit('upload', json);
           }
         };
@@ -60258,9 +60300,9 @@ var jsonFilevue_type_template_id_18d75a4e_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue?vue&type=script&lang=js&
  /* harmony default export */ var draw_jsonFilevue_type_script_lang_js_ = (jsonFilevue_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/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/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=18d75a4e&prod&lang=scss&scoped=true&
-var jsonFilevue_type_style_index_0_id_18d75a4e_prod_lang_scss_scoped_true_ = __webpack_require__(2412);
-;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=18d75a4e&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/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/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=57aca7b6&prod&lang=scss&scoped=true&
+var jsonFilevue_type_style_index_0_id_57aca7b6_prod_lang_scss_scoped_true_ = __webpack_require__(9993);
+;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue?vue&type=style&index=0&id=57aca7b6&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/jsonFile.vue
 
@@ -60273,18 +60315,18 @@ var jsonFilevue_type_style_index_0_id_18d75a4e_prod_lang_scss_scoped_true_ = __w
 
 var jsonFile_component = normalizeComponent(
   draw_jsonFilevue_type_script_lang_js_,
-  jsonFilevue_type_template_id_18d75a4e_scoped_true_render,
-  jsonFilevue_type_template_id_18d75a4e_scoped_true_staticRenderFns,
+  jsonFilevue_type_template_id_57aca7b6_scoped_true_render,
+  jsonFilevue_type_template_id_57aca7b6_scoped_true_staticRenderFns,
   false,
   null,
-  "18d75a4e",
+  "57aca7b6",
   null
   
 )
 
 /* harmony default export */ var jsonFile = (jsonFile_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/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=0f36a3d8&scoped=true&
-var shpFilevue_type_template_id_0f36a3d8_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/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=template&id=3bd5e448&scoped=true&
+var shpFilevue_type_template_id_3bd5e448_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-button', {
@@ -60304,10 +60346,11 @@ var shpFilevue_type_template_id_0f36a3d8_scoped_true_render = function render()
     }
   })]);
 };
-var shpFilevue_type_template_id_0f36a3d8_scoped_true_staticRenderFns = [];
+var shpFilevue_type_template_id_3bd5e448_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=script&lang=js&
 
+
 const shapeFile = __webpack_require__(1393); // 导入shpfile.js
 
 /* harmony default export */ var shpFilevue_type_script_lang_js_ = ({
@@ -60324,10 +60367,16 @@ const shapeFile = __webpack_require__(1393); // 导入shpfile.js
           const result = f.target.result;
           if (result) {
             shapeFile.read(result).then(json => {
+              const bbox = es(json);
               if (!json.features) {
                 json = arcGisToGeoJson(json);
               }
-              // console.log(json)
+              if (bbox.length > 0 && bbox[0] > 180) {
+                // 墨卡托坐标需要转换
+                // json = mercatorTolonlat(json)
+                console.log(json);
+                return this.$message.error('不属于WGS84坐标系，请使用其他工具进行数据转换');
+              }
               this.$emit('upload', json);
             });
           }
@@ -60338,9 +60387,9 @@ const shapeFile = __webpack_require__(1393); // 导入shpfile.js
 });
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=script&lang=js&
  /* harmony default export */ var draw_shpFilevue_type_script_lang_js_ = (shpFilevue_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/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/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=0f36a3d8&prod&lang=scss&scoped=true&
-var shpFilevue_type_style_index_0_id_0f36a3d8_prod_lang_scss_scoped_true_ = __webpack_require__(1811);
-;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=0f36a3d8&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/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/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3bd5e448&prod&lang=scss&scoped=true&
+var shpFilevue_type_style_index_0_id_3bd5e448_prod_lang_scss_scoped_true_ = __webpack_require__(6054);
+;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue?vue&type=style&index=0&id=3bd5e448&prod&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/package/draw/shpFile.vue
 
@@ -60353,11 +60402,11 @@ var shpFilevue_type_style_index_0_id_0f36a3d8_prod_lang_scss_scoped_true_ = __we
 
 var shpFile_component = normalizeComponent(
   draw_shpFilevue_type_script_lang_js_,
-  shpFilevue_type_template_id_0f36a3d8_scoped_true_render,
-  shpFilevue_type_template_id_0f36a3d8_scoped_true_staticRenderFns,
+  shpFilevue_type_template_id_3bd5e448_scoped_true_render,
+  shpFilevue_type_template_id_3bd5e448_scoped_true_staticRenderFns,
   false,
   null,
-  "0f36a3d8",
+  "3bd5e448",
   null
   
 )
@@ -60851,8 +60900,8 @@ var point_component = normalizeComponent(
 )
 
 /* harmony default export */ var draw_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/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=6f5160fa&
-var linevue_type_template_id_6f5160fa_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/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=template&id=efb89606&
+var linevue_type_template_id_efb89606_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -60907,11 +60956,13 @@ var linevue_type_template_id_6f5160fa_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var linevue_type_template_id_6f5160fa_staticRenderFns = [];
+var linevue_type_template_id_efb89606_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/line.vue?vue&type=script&lang=js&
 
 
+
+
 /* harmony default export */ var linevue_type_script_lang_js_ = ({
   components: {
     drawTools: draw
@@ -61005,12 +61056,14 @@ var linevue_type_template_id_6f5160fa_staticRenderFns = [];
     drawUpdate(data, autoZoom = false) {
       if (!data) return;
       this.geoJson = data;
-      console.log(data);
-      this.position = data.features.map(item => item.geometry.coordinates);
+      this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
+      this.position = spArray(2, ...this.position); // 数组分割，两两一组
+
       if (this.autoZoom || autoZoom) {
         // 开启缩放动画
         this.$nextTick(() => {
-          const bounds = this.position.flat(); // 二维数组转一维数组
+          let bounds = es(data);
+          bounds = spArray(2, bounds); // 数组分割
           package_map.fitLineBounds(bounds, {
             padding: 100
           });
@@ -61049,8 +61102,8 @@ var linevue_type_template_id_6f5160fa_staticRenderFns = [];
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_6f5160fa_render,
-  linevue_type_template_id_6f5160fa_staticRenderFns,
+  linevue_type_template_id_efb89606_render,
+  linevue_type_template_id_efb89606_staticRenderFns,
   false,
   null,
   null,
@@ -61059,8 +61112,8 @@ var line_component = normalizeComponent(
 )
 
 /* harmony default export */ var 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/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=a652ccb4&
-var polygonvue_type_template_id_a652ccb4_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/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=template&id=2d709a6c&
+var polygonvue_type_template_id_2d709a6c_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61115,11 +61168,13 @@ var polygonvue_type_template_id_a652ccb4_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var polygonvue_type_template_id_a652ccb4_staticRenderFns = [];
+var polygonvue_type_template_id_2d709a6c_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/draw/polygon.vue?vue&type=script&lang=js&
 
 
+
+
 /* harmony default export */ var polygonvue_type_script_lang_js_ = ({
   components: {
     drawTools: draw
@@ -61213,10 +61268,12 @@ var polygonvue_type_template_id_a652ccb4_staticRenderFns = [];
     drawUpdate(data, autoZoom = false) {
       if (!data) return;
       this.geoJson = data;
-      this.position = data.features.map(item => item.geometry.coordinates[0]);
+      this.position = data.features.map(item => item.geometry.coordinates.flat(Infinity));
+      this.position = spArray(2, ...this.position);
       if (this.autoZoom || autoZoom) {
         this.$nextTick(() => {
-          const bounds = this.position.flat(); // 二维数组转一维数组
+          let bounds = es(data);
+          bounds = spArray(2, bounds); // 数组分割
           package_map.fitLineBounds(bounds, {
             padding: 100
           });
@@ -61255,8 +61312,8 @@ var polygonvue_type_template_id_a652ccb4_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_a652ccb4_render,
-  polygonvue_type_template_id_a652ccb4_staticRenderFns,
+  polygonvue_type_template_id_2d709a6c_render,
+  polygonvue_type_template_id_2d709a6c_staticRenderFns,
   false,
   null,
   null,