@hzab/map-combine 0.4.2-alpha.0 → 0.4.2-alpha.11

package/src/mine/MinePoint.ts

@@ -28,10 +28,16 @@ export function drawPoint(map: MineMap, point: Point<unknown>) {
   };
 
   const marker = new minemap.Marker({
+    id: point.name,
     draggable: point.editable,
     rotation: 0,
     offset: [-size[0] * center[0], -size[1] * center[1]],
     element: img,
+    extData: {
+      name: point.name,
+      target: point,
+      userdata: point.userdata,
+    },
   });
 
   if (point.coordinates) {
@@ -69,7 +75,7 @@ export function drawPoint(map: MineMap, point: Point<unknown>) {
           break;
         case "coordinates":
           if (point.coordinates) {
-            marker.setLngLat(point.coordinates).setAltitude(point.coordinates[2] ?? 0);
+            marker.setLngLat(point.coordinates).setAltitude(point.coordinates[2] ?? point.height);
             switch (status) {
               case 0:
                 point.show && marker.addTo(map.viewer);

package/src/mine/MinePolygon.ts

@@ -50,6 +50,7 @@ function getPolygonOption(polygon: Polygon<unknown>) {
       "fill-color": color,
       "fill-opacity": opacity,
     },
+    zIndex: polygon.coordinates[0]?.[2] ?? polygon.height,
   };
 }
 
@@ -148,11 +149,15 @@ function main(map: MineMap, polygon: Polygon<unknown>) {
         type: "Feature",
         geometry: {
           type: "Polygon",
-          coordinates: [[...coordinates, coordinates[0]]],
+          coordinates: [[...coordinates, coordinates[0]].map((it) => [it[0], it[1], it[2] ?? polygon.height])],
         },
         properties: {
           id: polygon.name,
         },
+        extData: {
+          name: polygon.name,
+          userdata: polygon.userdata,
+        },
       };
     } else {
       data.features = [];

package/src/mine/MinePolyline.ts

@@ -56,6 +56,7 @@ function getLayerOption(polyline: Polyline<unknown>) {
           "line-color": polyline.stroke,
           "line-width": polyline.lineWidth,
         },
+    zIndex: polyline.coordinates[0]?.[2] ?? polyline.height,
   };
 }
 
@@ -130,10 +131,14 @@ function main(map: MineMap, polyline: Polyline<unknown>) {
         type: "Feature",
         geometry: {
           type: "LineString",
-          coordinates: coordinates,
+          coordinates: coordinates?.map((it) => [it[0], it[1], it[2] ?? polyline.height]),
         },
         properties: {
           id: polyline.name,
+          extData: {
+            name: polyline.name,
+            userdata: polyline.userdata,
+          },
         },
       };
     } else {

package/src/openlayer/OpenlayerEvent.ts

@@ -1,87 +1,109 @@
-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");
+      map.bussinesses.forEach((e) => e.show && e.onFrame?.());
+    }
+  };
+  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("singleclick", function (e) {
+    // 使用 forEachFeatureAtPixel 查询该像素位置下的所有要素
+    const pickedObjects = [];
+    viewer.forEachFeatureAtPixel(e.pixel, function (feature, layer) {
+      // 这个回调函数会为每一个被点击到的要素执行
+      pickedObjects.push(feature);
+      // 返回 true 可以提前终止遍历
+      // return true;
+    });
+
+    if (pickedObjects.length > 0) {
+      event.trigger("drill-pick", {
+        event: e,
+        pickedTargets: pickedObjects.map((it) => it?.values_?.userData?.target),
+        sourceObjects: pickedObjects,
+        position: map.canvasTgeography(e.pixel),
+      });
+    }
+  });
+
+  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");
+    }
+  });
+}