aur-openlayers 1.0.3 → 19.6.3

package/README.md

@@ -1,63 +1,63 @@
-# Lib
-
-This project was generated using [Angular CLI](https://github.com/angular/angular-cli) version 19.2.0.
-
-## Code scaffolding
-
-Angular CLI includes powerful code scaffolding tools. To generate a new component, run:
-
-```bash
-ng generate component component-name
-```
-
-For a complete list of available schematics (such as `components`, `directives`, or `pipes`), run:
-
-```bash
-ng generate --help
-```
-
-## Building
-
-To build the library, run:
-
-```bash
-ng build lib
-```
-
-This command will compile your project, and the build artifacts will be placed in the `dist/` directory.
-
-### Publishing the Library
-
-Once the project is built, you can publish your library by following these steps:
-
-1. Navigate to the `dist` directory:
-   ```bash
-   cd dist/lib
-   ```
-
-2. Run the `npm publish` command to publish your library to the npm registry:
-   ```bash
-   npm publish
-   ```
-
-## Running unit tests
-
-To execute unit tests with the [Karma](https://karma-runner.github.io) test runner, use the following command:
-
-```bash
-ng test
-```
-
-## Running end-to-end tests
-
-For end-to-end (e2e) testing, run:
-
-```bash
-ng e2e
-```
-
-Angular CLI does not come with an end-to-end testing framework by default. You can choose one that suits your needs.
-
-## Additional Resources
-
-For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
+# Lib
+
+This project was generated using [Angular CLI](https://github.com/angular/angular-cli) version 19.2.0.
+
+## Code scaffolding
+
+Angular CLI includes powerful code scaffolding tools. To generate a new component, run:
+
+```bash
+ng generate component component-name
+```
+
+For a complete list of available schematics (such as `components`, `directives`, or `pipes`), run:
+
+```bash
+ng generate --help
+```
+
+## Building
+
+To build the library, run:
+
+```bash
+ng build lib
+```
+
+This command will compile your project, and the build artifacts will be placed in the `dist/` directory.
+
+### Publishing the Library
+
+Once the project is built, you can publish your library by following these steps:
+
+1. Navigate to the `dist` directory:
+   ```bash
+   cd dist/lib
+   ```
+
+2. Run the `npm publish` command to publish your library to the npm registry:
+   ```bash
+   npm publish
+   ```
+
+## Running unit tests
+
+To execute unit tests with the [Karma](https://karma-runner.github.io) test runner, use the following command:
+
+```bash
+ng test
+```
+
+## Running end-to-end tests
+
+For end-to-end (e2e) testing, run:
+
+```bash
+ng e2e
+```
+
+Angular CLI does not come with an end-to-end testing framework by default. You can choose one that suits your needs.
+
+## Additional Resources
+
+For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.

package/fesm2022/aur-openlayers.mjs

@@ -3,12 +3,12 @@ import { Injectable, Component } from '@angular/core';
 import VectorLayer from 'ol/layer/Vector';
 import ClusterSource from 'ol/source/Cluster';
 import VectorSource from 'ol/source/Vector';
+import { createEmpty, extend, isEmpty } from 'ol/extent';
 import Feature from 'ol/Feature';
 import Collection from 'ol/Collection';
 import DragPan from 'ol/interaction/DragPan';
 import Modify from 'ol/interaction/Modify';
 import * as Observable from 'ol/Observable';
-import { createEmpty, extend, isEmpty } from 'ol/extent';
 
 class LibService {
     constructor() { }
@@ -24,18 +24,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.18", ngImpo
 
 class LibComponent {
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.18", ngImport: i0, type: LibComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.18", type: LibComponent, isStandalone: true, selector: "lib-lib", ngImport: i0, template: `
-    <p>
-      lib works!
-    </p>
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.18", type: LibComponent, isStandalone: true, selector: "lib-lib", ngImport: i0, template: `
+    <p>
+      lib works!
+    </p>
   `, isInline: true, styles: [""] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.18", ngImport: i0, type: LibComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'lib-lib', imports: [], template: `
-    <p>
-      lib works!
-    </p>
+            args: [{ selector: 'lib-lib', imports: [], template: `
+    <p>
+      lib works!
+    </p>
   ` }]
         }] });
 
@@ -150,35 +150,16 @@ class FlushScheduler {
     shouldUpgradePolicy(current, next) {
         return current === 'microtask' && next === 'raf';
     }
-}
-
-const createMapContext = (map, layers, popupHost, scheduler = new FlushScheduler()) => {
-    return {
-        map,
-        layers,
-        popupHost,
-        batch: (fn, options) => scheduler.batch(fn, options),
-    };
-};
-
-const CLUSTER_FEATURES_KEY = 'features';
-const getClusterFeatures = (feature) => {
-    const features = feature.get(CLUSTER_FEATURES_KEY);
-    if (!Array.isArray(features)) {
-        return null;
-    }
-    const items = features.filter((item) => {
-        if (!item || typeof item !== 'object') {
-            return false;
+    dispose() {
+        if (this.rafId !== null) {
+            cancelAnimationFrame(this.rafId);
+            this.rafId = null;
         }
-        const candidate = item;
-        return typeof candidate.get === 'function' && typeof candidate.getGeometry === 'function';
-    });
-    if (items.length === 0) {
-        return null;
+        this.scheduledToken++;
+        this.queue.clear();
+        this.pendingPolicy = null;
     }
-    return items;
-};
+}
 
 /**
  * Default padding for View#fit in pixels.
@@ -209,6 +190,58 @@ function toOlFitOptions(opts) {
     }
     return fitOpts;
 }
+function collectLayersExtent(layers, layerIds) {
+    const extent = createEmpty();
+    const ids = layerIds ?? Object.keys(layers);
+    for (const id of ids) {
+        const layer = layers[id];
+        if (!layer || !layer.isVisible())
+            continue;
+        const layerExtent = layer.getExtent();
+        if (layerExtent) {
+            extend(extent, layerExtent);
+        }
+    }
+    return isEmpty(extent) ? null : extent;
+}
+
+const createMapContext = (map, layers, popupHost, scheduler = new FlushScheduler()) => {
+    return {
+        map,
+        layers,
+        popupHost,
+        batch: (fn, options) => scheduler.batch(fn, options),
+        centerOnAllLayers: (opts) => {
+            const extent = collectLayersExtent(layers);
+            if (extent)
+                map.getView().fit(extent, toOlFitOptions(opts));
+        },
+        centerOnLayers: (layerIds, opts) => {
+            const extent = collectLayersExtent(layers, layerIds);
+            if (extent)
+                map.getView().fit(extent, toOlFitOptions(opts));
+        },
+    };
+};
+
+const CLUSTER_FEATURES_KEY = 'features';
+const getClusterFeatures = (feature) => {
+    const features = feature.get(CLUSTER_FEATURES_KEY);
+    if (!Array.isArray(features)) {
+        return null;
+    }
+    const items = features.filter((item) => {
+        if (!item || typeof item !== 'object') {
+            return false;
+        }
+        const candidate = item;
+        return typeof candidate.get === 'function' && typeof candidate.getGeometry === 'function';
+    });
+    if (items.length === 0) {
+        return null;
+    }
+    return items;
+};
 
 const STATES_KEY = '__mff_states__';
 const getFeatureStates = (feature) => {
@@ -312,6 +345,7 @@ class InteractionManager {
                             const active = {
                                 targetKey,
                                 startCoordinate: event.coordinate,
+                                startPixel: event.pixel,
                                 lastCoordinate: event.coordinate,
                                 lastItem: resolved,
                                 moveThrottleMs: translate.moveThrottleMs ?? 0,
@@ -1074,8 +1108,9 @@ class InteractionManager {
             nextCoordinate[1] - active.lastCoordinate[1],
         ];
         if (!active.started) {
-            const offsetX = nextCoordinate[0] - active.startCoordinate[0];
-            const offsetY = nextCoordinate[1] - active.startCoordinate[1];
+            const currentPixel = event.pixel;
+            const offsetX = currentPixel[0] - active.startPixel[0];
+            const offsetY = currentPixel[1] - active.startPixel[1];
             const distance = Math.hypot(offsetX, offsetY);
             if (distance < active.startThresholdPx) {
                 active.lastHandled = false;
@@ -1332,7 +1367,7 @@ class InteractionManager {
             if (aZ !== bZ) {
                 return bZ - aZ;
             }
-            return a.index - b.index;
+            return b.index - a.index;
         });
     }
     getHitTolerance(hitTolerance) {
@@ -1525,6 +1560,16 @@ class InteractionManager {
     shouldStopClusterPropagation() {
         return true;
     }
+    dispose() {
+        this.listenerKeys.forEach((key) => Observable.unByKey(key));
+        this.listenerKeys.clear();
+        Array.from(this.nativeModifies.keys()).forEach((id) => this.teardownNativeModify(id));
+        this.hoverItems.clear();
+        this.selectedItems.clear();
+        this.activeTranslates.clear();
+        this.activeModifies.clear();
+        this.enabledState.clear();
+    }
 }
 
 class StyleCache {
@@ -1872,6 +1917,10 @@ class VectorLayerBase {
         }
         this.ctx.map.getView().fit(extent, toOlFitOptions(opts));
     }
+    getExtent() {
+        const extent = this.source.getExtent();
+        return isEmpty(extent) ? null : extent;
+    }
     setVisible(visible) {
         this.layer.setVisible(visible);
     }
@@ -2016,7 +2065,7 @@ class ClusteredVectorLayer extends VectorLayerBase {
         this.layer.setSource(this.clusteringEnabled ? this.clusterSource : this.source);
     }
     setModels(models) {
-        this.setModelsInternal(models);
+        super.setModels(models);
         this.scheduleInvalidate();
     }
     setClusteringEnabled(enabled) {
@@ -2245,11 +2294,15 @@ class LayerManager {
     layers = {};
     apis = {};
     interactions;
+    scheduler;
+    popupHost;
     ctx;
     constructor(map, schema) {
         this.map = map;
         const popupHost = schema.options?.popupHost ? new PopupHost(schema.options.popupHost) : undefined;
         const scheduler = new FlushScheduler(schema.options?.scheduler?.policy ?? 'microtask');
+        this.scheduler = scheduler;
+        this.popupHost = popupHost;
         const ctx = createMapContext(this.map, this.apis, popupHost, scheduler);
         this.ctx = ctx;
         schema.layers.forEach((descriptor) => {
@@ -2318,6 +2371,12 @@ class LayerManager {
     refreshEnabled() {
         this.interactions.refreshEnabled();
     }
+    dispose() {
+        this.interactions.dispose();
+        this.popupHost?.dispose();
+        this.scheduler.dispose();
+        Object.values(this.layers).forEach((layer) => this.map.removeLayer(layer));
+    }
 }
 
 /*