@hzab/map-combine 0.4.0-alpha.0 → 0.4.1

package/src/mine/MineEvent.ts

@@ -1,46 +1,46 @@
-import { MineMap } from "./MineMap";
-
-export function bindEvent(map: MineMap) {
-  const { event, viewer, container } = map;
-
-  viewer.on("moveend", (e) => {
-    event.trigger("view-moveEnd");
-  });
-
-  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", () => {
-    viewer.remove();
-  });
-}
+import { MineMap } from "./MineMap";
+
+export function bindEvent(map: MineMap) {
+  const { event, viewer, container } = map;
+
+  viewer.on("moveend", (e) => {
+    event.trigger("view-moveEnd");
+  });
+
+  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", () => {
+    viewer.remove();
+  });
+}

package/src/mine/MineMap.ts

@@ -1,125 +1,125 @@
-import { MapCombine } from "../basic/MapCombine";
-import { PointOption, Point } from "../basic/Point";
-import { PointAggregationOption, PointAggregation } from "../basic/PointAggregation";
-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;
-  }
-
-  createPointAggregation(option?: PointAggregationOption): PointAggregation {
-    const e = new PointAggregation(this, option);
-    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 { PointAggregationOption, PointAggregation } from "../basic/PointAggregation";
+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;
+  }
+
+  createPointAggregation(option?: PointAggregationOption): PointAggregation {
+    const e = new PointAggregation(this, option);
+    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;
+  }
+}

package/src/openlayer/OpenlayerEvent.ts

@@ -1,87 +1,87 @@
-import { OpenlayerMap } from "./OpenlayerMap";
-
-export function bindEvent(map: OpenlayerMap) {
-  const { event, viewer, container } = map;
-  let target: any;
-  let moving = false;
-
-  const frame = () => {
-    if (map.isAlive) {
-      requestAnimationFrame(frame);
-      event.trigger("view-preRender");
-    }
-  };
-  frame();
-
-  viewer.on("moveend", (e) => {
-    event.trigger("view-moveEnd");
-  });
-
-  viewer.on("pointermove", (e) => {
-    event.canvas = e.pixel;
-    event.geography = map.canvasTgeography(event.canvas);
-    let _target: any;
-    if (moving) {
-      event.trigger("pointer-move");
-      return;
-    }
-    const res = viewer.getFeaturesAtPixel(event.canvas)[0];
-    _target = res ? res.get("event") : undefined;
-    if (_target?.silent) {
-      _target = undefined;
-    }
-    if (_target !== target) {
-      target?.onPointerOut?.();
-      _target?.onPointerIn?.();
-      target = _target;
-    }
-    event.trigger("pointer-move");
-  });
-
-  container.addEventListener("mousedown", () => {
-    if (target) {
-      moving = true;
-      target.onPointerDown?.();
-    }
-    event.trigger("pointer-down");
-  });
-
-  container.addEventListener("mouseup", () => {
-    if (target) {
-      moving = false;
-      target.onPointerUp?.();
-    }
-    event.trigger("pointer-up");
-  });
-
-  container.addEventListener("contextmenu", (e) => {
-    e.preventDefault();
-    if (target) {
-      target.onRClick?.();
-    }
-  });
-
-  viewer.on("click", () => {
-    if (target) {
-      target.onLClick?.();
-    }
-    event.trigger("left-click");
-  });
-
-  viewer.on("dblclick", () => {
-    if (target) {
-      target.onDbClick?.();
-    }
-    map.event.trigger("double-click");
-  });
-
-  let key = 0;
-
-  viewer.on("precompose", () => {
-    const _key = map.center.reduce((a, b) => a + b, map.zoom);
-    if (key != _key) {
-      key = _key;
-      event.trigger("view-change");
-    }
-  });
-}
+import { OpenlayerMap } from "./OpenlayerMap";
+
+export function bindEvent(map: OpenlayerMap) {
+  const { event, viewer, container } = map;
+  let target: any;
+  let moving = false;
+
+  const frame = () => {
+    if (map.isAlive) {
+      requestAnimationFrame(frame);
+      event.trigger("view-preRender");
+    }
+  };
+  frame();
+
+  viewer.on("moveend", (e) => {
+    event.trigger("view-moveEnd");
+  });
+
+  viewer.on("pointermove", (e) => {
+    event.canvas = e.pixel;
+    event.geography = map.canvasTgeography(event.canvas);
+    let _target: any;
+    if (moving) {
+      event.trigger("pointer-move");
+      return;
+    }
+    const res = viewer.getFeaturesAtPixel(event.canvas)[0];
+    _target = res ? res.get("event") : undefined;
+    if (_target?.silent) {
+      _target = undefined;
+    }
+    if (_target !== target) {
+      target?.onPointerOut?.();
+      _target?.onPointerIn?.();
+      target = _target;
+    }
+    event.trigger("pointer-move");
+  });
+
+  container.addEventListener("mousedown", () => {
+    if (target) {
+      moving = true;
+      target.onPointerDown?.();
+    }
+    event.trigger("pointer-down");
+  });
+
+  container.addEventListener("mouseup", () => {
+    if (target) {
+      moving = false;
+      target.onPointerUp?.();
+    }
+    event.trigger("pointer-up");
+  });
+
+  container.addEventListener("contextmenu", (e) => {
+    e.preventDefault();
+    if (target) {
+      target.onRClick?.();
+    }
+  });
+
+  viewer.on("click", () => {
+    if (target) {
+      target.onLClick?.();
+    }
+    event.trigger("left-click");
+  });
+
+  viewer.on("dblclick", () => {
+    if (target) {
+      target.onDbClick?.();
+    }
+    map.event.trigger("double-click");
+  });
+
+  let key = 0;
+
+  viewer.on("precompose", () => {
+    const _key = map.center.reduce((a, b) => a + b, map.zoom);
+    if (key != _key) {
+      key = _key;
+      event.trigger("view-change");
+    }
+  });
+}