map-ol-utils 0.0.75 → 0.1.1

package/dist/index.cjs

@@ -91,6 +91,7 @@ __export(index_exports, {
   instance: () => instance,
   removeAllLayers: () => removeAllLayers,
   removeLayerByName: () => removeLayerByName,
+  removeOverlays: () => removeOverlays,
   resetActiveFeature: () => resetActiveFeature,
   resetActiveVector: () => resetActiveVector,
   resetMap: () => resetMap,
@@ -168,8 +169,8 @@ var resetActiveVector = () => {
     interaction == null ? void 0 : interaction.getFeatures().clear();
   });
 };
-var setFitViewByCoords = (coords, fitOptions) => {
-  const view = instance.getView();
+var setFitViewByCoords = (coords, mapInstance = instance, fitOptions) => {
+  const view = mapInstance.getView();
   if (coords.length === 1) {
     view.animate(__spreadValues({
       zoom: 14,
@@ -184,16 +185,16 @@ var setFitViewByCoords = (coords, fitOptions) => {
     }, fitOptions || {}));
   }
 };
-var setFitViewByGeom = (geom, fitOptions) => {
-  instance.getView().fit(geom, __spreadValues({
+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 || {}));
@@ -329,7 +330,7 @@ var appendFeaturesByLayer = (targetLayer, dataList, crsForm) => {
 };
 var createVectorFaceLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign({}, config, { isLine: false }));
 var createVectorLineLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign({}, config, { isLine: true }));
-var removeAllLayers = (isClearAll = true) => {
+var removeAllLayers = () => {
   removeOverlays();
   if (instance) {
     instance.getAllLayers().forEach((layer) => {
@@ -822,6 +823,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);
@@ -839,7 +843,7 @@ var resetZoomAndCenter = (center = mapCenter) => {
   });
 };
 var resetMap = (config = { center: mapCenter, isClearAll: true }) => {
-  removeAllLayers(config.isClearAll);
+  removeAllLayers();
   resetZoomAndCenter(config.center || mapCenter);
 };
 
@@ -985,6 +989,7 @@ var createWmtsLayer = (serverUrl) => (config) => __async(null, null, function* (
   instance,
   removeAllLayers,
   removeLayerByName,
+  removeOverlays,
   resetActiveFeature,
   resetActiveVector,
   resetMap,

package/dist/index.d.cts

@@ -126,6 +126,7 @@ declare const resetMap: (config?: {
     isClearAll: boolean;
 }) => void;
 
+declare const removeOverlays: (key?: string) => void;
 declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
 /**
  * 重置激活的矢量数据
@@ -134,21 +135,24 @@ declare const resetActiveVector: () => void;
 /**
  * 根据Array<Coordinate> Fit
  * @param coords
+ * @param mapInstance
  * @param fitOptions
  */
-declare const setFitViewByCoords: (coords: Array<Coordinate>, fitOptions?: FitOptions | AnimationOptions) => void;
+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
@@ -170,10 +174,9 @@ declare const createVectorFaceLayer: (dataList: MassData[] | undefined, config:
  */
 declare const createVectorLineLayer: (dataList: MassData[] | undefined, config: VectorConfig) => VectorLayer<VectorSource<Feature<ol_geom.Geometry>>, Feature<ol_geom.Geometry>>;
 /**
- * 移除覆盖物已经自定义图层
- * @param isClearAll
+ * 移除覆盖物以及自定义图层
  */
-declare const removeAllLayers: (isClearAll?: boolean) => void;
+declare const removeAllLayers: () => void;
 /**
  * 重置激活Feature
  */
@@ -214,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, setFitViewByCoords, 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, removeOverlays, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByCoords, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };

package/dist/index.d.ts

@@ -126,6 +126,7 @@ declare const resetMap: (config?: {
     isClearAll: boolean;
 }) => void;
 
+declare const removeOverlays: (key?: string) => void;
 declare const createAnimationMarker: (imgUrl: string, data: MassData) => void;
 /**
  * 重置激活的矢量数据
@@ -134,21 +135,24 @@ declare const resetActiveVector: () => void;
 /**
  * 根据Array<Coordinate> Fit
  * @param coords
+ * @param mapInstance
  * @param fitOptions
  */
-declare const setFitViewByCoords: (coords: Array<Coordinate>, fitOptions?: FitOptions | AnimationOptions) => void;
+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
@@ -170,10 +174,9 @@ declare const createVectorFaceLayer: (dataList: MassData[] | undefined, config:
  */
 declare const createVectorLineLayer: (dataList: MassData[] | undefined, config: VectorConfig) => VectorLayer<VectorSource<Feature<ol_geom.Geometry>>, Feature<ol_geom.Geometry>>;
 /**
- * 移除覆盖物已经自定义图层
- * @param isClearAll
+ * 移除覆盖物以及自定义图层
  */
-declare const removeAllLayers: (isClearAll?: boolean) => void;
+declare const removeAllLayers: () => void;
 /**
  * 重置激活Feature
  */
@@ -214,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, setFitViewByCoords, 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, removeOverlays, resetActiveFeature, resetActiveVector, resetMap, resetZoomAndCenter, setFitViewByCoords, setFitViewByGeom, setFitViewByLayer, updateMarksLayersByStatus };

package/dist/index.js

@@ -104,8 +104,8 @@ var resetActiveVector = () => {
     interaction == null ? void 0 : interaction.getFeatures().clear();
   });
 };
-var setFitViewByCoords = (coords, fitOptions) => {
-  const view = instance.getView();
+var setFitViewByCoords = (coords, mapInstance = instance, fitOptions) => {
+  const view = mapInstance.getView();
   if (coords.length === 1) {
     view.animate(__spreadValues({
       zoom: 14,
@@ -120,16 +120,16 @@ var setFitViewByCoords = (coords, fitOptions) => {
     }, fitOptions || {}));
   }
 };
-var setFitViewByGeom = (geom, fitOptions) => {
-  instance.getView().fit(geom, __spreadValues({
+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 || {}));
@@ -265,7 +265,7 @@ var appendFeaturesByLayer = (targetLayer, dataList, crsForm) => {
 };
 var createVectorFaceLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign({}, config, { isLine: false }));
 var createVectorLineLayer = (dataList = [], config) => createBusinessLayer(dataList, Object.assign({}, config, { isLine: true }));
-var removeAllLayers = (isClearAll = true) => {
+var removeAllLayers = () => {
   removeOverlays();
   if (instance) {
     instance.getAllLayers().forEach((layer) => {
@@ -758,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);
@@ -775,7 +778,7 @@ var resetZoomAndCenter = (center = mapCenter) => {
   });
 };
 var resetMap = (config = { center: mapCenter, isClearAll: true }) => {
-  removeAllLayers(config.isClearAll);
+  removeAllLayers();
   resetZoomAndCenter(config.center || mapCenter);
 };
 
@@ -920,6 +923,7 @@ export {
   instance,
   removeAllLayers,
   removeLayerByName,
+  removeOverlays,
   resetActiveFeature,
   resetActiveVector,
   resetMap,

package/package.json

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