xy-map 1.1.58 → 1.1.60

package/package.json

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

package/xy-map.common.js

@@ -70779,6 +70779,12 @@ const gcj02ToWgs84 = coord => {
     return [lng, lat];
   }
 
+  // 使用迭代法求解，提高迭代次数以增加精度
+  let dLng = 0,
+    dLat = 0;
+  let mLng = lng,
+    mLat = lat;
+
   // 增加迭代次数到10次提高精度
   for (let i = 0; i < 10; i++) {
     // 使用wgs84ToGcj02获取当前估计值对应的gcj02坐标
@@ -72205,10 +72211,17 @@ const addLayerLine = (option, layerId) => {
   if (opt.click) {
     mapClick(opt.id, opt.click);
   }
+
+  //添加动画
   if (opt.animate) {
     addLayerLineAnimation(opt, layerId);
   }
 
+  //添加虚线
+  if (opt.dash) {
+    addLayerLineDash(opt, layerId);
+  }
+
   // 添加文本图层
   if (opt.text && opt.text.show) {
     addLayerText('line', opt, layerId);
@@ -72295,6 +72308,47 @@ const addLayerLineAnimation = (option, layerId) => {
     }
   });
 };
+
+/**
+ * 添加虚线图层
+ */
+const addLayerLineDash = (option, layerId) => {
+  let {
+    map
+  } = package_map;
+  let opt = option;
+  let parentId = opt.id;
+  let id = parentId + '-dash';
+  if (hasLayer(id)) {
+    setSource(id, opt.data);
+    return;
+  }
+  let layout = opt.dash ? opt.dash.layout : {};
+  let layoutOpt = Object.assign({
+    'visibility': 'visible'
+  }, layout);
+  let paint = opt.dash ? opt.dash.paint : {};
+  let paintOpt = Object.assign({
+    'line-color': '#28b2ff',
+    'line-dasharray': [4, 4],
+    'line-width': 3,
+    'line-opacity': 1
+  }, paint);
+  if (!hasSource(id)) {
+    map.addSource(id, {
+      type: 'geojson',
+      data: opt.data
+    });
+  }
+  map.addLayer({
+    id: id,
+    type: 'line',
+    source: id,
+    layout: layoutOpt,
+    paint: paintOpt,
+    ...opt.other
+  }, layerId);
+};
 ;// CONCATENATED MODULE: ./src/package/layers/Point.js
 
 

package/xy-map.umd.js

@@ -70797,6 +70797,12 @@ const gcj02ToWgs84 = coord => {
     return [lng, lat];
   }
 
+  // 使用迭代法求解，提高迭代次数以增加精度
+  let dLng = 0,
+    dLat = 0;
+  let mLng = lng,
+    mLat = lat;
+
   // 增加迭代次数到10次提高精度
   for (let i = 0; i < 10; i++) {
     // 使用wgs84ToGcj02获取当前估计值对应的gcj02坐标
@@ -72223,10 +72229,17 @@ const addLayerLine = (option, layerId) => {
   if (opt.click) {
     mapClick(opt.id, opt.click);
   }
+
+  //添加动画
   if (opt.animate) {
     addLayerLineAnimation(opt, layerId);
   }
 
+  //添加虚线
+  if (opt.dash) {
+    addLayerLineDash(opt, layerId);
+  }
+
   // 添加文本图层
   if (opt.text && opt.text.show) {
     addLayerText('line', opt, layerId);
@@ -72313,6 +72326,47 @@ const addLayerLineAnimation = (option, layerId) => {
     }
   });
 };
+
+/**
+ * 添加虚线图层
+ */
+const addLayerLineDash = (option, layerId) => {
+  let {
+    map
+  } = package_map;
+  let opt = option;
+  let parentId = opt.id;
+  let id = parentId + '-dash';
+  if (hasLayer(id)) {
+    setSource(id, opt.data);
+    return;
+  }
+  let layout = opt.dash ? opt.dash.layout : {};
+  let layoutOpt = Object.assign({
+    'visibility': 'visible'
+  }, layout);
+  let paint = opt.dash ? opt.dash.paint : {};
+  let paintOpt = Object.assign({
+    'line-color': '#28b2ff',
+    'line-dasharray': [4, 4],
+    'line-width': 3,
+    'line-opacity': 1
+  }, paint);
+  if (!hasSource(id)) {
+    map.addSource(id, {
+      type: 'geojson',
+      data: opt.data
+    });
+  }
+  map.addLayer({
+    id: id,
+    type: 'line',
+    source: id,
+    layout: layoutOpt,
+    paint: paintOpt,
+    ...opt.other
+  }, layerId);
+};
 ;// CONCATENATED MODULE: ./src/package/layers/Point.js