xy-map 1.1.52 → 1.1.54

package/package.json

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

package/xy-map.common.js

@@ -71655,7 +71655,7 @@ class mapSdk {
    * @param {*} config
    * @param {*} options 自定义配置
    */
-  drawCityBorder(geoJson, config = {}, options = {}) {
+  drawCityBorder(geoJson, config = {}, options = {}, beforId) {
     const style = Object.assign({
       lineWidth: 4,
       lineColor: 'rgb(100,149,237)',
@@ -71685,7 +71685,7 @@ class mapSdk {
       layout: Object.assign({
         visibility: 'visible'
       }, layout)
-    });
+    }, beforId);
     this.map.addLayer({
       //蒙版图层   //通过边界数据反选 达到挖洞效果
       id: 'bj-model',
@@ -71708,7 +71708,7 @@ class mapSdk {
       layout: {
         visibility: 'visible'
       }
-    });
+    }, beforId);
   }
 
   /**
@@ -72168,7 +72168,7 @@ const addLayerLine = (option, layerId) => {
 
   // 添加文本图层
   if (opt.text && opt.text.show) {
-    addLayerText('line', opt);
+    addLayerText('line', opt, layerId);
   }
 };
 
@@ -72611,7 +72611,7 @@ const addLayerImagePoint = async (option, layerId) => {
     }
     if (opt.cluster.cluster) {
       let style = opt.cluster.style || {};
-      clusterLayer(opt, style);
+      clusterLayer(opt, style, layerId);
     }
     if (opt.click) {
       mapClick(id, opt.click);
@@ -72652,7 +72652,7 @@ const addLayerImagePoint = async (option, layerId) => {
 /**
  * 点聚合图层
  */
-const clusterLayer = (option, style) => {
+const clusterLayer = (option, style, layerId) => {
   let {
     map
   } = package_map;
@@ -72676,7 +72676,7 @@ const clusterLayer = (option, style) => {
     source: id,
     filter: ['has', 'point_count'],
     paint: paintOpt
-  });
+  }, layerId);
   map.addLayer({
     id: id + '-cluster-count',
     type: 'symbol',
@@ -72686,7 +72686,7 @@ const clusterLayer = (option, style) => {
     paint: {
       'text-color': '#ffffff'
     }
-  });
+  }, layerId);
   mapClick(id + '-clusters', e => {
     package_map.zoom('in', e.position);
   });
@@ -121358,8 +121358,8 @@ var draw_component = normalizeComponent(
 )
 
 /* harmony default export */ var package_draw = (draw_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/point.vue?vue&type=template&id=93462f90&
-var pointvue_type_template_id_93462f90_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/point.vue?vue&type=template&id=289ceaca&
+var pointvue_type_template_id_289ceaca_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121414,7 +121414,7 @@ var pointvue_type_template_id_93462f90_render = function render() {
     staticClass: "margin-top font-12"
   }, [_vm._v(" 地址：" + _vm._s(_vm.address.formattedAddress) + " ")]) : _vm._e()])])], 1);
 };
-var pointvue_type_template_id_93462f90_staticRenderFns = [];
+var pointvue_type_template_id_289ceaca_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/point.vue?vue&type=script&lang=js&
 
@@ -121455,7 +121455,8 @@ var pointvue_type_template_id_93462f90_staticRenderFns = [];
     return {
       geoJson: '',
       position: '',
-      address: ''
+      address: '',
+      lastPosition: ''
     };
   },
   watch: {
@@ -121522,9 +121523,11 @@ var pointvue_type_template_id_93462f90_staticRenderFns = [];
             this.address = data;
           });
         });
+        this.lastPosition = data.lastPosition;
       } else {
         this.position = '';
         this.address = '';
+        this.lastPosition = '';
       }
     },
     save() {
@@ -121533,7 +121536,8 @@ var pointvue_type_template_id_93462f90_staticRenderFns = [];
         position: this.position,
         lng: this.position[0],
         lat: this.position[1],
-        address: this.address
+        address: this.address,
+        lastPosition: this.lastPosition //吸附后的信息
       };
       // console.log(data)
       this.$emit('save', data);
