xy-map 1.1.41 → 1.1.44

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "xy-map",
-  "version": "1.1.41",
+  "version": "1.1.44",
   "description": "雄越地图",
   "main": "xy-map.umd.min.js",
   "scripts": {
-    "pub": "npm publish"
+    "pub": "npm publish --registry=https://registry.npmjs.org/"
   },
   "keywords": [],
   "author": "hanjing",

package/xy-map.common.js

@@ -44432,16 +44432,20 @@ class mapSdk {
    * 行政区域边界
    * @param {*} geoJson
    * @param {*} config
+   * @param {*} options 自定义配置
    */
-  drawCityBorder(geoJson, config = {}) {
+  drawCityBorder(geoJson, config = {}, options = {}) {
     const style = Object.assign({
       lineWidth: 4,
       lineColor: 'rgb(100,149,237)',
       lineOpacity: 1,
       fillColor: 'rgb(2,26,79)',
-      fillOpacity: 0.2
+      fillOpacity: 0.2,
+      lineType: 'solid'
     }, config);
     let mbData = geoJson.features[0].geometry.coordinates[0].flat(1);
+    let paint = options.paint || {};
+    let layout = options.layout || {};
     this.map.addLayer({
       //蒙版边界
       id: 'bj-line',
@@ -44451,14 +44455,15 @@ class mapSdk {
         data: geoJson //区划的面数据
       },
 
-      paint: {
+      paint: Object.assign({
         'line-color': style.lineColor || 'rgb(100,149,237)',
         'line-width': style.lineWidth || 3,
-        'line-opacity': style.lineOpacity || 1
-      },
-      layout: {
+        'line-opacity': style.lineOpacity || 1,
+        'line-dasharray': style.lineType == 'dashed' ? [2, 2] : []
+      }, paint),
+      layout: Object.assign({
         visibility: 'visible'
-      }
+      }, layout)
     });
     this.map.addLayer({
       //蒙版图层   //通过边界数据反选 达到挖洞效果
@@ -71186,17 +71191,19 @@ const addFlashPoint = (option = {}, layerId) => {
     }); // 2倍屏分辨率
   }
 
-  let layout = option.layout || {};
-  Object.assign(layout, {
-    'icon-image': imgId
-  });
-  const opt = Object.assign({}, option, {
-    layout
-  });
-  if (hasLayer(opt.id)) {
-    setSource(opt.id, opt.data);
+  //自定义点图层样式
+  option.style = {
+    layout: Object.assign({}, option.layout || {}, {
+      'icon-image': imgId
+    }),
+    paint: Object.assign({}, option.paint || {}, {
+      'text-opacity': 0
+    })
+  };
+  if (hasLayer(option.id)) {
+    setSource(option.id, option.data);
   } else {
-    addDiyPoint(opt, layerId);
+    addDiyPoint(option, layerId);
   }
   if (option.time > 0) {
     window.clearInterval(clock);
@@ -71504,7 +71511,7 @@ const addLayerPolygon = (option, layerId) => {
     layout: layoutOpt,
     paint: paintOpt,
     ...opt.other
-  });
+  }, layerId);
 
   // 面描边
   map.addLayer({
@@ -71545,7 +71552,7 @@ const addLayerPolygon = (option, layerId) => {
 
   // 添加文本图层
   if (opt.text && opt.text.show) {
-    addLayerText('point', opt);
+    addLayerText('point', opt, layerId);
   }
 };
 ;// CONCATENATED MODULE: ./src/package/layers/circle.js

package/xy-map.umd.js

@@ -44450,16 +44450,20 @@ class mapSdk {
    * 行政区域边界
    * @param {*} geoJson
    * @param {*} config
+   * @param {*} options 自定义配置
    */
-  drawCityBorder(geoJson, config = {}) {
+  drawCityBorder(geoJson, config = {}, options = {}) {
     const style = Object.assign({
       lineWidth: 4,
       lineColor: 'rgb(100,149,237)',
       lineOpacity: 1,
       fillColor: 'rgb(2,26,79)',
-      fillOpacity: 0.2
+      fillOpacity: 0.2,
+      lineType: 'solid'
     }, config);
     let mbData = geoJson.features[0].geometry.coordinates[0].flat(1);
+    let paint = options.paint || {};
+    let layout = options.layout || {};
     this.map.addLayer({
       //蒙版边界
       id: 'bj-line',
@@ -44469,14 +44473,15 @@ class mapSdk {
         data: geoJson //区划的面数据
       },
 
-      paint: {
+      paint: Object.assign({
         'line-color': style.lineColor || 'rgb(100,149,237)',
         'line-width': style.lineWidth || 3,
-        'line-opacity': style.lineOpacity || 1
-      },
-      layout: {
+        'line-opacity': style.lineOpacity || 1,
+        'line-dasharray': style.lineType == 'dashed' ? [2, 2] : []
+      }, paint),
+      layout: Object.assign({
         visibility: 'visible'
-      }
+      }, layout)
     });
     this.map.addLayer({
       //蒙版图层   //通过边界数据反选 达到挖洞效果
@@ -71204,17 +71209,19 @@ const addFlashPoint = (option = {}, layerId) => {
     }); // 2倍屏分辨率
   }
 
-  let layout = option.layout || {};
-  Object.assign(layout, {
-    'icon-image': imgId
-  });
-  const opt = Object.assign({}, option, {
-    layout
-  });
-  if (hasLayer(opt.id)) {
-    setSource(opt.id, opt.data);
+  //自定义点图层样式
+  option.style = {
+    layout: Object.assign({}, option.layout || {}, {
+      'icon-image': imgId
+    }),
+    paint: Object.assign({}, option.paint || {}, {
+      'text-opacity': 0
+    })
+  };
+  if (hasLayer(option.id)) {
+    setSource(option.id, option.data);
   } else {
-    addDiyPoint(opt, layerId);
+    addDiyPoint(option, layerId);
   }
   if (option.time > 0) {
     window.clearInterval(clock);
@@ -71522,7 +71529,7 @@ const addLayerPolygon = (option, layerId) => {
     layout: layoutOpt,
     paint: paintOpt,
     ...opt.other
-  });
+  }, layerId);
 
   // 面描边
   map.addLayer({
@@ -71563,7 +71570,7 @@ const addLayerPolygon = (option, layerId) => {
 
   // 添加文本图层
   if (opt.text && opt.text.show) {
-    addLayerText('point', opt);
+    addLayerText('point', opt, layerId);
   }
 };
 ;// CONCATENATED MODULE: ./src/package/layers/circle.js