map-ol-utils 0.0.36 → 0.0.38

package/dist/index.cjs

@@ -67,6 +67,7 @@ var __async = (__this, __arguments, generator) => {
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  GeometryType: () => GeometryType,
   activeFeatureByUid: () => activeFeatureByUid,
   addMassMarksLayer: () => addMassMarksLayer,
   appendFeaturesByLayer: () => appendFeaturesByLayer,
@@ -95,6 +96,16 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/types.ts
+var GeometryType = /* @__PURE__ */ ((GeometryType2) => {
+  GeometryType2["LineString"] = "LineString";
+  GeometryType2["MultiLineString"] = "MultiLineString";
+  GeometryType2["Polygon"] = "Polygon";
+  GeometryType2["MultiPolygon"] = "MultiPolygon";
+  GeometryType2["Invalid"] = "Invalid";
+  return GeometryType2;
+})(GeometryType || {});
+
 // src/emitter.ts
 var import_mitt = __toESM(require("mitt"), 1);
 var emitter = (0, import_mitt.default)();
@@ -147,7 +158,7 @@ var resetActiveVector = () => {
   });
 };
 var assembleGeoJson = (dataList, config) => {
-  const { key, isLine, needTransform = true } = config;
+  const { key, needTransform = true } = config;
   const tempList = [];
   dataList.forEach((item) => {
     try {
@@ -158,7 +169,7 @@ var assembleGeoJson = (dataList, config) => {
           properties: __spreadValues({}, item),
           geometry: {
             coordinates: pathArray,
-            type: isLine ? "LineString" : "MultiPolygon"
+            type: determineGeometryType(pathArray)
           }
         });
       }
@@ -254,10 +265,10 @@ var createBusinessLayer = (dataList, config) => {
   });
   return vectorLayer;
 };
