@hzab/map-combine 0.3.0-beta → 0.3.0

package/CHANGELOG.md

@@ -1,7 +1,9 @@
-# @hzab/map-combine0.3.0
+# @hzab/map-combine@0.3.0
 
 fix: reactpoint 添加高德地图引擎并添加相应点线面绘制
 feat: 高德地图支持 ReactPoint
+feat: 增加 loadPromise 参数，用于地图异步加载判断是否加载完成
+fix: 解决 ReactPoint 点击事件无法触发的问题
 
 # @hzab/map-combine0.2.8
 

package/package.json

@@ -1,12 +1,19 @@
 {
   "name": "@hzab/map-combine",
-  "version": "0.3.0-beta",
+  "version": "0.3.0",
   "description": "地图组件",
   "main": "src",
   "scripts": {
     "dev": "npm run prepare && webpack serve -c ./config/webpack.config.js --env local",
     "build": "webpack -c ./config/webpack.config.js --env production",
-    "publish-beta": "npm publish --beta",
+    "version:alpha": "npm version prerelease --preid=alpha",
+    "publish:alpha": "npm publish --tag alpha",
+    "version:beta": "npm version prerelease --preid=beta",
+    "publish:beta": "npm publish --tag beta",
+    "version:patch": "npm version patch",
+    "version:minior": "npm version minor",
+    "version:major": "npm version major",
+    "publish:stable": "npm publish --access public",
     "publish-patch": "npm version patch && npm publish --access public",
     "publish-minor": "npm version minor && npm publish --access public",
     "publish-major": "npm version major && npm publish --access public",
@@ -22,11 +29,11 @@
   "author": "CaiYansong",
   "license": "ISC",
   "devDependencies": {
-    "ol": "^7.4.0",
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@hzab/permissions": "0.1.1",
     "@hzab/webpack-config": "^0.2.1",
     "@turf/turf": "6.5",
+    "@types/amap-js-api": "^1.4.16",
     "@types/react": "^17.0.62",
     "@types/react-dom": "^17.0.20",
     "antd": "^4.14.0",
@@ -36,6 +43,7 @@
     "lil-gui": "^0.19.2",
     "mobx": "^6.7.0",
     "mobx-react": "^7.6.0",
+    "ol": "^7.4.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "^6.14.1",
@@ -56,5 +64,6 @@
     "**.{js,jsx,ts,tsx,css,scss,less,json,html}": [
       "prettier --write"
     ]
-  }
+  },
+  "dependencies": {}
 }

package/src/amap/AMap.ts

