map-ol-utils 0.0.40 → 0.0.42

package/dist/index.cjs

@@ -117,12 +117,12 @@ var import_View = __toESM(require("ol/View"), 1);
 var import_control = require("ol/control");
 
 // src/layer-utils.ts
-var import_gcoord = __toESM(require("gcoord"), 1);
 var import_geom = require("ol/geom");
 var import_format = require("ol/format");
 var import_extent = require("ol/extent");
 var import_ol = require("ol");
 var import_interaction = require("ol/interaction");
+var import_gcoord = __toESM(require("gcoord"), 1);
 var import_Vector = __toESM(require("ol/layer/Vector"), 1);
 var import_Vector2 = __toESM(require("ol/source/Vector"), 1);
 var import_condition = require("ol/events/condition");
@@ -158,7 +158,7 @@ var resetActiveVector = () => {
   });
 };
 var assembleGeoJson = (dataList, config) => {
-  const { key, needTransform = true } = config;
+  const { key, crsForm } = config;
   const tempList = [];
   dataList.forEach((item) => {
     try {
@@ -177,9 +177,9 @@ var assembleGeoJson = (dataList, config) => {
       console.error(`\u521B\u5EFA\u7EBF\u72B6\u6570\u636E\u5931\u8D25\uFF1A${e}`);
     }
   });
-  return !needTransform ? { type: "FeatureCollection", features: tempList } : import_gcoord.default.transform(
+  return import_gcoord.default.transform(
     { type: "FeatureCollection", features: tempList },
-    import_gcoord.default.GCJ02,
+    crsForm || import_gcoord.default.WGS84,
     import_gcoord.default.WGS84
   );
 };
@@ -265,7 +265,7 @@ var createBusinessLayer = (dataList, config) => {
   });
   return vectorLayer;
 };