@@ -121557,8 +121561,8 @@ var pointvue_type_template_id_93462f90_staticRenderFns = [];
 ;
 var point_component = normalizeComponent(
   draw_pointvue_type_script_lang_js_,
-  pointvue_type_template_id_93462f90_render,
-  pointvue_type_template_id_93462f90_staticRenderFns,
+  pointvue_type_template_id_289ceaca_render,
+  pointvue_type_template_id_289ceaca_staticRenderFns,
   false,
   null,
   null,
@@ -121567,8 +121571,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=3a6a9292&
-var linevue_type_template_id_3a6a9292_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=9381e4bc&
+var linevue_type_template_id_9381e4bc_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121623,7 +121627,7 @@ var linevue_type_template_id_3a6a9292_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var linevue_type_template_id_3a6a9292_staticRenderFns = [];
+var linevue_type_template_id_9381e4bc_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&
 
@@ -121689,6 +121693,7 @@ var linevue_type_template_id_3a6a9292_staticRenderFns = [];
       package_map.initMap(config).then(map => {
         this.$refs.draw.initDraw(map);
         this.draw();
+        this.$emit('map-load');
       });
     },
     draw() {
@@ -121769,8 +121774,8 @@ var linevue_type_template_id_3a6a9292_staticRenderFns = [];
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_3a6a9292_render,
-  linevue_type_template_id_3a6a9292_staticRenderFns,
+  linevue_type_template_id_9381e4bc_render,
+  linevue_type_template_id_9381e4bc_staticRenderFns,
   false,
   null,
   null,
@@ -121779,8 +121784,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=75043640&
-var polygonvue_type_template_id_75043640_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=7fe5b58b&
+var polygonvue_type_template_id_7fe5b58b_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121835,7 +121840,7 @@ var polygonvue_type_template_id_75043640_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var polygonvue_type_template_id_75043640_staticRenderFns = [];
+var polygonvue_type_template_id_7fe5b58b_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&
 
@@ -121901,6 +121906,7 @@ var polygonvue_type_template_id_75043640_staticRenderFns = [];
       package_map.initMap(config).then(map => {
         this.$refs.draw.initDraw(map);
         this.draw();
+        this.$emit('map-load');
       });
     },
     draw() {
@@ -121980,8 +121986,8 @@ var polygonvue_type_template_id_75043640_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_75043640_render,
-  polygonvue_type_template_id_75043640_staticRenderFns,
+  polygonvue_type_template_id_7fe5b58b_render,
+  polygonvue_type_template_id_7fe5b58b_staticRenderFns,
   false,
   null,
   null,

package/xy-map.umd.js

@@ -71673,7 +71673,7 @@ class mapSdk {
    * @param {*} config
    * @param {*} options 自定义配置
    */
-  drawCityBorder(geoJson, config = {}, options = {}) {
+  drawCityBorder(geoJson, config = {}, options = {}, beforId) {
     const style = Object.assign({
       lineWidth: 4,
       lineColor: 'rgb(100,149,237)',
@@ -71703,7 +71703,7 @@ class mapSdk {
       layout: Object.assign({
         visibility: 'visible'
       }, layout)
-    });
+    }, beforId);
     this.map.addLayer({
       //蒙版图层   //通过边界数据反选 达到挖洞效果
       id: 'bj-model',
@@ -71726,7 +71726,7 @@ class mapSdk {
       layout: {
         visibility: 'visible'
       }
-    });
+    }, beforId);
   }
 
   /**
@@ -72186,7 +72186,7 @@ const addLayerLine = (option, layerId) => {
 
   // 添加文本图层
   if (opt.text && opt.text.show) {
-    addLayerText('line', opt);
+    addLayerText('line', opt, layerId);
   }
 };
 
@@ -72629,7 +72629,7 @@ const addLayerImagePoint = async (option, layerId) => {
     }
     if (opt.cluster.cluster) {
       let style = opt.cluster.style || {};
-      clusterLayer(opt, style);
+      clusterLayer(opt, style, layerId);
     }
     if (opt.click) {
       mapClick(id, opt.click);
@@ -72670,7 +72670,7 @@ const addLayerImagePoint = async (option, layerId) => {
 /**
  * 点聚合图层
  */
-const clusterLayer = (option, style) => {
+const clusterLayer = (option, style, layerId) => {
   let {
     map
   } = package_map;
@@ -72694,7 +72694,7 @@ const clusterLayer = (option, style) => {
     source: id,
     filter: ['has', 'point_count'],
     paint: paintOpt
-  });
+  }, layerId);
   map.addLayer({
     id: id + '-cluster-count',
     type: 'symbol',
@@ -72704,7 +72704,7 @@ const clusterLayer = (option, style) => {
     paint: {
       'text-color': '#ffffff'
     }
-  });
+  }, layerId);
   mapClick(id + '-clusters', e => {
     package_map.zoom('in', e.position);
   });
