hn-map 1.1.4 → 1.1.5

package/dist/index.js

@@ -767,13 +767,6 @@
         this.map.on("pitchend", function (e) {
           return _this2.updateMapParams(e);
         }); // 地图俯仰角度完成
-        this.map.on("load", function (e) {
-          // 路况展示
-          var roadNetLayer = new SGMap.RoadNetLayer({
-            map: _this2.map
-          });
-          roadNetLayer.render();
-        });
       }
       return _createClass(siji_map, [{
         key: "formatConfig",
@@ -943,6 +936,32 @@
                   _context3.n = 1;
                   return new Promise(function (resolve) {
                     instance.map.on("load", function (e) {
+                      // 路况展示
+                      var roadNetLayer = new SGMap.RoadNetLayer({
+                        map: instance.map
+                      });
+                      roadNetLayer.render();
+                      //添加天空图层
+                      instance.map.addLayer({
+                        "id": "sky",
+                        "type": "sky",
+                        "paint": {
+                          "sky-type": "atmosphere",
+                          "sky-atmosphere-sun": [0, 0],
+                          "sky-atmosphere-sun-intensity": 15
+                        }
+                      });
+                      // 加载地形（需要v3.1.0，且需要新的key和secret）
+                      // !instance.map.getSource('terrain') && instance.map.addSource('terrain',{
+                      //   type:'raster-dem',
+                      //   url:"aegis://aegis.Terrain3D",//地形高程数据源名称
+                      //   tileSize:512,
+                      //
+                      // })
+                      // instance.map.setTerrain({
+                      //   source:'terrain',
+                      //   exaggeration:1,//地形夸张比例
+                      // })
                       resolve(e);
                     });
                   });
@@ -1393,6 +1412,10 @@
               hnMap.map.map.removeLayer(entity.config_routeplay.id);
               hnMap.map.map.removeSource(entity.config_routeplay.id);
               entity.imgMarker.remove();
+            } else if (entity.type == "imagePoint") {
+              hnMap.map.map.removeImage(entity.id + "_image");
+              hnMap.map.map.removeLayer(entity.id);
+              hnMap.map.map.removeSource(entity.id);
             } else {
               hnMap.map.map.removeLayer(entity.id);
               hnMap.map.map.removeSource(entity.id);
@@ -1406,6 +1429,7 @@
         value: function moveEntity(layerIds) {
           // 数组转字符串
           var s = layerIds.join(",");
+          console.log("s===", s);
           hnMap.map.map.moveLayer(s);
         }
       }, {
@@ -1700,8 +1724,8 @@
         var handleClick = function handleClick(e) {
           var data = _this2.option.data;
           // const data = e.features[0].properties;
-          getCustomDom(data);
-          _this2.infoWindow.setHTML("<image-preview>");
+          var dom = getCustomDom(data);
+          _this2.infoWindow.setHTML(dom);
           _this2.infoWindow.setLngLat(e.lngLat).addTo(_this2.hnMap.map.map);
         };
         this.hnMap.map.map.on("click", this.config.id, handleClick);
@@ -5309,6 +5333,7 @@
               case 0:
                 // 判断是否在子路径下
                 basePath = window.location.pathname.endsWith("/") ? window.location.pathname : window.location.pathname.substring(0, window.location.pathname.lastIndexOf("/") + 1);
+                console.log(basePath);
                 _context.n = 1;
                 return loadResource(basePath + "lib/turf/turf.min.js", "js");
               case 1:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hn-map",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "hn-map集成mars3d、高德、思极",
   "main": "dist/index.js",
   "author": "庞大仙",

package/src/base/siji_entity.ts

@@ -53,7 +53,7 @@ export default class siji_entity {
       const data = this.option.data;
       // const data = e.features[0].properties;
       const dom = getCustomDom(data);
-      this.infoWindow.setHTML("<image-preview>");
+      this.infoWindow.setHTML(dom);
       this.infoWindow.setLngLat(e.lngLat).addTo(this.hnMap.map.map);
     };
 

package/src/layer/layer.ts

@@ -394,6 +394,10 @@ export default (hnMap: any) => {
           hnMap.map.map.removeLayer(entity.config_routeplay.id);
           hnMap.map.map.removeSource(entity.config_routeplay.id);
           entity.imgMarker.remove();
+        } else if (entity.type == "imagePoint") {
+          hnMap.map.map.removeImage(entity.id + "_image");
+          hnMap.map.map.removeLayer(entity.id);
+          hnMap.map.map.removeSource(entity.id);
         } else {
           hnMap.map.map.removeLayer(entity.id);
           hnMap.map.map.removeSource(entity.id);
@@ -405,6 +409,7 @@ export default (hnMap: any) => {
     moveEntity(layerIds: Array<string>) {
       // 数组转字符串
       let s = layerIds.join(",");
+      console.log("s===", s);
       hnMap.map.map.moveLayer(s);
     }
     clearEntity() {

package/src/map.ts

@@ -277,11 +277,6 @@ export default (hnMap: any) => {
       this.map.on("moveend", (e: any) => this.updateMapParams(e)); // 地图移动完成
       this.map.on("zoomend", (e: any) => this.updateMapParams(e)); // 地图缩放完成
       this.map.on("pitchend", (e: any) => this.updateMapParams(e)); // 地图俯仰角度完成
-      this.map.on("load", (e: any) => {
-        // 路况展示
-        let roadNetLayer = new SGMap.RoadNetLayer({ map: this.map });
-        roadNetLayer.render();
-      });
     }
 
     static async create(id: string, option: any) {
@@ -290,6 +285,34 @@ export default (hnMap: any) => {
       // 返回一个 Promise，等待地图的 'load' 事件
       await new Promise((resolve) => {
         instance.map.on("load", (e: any) => {
+          // 路况展示
+          let roadNetLayer = new SGMap.RoadNetLayer({ map: instance.map });
+          roadNetLayer.render();
+          //添加天空图层
+          instance.map.addLayer({
+            "id": "sky",
+            "type": "sky",
+            "paint": {
+              "sky-type": "atmosphere",
+              "sky-atmosphere-sun": [
+                0,
+                0
+              ],
+              "sky-atmosphere-sun-intensity": 15
+            }
+          })
+
+          // 加载地形（需要v3.1.0，且需要新的key和secret）
+          // !instance.map.getSource('terrain') && instance.map.addSource('terrain',{
+          //   type:'raster-dem',
+          //   url:"aegis://aegis.Terrain3D",//地形高程数据源名称
+          //   tileSize:512,
+          //
+          // })
+          // instance.map.setTerrain({
+          //   source:'terrain',
+          //   exaggeration:1,//地形夸张比例
+          // })
           resolve(e);
         });
       });
@@ -362,7 +385,7 @@ export default (hnMap: any) => {
             callback({
               lng: event.lngLat.lng,
               lat: event.lngLat.lat,
-              alt: event.lngLat.alt||0,
+              alt: event.lngLat.alt || 0,
             });
           };
           break;

package/src/util.ts

@@ -15,36 +15,36 @@
 
 // 对象深度合并
 export function deepMerge(target: any, source: any): any {
-    for (let key of Object.keys(source)) {
-        if (source[key] instanceof Object && !Array.isArray(source[key])) {
-            if (!target[key]) Object.assign(target, {[key]: {}});
-            deepMerge(target[key], source[key]);
-        } else {
-            Object.assign(target, {[key]: source[key]});
-        }
+  for (let key of Object.keys(source)) {
+    if (source[key] instanceof Object && !Array.isArray(source[key])) {
+      if (!target[key]) Object.assign(target, { [key]: {} });
+      deepMerge(target[key], source[key]);
+    } else {
+      Object.assign(target, { [key]: source[key] });
     }
-    return target;
+  }
+  return target;
 }
 
 // 递归格式化高德坐标系
 export function wgs84ToGcj02Format(position: any): any {
-    // 判断是否是数组
-    if (position.every((item: any) => Array.isArray(item))) {
-        return position.map((item: any) => {
-            return wgs84ToGcj02Format(item);
-        });
-    } else if (position.every((item: any) => typeof item === "object")) {
-        return position.map((item: any) => {
-            let data = wgs84ToGcj02Format([item.lng, item.lat]);
-            return {
-                ...item,
-                lng: data[0],
-                lat: data[1],
-            };
-        });
-    } else {
-        return wgs84ToGcj02(position[0], position[1]);
-    }
+  // 判断是否是数组
+  if (position.every((item: any) => Array.isArray(item))) {
+    return position.map((item: any) => {
+      return wgs84ToGcj02Format(item);
+    });
+  } else if (position.every((item: any) => typeof item === "object")) {
+    return position.map((item: any) => {
+      let data = wgs84ToGcj02Format([item.lng, item.lat]);
+      return {
+        ...item,
+        lng: data[0],
+        lat: data[1],
+      };
+    });
+  } else {
+    return wgs84ToGcj02(position[0], position[1]);
+  }
 }
 
 /**
@@ -54,66 +54,66 @@ export function wgs84ToGcj02Format(position: any): any {
  * @returns {[number, number]} GCJ-02经纬度数组
  */
 export function wgs84ToGcj02(wgsLng: any, wgsLat: any): any {
-    if (!isCorrectPosition(wgsLng, wgsLat)) {
-        return [wgsLng, wgsLat];
-    }
-
-    const a = 6378245.0; // 长半轴
-    const ee = 0.00669342162296594323; // 扁率
-
-    function transformLat(x: any, y: any): any {
-        let ret =
-            -100.0 +
-            2.0 * x +
-            3.0 * y +
-            0.2 * y * y +
-            0.1 * x * y +
-            0.2 * Math.sqrt(Math.abs(x));
-        ret +=
-            ((20.0 * Math.sin(6.0 * x * Math.PI) +
-                    20.0 * Math.sin(2.0 * x * Math.PI)) *
-                2.0) /
-            3.0;
-        ret +=
-            ((160.0 * Math.sin((y * Math.PI) / 3.0) +
-                    320 * Math.sin((y * Math.PI) / 30.0)) *
-                2.0) /
-            3.0;
-        return ret;
-    }
-
-    function transformLng(x: any, y: any): any {
-        let ret =
-            300.0 +
-            x +
-            2.0 * y +
-            0.1 * x * x +
-            0.1 * x * y +
-            0.1 * Math.sqrt(Math.abs(x));
-        ret +=
-            ((20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(x * Math.PI)) *
-                2.0) /
-            3.0;
-        ret +=
-            ((150.0 * Math.sin((x * Math.PI) / 3.0) +
-                    300.0 * Math.sin((x * Math.PI) / 15.0)) *
-                2.0) /
-            3.0;
-        return ret;
-    }
-
-    let dLat = transformLat(wgsLng - 105.0, wgsLat - 35.0);
-    let dLng = transformLng(wgsLng - 105.0, wgsLat - 35.0);
-    const radLat = (wgsLat / 180.0) * Math.PI;
-    let magic = Math.sin(radLat);
-    magic = 1 - ee * magic * magic;
-    const sqrtMagic = Math.sqrt(magic);
-    dLat = (dLat * 180.0) / (((a * (1 - ee)) / (magic * sqrtMagic)) * Math.PI);
-    dLng = (dLng * 180.0) / ((a / sqrtMagic) * Math.cos(radLat) * Math.PI);
-    const gcjLat = wgsLat + dLat;
-    const gcjLng = wgsLng + dLng;
-
-    return [gcjLng, gcjLat];
+  if (!isCorrectPosition(wgsLng, wgsLat)) {
+    return [wgsLng, wgsLat];
+  }
+
+  const a = 6378245.0; // 长半轴
+  const ee = 0.00669342162296594323; // 扁率
+
+  function transformLat(x: any, y: any): any {
+    let ret =
+      -100.0 +
+      2.0 * x +
+      3.0 * y +
+      0.2 * y * y +
+      0.1 * x * y +
+      0.2 * Math.sqrt(Math.abs(x));
+    ret +=
+      ((20.0 * Math.sin(6.0 * x * Math.PI) +
+        20.0 * Math.sin(2.0 * x * Math.PI)) *
+        2.0) /
+      3.0;
+    ret +=
+      ((160.0 * Math.sin((y * Math.PI) / 3.0) +
+        320 * Math.sin((y * Math.PI) / 30.0)) *
+        2.0) /
+      3.0;
+    return ret;
+  }
+
+  function transformLng(x: any, y: any): any {
+    let ret =
+      300.0 +
+      x +
+      2.0 * y +
+      0.1 * x * x +
+      0.1 * x * y +
+      0.1 * Math.sqrt(Math.abs(x));
+    ret +=
+      ((20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(x * Math.PI)) *
+        2.0) /
+      3.0;
+    ret +=
+      ((150.0 * Math.sin((x * Math.PI) / 3.0) +
+        300.0 * Math.sin((x * Math.PI) / 15.0)) *
+        2.0) /
+      3.0;
+    return ret;
+  }
+
+  let dLat = transformLat(wgsLng - 105.0, wgsLat - 35.0);
+  let dLng = transformLng(wgsLng - 105.0, wgsLat - 35.0);
+  const radLat = (wgsLat / 180.0) * Math.PI;
+  let magic = Math.sin(radLat);
+  magic = 1 - ee * magic * magic;
+  const sqrtMagic = Math.sqrt(magic);
+  dLat = (dLat * 180.0) / (((a * (1 - ee)) / (magic * sqrtMagic)) * Math.PI);
+  dLng = (dLng * 180.0) / ((a / sqrtMagic) * Math.cos(radLat) * Math.PI);
+  const gcjLat = wgsLat + dLat;
+  const gcjLng = wgsLng + dLng;
+
+  return [gcjLng, gcjLat];
 }
 
 /**
@@ -123,46 +123,46 @@ export function wgs84ToGcj02(wgsLng: any, wgsLat: any): any {
  * @returns {boolean}
  */
 export function isCorrectPosition(lng: any, lat: any): boolean {
-    return lng <= 180 && lng >= -180 && lat <= 90 && lat >= -90;
+  return lng <= 180 && lng >= -180 && lat <= 90 && lat >= -90;
 }
 
 // 根据矩形左上角和右上角坐标计算矩形坐标对
 export function createRectangleCoordinates(leftTop: any, rightBottom: any) {
-    const [leftTopLng, leftTopLat] = leftTop;
-    const [rightBottomLng, rightBottomLat] = rightBottom;
-
-    // 计算四个角点
-    const leftTopPoint = [Number(leftTopLng), Number(leftTopLat)];
-    const rightTopPoint = [Number(rightBottomLng), Number(leftTopLat)];
-    const rightBottomPoint = [Number(rightBottomLng), Number(rightBottomLat)];
-    const leftBottomPoint = [Number(leftTopLng), Number(rightBottomLat)];
-
-    // 返回五个点的坐标对（首尾相同）
-    return [
-        leftTopPoint,
-        rightTopPoint,
-        rightBottomPoint,
-        leftBottomPoint,
-        leftTopPoint, // 闭合矩形
-    ];
+  const [leftTopLng, leftTopLat] = leftTop;
+  const [rightBottomLng, rightBottomLat] = rightBottom;
+
+  // 计算四个角点
+  const leftTopPoint = [Number(leftTopLng), Number(leftTopLat)];
+  const rightTopPoint = [Number(rightBottomLng), Number(leftTopLat)];
+  const rightBottomPoint = [Number(rightBottomLng), Number(rightBottomLat)];
+  const leftBottomPoint = [Number(leftTopLng), Number(rightBottomLat)];
+
+  // 返回五个点的坐标对（首尾相同）
+  return [
+    leftTopPoint,
+    rightTopPoint,
+    rightBottomPoint,
+    leftBottomPoint,
+    leftTopPoint, // 闭合矩形
+  ];
 }
 
 export function getMapRangeHeightByLevel(level: number) {
-    // 输入校验：限制在 1~18
-    level = Math.max(1, Math.min(18, Math.floor(level)));
-
-    // 计算指定 level 对应的高度（level >= 2 时使用指数衰减）
-    function getHeight(lvl: number) {
-        if (lvl === 1) {
-            return Infinity; // level=1 表示“最大高度”，逻辑上为无穷大
-        } else {
-            return 32000000 / Math.pow(2, lvl - 2);
-        }
+  // 输入校验：限制在 1~18
+  level = Math.max(1, Math.min(18, Math.floor(level)));
+
+  // 计算指定 level 对应的高度（level >= 2 时使用指数衰减）
+  function getHeight(lvl: number) {
+    if (lvl === 1) {
+      return Infinity; // level=1 表示“最大高度”，逻辑上为无穷大
+    } else {
+      return 32000000 / Math.pow(2, lvl - 2);
     }
+  }
 
-    const endHeight = getHeight(level);           // 当前 level 的“粗略”高度
-    const startHeight = level < 18 ? getHeight(level + 1) : 0; // 下一级更细
-    return {startHeight, endHeight};
+  const endHeight = getHeight(level); // 当前 level 的“粗略”高度
+  const startHeight = level < 18 ? getHeight(level + 1) : 0; // 下一级更细
+  return { startHeight, endHeight };
 }
 
 /**
@@ -172,18 +172,17 @@ export function getMapRangeHeightByLevel(level: number) {
  * @returns {number} 中间高度（米）
  */
 export function getLevelMiddleHeight(level: number): number {
-    const {startHeight, endHeight} = getMapRangeHeightByLevel(level)
-    // 如果 startHeight 为 0（如 level=18），几何平均会为 0，不合理
-    // 所以 level=18 特殊处理：返回 (0 + end)/2 或直接返回 end * 0.7 左右
-    if (startHeight === 0) {
-        return endHeight * 0.7; // 经验值，贴近“中间感知”
-    }
-
-    // 几何平均：√(start × end)
-    return Math.sqrt(startHeight * endHeight);
+  const { startHeight, endHeight } = getMapRangeHeightByLevel(level);
+  // 如果 startHeight 为 0（如 level=18），几何平均会为 0，不合理
+  // 所以 level=18 特殊处理：返回 (0 + end)/2 或直接返回 end * 0.7 左右
+  if (startHeight === 0) {
+    return endHeight * 0.7; // 经验值，贴近“中间感知”
+  }
+
+  // 几何平均：√(start × end)
+  return Math.sqrt(startHeight * endHeight);
 }
 
-
 /**
  * 根据地图缩放级别（level），返回对应的视野高度范围
  * 规则：
@@ -194,8 +193,8 @@ export function getLevelMiddleHeight(level: number): number {
  * @returns {[number, number]} [开始高度, 结束高度]（单位：米）
  */
 export function getLevelHeightRange(level: number): [number, number] {
-    const {startHeight, endHeight} = getMapRangeHeightByLevel(level)
-    return [startHeight, endHeight];
+  const { startHeight, endHeight } = getMapRangeHeightByLevel(level);
+  return [startHeight, endHeight];
 }
 
 /**
@@ -203,14 +202,24 @@ export function getLevelHeightRange(level: number): [number, number] {
  * @param {number} height - 当前视野高度（米）
  * @returns {number} level
  */
-export function getHeightToLevel(height:number): number {
-    if (height > 32000000) return 1;
-    if (height <= 0) return 18;
+export function getHeightToLevel(height: number): number {
+  if (height > 32000000) return 1;
+  if (height <= 0) return 18;
 
-    // 解公式：height = 32e6 / 2^(level-2)
-    let level = 2 + Math.log(32000000 / height) / Math.log(2);
-    level = Math.floor(level);
+  // 解公式：height = 32e6 / 2^(level-2)
+  let level = 2 + Math.log(32000000 / height) / Math.log(2);
+  level = Math.floor(level);
 
-    // 限制在 1~18
-    return Math.max(1, Math.min(18, level));
+  // 限制在 1~18
+  return Math.max(1, Math.min(18, level));
+}
+// 將坐标数组中的元素字符串类型统一处理为number类型
+export function convertPosition(
+  position: string[] | string[][]
+): number[] | number[][] {
+  return position.map((item) =>
+    Array.isArray(item)
+      ? (item as string[]).map((str) => Number(str))
+      : Number(item)
+  ) as number[] | number[][];
 }

package/src/other/geocodingTask.ts

@@ -1,120 +0,0 @@
-import { deepMerge, wgs84ToGcj02Format } from "../util";
-
-export default (hnMap: any) => {
-  const defaultOption = {
-    id: "",
-    position: [],
-    addressName: "", //地址名称
-    region: "", //地址
-    isEncode: false, //是否进行坐标转换
-    iconSize: 13,
-    offfset: [0, 0],
-    color: "#fff",
-    text: "",
-    data: null,
-  };
-
-  class mars3d_class {
-    type: any = "geocodingTask";
-    id: any = null;
-    option: any = JSON.parse(JSON.stringify(defaultOption));
-    config: any = null;
-    layerEntity: any = null;
-
-    constructor(option: any) {
-      this.id = option.id;
-      deepMerge(this.option, option);
-      this.config = this.formatConfig(this.option);
-      this.layerEntity = new mars3d.layer.HeatLayer(
-        JSON.parse(JSON.stringify(this.config))
-      );
-    }
-
-    formatConfig(option: any) {
-      return {
-        id: option.id,
-        positions: option.position,
-
-        style: {
-          opacity: option.opacity,
-          scaleByDistance: option.scaleByDistance,
-          clampToGround: option.clampToGround,
-        },
-
-        attr: option.data,
-      };
-    }
-
-    set(option: any) {
-      deepMerge(this.option, option);
-      this.config = this.formatConfig(this.option);
-      this.layerEntity.setOptions(this.config);
-    }
-
-    destroy() {
-      this.layerEntity.remove(true);
-      hnMap.map.layerList = hnMap.map.layerList.filter(
-        (v: any) => v.id !== this.id
-      );
-    }
-
-    flyTo() {
-      this.layerEntity.flyTo();
-    }
-
-    clear() {
-      this.layerEntity.clear();
-    }
-
-    setPosition(position: any) {
-      deepMerge(this.option, { position });
-      this.layerEntity.setPositions(position);
-    }
-
-    show() {
-      this.layerEntity.show = true;
-    }
-
-    hide() {
-      this.layerEntity.show = false;
-    }
-  }
-
-  class siji_class {
-    id: any = null;
-    option: any = JSON.parse(JSON.stringify(defaultOption));
-    config: any = null;
-    layerEntity: any = null;
-
-    constructor(option: any) {
-      this.id = option.id;
-      deepMerge(this.option, option);
-      this.layerEntity = new SGMap.GeocodingTask();
-    }
-
-    getLnglat(option: any) {
-      // return new Promise((resolve, reject) => {
-      this.layerEntity
-        .getLocation({
-          address: option.addressName,
-          region: option.region,
-          isEncode: option.isEncode,
-        })
-        .then(function (res: any) {
-          return res.location;
-        });
-      // });
-    }
-
-    easeTo(option: any) {
-      hnMap.map.map.easeTo(option);
-    }
-  }
-
-  const fn: any = {
-    mars3d: mars3d_class,
-    siji: siji_class,
-  };
-
-  return fn[hnMap.mapType];
-};