-var appendFeaturesByLayer = (targetLayer, dataList, needTransform = false) => {
+var appendFeaturesByLayer = (targetLayer, dataList, crsForm) => {
   const vectorSource = targetLayer.getSource();
   const tempSet = targetLayer.get("_uuidSet") || /* @__PURE__ */ new Set();
   dataList.forEach((item) => tempSet.add(item._uuid));
@@ -273,7 +273,7 @@ var appendFeaturesByLayer = (targetLayer, dataList, needTransform = false) => {
   const { _vectorConfig: config } = targetLayer.getProperties() || {};
   const geoJson = assembleGeoJson(
     dataList,
-    Object.assign({}, config, { needTransform })
+    Object.assign({}, config, { crsForm })
   );
   vectorSource.addFeatures(
     new import_format.GeoJSON().readFeatures(geoJson).map((feature) => {
@@ -282,8 +282,8 @@ var appendFeaturesByLayer = (targetLayer, dataList, needTransform = false) => {
     })
   );
 };
-var createVectorFaceLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign(config, { isLine: false }));
-var createVectorLineLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign(config, { isLine: true }));
+var createVectorFaceLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign({}, config, { isLine: false }));
+var createVectorLineLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign({}, config, { isLine: true }));
 var removeAllLayers = (isClearAll = true) => {
   removeOverlays();
   console.log(isClearAll);
@@ -442,8 +442,14 @@ var createSelectByLayer = (vectorLayer) => {
 };
 var createMassMarksLayer = (dataList, styleList = []) => {
   const features = dataList.map((item) => {
+    const { crsForm } = item;
+    const coord = import_gcoord.default.transform(
+      [+item.lnglat[0], +item.lnglat[1]],
+      crsForm || import_gcoord.default.WGS84,
+      import_gcoord.default.WGS84
+    );
     const feature = new import_ol.Feature({
-      geometry: new import_geom.Point([+item.lnglat[0], +item.lnglat[1]])
+      geometry: new import_geom.Point(coord)
     });
     feature.setProperties(__spreadProps(__spreadValues({}, item), {
       unActiveStyle: styleList[item.style],
@@ -494,27 +500,36 @@ var addMassMarksLayer = (getImgUrlFn) => {
     if (hasLine) {
       const vectorLayer = createBusinessLayer(
         dataList,
-        vectorConfig || {
-          key: "line",
-          isLine: true,
-          openClick: false,
-          strokeColor: "rgba(29, 235, 255, 0.8)"
-        }
+        Object.assign(
+          {},
+          {
+            key: "line",
+            isLine: true,
+            openClick: false,
+            strokeWeight: 4,
+            strokeColor: "rgba(29, 235, 255, 0.8)"
+          },
+          vectorConfig || {}
+        )
       );
       instance.addLayer(vectorLayer);
     }
     if (hasFace) {
       const vectorLayer = createBusinessLayer(
         dataList,
-        vectorConfig || {
-          isLine: false,
-          key: "faceList",
-          strokeWeight: 1,
-          openClick: false,
-          fillColor: "#4247DF",
-          strokeStyle: "dashed",
-          strokeColor: "#4247DF"
-        }
+        Object.assign(
+          {},
+          {
+            isLine: false,
+            key: "faceList",
+            strokeWeight: 1,
+            openClick: false,
+            fillColor: "#4247DF",
+            strokeStyle: "dashed",
+            strokeColor: "#4247DF"
+          },
+          vectorConfig || {}
+        )
       );
       instance.addLayer(vectorLayer);
     }

package/dist/index.d.cts

@@ -1,5 +1,6 @@
 import { Layer, Tile } from 'ol/layer';
 import { Map as Map$1, Feature } from 'ol';
+import { CRSTypes } from 'gcoord';
 import { Source, XYZ, WMTS } from 'ol/source';
 import { Coordinate } from 'ol/coordinate';
 import { Emitter, EventType } from 'mitt';
@@ -29,6 +30,7 @@ type VectorConfig = {
     layerName?: string;
     openClick?: boolean;
     fillColor?: string;
+    crsForm?: CRSTypes;
     fillOpacity?: number;
     strokeColor?: string;
     strokeStyle?: string;
@@ -60,6 +62,7 @@ type MassData = {
     width?: number;
     height?: number;
     itemName: string;
+    crsForm?: CRSTypes;
     rawData: {
         [key: string]: any;
     };
@@ -127,9 +130,9 @@ declare const createBusinessLayer: (dataList: MassData[], config: VectorConfig)
  * 追加Features
  * @param targetLayer
  * @param dataList
- * @param needTransform
+ * @param crsForm
  */
-declare const appendFeaturesByLayer: (targetLayer: VectorLayer, dataList: MassData[], needTransform?: boolean) => void;
+declare const appendFeaturesByLayer: (targetLayer: VectorLayer, dataList: MassData[], crsForm: CRSTypes) => void;
 /**
  * 创建面状数据
  * @param dataList

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { Layer, Tile } from 'ol/layer';
 import { Map as Map$1, Feature } from 'ol';
+import { CRSTypes } from 'gcoord';
 import { Source, XYZ, WMTS } from 'ol/source';
 import { Coordinate } from 'ol/coordinate';
 import { Emitter, EventType } from 'mitt';
@@ -29,6 +30,7 @@ type VectorConfig = {
     layerName?: string;
     openClick?: boolean;
     fillColor?: string;
+    crsForm?: CRSTypes;
     fillOpacity?: number;
     strokeColor?: string;
     strokeStyle?: string;
@@ -60,6 +62,7 @@ type MassData = {
     width?: number;
     height?: number;
     itemName: string;
+    crsForm?: CRSTypes;
     rawData: {
         [key: string]: any;
     };
@@ -127,9 +130,9 @@ declare const createBusinessLayer: (dataList: MassData[], config: VectorConfig)
  * 追加Features
  * @param targetLayer
  * @param dataList
- * @param needTransform
+ * @param crsForm
  */
-declare const appendFeaturesByLayer: (targetLayer: VectorLayer, dataList: MassData[], needTransform?: boolean) => void;
+declare const appendFeaturesByLayer: (targetLayer: VectorLayer, dataList: MassData[], crsForm: CRSTypes) => void;
 /**
  * 创建面状数据
  * @param dataList

package/dist/index.js

@@ -59,12 +59,12 @@ import View from "ol/View";
 import { defaults } from "ol/control";
 
 // src/layer-utils.ts
-import gcoord from "gcoord";
 import { Point } from "ol/geom";
 import { GeoJSON } from "ol/format";
 import { getCenter } from "ol/extent";
 import { Feature, Overlay } from "ol";
 import { Select } from "ol/interaction";
+import gcoord from "gcoord";
 import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector";
 import { click } from "ol/events/condition";
@@ -100,7 +100,7 @@ var resetActiveVector = () => {
   });
 };
 var assembleGeoJson = (dataList, config) => {
-  const { key, needTransform = true } = config;
+  const { key, crsForm } = config;
   const tempList = [];
   dataList.forEach((item) => {
     try {
@@ -119,9 +119,9 @@ var assembleGeoJson = (dataList, config) => {
       console.error(`\u521B\u5EFA\u7EBF\u72B6\u6570\u636E\u5931\u8D25\uFF1A${e}`);
     }
   });
-  return !needTransform ? { type: "FeatureCollection", features: tempList } : gcoord.transform(
+  return gcoord.transform(
     { type: "FeatureCollection", features: tempList },
-    gcoord.GCJ02,
+    crsForm || gcoord.WGS84,
     gcoord.WGS84
   );
 };
@@ -207,7 +207,7 @@ var createBusinessLayer = (dataList, config) => {
   });
   return vectorLayer;
 };
-var appendFeaturesByLayer = (targetLayer, dataList, needTransform = false) => {
+var appendFeaturesByLayer = (targetLayer, dataList, crsForm) => {
   const vectorSource = targetLayer.getSource();
   const tempSet = targetLayer.get("_uuidSet") || /* @__PURE__ */ new Set();
   dataList.forEach((item) => tempSet.add(item._uuid));
@@ -215,7 +215,7 @@ var appendFeaturesByLayer = (targetLayer, dataList, needTransform = false) => {
   const { _vectorConfig: config } = targetLayer.getProperties() || {};
   const geoJson = assembleGeoJson(
     dataList,
-    Object.assign({}, config, { needTransform })
+    Object.assign({}, config, { crsForm })
   );
   vectorSource.addFeatures(
     new GeoJSON().readFeatures(geoJson).map((feature) => {
@@ -224,8 +224,8 @@ var appendFeaturesByLayer = (targetLayer, dataList, needTransform = false) => {
     })
   );
 };
-var createVectorFaceLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign(config, { isLine: false }));
-var createVectorLineLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign(config, { isLine: true }));
+var createVectorFaceLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign({}, config, { isLine: false }));
+var createVectorLineLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign({}, config, { isLine: true }));
 var removeAllLayers = (isClearAll = true) => {
   removeOverlays();
   console.log(isClearAll);
@@ -384,8 +384,14 @@ var createSelectByLayer = (vectorLayer) => {
 };
 var createMassMarksLayer = (dataList, styleList = []) => {
   const features = dataList.map((item) => {
+    const { crsForm } = item;
+    const coord = gcoord.transform(
+      [+item.lnglat[0], +item.lnglat[1]],
+      crsForm || gcoord.WGS84,
+      gcoord.WGS84
+    );
     const feature = new Feature({
-      geometry: new Point([+item.lnglat[0], +item.lnglat[1]])
+      geometry: new Point(coord)
     });
     feature.setProperties(__spreadProps(__spreadValues({}, item), {
       unActiveStyle: styleList[item.style],
@@ -436,27 +442,36 @@ var addMassMarksLayer = (getImgUrlFn) => {
     if (hasLine) {
       const vectorLayer = createBusinessLayer(
         dataList,
-        vectorConfig || {
-          key: "line",
-          isLine: true,
-          openClick: false,
-          strokeColor: "rgba(29, 235, 255, 0.8)"
-        }
+        Object.assign(
+          {},
+          {
+            key: "line",
+            isLine: true,
+            openClick: false,
+            strokeWeight: 4,
+            strokeColor: "rgba(29, 235, 255, 0.8)"
+          },
+          vectorConfig || {}
+        )
       );
       instance.addLayer(vectorLayer);
     }
     if (hasFace) {
       const vectorLayer = createBusinessLayer(
         dataList,
-        vectorConfig || {
-          isLine: false,
-          key: "faceList",
-          strokeWeight: 1,
-          openClick: false,
-          fillColor: "#4247DF",
-          strokeStyle: "dashed",
-          strokeColor: "#4247DF"
-        }
+        Object.assign(
+          {},
+          {
+            isLine: false,
+            key: "faceList",
+            strokeWeight: 1,
+            openClick: false,
+            fillColor: "#4247DF",
+            strokeStyle: "dashed",
+            strokeColor: "#4247DF"
+          },
+          vectorConfig || {}
+        )
       );
       instance.addLayer(vectorLayer);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "map-ol-utils",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "type": "module",
   "description": "Openlayers utils library",
   "files": [