map-ol-utils 0.0.28 → 0.0.30

package/dist/index.cjs

@@ -132,7 +132,6 @@ var createWmtsLayer = (serverUrl) => (config) => __async(void 0, null, function*
         format: format || "image/png",
         matrixSet: matrixSet || "EPSG:4326"
       });
-      console.log(options);
       if (options) {
         resolve(
           new import_Tile.default({
@@ -220,7 +219,7 @@ var resetActiveVector = () => {
   });
 };
 var assembleGeoJson = (dataList, config) => {
-  const { key, isLine } = config;
+  const { key, isLine, needTransform = true } = config;
   const tempList = [];
   dataList.forEach((item) => {
     try {
@@ -239,10 +238,18 @@ var assembleGeoJson = (dataList, config) => {
       console.error(`\u521B\u5EFA\u7EBF\u72B6\u6570\u636E\u5931\u8D25\uFF1A${e}`);
     }
   });
-  return import_gcoord.default.transform({ type: "FeatureCollection", features: tempList }, import_gcoord.default.GCJ02, import_gcoord.default.WGS84);
+  return !needTransform ? { type: "FeatureCollection", features: tempList } : import_gcoord.default.transform({ type: "FeatureCollection", features: tempList }, import_gcoord.default.GCJ02, import_gcoord.default.WGS84);
 };
 var createVectorStyle = (data, config) => {
-  const { isLine, colorMap, fillColor, colorKey, strokeColor, strokeWeight, fillOpacity } = config || {};
+  const {
+    isLine,
+    colorMap,
+    fillColor,
+    colorKey,
+    strokeColor,
+    strokeWeight,
+    fillOpacity
+  } = config || {};
   const style = new import_style.Style({
     stroke: new import_style.Stroke({
       width: strokeWeight,
@@ -252,14 +259,17 @@ var createVectorStyle = (data, config) => {
   if (!isLine) {
     style.setFill(
       new import_style.Fill({
-        color: hexToRgba((colorKey ? (colorMap == null ? void 0 : colorMap.get(data[colorKey])) || fillColor : fillColor) || "", fillOpacity || 1)
+        color: hexToRgba(
+          (colorKey ? (colorMap == null ? void 0 : colorMap.get(data[colorKey])) || fillColor : fillColor) || "",
+          fillOpacity || 1
+        )
       })
     );
   }
   return style;
 };
 var createBusinessLayer = (dataList, config) => {
-  const { layerName } = config || {};
+  const { layerName } = config;
   const geoJson = assembleGeoJson(dataList, config);
   const vectorLayer = new import_Vector.default({
     zIndex: 5,
@@ -271,7 +281,10 @@ var createBusinessLayer = (dataList, config) => {
       })
     })
   });
-  vectorLayer.set("_layerName", layerName);
+  vectorLayer.setProperties({
+    _layerName: layerName,
+    _dataList: [...dataList]
+  });
   return vectorLayer;
 };
 var createVectorFaceLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign(config, { isLine: false }));
@@ -289,7 +302,7 @@ var removeAllLayers = (isClearAll = true) => {
 };
 var resetActiveMarker = () => {
   removeOverlays();
-  const massMarksLayers = instance.getLayers().getArray().filter((layer) => layer.get("_isMassMarksLayer"));
+  const massMarksLayers = instance.getAllLayers().filter((layer) => layer.get("_isMassMarksLayer"));
   massMarksLayers.forEach((layer) => {
     const selectInteraction = layer.get("_selectInteraction");
     if (selectInteraction) {
@@ -312,11 +325,15 @@ var activeMarkerByUid = (uid) => {
     );
     if (targetLayer) {
       const tempList = ((_a = targetLayer.getSource()) == null ? void 0 : _a.getFeatures()) || [];
-      const targetFeature = tempList.find((feature) => feature.get("_uuid") === uid);
+      const targetFeature = tempList.find(
+        (feature) => feature.get("_uuid") === uid
+      );
       const selectInteraction = targetLayer.get("_selectInteraction");
       if (selectInteraction) {
         const collection = selectInteraction.getFeatures().getArray();
-        const hasFeature = collection.find((feature) => feature.get("_uuid") === uid);
+        const hasFeature = collection.find(
+          (feature) => feature.get("_uuid") === uid
+        );
         if (!hasFeature) {
           selectInteraction.dispatchEvent({
             type: "select",
@@ -411,7 +428,11 @@ var createSelectByLayer = (vectorLayer) => {
         }, 1e3);
       }
       const view = instance.getView();
-      view.animate({ zoom: 12, center: [+data.lnglat[0], +data.lnglat[1]], duration: 1e3 });
+      view.animate({
+        zoom: 12,
+        center: [+data.lnglat[0], +data.lnglat[1]],
+        duration: 1e3
+      });
     }
     if (deselected.length) {
       const feature = deselected[0];
@@ -475,22 +496,28 @@ var addMassMarksLayer = (getImgUrlFn) => {
       createSelectByLayer(massMarksLayer);
     }
     if (hasLine) {
-      const vectorLayer = createBusinessLayer(dataList, vectorConfig ? vectorConfig : {
-        key: "line",
-        isLine: true,
-        strokeColor: "rgba(29, 235, 255, 0.8)"
-      });
+      const vectorLayer = createBusinessLayer(
+        dataList,
+        vectorConfig || {
+          key: "line",
+          isLine: true,
+          strokeColor: "rgba(29, 235, 255, 0.8)"
+        }
+      );
       instance.addLayer(vectorLayer);
     }
     if (hasFace) {
-      const vectorLayer = createBusinessLayer(dataList, vectorConfig ? vectorConfig : {
-        isLine: false,
-        key: "faceList",
-        fillColor: "#4247DF",
-        strokeWeight: 1,
-        strokeStyle: "dashed",
-        strokeColor: "#4247DF"
-      });
+      const vectorLayer = createBusinessLayer(
+        dataList,
+        vectorConfig || {
+          isLine: false,
+          key: "faceList",
+          fillColor: "#4247DF",
+          strokeWeight: 1,
+          strokeStyle: "dashed",
+          strokeColor: "#4247DF"
+        }
+      );
       instance.addLayer(vectorLayer);
     }
     massMarksLayer.setProperties({
@@ -601,7 +628,12 @@ var createBaseLayer = (isDark = true) => {
           134089306640625e-20
         ],
         origin: [118.125614083886, 31.2857011022836],
-        extent: [118.340502132662, 29.2073269598186, 120.724787992425, 30.5617943760008]
+        extent: [
+          118.340502132662,
+          29.2073269598186,
+          120.724787992425,
+          30.5617943760008
+        ]
       }),
       projection: "EPSG:4326",
       urls: isDark ? [

package/dist/index.d.cts

@@ -32,6 +32,7 @@ type VectorConfig = {
     strokeColor?: string;
     strokeStyle?: string;
     strokeWeight?: number;
+    needTransform?: boolean;
     colorMap?: Map<string, string>;
 };
 type IconConfig = {
@@ -63,13 +64,6 @@ type MassData = {
     }[];
     lnglat: [string, string] | [number, number];
 };
-type MassMarkersStyleOptions = {
-    url: string;
-    zIndex?: number;
-    rotation: number;
-    size: [number, number];
-    anchor?: [number, number];
-};
 type WmtsSourceOptions = {
     style?: string;
     format?: string;
@@ -80,6 +74,10 @@ type WmtsSourceOptions = {
 
 declare const emitter: Emitter<Record<EventType, any>>;
 
+/**
+ * 创建WMTS图层
+ * @param serverUrl
+ */
 declare const createWmtsLayer: (serverUrl: string) => (config: WmtsSourceOptions) => Promise<TileLayer>;
 
 /**
@@ -162,4 +160,4 @@ declare const addMassMarksLayer: (getImgUrlFn: GetImgUrlFn) => (dataList: never[
  */
 declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => void;
 
-export { type CustomMap, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type MassMarkersStyleOptions, type VectorConfig, type WmtsSourceOptions, activeMarkerByUid, addMassMarksLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getMapInstance, instance, removeAllLayers, resetActiveMarker, resetActiveVector, resetMap, resetZoomAndCenter, updateMarksLayersByStatus };
+export { type CustomMap, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeMarkerByUid, addMassMarksLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getMapInstance, instance, removeAllLayers, resetActiveMarker, resetActiveVector, resetMap, resetZoomAndCenter, updateMarksLayersByStatus };

package/dist/index.d.ts

@@ -32,6 +32,7 @@ type VectorConfig = {
     strokeColor?: string;
     strokeStyle?: string;
     strokeWeight?: number;
+    needTransform?: boolean;
     colorMap?: Map<string, string>;
 };
 type IconConfig = {
@@ -63,13 +64,6 @@ type MassData = {
     }[];
     lnglat: [string, string] | [number, number];
 };
-type MassMarkersStyleOptions = {
-    url: string;
-    zIndex?: number;
-    rotation: number;
-    size: [number, number];
-    anchor?: [number, number];
-};
 type WmtsSourceOptions = {
     style?: string;
     format?: string;
@@ -80,6 +74,10 @@ type WmtsSourceOptions = {
 
 declare const emitter: Emitter<Record<EventType, any>>;
 
+/**
+ * 创建WMTS图层
+ * @param serverUrl
+ */
 declare const createWmtsLayer: (serverUrl: string) => (config: WmtsSourceOptions) => Promise<TileLayer>;
 
 /**
@@ -162,4 +160,4 @@ declare const addMassMarksLayer: (getImgUrlFn: GetImgUrlFn) => (dataList: never[
  */
 declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => void;
 
-export { type CustomMap, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type MassMarkersStyleOptions, type VectorConfig, type WmtsSourceOptions, activeMarkerByUid, addMassMarksLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getMapInstance, instance, removeAllLayers, resetActiveMarker, resetActiveVector, resetMap, resetZoomAndCenter, updateMarksLayersByStatus };
+export { type CustomMap, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeMarkerByUid, addMassMarksLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getMapInstance, instance, removeAllLayers, resetActiveMarker, resetActiveVector, resetMap, resetZoomAndCenter, updateMarksLayersByStatus };

package/dist/index.js

@@ -77,7 +77,6 @@ var createWmtsLayer = (serverUrl) => (config) => __async(void 0, null, function*
         format: format || "image/png",
         matrixSet: matrixSet || "EPSG:4326"
       });
-      console.log(options);
       if (options) {
         resolve(
           new TileLayer({
@@ -165,7 +164,7 @@ var resetActiveVector = () => {
   });
 };
 var assembleGeoJson = (dataList, config) => {
-  const { key, isLine } = config;
+  const { key, isLine, needTransform = true } = config;
   const tempList = [];
   dataList.forEach((item) => {
     try {
@@ -184,10 +183,18 @@ var assembleGeoJson = (dataList, config) => {
       console.error(`\u521B\u5EFA\u7EBF\u72B6\u6570\u636E\u5931\u8D25\uFF1A${e}`);
     }
   });
-  return gcoord.transform({ type: "FeatureCollection", features: tempList }, gcoord.GCJ02, gcoord.WGS84);
+  return !needTransform ? { type: "FeatureCollection", features: tempList } : gcoord.transform({ type: "FeatureCollection", features: tempList }, gcoord.GCJ02, gcoord.WGS84);
 };
 var createVectorStyle = (data, config) => {
-  const { isLine, colorMap, fillColor, colorKey, strokeColor, strokeWeight, fillOpacity } = config || {};
+  const {
+    isLine,
+    colorMap,
+    fillColor,
+    colorKey,
+    strokeColor,
+    strokeWeight,
+    fillOpacity
+  } = config || {};
   const style = new Style({
     stroke: new Stroke({
       width: strokeWeight,
@@ -197,14 +204,17 @@ var createVectorStyle = (data, config) => {
   if (!isLine) {
     style.setFill(
       new Fill({
-        color: hexToRgba((colorKey ? (colorMap == null ? void 0 : colorMap.get(data[colorKey])) || fillColor : fillColor) || "", fillOpacity || 1)
+        color: hexToRgba(
+          (colorKey ? (colorMap == null ? void 0 : colorMap.get(data[colorKey])) || fillColor : fillColor) || "",
+          fillOpacity || 1
+        )
       })
     );
   }
   return style;
 };
 var createBusinessLayer = (dataList, config) => {
-  const { layerName } = config || {};
+  const { layerName } = config;
   const geoJson = assembleGeoJson(dataList, config);
   const vectorLayer = new VectorLayer({
     zIndex: 5,
@@ -216,7 +226,10 @@ var createBusinessLayer = (dataList, config) => {
       })
     })
   });
-  vectorLayer.set("_layerName", layerName);
+  vectorLayer.setProperties({
+    _layerName: layerName,
+    _dataList: [...dataList]
+  });
   return vectorLayer;
 };
 var createVectorFaceLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign(config, { isLine: false }));
@@ -234,7 +247,7 @@ var removeAllLayers = (isClearAll = true) => {
 };
 var resetActiveMarker = () => {
   removeOverlays();
-  const massMarksLayers = instance.getLayers().getArray().filter((layer) => layer.get("_isMassMarksLayer"));
+  const massMarksLayers = instance.getAllLayers().filter((layer) => layer.get("_isMassMarksLayer"));
   massMarksLayers.forEach((layer) => {
     const selectInteraction = layer.get("_selectInteraction");
     if (selectInteraction) {
@@ -257,11 +270,15 @@ var activeMarkerByUid = (uid) => {
     );
     if (targetLayer) {
       const tempList = ((_a = targetLayer.getSource()) == null ? void 0 : _a.getFeatures()) || [];
-      const targetFeature = tempList.find((feature) => feature.get("_uuid") === uid);
+      const targetFeature = tempList.find(
+        (feature) => feature.get("_uuid") === uid
+      );
       const selectInteraction = targetLayer.get("_selectInteraction");
       if (selectInteraction) {
         const collection = selectInteraction.getFeatures().getArray();
-        const hasFeature = collection.find((feature) => feature.get("_uuid") === uid);
+        const hasFeature = collection.find(
+          (feature) => feature.get("_uuid") === uid
+        );
         if (!hasFeature) {
           selectInteraction.dispatchEvent({
             type: "select",
@@ -356,7 +373,11 @@ var createSelectByLayer = (vectorLayer) => {
         }, 1e3);
       }
       const view = instance.getView();
-      view.animate({ zoom: 12, center: [+data.lnglat[0], +data.lnglat[1]], duration: 1e3 });
+      view.animate({
+        zoom: 12,
+        center: [+data.lnglat[0], +data.lnglat[1]],
+        duration: 1e3
+      });
     }
     if (deselected.length) {
       const feature = deselected[0];
@@ -420,22 +441,28 @@ var addMassMarksLayer = (getImgUrlFn) => {
       createSelectByLayer(massMarksLayer);
     }
     if (hasLine) {
-      const vectorLayer = createBusinessLayer(dataList, vectorConfig ? vectorConfig : {
-        key: "line",
-        isLine: true,
-        strokeColor: "rgba(29, 235, 255, 0.8)"
-      });
+      const vectorLayer = createBusinessLayer(
+        dataList,
+        vectorConfig || {
+          key: "line",
+          isLine: true,
+          strokeColor: "rgba(29, 235, 255, 0.8)"
+        }
+      );
       instance.addLayer(vectorLayer);
     }
     if (hasFace) {
-      const vectorLayer = createBusinessLayer(dataList, vectorConfig ? vectorConfig : {
-        isLine: false,
-        key: "faceList",
-        fillColor: "#4247DF",
-        strokeWeight: 1,
-        strokeStyle: "dashed",
-        strokeColor: "#4247DF"
-      });
+      const vectorLayer = createBusinessLayer(
+        dataList,
+        vectorConfig || {
+          isLine: false,
+          key: "faceList",
+          fillColor: "#4247DF",
+          strokeWeight: 1,
+          strokeStyle: "dashed",
+          strokeColor: "#4247DF"
+        }
+      );
       instance.addLayer(vectorLayer);
     }
     massMarksLayer.setProperties({
@@ -546,7 +573,12 @@ var createBaseLayer = (isDark = true) => {
           134089306640625e-20
         ],
         origin: [118.125614083886, 31.2857011022836],
-        extent: [118.340502132662, 29.2073269598186, 120.724787992425, 30.5617943760008]
+        extent: [
+          118.340502132662,
+          29.2073269598186,
+          120.724787992425,
+          30.5617943760008
+        ]
       }),
       projection: "EPSG:4326",
       urls: isDark ? [

package/package.json

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