@hzab/map-combine 0.2.7 → 0.3.0-alpha.0

package/src/cesium/CesiumTile3D.ts

@@ -55,7 +55,7 @@ export function drawTile3D(map: CesiumMap, tile3d: Tile3D) {
     // (window as any).getCenter = () => {
     //   const center = tileset.boundingSphere.center
     //   const cartographic = Cesium.Cartographic.fromCartesian(center)
-    //   console.log(Cesium.Math.toDegrees(cartographic.longitude), Cesium.Math.toDegrees(cartographic.latitude), cartographic.height);
+    //   console.info(Cesium.Math.toDegrees(cartographic.longitude), Cesium.Math.toDegrees(cartographic.latitude), cartographic.height);
     // }
   });
 
@@ -103,7 +103,6 @@ export function drawTile3D(map: CesiumMap, tile3d: Tile3D) {
   tile3d.tileset = tileset;
   tile3d.translate = function (x: number, y: number, z: number, _tileset) {
     return tileset.readyPromise.then((argument) => {
-      console.log("debug translate tileset.readyPromise");
       test();
       translate(x, y, z, _tileset || tileset);
     });
@@ -125,7 +124,7 @@ export function drawTile3D(map: CesiumMap, tile3d: Tile3D) {
 }
 
 function test() {
-  console.log("debug test");
+  console.info("debug test");
 }
 
 /** 基于本地的 ENU 坐标系的偏移，也就是垂直于地表向上为 Z，东为 X，北为 Y
@@ -135,9 +134,7 @@ function test() {
  * @param tileset Cesium3DTileset
  */
 function translate(dx: number, dy: number, dz: number, tileset) {
-  console.log("debug translate", dx, dy, dz);
   if (dx === 0 && dy === 0 && dz === 0) return;
-  console.log("debug translate", dx, dy, dz);
 
   try {
     const { Cartesian3, Matrix4, Transforms } = Cesium;
@@ -169,7 +166,6 @@ function translate(dx: number, dy: number, dz: number, tileset) {
  * @param tileset Cesium3DTileset
  */
 function rotate(rx: number, ry: number, rz: number, tileset) {
-  console.log("debug rotate ", rx, ry, rz);
   if (rx === 0 && ry === 0 && rz === 0) return;
   const { Matrix3, Matrix4, Transforms, Math: CesiumMath } = Cesium;
   // 获取中心点。

package/src/mine/MineEvent.ts

@@ -1,29 +1,42 @@
 import { MineMap } from "./MineMap";
 
-
 export function bindEvent(map: MineMap) {
-  const { event, viewer, container } = map
-  viewer.on('mousemove', (e) => {
-    event.canvas = [e.point.x, e.point.y]
-    event.geography = [e.lngLat.lng, e.lngLat.lat, 0]
-  })
-  container.addEventListener('pointermove', (e) => {
-    event.trigger('pointer-move')
-  })
-  viewer.on('move', () => {
-    event.trigger('view-change')
-  })
-  viewer.on('mouseup', () => {
-    event.trigger('pointer-up')
-  })
-  viewer.on('mousedown', () => {
-    event.trigger('pointer-down')
-  })
-  viewer.on('click', () => {
-    event.trigger('left-click')
-  })
+  const { event, viewer, container } = map;
+
+  container.addEventListener("mousedown", (e) => {
+    event.trigger("pointer-down");
+  });
+
+  container.addEventListener("mouseup", (e) => {
+    event.trigger("pointer-up");
+  });
+
+  // 解决 ReactPoint 点击事件无法触发的问题
+  container.addEventListener("click", (e) => {
+    event.trigger("left-click");
+  });
+
+  viewer.on("mousemove", (e) => {
+    event.canvas = [e.point.x, e.point.y];
+    event.geography = [e.lngLat.lng, e.lngLat.lat, 0];
+  });
+  container.addEventListener("pointermove", (e) => {
+    event.trigger("pointer-move");
+  });
+  viewer.on("move", () => {
+    event.trigger("view-change");
+  });
+  viewer.on("mouseup", () => {
+    event.trigger("pointer-up");
+  });
+  viewer.on("mousedown", () => {
+    event.trigger("pointer-down");
+  });
+  viewer.on("click", () => {
+    event.trigger("left-click");
+  });
 
-  event.on('destroy', () => {
-    this.viewer.remove()
-  })
-}
+  event.on("destroy", () => {
+    viewer.remove();
+  });
+}

package/src/mine/MineMap.ts

@@ -1,119 +1,119 @@
-import { MapCombine } from "../basic/MapCombine";
-import { PointOption, Point } from "../basic/Point";
-import { PolygonOption, Polygon } from "../basic/Polygon";
-import { PolylineOption, Polyline } from "../basic/Polyline";
-import { Tile3DOption, Tile3D } from "../basic/Tile3D";
-import { bindEvent } from "./MineEvent";
-import { drawPoint } from "./MinePoint";
-import { drawPolygon } from "./MinePolygon";
-import { drawPolyline } from "./MinePolyline";
-import { drawTile3D } from "./MineTile3D";
-
-const MAX_ZOOM = 18;
-
-export class MineMap extends MapCombine {
-  viewer: any;
-  container: HTMLDivElement;
-
-  get cursor(): string {
-    return this.viewer.getCursor();
-  }
-  set cursor(val: string) {
-    this.viewer.setCursor(val);
-  }
-
-  get moveable(): boolean {
-    return this.viewer.dragPan.isEnabled();
-  }
-  set moveable(val: boolean) {
-    val ? this.viewer.dragPan.enable() : this.viewer.dragPan.disable();
-  }
-  get center(): number[] {
-    const p = this.viewer.getCenter();
-    return [p.lng, p.lat];
-  }
-  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: any) {
-    super();
-    this.viewer = viewer;
-    this.container = viewer.getContainer();
-    this.container.children.item(1).appendChild(this.htmllayer);
-    this.cursor = "default";
-    bindEvent(this);
-  }
-
-  canvasTgeography(p: number[]): number[] {
-    const res = this.viewer.getTDSpaceCoord({ point: p, disableLayer: true });
-    return [res.lngLat.lng, res.lngLat.lat, 0];
-  }
-  geographyTcanvas(p: number[]): number[] {
-    const res = this.viewer.project([p[0], p[1]], p[2] ?? 0);
-    return [res.x, res.y];
-  }
-
-  createPoint<K>(option?: Partial<PointOption<K>>): Point<K> {
-    const e = new Point(this, option);
-    drawPoint(this, e);
-    return e;
-  }
-
-  createPolyline<K>(option?: Partial<PolylineOption<K>>): Polyline<K> {
-    const e = new Polyline(this, option);
-    drawPolyline(this, e);
-    return e;
-  }
-  createPolygon<K>(option?: Partial<PolygonOption<K>>): Polygon<K> {
-    const e = new Polygon(this, option);
-    drawPolygon(this, e);
-    return e;
-  }
-
-  /**
-   * 所有点位移动至视口，调整位置及层级
-   * @param points
-   * @param opt
-   * @param {Array<number> = [0,0,0,0]} opt.avoid 距离边框的内边距，顺序：上、下、左、右
-   */
-  flyToViewer(points, opt = { avoid: [0, 0, 0, 0], maxZoom: MAX_ZOOM }) {
-    if (points?.length === 0) {
-      return this.flyTo(points[0], opt);
-    }
-    const rectangle = this.getBounds(points, { canvas: this.viewer.getCanvas(), ...opt });
-
-    // 设置地图视图，使用调整后的边界范围
-    this.viewer.fitBounds(
-      [
-        [rectangle[0], rectangle[1]],
-        [rectangle[2], rectangle[3]],
-      ],
-      {
-        maxZoom: opt?.maxZoom ?? MAX_ZOOM,
-      },
-    );
-  }
-
-  /**
-   * 移动点位到中心点
-   * @param point
-   */
-  flyTo(point, opt = {}) {
-    // 设置相机视角
-    this.viewer.flyTo({ center: point, ...opt });
-  }
-
-  createTile3D(option?: Partial<Tile3DOption>): Tile3D {
-    const e = new Tile3D(this, option);
-    drawTile3D(this, e);
-    return e;
-  }
-}
+import { MapCombine } from "../basic/MapCombine";
+import { PointOption, Point } from "../basic/Point";
+import { PolygonOption, Polygon } from "../basic/Polygon";
+import { PolylineOption, Polyline } from "../basic/Polyline";
+import { Tile3DOption, Tile3D } from "../basic/Tile3D";
+import { bindEvent } from "./MineEvent";
+import { drawPoint } from "./MinePoint";
+import { drawPolygon } from "./MinePolygon";
+import { drawPolyline } from "./MinePolyline";
+import { drawTile3D } from "./MineTile3D";
+
+const MAX_ZOOM = 18;
+
+export class MineMap extends MapCombine {
+  viewer: any;
+  container: HTMLDivElement;
+
+  get cursor(): string {
+    return this.viewer.getCursor();
+  }
+  set cursor(val: string) {
+    this.viewer.setCursor(val);
+  }
+
+  get moveable(): boolean {
+    return this.viewer.dragPan.isEnabled();
+  }
+  set moveable(val: boolean) {
+    val ? this.viewer.dragPan.enable() : this.viewer.dragPan.disable();
+  }
+  get center(): number[] {
+    const p = this.viewer.getCenter();
+    return [p.lng, p.lat];
+  }
+  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: any) {
+    super();
+    this.viewer = viewer;
+    this.container = viewer.getContainer();
+    this.container.children.item(1).appendChild(this.htmllayer);
+    this.cursor = "default";
+    bindEvent(this);
+  }
+
+  canvasTgeography(p: number[]): number[] {
+    const res = this.viewer.getTDSpaceCoord({ point: p, disableLayer: true });
+    return [res.lngLat.lng, res.lngLat.lat, 0];
+  }
+  geographyTcanvas(p: number[]): number[] {
+    const res = this.viewer.project([p[0], p[1]], p[2] ?? 0);
+    return [res.x, res.y];
+  }
+
+  createPoint<K>(option?: Partial<PointOption<K>>): Point<K> {
+    const e = new Point(this, option);
+    drawPoint(this, e);
+    return e;
+  }
+
+  createPolyline<K>(option?: Partial<PolylineOption<K>>): Polyline<K> {
+    const e = new Polyline(this, option);
+    drawPolyline(this, e);
+    return e;
+  }
+  createPolygon<K>(option?: Partial<PolygonOption<K>>): Polygon<K> {
+    const e = new Polygon(this, option);
+    drawPolygon(this, e);
+    return e;
+  }
+
+  /**
+   * 所有点位移动至视口，调整位置及层级
+   * @param points
+   * @param opt
+   * @param {Array<number> = [0,0,0,0]} opt.avoid 距离边框的内边距，顺序：上、下、左、右
+   */
+  flyToViewer(points, opt = { avoid: [0, 0, 0, 0], maxZoom: MAX_ZOOM }) {
+    if (points?.length === 0) {
+      return this.flyTo(points[0], opt);
+    }
+    const rectangle = this.getBounds(points, { canvas: this.viewer.getCanvas(), ...opt });
+
+    // 设置地图视图，使用调整后的边界范围
+    this.viewer.fitBounds(
+      [
+        [rectangle[0], rectangle[1]],
+        [rectangle[2], rectangle[3]],
+      ],
+      {
+        maxZoom: opt?.maxZoom ?? MAX_ZOOM,
+      },
+    );
+  }
+
+  /**
+   * 移动点位到中心点
+   * @param point
+   */
+  flyTo(point, opt = {}) {
+    // 设置相机视角
+    this.viewer.flyTo({ center: point, ...opt });
+  }
+
+  createTile3D(option?: Partial<Tile3DOption>): Tile3D {
+    const e = new Tile3D(this, option);
+    drawTile3D(this, e);
+    return e;
+  }
+}