@hzab/map-combine 0.2.0 → 0.2.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/map-combine0.2.2
+
+fix: openlayer point 问题修复
+
+# @hzab/map-combine0.2.1
+
+feat: openLayer 对除 EPSG:3857 和 EPSG:4326 的瓦片坐标系取消偏移
+
 # @hzab/map-combine0.2.0
 
 feat: flyToViewer 所有点位移动至视口，调整位置及层级

package/package.json

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

package/src/openlayer/OpenlayerMap.ts

@@ -7,7 +7,6 @@ import DragPan from "ol/interaction/DragPan";
 import VectorSource from "ol/source/Vector";
 import VectorLayer from "ol/layer/Vector";
 import { fromLonLat } from "ol/proj";
-import * as olProj from "ol/proj";
 import * as olGeom from "ol/geom";
 import * as olSource from "ol/source";
 import * as olStyle from "ol/style";
@@ -47,6 +46,7 @@ export class OpenlayerMap extends MapCombine {
   option: IOpenlayerOption;
   offset: number[];
   fov = 0.9272952180016121;
+  isFromLonLat = true;
   get cursor(): string {
     return this.container.style.cursor;
   }
@@ -121,8 +121,9 @@ export class OpenlayerMap extends MapCombine {
     this.cursor = "default";
 
     const { center } = this;
-    this.offset = fromLonLat(center);
-
+    const proj = this.viewer.getView().getProjection().getCode();
+    this.isFromLonLat = (proj === "EPSG:3857" || proj === "EPSG:4326");
+    this.offset = this.getFromLonLat(center);
     this.vectors = new VectorSource();
     this.viewer.addLayer(
       new VectorLayer({
@@ -143,6 +144,11 @@ export class OpenlayerMap extends MapCombine {
     bindEvent(this);
   }
 
+
+  getFromLonLat(lonLat, isFromLonLat = this.isFromLonLat) {
+    return isFromLonLat ? fromLonLat(lonLat) : lonLat;
+  }
+
   createPoint<K>(option?: Partial<PointOption<K>>): Point<K> {
     const e = new Point(this, option);
     drawPoint(this, e);
@@ -182,7 +188,7 @@ export class OpenlayerMap extends MapCombine {
     // 创建 Feature 数组
     const features = points.map((point) => {
       const [lon, lat] = point;
-      const coord = olProj.fromLonLat([lon, lat]);
+      const coord = this.getFromLonLat([lon, lat]);
       return new ol.Feature({
         geometry: new olGeom.Point(coord),
       });
@@ -214,7 +220,7 @@ export class OpenlayerMap extends MapCombine {
     return [Projection.lonToX(p[0]) - offset[0], Projection.latToY(p[1]) - offset[1], p[2] ?? 0];
   }
   geographyTcanvas(p: number[]): number[] {
-    const pixel = this.viewer.getPixelFromCoordinate(fromLonLat(p));
+    const pixel = this.viewer.getPixelFromCoordinate(this.getFromLonLat(p));
     if (pixel) {
       return [pixel[0], pixel[1]];
     } else {

package/src/openlayer/OpenlayerPoint.ts

@@ -9,7 +9,7 @@ import VectorLayer from "ol/layer/Vector";
 const RD = 0.017453292519943295
 
 export function drawPoint(map: OpenlayerMap, point: Point<unknown>) {
-  const { viewer, event } = map
+  const { viewer, event, getFromLonLat } = map
   let status = 0
 
   const source = new VectorSource();
@@ -67,7 +67,7 @@ export function drawPoint(map: OpenlayerMap, point: Point<unknown>) {
   feature.set('event', _event, true)
   if (point.coordinates) {
     status = 2
-    geometry.setCoordinates(fromLonLat(point.coordinates))
+    geometry.setCoordinates(getFromLonLat(point.coordinates))
     layer.setZIndex(point.coordinates[2] ?? 1)
     point.event.trigger('data-loaded')
     source.addFeature(feature)
@@ -87,7 +87,7 @@ export function drawPoint(map: OpenlayerMap, point: Point<unknown>) {
           break;
         case 'coordinates':
           if (point.coordinates) {
-            geometry.setCoordinates(fromLonLat(point.coordinates))
+            geometry.setCoordinates(getFromLonLat(point.coordinates))
             layer.setZIndex(point.coordinates[2])
             switch (status) {
               case 0:
@@ -138,16 +138,16 @@ export function drawPoint(map: OpenlayerMap, point: Point<unknown>) {
   }
 
   const onMouseMove = () => {
-    const coordinates = [event.geography[0], event.geography[1], point.height]
+    const coordinates = [event.geography[0], event.geography[1], point.height];
     switch (status) {
       case 0:
         status = 1
-        geometry.setCoordinates(fromLonLat(coordinates))
+        geometry.setCoordinates(getFromLonLat(coordinates))
         source.addFeature(feature)
         break;
       case 1:
       case 3:
-        geometry.setCoordinates(fromLonLat(coordinates))
+        geometry.setCoordinates(getFromLonLat(coordinates))
         break
     }
   }

package/src/openlayer/OpenlayerPolygon.ts

@@ -34,7 +34,7 @@ const styleVirtual = new Style({
 
 
 export function drawPolygon(map: OpenlayerMap, polygon: Polygon<unknown>) {
-  const { event, viewer, vectors } = map
+  const { event, viewer, vectors, getFromLonLat, isFromLonLat } = map
 
   const source = new VectorSource();
 
@@ -93,7 +93,7 @@ export function drawPolygon(map: OpenlayerMap, polygon: Polygon<unknown>) {
   feature.set('event', _event, true)
   if (polygon.coordinates) {
     status = 2
-    geometry.setCoordinates([polygon.coordinates.map(e => fromLonLat(e))])
+    geometry.setCoordinates([polygon.coordinates.map(e => getFromLonLat(e, isFromLonLat))])
     layer.setZIndex(polygon.coordinates[0][2] ?? 1)
     source.addFeature(feature)
   }
@@ -116,7 +116,7 @@ export function drawPolygon(map: OpenlayerMap, polygon: Polygon<unknown>) {
           break;
         case 'coordinates':
           if (polygon.coordinates) {
-            geometry.setCoordinates([polygon.coordinates.map(e => fromLonLat(e))])
+            geometry.setCoordinates([polygon.coordinates.map(e => getFromLonLat(e, isFromLonLat))])
             layer.setZIndex(polygon.coordinates[0][2] ?? 1)
             switch (status) {
               case 0:
@@ -158,11 +158,11 @@ export function drawPolygon(map: OpenlayerMap, polygon: Polygon<unknown>) {
     switch (status) {
       case 1:
         cache.pop()
-        cache.push(fromLonLat(event.geography))
+        cache.push(getFromLonLat(event.geography))
         geometry.setCoordinates([cache])
         break
       case 4:
-        activeNode.update(fromLonLat(event.geography))
+        activeNode.update(getFromLonLat(event.geography))
         geometry.setCoordinates([editor.getCoordinates()])
         break;
     }
@@ -172,8 +172,7 @@ export function drawPolygon(map: OpenlayerMap, polygon: Polygon<unknown>) {
     switch (status) {
       case 0:
         status = 1
-
-        cache = [fromLonLat(event.geography)]
+        cache = [getFromLonLat(event.geography)]
         cache.push(cache[0])
         geometry.setCoordinates([cache])
         source.addFeature(feature)

package/src/openlayer/OpenlayerPolyline.ts

@@ -30,7 +30,7 @@ const styleVirtual = new Style({
 });
 
 export function drawPolyline(map: OpenlayerMap, polyline: Polyline<unknown>) {
-  const { event, viewer } = map
+  const { event, viewer, getFromLonLat, isFromLonLat } = map
 
   const source = new VectorSource();
 
@@ -86,7 +86,7 @@ export function drawPolyline(map: OpenlayerMap, polyline: Polyline<unknown>) {
   feature.set('event', _event, true)
   if (polyline.coordinates) {
     status = 2
-    geometry.setCoordinates(polyline.coordinates.map(e => fromLonLat(e)))
+    geometry.setCoordinates(polyline.coordinates.map(e => getFromLonLat(e, isFromLonLat)))
     layer.setZIndex(polyline.coordinates[0][2] ?? 1)
     source.addFeature(feature)
   }
@@ -106,7 +106,7 @@ export function drawPolyline(map: OpenlayerMap, polyline: Polyline<unknown>) {
           break;
         case 'coordinates':
           if (polyline.coordinates) {
-            geometry.setCoordinates(polyline.coordinates.map(e => fromLonLat(e)))
+            geometry.setCoordinates(polyline.coordinates.map(e => getFromLonLat(e, isFromLonLat)))
             layer.setZIndex(polyline.coordinates[0][2] ?? 1)
             switch (status) {
               case 0:
@@ -147,11 +147,11 @@ export function drawPolyline(map: OpenlayerMap, polyline: Polyline<unknown>) {
     switch (status) {
       case 1:
         cache.pop()
-        cache.push(fromLonLat(event.geography))
+        cache.push(getFromLonLat(event.geography))
         geometry.setCoordinates(cache)
         break
       case 4:
-        activeNode.update(fromLonLat(event.geography))
+        activeNode.update(getFromLonLat(event.geography))
         geometry.setCoordinates(editor.getCoordinates())
         break;
     }
@@ -161,8 +161,8 @@ export function drawPolyline(map: OpenlayerMap, polyline: Polyline<unknown>) {
     switch (status) {
       case 0:
         status = 1
-        _event.silent = true
-        cache = [fromLonLat(event.geography)]
+        _event.silent = true;
+        cache = [getFromLonLat(event.geography)]
         cache.push(cache[0])
         geometry.setCoordinates(cache)
         source.addFeature(feature)