@@ -1,249 +1,300 @@
-import { MapCombine } from "../basic/MapCombine";
-import { PointOption, Point } from "../basic/Point";
-import { ReactPointOption, ReactPoint, drawReactPoint } from "../basic/ReactPoint";
-import { PolylineOption, Polyline } from "../basic/Polyline";
-import { PolygonOption, Polygon } from "../basic/Polygon";
-import { Tile3DOption, Tile3D } from "../basic/Tile3D";
-
-import AMapLoader from "./loader";
-import { bindEvent } from "./AMapEvent";
-import { drawPoint } from "./AMapPoint";
-import { drawPolyline } from "./AMapPolyline";
-import { drawPolygon } from "./AMapPolygon";
-
-export interface IAMapOption {
-  container;
-  url?: string | string[];
-  center?: number[];
-  zoom?: number;
-  maxZoom?: number;
-  minZoom?: number;
-  /** 地图瓦片转换规则 GCJ02 转 WGS84 */
-  proj?: "GCJ02->WGS84";
-  /** 高德地图 key */
-  key: string;
-  /** 高德地图 securityJsCode */
-  securityJsCode: string;
-  /** 加载的插件列表 */
-  plugins?: [string];
-}
-
-export interface IFlyToViewerOpt {
-  /**
-   * 立即缩放到指定位置
-   */
-  immediately?: boolean;
-  /**
-   * (Array<number> = [0,0,0,0]) 距离边框的内边距，顺序：上、下、左、右
-   */
-  avoid?: [number, number, number, number];
-}
-
-export class AMap extends MapCombine {
-  loadPromise;
-  viewer: any;
-  container: HTMLDivElement;
-  option;
-  offset: number[];
-  fov = 0.9272952180016121;
-  isFromLonLat = true;
-  LbsAMap;
-  get cursor(): string {
-    return this.container.style.cursor;
-  }
-  set cursor(val: string) {
-    this.container.style.cursor = val;
-  }
-
-  get moveable(): boolean {
-    return this.viewer?.getStatus()?.dragEnable;
-  }
-  set moveable(val: boolean) {
-    this.viewer?.setStatus({ dragEnable: val });
-  }
-
-  get center(): number[] {
-    return this.viewer?.getCenter();
-  }
-  set center(val: number[]) {
-    this.viewer?.setCenter(val);
-  }
-  get zoom(): number {
-    return this.viewer?.getZoom();
-  }
-  set zoom(val: number) {
-    this.viewer?.setZoom(val);
-  }
-
-  constructor(viewer = undefined) {
-    super();
-    viewer && this._initParamsEvent(viewer);
-  }
-
-  private _initParamsEvent(viewer) {
-    if (!viewer) {
-      return;
-    }
-    this.viewer = viewer;
-
-    this.container = this.viewer.getContainer();
-    // this.markers = this.viewer.scene.primitives.add(new Cesium.BillboardCollection());
-
-    bindEvent(this);
-  }
-
-  init(opt: IAMapOption) {
-    this.option = opt;
-    const {
-      container,
-      center = [120.2288892, 30.2349677, 0],
-      zoom = 13,
-      url,
-      maxZoom,
-      minZoom,
-      proj,
-      key,
-      securityJsCode,
-      plugins,
-    } = opt || {};
-
-    this.loadPromise = new Promise((resolve, reject) => {
-      AMapLoader({
-        key,
-        securityJsCode,
-        plugins,
-      })
-        .then((LbsAMap: any) => {
-          this.LbsAMap = LbsAMap;
-          let _urls = Array.isArray(url) ? url : [url];
-          this.viewer = new LbsAMap.Map(container, {
-            zoom: zoom || 14,
-            center: center || [120.160217, 30.243861],
-            doubleClickZoom: false,
-            zooms: minZoom && maxZoom && [minZoom, maxZoom],
-            layers: url
-              ? _urls.map((it: any) => {
-                  let opt = { tileUrl: "", getTileUrl: undefined };
-                  if (typeof it === "string") {
-                    opt.tileUrl = it;
-                  } else {
-                    opt = it;
-                  }
-                  // 使用 getTileUrl 解决接口地址强制改为 https 的问题
-                  opt.getTileUrl = function (x, y, z) {
-                    return opt.tileUrl.replace("{x}", x).replace("{y}", y).replace("{z}", z);
-                  };
-
-                  return new LbsAMap.TileLayer(opt);
-                })
-              : undefined,
-          });
-          this.viewer.on("complete", () => {
-            resolve(this.viewer);
-          });
-
-          this._initParamsEvent(this.viewer);
-          return this.viewer;
-        })
-        .catch(reject);
-    });
-    this.loadPromise.then(() => {
-      this.container.appendChild(this.htmllayer);
-    });
-    return this.loadPromise;
-  }
-
-  createPoint<K>(option?: Partial<PointOption<K>>): Point<K> {
-    const e = new Point(this, option);
-    this.loadPromise.then(() => {
-      drawPoint(this, e);
-    });
-    return e;
-  }
-
-  createReactPoint<K>(option?: Partial<ReactPointOption<K>>): ReactPoint<K> {
-    const e = new ReactPoint(this, option);
-    this.loadPromise.then(() => {
-      drawReactPoint(this, e);
-    });
-    return e;
-  }
-
-  createPolyline<K>(option?: Partial<PolylineOption<K>>): Polyline<K> {
-    const e = new Polyline(this, option);
-    this.loadPromise.then(() => {
-      drawPolyline(this, e);
-    });
-    return e;
-  }
-  createPolygon<K>(option?: Partial<PolygonOption<K>>): Polygon<K> {
-    const e = new Polygon(this, option);
-    this.loadPromise.then(() => {
-      drawPolygon(this, e);
-    });
-    return e;
-  }
-  createTile3D(option?: Partial<Tile3DOption>): Tile3D {
-    throw new Error("Method not implemented.");
-  }
-
-  /**
-   * 将高德地图 Canvas 像素坐标转换为经纬度
-   * @param {Array} p - canvas 点位数组 [x, y]
-   * @returns {Array} p - 经纬度数组 [lng, lat]
-   */
-  canvasTgeography(p: number[]) {
-    const mapInstance = this.viewer;
-    if (!mapInstance) {
-      this.loadPromise.then(() => {
-        this.canvasTgeography(p);
-      });
-      return [];
-    }
-    try {
-      const lngLat = this.viewer.lngLatToContainer(p);
-      return [lngLat.lng, lngLat.lat];
-    } catch (error) {
-      console.error("canvasPixelToLngLat 转换出错:", error);
-      return [];
-    }
-  }
-
-  /**
-   * 经纬度转换为高德地图 Canvas 像素坐标
-   * @param {Array} p - 经纬度数组 [lng, lat]
-   * @returns {Array} Canvas 像素坐标 [x, y]
-   */
-  geographyTcanvas(p: number[]): number[] {
-    const mapInstance = this.viewer;
-    if (!mapInstance) {
-      this.loadPromise.then(() => {
-        this.geographyTcanvas(p);
-      });
-      return [];
-    }
-    try {
-      const containerPixel = this.viewer.lngLatToContainer(p);
-      return [containerPixel.x, containerPixel.y];
-    } catch (error) {
-      console.error("lngLatToCanvasPixel 转换出错:", error);
-      return [];
-    }
-  }
-  /**
-   * 所有点位移动至视口，调整位置及层级
-   * @param points
-   * @param opt
-   * @param {Array<number> = [0,0,0,0]} opt.avoid 距离边框的内边距，顺序：上、下、左、右
-   */
-  flyToViewer(points: number[][], opt: IFlyToViewerOpt = { avoid: [0, 0, 0, 0], immediately: true }): void {
-    this.loadPromise.then(() => {
-      this.viewer.setBounds(
-        this.getBounds(points, { canvas: this.viewer.canvas, ...opt }),
-        opt?.immediately,
-        opt?.avoid,
-      );
-    });
-  }
-  flyTo() {}
-}
+import { MapCombine } from "../basic/MapCombine";
+import { PointOption, Point } from "../basic/Point";
+import { ReactPointOption, ReactPoint, drawReactPoint } from "../basic/ReactPoint";
+import { PolylineOption, Polyline } from "../basic/Polyline";
+import { PolygonOption, Polygon } from "../basic/Polygon";
+import { Tile3DOption, Tile3D } from "../basic/Tile3D";
+
+import AMapLoader from "./loader";
+import { bindEvent } from "./AMapEvent";
+import { drawPoint } from "./AMapPoint";
+import { drawPolyline } from "./AMapPolyline";
+import { drawPolygon } from "./AMapPolygon";
+
+export interface IAMapOption {
+  container: HTMLDivElement;
+  url?: string | string[];
+  center?: number[];
+  zoom?: number;
+  maxZoom?: number;
+  minZoom?: number;
+  /** 地图瓦片转换规则 GCJ02 转 WGS84 */
+  proj?: "GCJ02->WGS84";
+  /** 高德地图 key */
+  key: string;
+  /** 高德地图 securityJsCode */
+  securityJsCode: string;
+  /** 加载的插件列表 */
+  plugins?: [string];
+  /** loader 配置参数 */
+  loaderOpt?: Object;
+  /** 地图初始化 配置参数 */
+  mapOpt?: Object;
+}
+
+export interface IFlyToViewerOpt {
+  /**
+   * 立即缩放到指定位置
+   */
+  immediately?: boolean;
+  /**
+   * (Array<number> = [0,0,0,0]) 距离边框的内边距，顺序：上、下、左、右
+   */
+  avoid?: [number, number, number, number];
+  /**
+   * 最大缩放级别
+   */
+  maxZoom?: number;
+  /**
+   * 动画时间
+   */
+  duration?: number;
+}
+
+export class AMap extends MapCombine {
+  viewer: any;
+  container: HTMLDivElement = null;
+  option: any = {};
+  offset: number[];
+  fov = 0.9272952180016121;
+  isFromLonLat = true;
+  LbsAMap: any;
+  get cursor(): string {
+    return this.container.style.cursor;
+  }
+  set cursor(val: string) {
+    this.container.style.cursor = val;
+  }
+
+  get moveable(): boolean {
+    return this.viewer?.getStatus()?.dragEnable;
+  }
+  set moveable(val: boolean) {
+    this.viewer?.setStatus({ dragEnable: val });
+  }
+
+  get center(): number[] {
+    return this.viewer?.getCenter();
+  }
+  set center(val: number[]) {
+    this.viewer?.setCenter(val);
+  }
+  get zoom(): number {
+    return this.viewer?.getZoom();
+  }
+  set zoom(val: number) {
+    this.viewer?.setZoom(val);
+  }
+
+  constructor(viewer = undefined) {
+    super();
+    viewer && this._initParamsEvent(viewer);
+  }
+
+  private _initParamsEvent(viewer) {
+    if (!viewer) {
+      return;
+    }
+    this.viewer = viewer;
+
+    this.container = this.viewer.getContainer();
+    // this.markers = this.viewer.scene.primitives.add(new Cesium.BillboardCollection());
+
+    bindEvent(this);
+  }
+
+  init(opt: IAMapOption) {
+    this.option = opt;
+    const {
+      container,
+      center = [120.2288892, 30.2349677, 0],
+      zoom = 13,
+      url,
+      maxZoom,
+      minZoom,
+      proj,
+      key,
+      securityJsCode,
+      plugins,
+    } = opt || {};
+
+    this.loadPromise = new Promise((resolve, reject) => {
+      AMapLoader({
+        ...opt.loaderOpt,
+        key,
+        securityJsCode,
+        plugins,
+      })
+        .then((LbsAMap: any) => {
+          this.LbsAMap = LbsAMap;
+          let _urls = Array.isArray(url) ? url : [url];
+          this.viewer = new LbsAMap.Map(container, {
+            ...opt.mapOpt,
+            zoom: zoom || 14,
+            center: center || [120.160217, 30.243861],
+            doubleClickZoom: false,
+            zooms: minZoom && maxZoom && [minZoom, maxZoom],
+            layers: url
+              ? _urls.map((it: any) => {
+                  let opt = { tileUrl: "", getTileUrl: undefined };
+                  if (typeof it === "string") {
+                    opt.tileUrl = it;
+                  } else {
+                    opt = it;
+                  }
+                  // 使用 getTileUrl 解决接口地址强制改为 https 的问题
+                  opt.getTileUrl = function (x, y, z) {
+                    return opt.tileUrl.replace("{x}", x).replace("{y}", y).replace("{z}", z);
+                  };
+
+                  return new LbsAMap.TileLayer(opt);
+                })
+              : undefined,
+          });
+          this.viewer.on("complete", () => {
+            resolve(this);
+          });
+
+          this._initParamsEvent(this.viewer);
+          return this;
+        })
+        .catch(reject);
+    });
+    this.loadPromise.then(() => {
+      this.container.appendChild(this.htmllayer);
+    });
+    return this.loadPromise;
+  }
+
+  createPoint<K>(option?: Partial<PointOption<K>>): Point<K> {
+    const e = new Point(this, option);
+    this.loadPromise.then(() => {
+      drawPoint(this, e);
+    });
+    return e;
+  }
+
+  createReactPoint<K>(option?: Partial<ReactPointOption<K>>): ReactPoint<K> {
+    const e = new ReactPoint(this, option);
+    this.loadPromise.then(() => {
+      drawReactPoint(this, e);
+    });
+    return e;
+  }
+
+  createPolyline<K>(option?: Partial<PolylineOption<K>>): Polyline<K> {
+    const e = new Polyline(this, option);
+    this.loadPromise.then(() => {
+      drawPolyline(this, e);
+    });
+    return e;
+  }
+  createPolygon<K>(option?: Partial<PolygonOption<K>>): Polygon<K> {
+    const e = new Polygon(this, option);
+    this.loadPromise.then(() => {
+      drawPolygon(this, e);
+    });
+    return e;
+  }
+  createTile3D(option?: Partial<Tile3DOption>): Tile3D {
+    throw new Error("Method not implemented.");
+  }
+
+  /**
+   * 将高德地图 Canvas 像素坐标转换为经纬度
+   * @param {Array} p - canvas 点位数组 [x, y]
+   * @returns {Array} p - 经纬度数组 [lng, lat]
+   */
+  canvasTgeography(p: number[]) {
+    const mapInstance = this.viewer;
+    if (!mapInstance) {
+      this.loadPromise.then(() => {
+        this.canvasTgeography(p);
+      });
+      return [];
+    }
+    try {
+      const lngLat = this.viewer.lngLatToContainer(p);
+      return [lngLat.lng, lngLat.lat];
+    } catch (error) {
+      console.error("canvasPixelToLngLat 转换出错:", error);
+      return [];
+    }
+  }
+
+  /**
+   * 经纬度转换为高德地图 Canvas 像素坐标
+   * @param {Array} p - 经纬度数组 [lng, lat]
+   * @returns {Array} Canvas 像素坐标 [x, y]
+   */
+  geographyTcanvas(p: number[]): number[] {
+    const mapInstance = this.viewer;
+    if (!mapInstance) {
+      this.loadPromise.then(() => {
+        this.geographyTcanvas(p);
+      });
+      return [];
+    }
+    try {
+      const containerPixel = this.viewer.lngLatToContainer(p);
+      return [containerPixel.x, containerPixel.y];
+    } catch (error) {
+      console.error("lngLatToCanvasPixel 转换出错:", error);
+      return [];
+    }
+  }
+  /**
+   * 所有点位移动至视口，调整位置及层级
+   * @param points
+   * @param opt
+   * @param {Array<number> = [0,0,0,0]} opt.avoid 距离边框的内边距，顺序：上、下、左、右
+   */
+  flyToViewer(points: number[][], opt: IFlyToViewerOpt = { avoid: [0, 0, 0, 0], immediately: true }): void {
+    this.loadPromise.then(() => {
+      const [zoom, center] = this.viewer.getFitZoomAndCenterByBounds(
+        this.getBounds(points, { canvas: this.viewer.canvas, ...opt }),
+        opt?.avoid,
+        opt.maxZoom,
+      );
+
+      this.viewer.setZoomAndCenter(zoom, center, opt?.immediately, opt?.duration);
+    });
+  }
+
+  /**
+   * 将点集视野调整至容器内，支持相对边距（百分比）
+   * @param {number[][]} points - 经纬度数组 [[lng, lat], ...]
+   * @param {Object} opt
+   * @param {number[]} opt.avoid - 相对边距 [上, 下, 左, 右]，取值范围 0~1，默认 [0,0,0,0]
+   * @param {boolean} opt.immediately - 是否立即跳转，默认 false（带动画）
+   */
+  flyToViewerPercent(points: number[][], opt = { avoid: [0, 0, 0, 0], immediately: false }) {
+    if (!points?.length) return;
+
+    // 计算原始经纬度范围
+    let west = Infinity,
+      east = -Infinity,
+      south = Infinity,
+      north = -Infinity;
+    points.forEach(([lng, lat]) => {
+      west = Math.min(west, lng);
+      east = Math.max(east, lng);
+      south = Math.min(south, lat);
+      north = Math.max(north, lat);
+    });
+
+    // 应用相对边距
+    const [top, bottom, left, right] = opt.avoid;
+    const lngSpan = east - west;
+    const latSpan = north - south;
+
+    const bounds = this.LbsAMap.Bounds(
+      [west - lngSpan * left, south - latSpan * bottom],
+      [east + lngSpan * right, north + latSpan * top],
+    );
+
+    this.viewer.setBounds(bounds, opt.immediately);
+  }
+
+  flyTo() {}
+}