-var appendFeaturesByLayer = (targetLayer, dataList) => {
+var appendFeaturesByLayer = (targetLayer, dataList, needTransform = false) => {
   const vectorSource = targetLayer.getSource();
   const { _vectorConfig: config } = targetLayer.getProperties() || {};
-  const geoJson = assembleGeoJson(dataList, config);
+  const geoJson = assembleGeoJson(dataList, Object.assign({}, config, { needTransform }));
   vectorSource.addFeatures(new import_format.GeoJSON().readFeatures(geoJson).map((feature) => {
     feature.setStyle(createVectorStyle(feature, config));
     return feature;
@@ -756,6 +767,54 @@ var getLayersDataList = () => {
   var _a;
   return ((_a = instance) == null ? void 0 : _a.getAllLayers().map((layer) => layer.get("_dataList") || []).flat(2)) || [];
 };
+var determineGeometryType = (coordinates) => {
+  const getArrayDepth = (arr) => {
+    if (!Array.isArray(arr)) return 0;
+    return 1 + Math.max(...arr.map((item) => getArrayDepth(item)), 0);
+  };
+  const isClosedRing = (coords) => {
+    if (!Array.isArray(coords) || coords.length < 3) return false;
+    const first = coords[0];
+    const last = coords[coords.length - 1];
+    return first[0] === last[0] && first[1] === last[1];
+  };
+  const isValidCoordinate = (coord) => {
+    return Array.isArray(coord) && coord.length >= 2 && typeof coord[0] === "number" && typeof coord[1] === "number";
+  };
+  const isValidLineString = (coords) => {
+    return Array.isArray(coords) && coords.length >= 2 && coords.every(isValidCoordinate);
+  };
+  const isValidPolygon = (coords) => {
+    if (!Array.isArray(coords)) return false;
+    const rings = getArrayDepth(coords) === 2 ? [coords] : coords;
+    return rings.every(
+      (ring) => Array.isArray(ring) && ring.length >= 4 && isClosedRing(ring) && ring.every(isValidCoordinate)
+    );
+  };
+  const depth = getArrayDepth(coordinates);
+  try {
+    if (depth < 2 || !coordinates || coordinates.length === 0) {
+      return "Invalid" /* Invalid */;
+    } else if (depth === 2 && isValidLineString(coordinates)) {
+      return isClosedRing(coordinates) && coordinates.length >= 4 ? "Polygon" /* Polygon */ : "LineString" /* LineString */;
+    } else if (depth === 3 && Array.isArray(coordinates) && coordinates.every(isValidLineString)) {
+      if (isValidPolygon(coordinates)) {
+        return "Polygon" /* Polygon */;
+      } else if (coordinates.every((arr) => !isClosedRing(arr))) {
+        return "MultiLineString" /* MultiLineString */;
+      } else {
+        return "Invalid" /* Invalid */;
+      }
+    } else if (depth === 4 && Array.isArray(coordinates) && coordinates.every((rings) => isValidPolygon(rings))) {
+      return "MultiPolygon" /* MultiPolygon */;
+    } else {
+      return "Invalid" /* Invalid */;
+    }
+  } catch (error) {
+    console.error("Error analyzing coordinates:", error);
+    return "Invalid" /* Invalid */;
+  }
+};
 
 // src/ogc-utils.ts
 var import_source3 = require("ol/source");
@@ -807,6 +866,7 @@ var createWmtsLayer = (serverUrl) => (config) => __async(void 0, null, function*
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  GeometryType,
   activeFeatureByUid,
   addMassMarksLayer,
   appendFeaturesByLayer,

package/dist/index.d.cts

@@ -1,6 +1,7 @@
 import { Layer, Tile } from 'ol/layer';
 import { Map as Map$1, Feature } from 'ol';
 import { Source, XYZ, WMTS } from 'ol/source';
+import { Coordinate } from 'ol/coordinate';
 import { Emitter, EventType } from 'mitt';
 import TileLayer from 'ol/layer/Tile';
 import * as ol_geom from 'ol/geom';
@@ -75,6 +76,14 @@ type WmtsSourceOptions = {
     layerName: string;
     matrixSet?: string;
 };
+declare enum GeometryType {
+    LineString = "LineString",
+    MultiLineString = "MultiLineString",
+    Polygon = "Polygon",
+    MultiPolygon = "MultiPolygon",
+    Invalid = "Invalid"
+}
+type GeometryCoordinates = Coordinate[] | Coordinate[][] | Coordinate[][][];
 
 declare const emitter: Emitter<Record<EventType, any>>;
 
@@ -118,8 +127,9 @@ declare const createBusinessLayer: (dataList: MassData[], config: VectorConfig)
  * 追加Features
  * @param targetLayer
  * @param dataList
+ * @param needTransform
  */
-declare const appendFeaturesByLayer: (targetLayer: VectorLayer, dataList: MassData[]) => void;
+declare const appendFeaturesByLayer: (targetLayer: VectorLayer, dataList: MassData[], needTransform?: boolean) => void;
 /**
  * 创建面状数据
  * @param dataList
@@ -172,4 +182,4 @@ declare const addMassMarksLayer: (getImgUrlFn: GetImgUrlFn) => (dataList: never[
  */
 declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => MassData[];
 
-export { type CustomMap, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeFeatureByUid, addMassMarksLayer, appendFeaturesByLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, updateMarksLayersByStatus };
+export { type CustomMap, type GeometryCoordinates, GeometryType, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeFeatureByUid, addMassMarksLayer, appendFeaturesByLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, updateMarksLayersByStatus };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { Layer, Tile } from 'ol/layer';
 import { Map as Map$1, Feature } from 'ol';
 import { Source, XYZ, WMTS } from 'ol/source';
+import { Coordinate } from 'ol/coordinate';
 import { Emitter, EventType } from 'mitt';
 import TileLayer from 'ol/layer/Tile';
 import * as ol_geom from 'ol/geom';
@@ -75,6 +76,14 @@ type WmtsSourceOptions = {
     layerName: string;
     matrixSet?: string;
 };
+declare enum GeometryType {
+    LineString = "LineString",
+    MultiLineString = "MultiLineString",
+    Polygon = "Polygon",
+    MultiPolygon = "MultiPolygon",
+    Invalid = "Invalid"
+}
+type GeometryCoordinates = Coordinate[] | Coordinate[][] | Coordinate[][][];
 
 declare const emitter: Emitter<Record<EventType, any>>;
 
@@ -118,8 +127,9 @@ declare const createBusinessLayer: (dataList: MassData[], config: VectorConfig)
  * 追加Features
  * @param targetLayer
  * @param dataList
+ * @param needTransform
  */
-declare const appendFeaturesByLayer: (targetLayer: VectorLayer, dataList: MassData[]) => void;
+declare const appendFeaturesByLayer: (targetLayer: VectorLayer, dataList: MassData[], needTransform?: boolean) => void;
 /**
  * 创建面状数据
  * @param dataList
@@ -172,4 +182,4 @@ declare const addMassMarksLayer: (getImgUrlFn: GetImgUrlFn) => (dataList: never[
  */
 declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => MassData[];
 
-export { type CustomMap, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeFeatureByUid, addMassMarksLayer, appendFeaturesByLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, updateMarksLayersByStatus };
+export { type CustomMap, type GeometryCoordinates, GeometryType, type GetImgUrl, type GetImgUrlFn, type IconConfig, type MassData, type VectorConfig, type WmtsSourceOptions, activeFeatureByUid, addMassMarksLayer, appendFeaturesByLayer, buildMassMarksStyles, createAnimationMarker, createBaseLayer, createBusinessLayer, createMapInstance, createMapWorldLayer, createMassMarksLayer, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, updateMarksLayersByStatus };

package/dist/index.js

@@ -38,6 +38,16 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
+// src/types.ts
+var GeometryType = /* @__PURE__ */ ((GeometryType2) => {
+  GeometryType2["LineString"] = "LineString";
+  GeometryType2["MultiLineString"] = "MultiLineString";
+  GeometryType2["Polygon"] = "Polygon";
+  GeometryType2["MultiPolygon"] = "MultiPolygon";
+  GeometryType2["Invalid"] = "Invalid";
+  return GeometryType2;
+})(GeometryType || {});
+
 // src/emitter.ts
 import mitt from "mitt";
 var emitter = mitt();
@@ -90,7 +100,7 @@ var resetActiveVector = () => {
   });
 };
 var assembleGeoJson = (dataList, config) => {
-  const { key, isLine, needTransform = true } = config;
+  const { key, needTransform = true } = config;
   const tempList = [];
   dataList.forEach((item) => {
     try {
@@ -101,7 +111,7 @@ var assembleGeoJson = (dataList, config) => {
           properties: __spreadValues({}, item),
           geometry: {
             coordinates: pathArray,
-            type: isLine ? "LineString" : "MultiPolygon"
+            type: determineGeometryType(pathArray)
           }
         });
       }
@@ -197,10 +207,10 @@ var createBusinessLayer = (dataList, config) => {
   });
   return vectorLayer;
 };
-var appendFeaturesByLayer = (targetLayer, dataList) => {
+var appendFeaturesByLayer = (targetLayer, dataList, needTransform = false) => {
   const vectorSource = targetLayer.getSource();
   const { _vectorConfig: config } = targetLayer.getProperties() || {};
-  const geoJson = assembleGeoJson(dataList, config);
+  const geoJson = assembleGeoJson(dataList, Object.assign({}, config, { needTransform }));
   vectorSource.addFeatures(new GeoJSON().readFeatures(geoJson).map((feature) => {
     feature.setStyle(createVectorStyle(feature, config));
     return feature;
@@ -699,6 +709,54 @@ var getLayersDataList = () => {
   var _a;
   return ((_a = instance) == null ? void 0 : _a.getAllLayers().map((layer) => layer.get("_dataList") || []).flat(2)) || [];
 };
+var determineGeometryType = (coordinates) => {
+  const getArrayDepth = (arr) => {
+    if (!Array.isArray(arr)) return 0;
+    return 1 + Math.max(...arr.map((item) => getArrayDepth(item)), 0);
+  };
+  const isClosedRing = (coords) => {
+    if (!Array.isArray(coords) || coords.length < 3) return false;
+    const first = coords[0];
+    const last = coords[coords.length - 1];
+    return first[0] === last[0] && first[1] === last[1];
+  };
+  const isValidCoordinate = (coord) => {
+    return Array.isArray(coord) && coord.length >= 2 && typeof coord[0] === "number" && typeof coord[1] === "number";
+  };
+  const isValidLineString = (coords) => {
+    return Array.isArray(coords) && coords.length >= 2 && coords.every(isValidCoordinate);
+  };
+  const isValidPolygon = (coords) => {
+    if (!Array.isArray(coords)) return false;
+    const rings = getArrayDepth(coords) === 2 ? [coords] : coords;
+    return rings.every(
+      (ring) => Array.isArray(ring) && ring.length >= 4 && isClosedRing(ring) && ring.every(isValidCoordinate)
+    );
+  };
+  const depth = getArrayDepth(coordinates);
+  try {
+    if (depth < 2 || !coordinates || coordinates.length === 0) {
+      return "Invalid" /* Invalid */;
+    } else if (depth === 2 && isValidLineString(coordinates)) {
+      return isClosedRing(coordinates) && coordinates.length >= 4 ? "Polygon" /* Polygon */ : "LineString" /* LineString */;
+    } else if (depth === 3 && Array.isArray(coordinates) && coordinates.every(isValidLineString)) {
+      if (isValidPolygon(coordinates)) {
+        return "Polygon" /* Polygon */;
+      } else if (coordinates.every((arr) => !isClosedRing(arr))) {
+        return "MultiLineString" /* MultiLineString */;
+      } else {
+        return "Invalid" /* Invalid */;
+      }
+    } else if (depth === 4 && Array.isArray(coordinates) && coordinates.every((rings) => isValidPolygon(rings))) {
+      return "MultiPolygon" /* MultiPolygon */;
+    } else {
+      return "Invalid" /* Invalid */;
+    }
+  } catch (error) {
+    console.error("Error analyzing coordinates:", error);
+    return "Invalid" /* Invalid */;
+  }
+};
 
 // src/ogc-utils.ts
 import { WMTS as WMTS2 } from "ol/source";
@@ -749,6 +807,7 @@ var createWmtsLayer = (serverUrl) => (config) => __async(void 0, null, function*
   });
 });
 export {
+  GeometryType,
   activeFeatureByUid,
   addMassMarksLayer,
   appendFeaturesByLayer,

package/package.json

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