map-ol-utils 0.0.51 → 0.0.53

package/dist/index.cjs

@@ -165,12 +165,12 @@ var resetActiveVector = () => {
 };
 var setFitViewByLayer = (layer, fitOptions) => {
   const extent = (0, import_extent.boundingExtent)(
-    layer.getSource().getFeatures().map((feature) => feature.getCoordinates())
+    layer.getSource().getFeatures().map((feature) => feature.getGeometry().getCoordinates())
   );
   instance.getView().fit(extent, __spreadValues({
     padding: [50, 50, 50, 50],
     duration: 1e3
-  }, fitOptions));
+  }, fitOptions || {}));
 };
 var assembleGeoJson = (dataList, config) => {
   const { key, crsForm } = config;
@@ -445,9 +445,9 @@ var createSelectByLayer = (vectorLayer) => {
       }
       const view = instance.getView();
       view.animate({
-        zoom: 12,
         duration: 1e3,
-        center: (0, import_extent.getCenter)(feature.getGeometry().getExtent())
+        center: (0, import_extent.getCenter)(feature.getGeometry().getExtent()),
+        zoom: vectorLayer.get("_isAutoFit") ? view.getZoom() : 12
       });
     }
     if (deselected.length) {
@@ -502,6 +502,7 @@ var addMassMarksLayer = (getImgUrlFn) => {
       hasLine,
       hasFace,
       isDynamic,
+      isAutoFit,
       statusNum,
       markerIcon,
       markerSize,
@@ -517,6 +518,9 @@ var addMassMarksLayer = (getImgUrlFn) => {
     });
     const massMarksLayer = createMassMarksLayer(dataList, massMarksStyles);
     if (openClick) {
+      massMarksLayer.setProperties({
+        _isAutoFit: isAutoFit
+      });
       createSelectByLayer(massMarksLayer);
     }
     if (hasLine) {
@@ -882,7 +886,7 @@ var getCapabilities = (url) => {
     }
   });
 };
-var createWmtsLayer = (serverUrl) => (config) => __async(void 0, null, function* () {
+var createWmtsLayer = (serverUrl) => (config) => __async(null, null, function* () {
   const { style, format, version, layerName, matrixSet } = config;
   const [workspace, datastore] = layerName.split(":");
   const capabilitiesUrl = `${serverUrl}/${workspace}/${datastore}/gwc/service/wmts?request=GetCapabilities`;

package/dist/index.d.cts

@@ -51,6 +51,7 @@ type IconConfig = {
     isDynamic?: boolean;
     markerIcon: string;
     activeScale?: number;
+    isAutoFit?: boolean;
     vectorConfig?: VectorConfig;
     markerSize: [number, number];
 };
@@ -131,7 +132,7 @@ declare const resetActiveVector: () => void;
  * @param layer
  * @param fitOptions
  */
-declare const setFitViewByLayer: (layer: VectorLayer, fitOptions: FitOptions) => void;
+declare const setFitViewByLayer: (layer: VectorLayer, fitOptions?: FitOptions) => void;
 declare const createBusinessLayer: (dataList: MassData[], config: VectorConfig) => VectorLayer<VectorSource<Feature<ol_geom.Geometry>>, Feature<ol_geom.Geometry>>;
 /**
  * 追加Features

package/dist/index.d.ts

@@ -51,6 +51,7 @@ type IconConfig = {
     isDynamic?: boolean;
     markerIcon: string;
     activeScale?: number;
+    isAutoFit?: boolean;
     vectorConfig?: VectorConfig;
     markerSize: [number, number];
 };
@@ -131,7 +132,7 @@ declare const resetActiveVector: () => void;
  * @param layer
  * @param fitOptions
  */
-declare const setFitViewByLayer: (layer: VectorLayer, fitOptions: FitOptions) => void;
+declare const setFitViewByLayer: (layer: VectorLayer, fitOptions?: FitOptions) => void;
 declare const createBusinessLayer: (dataList: MassData[], config: VectorConfig) => VectorLayer<VectorSource<Feature<ol_geom.Geometry>>, Feature<ol_geom.Geometry>>;
 /**
  * 追加Features

package/dist/index.js

@@ -106,12 +106,12 @@ var resetActiveVector = () => {
 };
 var setFitViewByLayer = (layer, fitOptions) => {
   const extent = boundingExtent(
-    layer.getSource().getFeatures().map((feature) => feature.getCoordinates())
+    layer.getSource().getFeatures().map((feature) => feature.getGeometry().getCoordinates())
   );
   instance.getView().fit(extent, __spreadValues({
     padding: [50, 50, 50, 50],
     duration: 1e3
-  }, fitOptions));
+  }, fitOptions || {}));
 };
 var assembleGeoJson = (dataList, config) => {
   const { key, crsForm } = config;
@@ -386,9 +386,9 @@ var createSelectByLayer = (vectorLayer) => {
       }
       const view = instance.getView();
       view.animate({
-        zoom: 12,
         duration: 1e3,
-        center: getCenter(feature.getGeometry().getExtent())
+        center: getCenter(feature.getGeometry().getExtent()),
+        zoom: vectorLayer.get("_isAutoFit") ? view.getZoom() : 12
       });
     }
     if (deselected.length) {
@@ -443,6 +443,7 @@ var addMassMarksLayer = (getImgUrlFn) => {
       hasLine,
       hasFace,
       isDynamic,
+      isAutoFit,
       statusNum,
       markerIcon,
       markerSize,
@@ -458,6 +459,9 @@ var addMassMarksLayer = (getImgUrlFn) => {
     });
     const massMarksLayer = createMassMarksLayer(dataList, massMarksStyles);
     if (openClick) {
+      massMarksLayer.setProperties({
+        _isAutoFit: isAutoFit
+      });
       createSelectByLayer(massMarksLayer);
     }
     if (hasLine) {
@@ -823,7 +827,7 @@ var getCapabilities = (url) => {
     }
   });
 };
-var createWmtsLayer = (serverUrl) => (config) => __async(void 0, null, function* () {
+var createWmtsLayer = (serverUrl) => (config) => __async(null, null, function* () {
   const { style, format, version, layerName, matrixSet } = config;
   const [workspace, datastore] = layerName.split(":");
   const capabilitiesUrl = `${serverUrl}/${workspace}/${datastore}/gwc/service/wmts?request=GetCapabilities`;

package/package.json

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