@@ -121376,8 +121376,8 @@ var draw_component = normalizeComponent(
 )
 
 /* harmony default export */ var package_draw = (draw_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/point.vue?vue&type=template&id=93462f90&
-var pointvue_type_template_id_93462f90_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/point.vue?vue&type=template&id=289ceaca&
+var pointvue_type_template_id_289ceaca_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121432,7 +121432,7 @@ var pointvue_type_template_id_93462f90_render = function render() {
     staticClass: "margin-top font-12"
   }, [_vm._v(" 地址：" + _vm._s(_vm.address.formattedAddress) + " ")]) : _vm._e()])])], 1);
 };
-var pointvue_type_template_id_93462f90_staticRenderFns = [];
+var pointvue_type_template_id_289ceaca_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/point.vue?vue&type=script&lang=js&
 
@@ -121473,7 +121473,8 @@ var pointvue_type_template_id_93462f90_staticRenderFns = [];
     return {
       geoJson: '',
       position: '',
-      address: ''
+      address: '',
+      lastPosition: ''
     };
   },
   watch: {
@@ -121540,9 +121541,11 @@ var pointvue_type_template_id_93462f90_staticRenderFns = [];
             this.address = data;
           });
         });
+        this.lastPosition = data.lastPosition;
       } else {
         this.position = '';
         this.address = '';
+        this.lastPosition = '';
       }
     },
     save() {
@@ -121551,7 +121554,8 @@ var pointvue_type_template_id_93462f90_staticRenderFns = [];
         position: this.position,
         lng: this.position[0],
         lat: this.position[1],
-        address: this.address
+        address: this.address,
+        lastPosition: this.lastPosition //吸附后的信息
       };
       // console.log(data)
       this.$emit('save', data);
@@ -121575,8 +121579,8 @@ var pointvue_type_template_id_93462f90_staticRenderFns = [];
 ;
 var point_component = normalizeComponent(
   draw_pointvue_type_script_lang_js_,
-  pointvue_type_template_id_93462f90_render,
-  pointvue_type_template_id_93462f90_staticRenderFns,
+  pointvue_type_template_id_289ceaca_render,
+  pointvue_type_template_id_289ceaca_staticRenderFns,
   false,
   null,
   null,
@@ -121585,8 +121589,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=3a6a9292&
-var linevue_type_template_id_3a6a9292_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=9381e4bc&
+var linevue_type_template_id_9381e4bc_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121641,7 +121645,7 @@ var linevue_type_template_id_3a6a9292_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var linevue_type_template_id_3a6a9292_staticRenderFns = [];
+var linevue_type_template_id_9381e4bc_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&
 
@@ -121707,6 +121711,7 @@ var linevue_type_template_id_3a6a9292_staticRenderFns = [];
       package_map.initMap(config).then(map => {
         this.$refs.draw.initDraw(map);
         this.draw();
+        this.$emit('map-load');
       });
     },
     draw() {
@@ -121787,8 +121792,8 @@ var linevue_type_template_id_3a6a9292_staticRenderFns = [];
 ;
 var line_component = normalizeComponent(
   draw_linevue_type_script_lang_js_,
-  linevue_type_template_id_3a6a9292_render,
-  linevue_type_template_id_3a6a9292_staticRenderFns,
+  linevue_type_template_id_9381e4bc_render,
+  linevue_type_template_id_9381e4bc_staticRenderFns,
   false,
   null,
   null,
@@ -121797,8 +121802,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=75043640&
-var polygonvue_type_template_id_75043640_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=7fe5b58b&
+var polygonvue_type_template_id_7fe5b58b_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -121853,7 +121858,7 @@ var polygonvue_type_template_id_75043640_render = function render() {
     }
   }, [_vm._v("保存")]), _vm._t("default")], 2)])], 1);
 };
-var polygonvue_type_template_id_75043640_staticRenderFns = [];
+var polygonvue_type_template_id_7fe5b58b_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&
 
@@ -121919,6 +121924,7 @@ var polygonvue_type_template_id_75043640_staticRenderFns = [];
       package_map.initMap(config).then(map => {
         this.$refs.draw.initDraw(map);
         this.draw();
+        this.$emit('map-load');
       });
     },
     draw() {
@@ -121998,8 +122004,8 @@ var polygonvue_type_template_id_75043640_staticRenderFns = [];
 ;
 var polygon_component = normalizeComponent(
   draw_polygonvue_type_script_lang_js_,
-  polygonvue_type_template_id_75043640_render,
-  polygonvue_type_template_id_75043640_staticRenderFns,
+  polygonvue_type_template_id_7fe5b58b_render,
+  polygonvue_type_template_id_7fe5b58b_staticRenderFns,
   false,
   null,
   null,