map-ol-utils 0.0.52 → 0.0.54

package/dist/index.cjs

@@ -92,6 +92,7 @@ __export(index_exports, {
   resetActiveVector: () => resetActiveVector,
   resetMap: () => resetMap,
   resetZoomAndCenter: () => resetZoomAndCenter,
+  setFitViewByGeom: () => setFitViewByGeom,
   setFitViewByLayer: () => setFitViewByLayer,
   updateMarksLayersByStatus: () => updateMarksLayersByStatus
 });
@@ -118,13 +119,13 @@ var import_View = __toESM(require("ol/View"), 1);
 var import_control = require("ol/control");
 
 // src/layer-utils.ts
-var import_geom = require("ol/geom");
 var import_format = require("ol/format");
 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_geom = require("ol/geom");
 var import_condition = require("ol/events/condition");
 var import_style = require("ol/style");
 var import_extent = require("ol/extent");
@@ -163,6 +164,12 @@ var resetActiveVector = () => {
     interaction == null ? void 0 : interaction.getFeatures().clear();
   });
 };
+var setFitViewByGeom = (geom, fitOptions) => {
+  instance.getView().fit(geom, __spreadValues({
+    padding: [50, 50, 50, 50],
+    duration: 1e3
+  }, fitOptions || {}));
+};
 var setFitViewByLayer = (layer, fitOptions) => {
   const extent = (0, import_extent.boundingExtent)(
     layer.getSource().getFeatures().map((feature) => feature.getGeometry().getCoordinates())
@@ -445,9 +452,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 +509,7 @@ var addMassMarksLayer = (getImgUrlFn) => {
       hasLine,
       hasFace,
       isDynamic,
+      isAutoFit,
       statusNum,
       markerIcon,
       markerSize,
@@ -517,6 +525,9 @@ var addMassMarksLayer = (getImgUrlFn) => {
     });
     const massMarksLayer = createMassMarksLayer(dataList, massMarksStyles);
     if (openClick) {
+      massMarksLayer.setProperties({
+        _isAutoFit: isAutoFit
+      });
       createSelectByLayer(massMarksLayer);
     }
     if (hasLine) {
@@ -936,6 +947,7 @@ var createWmtsLayer = (serverUrl) => (config) => __async(null, null, function* (
   resetActiveVector,
   resetMap,
   resetZoomAndCenter,
+  setFitViewByGeom,
   setFitViewByLayer,
   updateMarksLayersByStatus
 });

package/dist/index.d.cts

@@ -6,12 +6,12 @@ import { Coordinate } from 'ol/coordinate';
 import { Emitter, EventType } from 'mitt';
 import TileLayer from 'ol/layer/Tile';
 import * as ol_geom from 'ol/geom';
-import { Point } from 'ol/geom';
+import { SimpleGeometry, Point } from 'ol/geom';
+import { FitOptions } from 'ol/View';
 import { Select } from 'ol/interaction';
 import VectorLayer from 'ol/layer/Vector';
 import { StyleLike } from 'ol/style/Style';
 import VectorSource from 'ol/source/Vector';
-import { FitOptions } from 'ol/View';
 
 interface CustomMap extends Map$1 {
     activeBaseLayer?: string;
@@ -51,6 +51,7 @@ type IconConfig = {
     isDynamic?: boolean;
     markerIcon: string;
     activeScale?: number;
+    isAutoFit?: boolean;
     vectorConfig?: VectorConfig;
     markerSize: [number, number];
 };
@@ -127,7 +128,13 @@ declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
  */
 declare const resetActiveVector: () => void;
 /**
- * 根据VectorLayer自动缩放地图到合适的视野级别
+ * 根据SimpleGeometry Fit
+ * @param geom
+ * @param fitOptions
+ */
+declare const setFitViewByGeom: (geom: SimpleGeometry, fitOptions?: FitOptions) => void;
+/**
+ * 根据VectorLayer要素的四至信息Fit
  * @param layer
  * @param fitOptions
  */
@@ -192,4 +199,4 @@ declare const addMassMarksLayer: (getImgUrlFn: GetImgUrlFn) => (dataList: never[
  */
 declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => MassData[];
 
-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, setFitViewByLayer, 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, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };

package/dist/index.d.ts

@@ -6,12 +6,12 @@ import { Coordinate } from 'ol/coordinate';
 import { Emitter, EventType } from 'mitt';
 import TileLayer from 'ol/layer/Tile';
 import * as ol_geom from 'ol/geom';
-import { Point } from 'ol/geom';
+import { SimpleGeometry, Point } from 'ol/geom';
+import { FitOptions } from 'ol/View';
 import { Select } from 'ol/interaction';
 import VectorLayer from 'ol/layer/Vector';
 import { StyleLike } from 'ol/style/Style';
 import VectorSource from 'ol/source/Vector';
-import { FitOptions } from 'ol/View';
 
 interface CustomMap extends Map$1 {
     activeBaseLayer?: string;
@@ -51,6 +51,7 @@ type IconConfig = {
     isDynamic?: boolean;
     markerIcon: string;
     activeScale?: number;
+    isAutoFit?: boolean;
     vectorConfig?: VectorConfig;
     markerSize: [number, number];
 };
@@ -127,7 +128,13 @@ declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
  */
 declare const resetActiveVector: () => void;
 /**
- * 根据VectorLayer自动缩放地图到合适的视野级别
+ * 根据SimpleGeometry Fit
+ * @param geom
+ * @param fitOptions
+ */
+declare const setFitViewByGeom: (geom: SimpleGeometry, fitOptions?: FitOptions) => void;
+/**
+ * 根据VectorLayer要素的四至信息Fit
  * @param layer
  * @param fitOptions
  */
@@ -192,4 +199,4 @@ declare const addMassMarksLayer: (getImgUrlFn: GetImgUrlFn) => (dataList: never[
  */
 declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => MassData[];
 
-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, setFitViewByLayer, 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, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };

package/dist/index.js

@@ -59,13 +59,13 @@ import View from "ol/View";
 import { defaults } from "ol/control";
 
 // src/layer-utils.ts
-import { Point } from "ol/geom";
 import { GeoJSON } from "ol/format";
 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 { Point } from "ol/geom";
 import { singleClick } from "ol/events/condition";
 import { Fill, Icon, Stroke, Style } from "ol/style";
 import { getCenter, boundingExtent } from "ol/extent";
@@ -104,6 +104,12 @@ var resetActiveVector = () => {
     interaction == null ? void 0 : interaction.getFeatures().clear();
   });
 };
+var setFitViewByGeom = (geom, fitOptions) => {
+  instance.getView().fit(geom, __spreadValues({
+    padding: [50, 50, 50, 50],
+    duration: 1e3
+  }, fitOptions || {}));
+};
 var setFitViewByLayer = (layer, fitOptions) => {
   const extent = boundingExtent(
     layer.getSource().getFeatures().map((feature) => feature.getGeometry().getCoordinates())
@@ -386,9 +392,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 +449,7 @@ var addMassMarksLayer = (getImgUrlFn) => {
       hasLine,
       hasFace,
       isDynamic,
+      isAutoFit,
       statusNum,
       markerIcon,
       markerSize,
@@ -458,6 +465,9 @@ var addMassMarksLayer = (getImgUrlFn) => {
     });
     const massMarksLayer = createMassMarksLayer(dataList, massMarksStyles);
     if (openClick) {
+      massMarksLayer.setProperties({
+        _isAutoFit: isAutoFit
+      });
       createSelectByLayer(massMarksLayer);
     }
     if (hasLine) {
@@ -876,6 +886,7 @@ export {
   resetActiveVector,
   resetMap,
   resetZoomAndCenter,
+  setFitViewByGeom,
   setFitViewByLayer,
   updateMarksLayersByStatus
 };

package/package.json

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