map-ol-utils 0.0.73 → 0.0.75

package/dist/index.cjs

@@ -95,6 +95,7 @@ __export(index_exports, {
   resetActiveVector: () => resetActiveVector,
   resetMap: () => resetMap,
   resetZoomAndCenter: () => resetZoomAndCenter,
+  setFitViewByCoords: () => setFitViewByCoords,
   setFitViewByGeom: () => setFitViewByGeom,
   setFitViewByLayer: () => setFitViewByLayer,
   updateMarksLayersByStatus: () => updateMarksLayersByStatus
@@ -124,7 +125,6 @@ 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);
@@ -132,6 +132,7 @@ 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"));
@@ -167,6 +168,22 @@ var resetActiveVector = () => {
     interaction == null ? void 0 : interaction.getFeatures().clear();
   });
 };
+var setFitViewByCoords = (coords, fitOptions) => {
+  const view = instance.getView();
+  if (coords.length === 1) {
+    view.animate(__spreadValues({
+      zoom: 14,
+      duration: 1e3,
+      center: coords[0]
+    }, fitOptions || {}));
+  } else {
+    const extent = (0, import_extent.boundingExtent)(coords);
+    view.fit(extent, __spreadValues({
+      padding: [50, 50, 50, 50],
+      duration: 1e3
+    }, fitOptions || {}));
+  }
+};
 var setFitViewByGeom = (geom, fitOptions) => {
   instance.getView().fit(geom, __spreadValues({
     padding: [50, 50, 50, 50],
@@ -427,15 +444,13 @@ var createSelectByLayer = (vectorLayer) => {
     }
   });
   interaction.on("select", (evt) => {
-    const { selected, deselected, mapBrowserEvent } = evt;
+    const { selected, deselected } = evt;
     if (selected.length) {
       const feature = selected[0];
       const data = feature.getProperties();
       const { activeStyle } = data;
       feature.setStyle(activeStyle);
-      if (mapBrowserEvent) {
-        emitter_default.emit("selected-feature", data);
-      }
+      emitter_default.emit("selected-feature", data);
       vectorLayer.set("_hasActive", true);
       if (vectorLayer.get("_isDynamic")) {
         const activeImage = activeStyle.getImage();
@@ -806,13 +821,13 @@ var createMap = (config = {}) => {
   });
   return instance2;
 };
-var disposeMap = () => {
-  const layers = instance.getAllLayers();
+var disposeMap = (mapInstance = instance) => {
+  const layers = mapInstance.getAllLayers();
   layers.forEach((layer) => {
-    instance.removeLayer(layer);
+    mapInstance.removeLayer(layer);
   });
-  instance.setTarget("");
-  instance = void 0;
+  mapInstance.setTarget("");
+  mapInstance = void 0;
 };
 var getMapInstance = () => instance;
 var resetZoomAndCenter = (center = mapCenter) => {
@@ -974,6 +989,7 @@ var createWmtsLayer = (serverUrl) => (config) => __async(null, null, function* (
   resetActiveVector,
   resetMap,
   resetZoomAndCenter,
+  setFitViewByCoords,
   setFitViewByGeom,
   setFitViewByLayer,
   updateMarksLayersByStatus

package/dist/index.d.cts

@@ -8,7 +8,7 @@ import TileLayer from 'ol/layer/Tile';
 import * as ol_geom from 'ol/geom';
 import { SimpleGeometry, Point } from 'ol/geom';
 import { Options } from 'ol/Overlay';
-import { FitOptions } from 'ol/View';
+import { FitOptions, AnimationOptions } from 'ol/View';
 import { Select } from 'ol/interaction';
 import VectorLayer from 'ol/layer/Vector';
 import { StyleLike } from 'ol/style/Style';
@@ -118,7 +118,7 @@ declare const removeLayerByName: (name: string) => void;
 declare let instance: CustomMap;
 declare const createMapInstance: (config?: {}) => CustomMap;
 declare const createMap: (config?: {}) => CustomMap;
-declare const disposeMap: () => void;
+declare const disposeMap: (mapInstance?: CustomMap) => void;
 declare const getMapInstance: () => CustomMap;
 declare const resetZoomAndCenter: (center?: [number, number]) => void;
 declare const resetMap: (config?: {
@@ -131,6 +131,12 @@ declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
  * 重置激活的矢量数据
  */
 declare const resetActiveVector: () => void;
+/**
+ * 根据Array<Coordinate> Fit
+ * @param coords
+ * @param fitOptions
+ */
+declare const setFitViewByCoords: (coords: Array<Coordinate>, fitOptions?: FitOptions | AnimationOptions) => void;
 /**
  * 根据SimpleGeometry Fit
  * @param geom
@@ -208,4 +214,4 @@ declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => MassD
  */
 declare const createOverlay: (config?: Options) => Overlay;
 
-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, createMap, createMapInstance, createMapWorldLayer, createMassMarksLayer, createOverlay, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, removeLayerByName, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByGeom, 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, createMap, createMapInstance, createMapWorldLayer, createMassMarksLayer, createOverlay, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, removeLayerByName, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByCoords, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import TileLayer from 'ol/layer/Tile';
 import * as ol_geom from 'ol/geom';
 import { SimpleGeometry, Point } from 'ol/geom';
 import { Options } from 'ol/Overlay';
-import { FitOptions } from 'ol/View';
+import { FitOptions, AnimationOptions } from 'ol/View';
 import { Select } from 'ol/interaction';
 import VectorLayer from 'ol/layer/Vector';
 import { StyleLike } from 'ol/style/Style';
@@ -118,7 +118,7 @@ declare const removeLayerByName: (name: string) => void;
 declare let instance: CustomMap;
 declare const createMapInstance: (config?: {}) => CustomMap;
 declare const createMap: (config?: {}) => CustomMap;
-declare const disposeMap: () => void;
+declare const disposeMap: (mapInstance?: CustomMap) => void;
 declare const getMapInstance: () => CustomMap;
 declare const resetZoomAndCenter: (center?: [number, number]) => void;
 declare const resetMap: (config?: {
@@ -131,6 +131,12 @@ declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
  * 重置激活的矢量数据
  */
 declare const resetActiveVector: () => void;
+/**
+ * 根据Array<Coordinate> Fit
+ * @param coords
+ * @param fitOptions
+ */
+declare const setFitViewByCoords: (coords: Array<Coordinate>, fitOptions?: FitOptions | AnimationOptions) => void;
 /**
  * 根据SimpleGeometry Fit
  * @param geom
@@ -208,4 +214,4 @@ declare const updateMarksLayersByStatus: (checkedStatusList?: string[]) => MassD
  */
 declare const createOverlay: (config?: Options) => Overlay;
 
-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, createMap, createMapInstance, createMapWorldLayer, createMassMarksLayer, createOverlay, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, removeLayerByName, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByGeom, 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, createMap, createMapInstance, createMapWorldLayer, createMassMarksLayer, createOverlay, createSelectByLayer, createVectorFaceLayer, createVectorLineLayer, createWmtsLayer, disposeMap, emitter, getLayersDataList, getMapInstance, instance, removeAllLayers, removeLayerByName, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByCoords, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };

package/dist/index.js

@@ -61,7 +61,6 @@ 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";
@@ -69,6 +68,7 @@ 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 { boundingExtent, getCenter } from "ol/extent";
 var removeOverlays = (key = "") => {
   if (instance) {
     const overlays = instance.getOverlays().getArray().filter((overlay) => overlay.get(key || "position"));
@@ -104,6 +104,22 @@ var resetActiveVector = () => {
     interaction == null ? void 0 : interaction.getFeatures().clear();
   });
 };
+var setFitViewByCoords = (coords, fitOptions) => {
+  const view = instance.getView();
+  if (coords.length === 1) {
+    view.animate(__spreadValues({
+      zoom: 14,
+      duration: 1e3,
+      center: coords[0]
+    }, fitOptions || {}));
+  } else {
+    const extent = boundingExtent(coords);
+    view.fit(extent, __spreadValues({
+      padding: [50, 50, 50, 50],
+      duration: 1e3
+    }, fitOptions || {}));
+  }
+};
 var setFitViewByGeom = (geom, fitOptions) => {
   instance.getView().fit(geom, __spreadValues({
     padding: [50, 50, 50, 50],
@@ -364,15 +380,13 @@ var createSelectByLayer = (vectorLayer) => {
     }
   });
   interaction.on("select", (evt) => {
-    const { selected, deselected, mapBrowserEvent } = evt;
+    const { selected, deselected } = evt;
     if (selected.length) {
       const feature = selected[0];
       const data = feature.getProperties();
       const { activeStyle } = data;
       feature.setStyle(activeStyle);
-      if (mapBrowserEvent) {
-        emitter_default.emit("selected-feature", data);
-      }
+      emitter_default.emit("selected-feature", data);
       vectorLayer.set("_hasActive", true);
       if (vectorLayer.get("_isDynamic")) {
         const activeImage = activeStyle.getImage();
@@ -743,13 +757,13 @@ var createMap = (config = {}) => {
   });
   return instance2;
 };
-var disposeMap = () => {
-  const layers = instance.getAllLayers();
+var disposeMap = (mapInstance = instance) => {
+  const layers = mapInstance.getAllLayers();
   layers.forEach((layer) => {
-    instance.removeLayer(layer);
+    mapInstance.removeLayer(layer);
   });
-  instance.setTarget("");
-  instance = void 0;
+  mapInstance.setTarget("");
+  mapInstance = void 0;
 };
 var getMapInstance = () => instance;
 var resetZoomAndCenter = (center = mapCenter) => {
@@ -910,6 +924,7 @@ export {
   resetActiveVector,
   resetMap,
   resetZoomAndCenter,
+  setFitViewByCoords,
   setFitViewByGeom,
   setFitViewByLayer,
   updateMarksLayersByStatus

package/package.json

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