@hzab/map-combine 0.1.2 → 0.1.3

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# @hzab/map-combine0.1.3
+
+feat: 添加地图preRender事件
+
 # @hzab/map-combine@0.1.0
 
 feat: BIM 模型加载；旋转、平移、缩放

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/map-combine",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "地图组件",
   "main": "src",
   "scripts": {

package/src/basic/BasicMouseHandler.ts

@@ -0,0 +1,8 @@
+export abstract class BasicMouseHandler{
+  /** 鼠标在屏幕上的坐标 */
+  position = [0, 0]
+  /** 鼠标在地图上的坐标 */
+  location = [0, 0, 0]
+  /** 忽略要素,使要素不会拦截鼠标事件 */
+  ignoreElement = false
+}

package/src/basic/MapEvent.ts

@@ -1,18 +1,19 @@
 import Eventful from "zrender/lib/core/Eventful";
 
 export class MapEvent extends Eventful<{
-  'pointer-down': () => void
-  'pointer-move': () => void
-  'pointer-up': () => void
-  'left-click': () => void
-  'right-click': () => void
-  'double-click': () => void
-  'view-change': () => void
-  'view-moveEnd': () => void
-  'frame': () => void
-  'resize': () => void
-  'destroy': () => void
+  "pointer-down": () => void;
+  "pointer-move": () => void;
+  "pointer-up": () => void;
+  "left-click": () => void;
+  "right-click": () => void;
+  "double-click": () => void;
+  "view-change": () => void;
+  "view-moveEnd": () => void;
+  "view-preRender": () => void;
+  frame: () => void;
+  resize: () => void;
+  destroy: () => void;
 }> {
-  canvas = [0, 0]
-  geography = [0, 0, 0]
-}
+  canvas = [0, 0];
+  geography = [0, 0, 0];
+}

package/src/cesium/CesiumEvent.ts

@@ -3,6 +3,11 @@ import { CesiumMap } from "./CesiumMap";
 export function bindEvent(map: CesiumMap) {
   const { event, viewer, container } = map;
   viewer.camera.percentageChanged = 0.0001;
+
+  viewer.scene.preRender.addEventListener(() => {
+    event.trigger("view-preRender");
+  });
+
   viewer.camera.changed.addEventListener(() => {
     event.trigger("view-change");
   });

package/src/openlayer/OpenlayerEvent.ts

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