map-ol-utils 0.0.60 → 0.0.62

package/dist/index.cjs

@@ -121,6 +121,7 @@ var import_control = require("ol/control");
 // src/layer-utils.ts
 var import_format = require("ol/format");
 var import_ol = require("ol");
+var import_extent = require("ol/extent");
 var import_interaction = require("ol/interaction");
 var import_gcoord = __toESM(require("gcoord"), 1);
 var import_Vector = __toESM(require("ol/layer/Vector"), 1);
@@ -128,7 +129,6 @@ var import_Vector2 = __toESM(require("ol/source/Vector"), 1);
 var import_geom = require("ol/geom");
 var import_condition = require("ol/events/condition");
 var import_style = require("ol/style");
-var import_extent = require("ol/extent");
 var removeOverlays = (key = "") => {
   if (instance) {
     const overlays = instance.getOverlays().getArray().filter((overlay) => overlay.get(key || "position"));
@@ -185,7 +185,7 @@ var assembleGeoJson = (dataList, config) => {
     try {
       const pathArray = Array.isArray(item[key]) ? item[key] : JSON.parse(item[key] || "[]");
       if (pathArray.length) {
-        const type = determineGeometryType(pathArray);
+        const type = item["geoType"] || determineGeometryType(pathArray);
         if (type !== "Invalid" /* Invalid */) {
           tempList.push({
             type: "Feature",
@@ -264,7 +264,7 @@ var createVectorStyle = (feature, config) => {
   return unActiveStyle;
 };
 var createBusinessLayer = (dataList, config) => {
-  const { layerName, openClick } = config;
+  const { isAutoFit, layerName, openClick } = config;
   const geoJson = assembleGeoJson(dataList, config);
   const vectorLayer = new import_Vector.default({
     zIndex: 5,
@@ -281,6 +281,7 @@ var createBusinessLayer = (dataList, config) => {
   }
   vectorLayer.setProperties({
     _isCustom: true,
+    _isAutoFit: isAutoFit,
     _isVectorLayer: true,
     _vectorConfig: config,
     _layerName: layerName,
@@ -448,12 +449,15 @@ var createSelectByLayer = (vectorLayer) => {
           );
         }, 1e3);
       }
-      const view = instance.getView();
-      view.animate({
-        duration: 1e3,
-        center: (0, import_extent.getCenter)(feature.getGeometry().getExtent()),
-        zoom: vectorLayer.get("_isAutoFit") ? view.getZoom() : 12
-      });
+      const isAutoFit = vectorLayer.get("_isAutoFit");
+      if (isAutoFit) {
+        const view = instance.getView();
+        view.animate({
+          duration: 1e3,
+          zoom: view.getZoom(),
+          center: (0, import_extent.getCenter)(feature.getGeometry().getExtent())
+        });
+      }
     }
     if (deselected.length) {
       const feature = deselected[0];
@@ -776,9 +780,7 @@ var createMapInstance = (config = {}) => {
   instance.removeLayerByName = removeLayerByName;
   instance.changeLayersByNames = changeLayersByNames;
   instance.on("pointermove", (evt) => {
-    instance.getTargetElement().style.cursor = instance.hasFeatureAtPixel(
-      evt.pixel
-    ) ? "pointer" : "";
+    instance.getTargetElement().style.cursor = instance.hasFeatureAtPixel(evt.pixel) ? "pointer" : "";
   });
   return instance;
 };

package/dist/index.d.cts

@@ -31,6 +31,7 @@ type VectorConfig = {
     layerName?: string;
     openClick?: boolean;
     fillColor?: string;
+    isAutoFit?: boolean;
     crsForm?: CRSTypes;
     fillOpacity?: number;
     strokeColor?: string;
@@ -63,15 +64,10 @@ type MassData = {
     status: string;
     width?: number;
     height?: number;
-    itemName: string;
     crsForm?: CRSTypes;
     rawData: {
         [key: string]: any;
     };
-    imgList: {
-        text: string;
-        icon: string;
-    }[];
     lnglat: [string, string] | [number, number];
 };
 type WmtsSourceOptions = {

package/dist/index.d.ts

@@ -31,6 +31,7 @@ type VectorConfig = {
     layerName?: string;
     openClick?: boolean;
     fillColor?: string;
+    isAutoFit?: boolean;
     crsForm?: CRSTypes;
     fillOpacity?: number;
     strokeColor?: string;
@@ -63,15 +64,10 @@ type MassData = {
     status: string;
     width?: number;
     height?: number;
-    itemName: string;
     crsForm?: CRSTypes;
     rawData: {
         [key: string]: any;
     };
-    imgList: {
-        text: string;
-        icon: string;
-    }[];
     lnglat: [string, string] | [number, number];
 };
 type WmtsSourceOptions = {

package/dist/index.js

@@ -61,6 +61,7 @@ import { defaults } from "ol/control";
 // src/layer-utils.ts
 import { GeoJSON } from "ol/format";
 import { Feature, Overlay } from "ol";
+import { getCenter } from "ol/extent";
 import { Select } from "ol/interaction";
 import gcoord from "gcoord";
 import VectorLayer from "ol/layer/Vector";
@@ -68,7 +69,6 @@ import VectorSource from "ol/source/Vector";
 import { Point } from "ol/geom";
 import { singleClick } from "ol/events/condition";
 import { Fill, Icon, Stroke, Style } from "ol/style";
-import { getCenter } from "ol/extent";
 var removeOverlays = (key = "") => {
   if (instance) {
     const overlays = instance.getOverlays().getArray().filter((overlay) => overlay.get(key || "position"));
@@ -125,7 +125,7 @@ var assembleGeoJson = (dataList, config) => {
     try {
       const pathArray = Array.isArray(item[key]) ? item[key] : JSON.parse(item[key] || "[]");
       if (pathArray.length) {
-        const type = determineGeometryType(pathArray);
+        const type = item["geoType"] || determineGeometryType(pathArray);
         if (type !== "Invalid" /* Invalid */) {
           tempList.push({
             type: "Feature",
@@ -204,7 +204,7 @@ var createVectorStyle = (feature, config) => {
   return unActiveStyle;
 };
 var createBusinessLayer = (dataList, config) => {
-  const { layerName, openClick } = config;
+  const { isAutoFit, layerName, openClick } = config;
   const geoJson = assembleGeoJson(dataList, config);
   const vectorLayer = new VectorLayer({
     zIndex: 5,
@@ -221,6 +221,7 @@ var createBusinessLayer = (dataList, config) => {
   }
   vectorLayer.setProperties({
     _isCustom: true,
+    _isAutoFit: isAutoFit,
     _isVectorLayer: true,
     _vectorConfig: config,
     _layerName: layerName,
@@ -388,12 +389,15 @@ var createSelectByLayer = (vectorLayer) => {
           );
         }, 1e3);
       }
-      const view = instance.getView();
-      view.animate({
-        duration: 1e3,
-        center: getCenter(feature.getGeometry().getExtent()),
-        zoom: vectorLayer.get("_isAutoFit") ? view.getZoom() : 12
-      });
+      const isAutoFit = vectorLayer.get("_isAutoFit");
+      if (isAutoFit) {
+        const view = instance.getView();
+        view.animate({
+          duration: 1e3,
+          zoom: view.getZoom(),
+          center: getCenter(feature.getGeometry().getExtent())
+        });
+      }
     }
     if (deselected.length) {
       const feature = deselected[0];
@@ -716,9 +720,7 @@ var createMapInstance = (config = {}) => {
   instance.removeLayerByName = removeLayerByName;
   instance.changeLayersByNames = changeLayersByNames;
   instance.on("pointermove", (evt) => {
-    instance.getTargetElement().style.cursor = instance.hasFeatureAtPixel(
-      evt.pixel
-    ) ? "pointer" : "";
+    instance.getTargetElement().style.cursor = instance.hasFeatureAtPixel(evt.pixel) ? "pointer" : "";
   });
   return instance;
 };

package/package.json

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