xy-map 1.1.59 → 1.1.61

package/package.json

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

package/xy-map.common.js

@@ -70779,20 +70779,29 @@ const gcj02ToWgs84 = coord => {
     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;
-  let magic = Math.sin(radLat);
-  magic = 1 - ee * magic * magic;
-  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);
-
-  // GCJ-02 to WGS-84
-  let wgsLat = lat - dLat;
-  let wgsLng = lng - dLng;
-  return [wgsLng, wgsLat];
+  // 使用迭代法求解，提高迭代次数以增加精度
+  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];
 };
 
 // 3857墨卡托坐标系转换为4326 (WGS84)经纬度坐标
@@ -72202,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);
@@ -72263,13 +72279,34 @@ const addLayerLineAnimation = (option, layerId) => {
   opt.data.features.forEach(f => {
     let coordinates = f.geometry.coordinates;
     if (coordinates && coordinates.length > 0) {
+      // 存储所有插值后的点坐标
       let arc = [];
-      // 计算起点和终点长度，切割数组
-      let lineDistance = es_length(f, 'kilometers');
-      for (let q = 0; q < lineDistance; q += lineDistance / step) {
-        let segment = along(f, q, 'kilometers');
-        arc.push(segment.geometry.coordinates);
+      // 计算整条线的总长度(单位:公里)
+      let length = es_length(f, 'kilometers');
+
+      // 遍历每个线段,进行插值计算
+      for (let i = 0; i < coordinates.length - 1; i++) {
+        const start = coordinates[i];
+        const end = coordinates[i + 1];
+        const lineSegment = lineString([start, end]);
+        const segLength = es_length(lineSegment, 'kilometers');
+        // 根据线段长度和总长度的比例,计算需要插入的点数
+        const pointsToAdd = Math.floor(segLength / (length / step));
+
+        // 添加起始点
+        arc.push(start);
+
+        // 在线段上进行插值,添加过渡点
+        if (pointsToAdd > 1) {
+          for (let j = 1; j < pointsToAdd; j++) {
+            const fraction = j / pointsToAdd;
+            const point = along(lineSegment, segLength * fraction, 'kilometers');
+            arc.push(point.geometry.coordinates);
+          }
+        }
       }
+      // 添加线段的终点
+      arc.push(coordinates[coordinates.length - 1]);
 
       // 更新数据
       let i = 0;
@@ -72292,6 +72329,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,20 +70797,29 @@ const gcj02ToWgs84 = coord => {
     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;
-  let magic = Math.sin(radLat);
-  magic = 1 - ee * magic * magic;
-  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);
-
-  // GCJ-02 to WGS-84
-  let wgsLat = lat - dLat;
-  let wgsLng = lng - dLng;
-  return [wgsLng, wgsLat];
+  // 使用迭代法求解，提高迭代次数以增加精度
+  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];
 };
 
 // 3857墨卡托坐标系转换为4326 (WGS84)经纬度坐标
@@ -72220,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);
@@ -72281,13 +72297,34 @@ const addLayerLineAnimation = (option, layerId) => {
   opt.data.features.forEach(f => {
     let coordinates = f.geometry.coordinates;
     if (coordinates && coordinates.length > 0) {
+      // 存储所有插值后的点坐标
       let arc = [];
-      // 计算起点和终点长度，切割数组
-      let lineDistance = es_length(f, 'kilometers');
-      for (let q = 0; q < lineDistance; q += lineDistance / step) {
-        let segment = along(f, q, 'kilometers');
-        arc.push(segment.geometry.coordinates);
+      // 计算整条线的总长度(单位:公里)
+      let length = es_length(f, 'kilometers');
+
+      // 遍历每个线段,进行插值计算
+      for (let i = 0; i < coordinates.length - 1; i++) {
+        const start = coordinates[i];
+        const end = coordinates[i + 1];
+        const lineSegment = lineString([start, end]);
+        const segLength = es_length(lineSegment, 'kilometers');
+        // 根据线段长度和总长度的比例,计算需要插入的点数
+        const pointsToAdd = Math.floor(segLength / (length / step));
+
+        // 添加起始点
+        arc.push(start);
+
+        // 在线段上进行插值,添加过渡点
+        if (pointsToAdd > 1) {
+          for (let j = 1; j < pointsToAdd; j++) {
+            const fraction = j / pointsToAdd;
+            const point = along(lineSegment, segLength * fraction, 'kilometers');
+            arc.push(point.geometry.coordinates);
+          }
+        }
       }
+      // 添加线段的终点
+      arc.push(coordinates[coordinates.length - 1]);
 
       // 更新数据
       let i = 0;
@@ -72310,6 +72347,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