map-ol-utils 0.0.74 → 0.1.0

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,16 +168,32 @@ var resetActiveVector = () => {
     interaction == null ? void 0 : interaction.getFeatures().clear();
   });
 };
-var setFitViewByGeom = (geom, fitOptions) => {
-  instance.getView().fit(geom, __spreadValues({
+var setFitViewByCoords = (coords, mapInstance = instance, fitOptions) => {
+  const view = mapInstance.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, mapInstance = instance, fitOptions) => {
+  mapInstance.getView().fit(geom, __spreadValues({
     padding: [50, 50, 50, 50],
     duration: 1e3
   }, fitOptions || {}));
 };
-var setFitViewByLayer = (layer, fitOptions) => {
+var setFitViewByLayer = (layer, mapInstance = instance, fitOptions) => {
   var _a;
   const extent = ((_a = layer.getSource()) == null ? void 0 : _a.getExtent()) || [];
-  instance.getView().fit(extent, __spreadValues({
+  mapInstance.getView().fit(extent, __spreadValues({
     padding: [50, 50, 50, 50],
     duration: 1e3
   }, fitOptions || {}));
@@ -353,7 +370,9 @@ var activeFeatureByUid = (uid) => {
       const selectInteraction = targetLayer.get("_selectInteraction");
       if (selectInteraction) {
         const collection = selectInteraction.getFeatures().getArray();
-        const hasFeature = collection.find((feature) => feature.get("_uuid") === uid);
+        const hasFeature = collection.find(
+          (feature) => feature.get("_uuid") === uid
+        );
         if (!hasFeature) {
           selectInteraction.dispatchEvent({
             type: "select",
@@ -425,7 +444,7 @@ 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();
@@ -803,6 +822,9 @@ var createMap = (config = {}) => {
   return instance2;
 };
 var disposeMap = (mapInstance = instance) => {
+  mapInstance.getOverlays().forEach((overlay) => {
+    mapInstance.removeOverlay(overlay);
+  });
   const layers = mapInstance.getAllLayers();
   layers.forEach((layer) => {
     mapInstance.removeLayer(layer);
@@ -970,6 +992,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';
@@ -131,18 +131,27 @@ declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
  * 重置激活的矢量数据
  */
 declare const resetActiveVector: () => void;
+/**
+ * 根据Array<Coordinate> Fit
+ * @param coords
+ * @param mapInstance
+ * @param fitOptions
+ */
+declare const setFitViewByCoords: (coords: Array<Coordinate>, mapInstance?: CustomMap, fitOptions?: FitOptions | AnimationOptions) => void;
 /**
  * 根据SimpleGeometry Fit
  * @param geom
+ * @param mapInstance
  * @param fitOptions
  */
-declare const setFitViewByGeom: (geom: SimpleGeometry, fitOptions?: FitOptions) => void;
+declare const setFitViewByGeom: (geom: SimpleGeometry, mapInstance?: CustomMap, fitOptions?: FitOptions) => void;
 /**
  * 根据VectorLayer要素的四至信息Fit
  * @param layer
+ * @param mapInstance
  * @param fitOptions
  */
-declare const setFitViewByLayer: (layer: VectorLayer, fitOptions?: FitOptions) => void;
+declare const setFitViewByLayer: (layer: VectorLayer, mapInstance?: CustomMap, fitOptions?: FitOptions) => void;
 declare const createBusinessLayer: (dataList: MassData[], config: VectorConfig) => VectorLayer<VectorSource<Feature<ol_geom.Geometry>>, Feature<ol_geom.Geometry>>;
 /**
  * 追加Features
@@ -208,4 +217,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';
@@ -131,18 +131,27 @@ declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
  * 重置激活的矢量数据
  */
 declare const resetActiveVector: () => void;
+/**
+ * 根据Array<Coordinate> Fit
+ * @param coords
+ * @param mapInstance
+ * @param fitOptions
+ */
+declare const setFitViewByCoords: (coords: Array<Coordinate>, mapInstance?: CustomMap, fitOptions?: FitOptions | AnimationOptions) => void;
 /**
  * 根据SimpleGeometry Fit
  * @param geom
+ * @param mapInstance
  * @param fitOptions
  */
-declare const setFitViewByGeom: (geom: SimpleGeometry, fitOptions?: FitOptions) => void;
+declare const setFitViewByGeom: (geom: SimpleGeometry, mapInstance?: CustomMap, fitOptions?: FitOptions) => void;
 /**
  * 根据VectorLayer要素的四至信息Fit
  * @param layer
+ * @param mapInstance
  * @param fitOptions
  */
-declare const setFitViewByLayer: (layer: VectorLayer, fitOptions?: FitOptions) => void;
+declare const setFitViewByLayer: (layer: VectorLayer, mapInstance?: CustomMap, fitOptions?: FitOptions) => void;
 declare const createBusinessLayer: (dataList: MassData[], config: VectorConfig) => VectorLayer<VectorSource<Feature<ol_geom.Geometry>>, Feature<ol_geom.Geometry>>;
 /**
  * 追加Features
@@ -208,4 +217,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,16 +104,32 @@ var resetActiveVector = () => {
     interaction == null ? void 0 : interaction.getFeatures().clear();
   });
 };
-var setFitViewByGeom = (geom, fitOptions) => {
-  instance.getView().fit(geom, __spreadValues({
+var setFitViewByCoords = (coords, mapInstance = instance, fitOptions) => {
+  const view = mapInstance.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, mapInstance = instance, fitOptions) => {
+  mapInstance.getView().fit(geom, __spreadValues({
     padding: [50, 50, 50, 50],
     duration: 1e3
   }, fitOptions || {}));
 };
-var setFitViewByLayer = (layer, fitOptions) => {
+var setFitViewByLayer = (layer, mapInstance = instance, fitOptions) => {
   var _a;
   const extent = ((_a = layer.getSource()) == null ? void 0 : _a.getExtent()) || [];
-  instance.getView().fit(extent, __spreadValues({
+  mapInstance.getView().fit(extent, __spreadValues({
     padding: [50, 50, 50, 50],
     duration: 1e3
   }, fitOptions || {}));
@@ -290,7 +306,9 @@ var activeFeatureByUid = (uid) => {
       const selectInteraction = targetLayer.get("_selectInteraction");
       if (selectInteraction) {
         const collection = selectInteraction.getFeatures().getArray();
-        const hasFeature = collection.find((feature) => feature.get("_uuid") === uid);
+        const hasFeature = collection.find(
+          (feature) => feature.get("_uuid") === uid
+        );
         if (!hasFeature) {
           selectInteraction.dispatchEvent({
             type: "select",
@@ -362,7 +380,7 @@ 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();
@@ -740,6 +758,9 @@ var createMap = (config = {}) => {
   return instance2;
 };
 var disposeMap = (mapInstance = instance) => {
+  mapInstance.getOverlays().forEach((overlay) => {
+    mapInstance.removeOverlay(overlay);
+  });
   const layers = mapInstance.getAllLayers();
   layers.forEach((layer) => {
     mapInstance.removeLayer(layer);
@@ -906,6 +927,7 @@ export {
   resetActiveVector,
   resetMap,
   resetZoomAndCenter,
+  setFitViewByCoords,
   setFitViewByGeom,
   setFitViewByLayer,
   updateMarksLayersByStatus

package/package.json

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