@mapsight/lib-ol 4.0.2 → 4.1.0

package/README.md

@@ -1,20 +1,27 @@
 # @mapsight/lib-ol
 
-Library of openlayers helpers code to have them available from different projects and accessible by other internal libraries.
+Shared **OpenLayers helpers** used across Mapsight packages — style function types, multi-level style caching, map fit/animation utilities, feature hit-testing, clustering, and geometry derivation. Import subpaths directly (there is no single barrel export).
 
-## Getting started
+See the [documentation hub](https://github.com/open-mapsight/mapsight/blob/main/docs/README.md) for architecture and integration context.
 
-TODO
+## Common imports
 
-## How to publish
+| Module                                                              | Purpose                                                |
+| ------------------------------------------------------------------- | ------------------------------------------------------ |
+| `@mapsight/lib-ol/style/createCachedStyleFunction`                  | 3-level LRU cache wrapper for compiled style functions |
+| `@mapsight/lib-ol/style/styleFunction`                              | `MapsightStyleFunction` and env types                  |
+| `@mapsight/lib-ol/style/styleFeatureScope`                          | Hooks for runtime icon and style scope                 |
+| `@mapsight/lib-ol/map/fitToFeature`, `fitToExtent`, `fitToFeatures` | View fitting with padding                              |
+| `@mapsight/lib-ol/feature/detectFeatureHits`                        | Pointer hit detection                                  |
+| `@mapsight/lib-ol/feature/getGeoJsonFeatureSortAnchor`              | Distance sorting anchor for lists                      |
 
-- Publish:
+Peer dependency: `ol`.
 
-```
-git status
-git commit
-npm version x.x.x|major|minor|patch
-npm publish
-git push
-git push --tags
-```
+## Related packages
+
+| Package                                                                                                                           | Role                                                            |
+| --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------- |
+| [`@mapsight/vector-style-compiler`](https://github.com/open-mapsight/mapsight/blob/main/packages/vector-style-compiler/README.md) | Emits imports of `createCachedStyleFunction` in compiled output |
+| [`@mapsight/traffic-style`](https://github.com/open-mapsight/mapsight/blob/main/packages/traffic-style/README.md)                 | Default compiled style built on this cache                      |
+| [`@mapsight/core`](https://github.com/open-mapsight/mapsight/blob/main/packages/core/README.md)                                   | Map controller uses style and fit helpers                       |
+| [`@mapsight/ui`](https://github.com/open-mapsight/mapsight/blob/main/packages/ui/README.md)                                       | UI plugins and config types                                     |

package/dist/feature/getGeoJsonFeatureSortAnchor.d.ts

@@ -0,0 +1,21 @@
+import type { Coordinate } from "ol/coordinate";
+type GeoJsonBbox = [number, number, number, number];
+type GeoJsonGeometryLike = {
+    type: string;
+    coordinates?: unknown;
+};
+export type GeoJsonFeatureLike = {
+    bbox?: GeoJsonBbox;
+    geometry?: GeoJsonGeometryLike | null;
+};
+/**
+ * Returns a WGS84 lon/lat anchor suitable for `ol/sphere.getDistance`.
+ *
+ * Prefers `feature.bbox` when present. For Point geometries without bbox,
+ * reads coordinates directly. Other geometry types fall back to OpenLayers
+ * geometry parsing and extent center (with a one-time console warning).
+ */
+export default function getGeoJsonFeatureSortAnchor(feature: GeoJsonFeatureLike | null | undefined): Coordinate | null;
+export declare function resetGeoJsonFeatureSortAnchorWarningForTests(): void;
+export {};
+//# sourceMappingURL=getGeoJsonFeatureSortAnchor.d.ts.map

package/dist/feature/getGeoJsonFeatureSortAnchor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getGeoJsonFeatureSortAnchor.d.ts","sourceRoot":"","sources":["../../src/js/feature/getGeoJsonFeatureSortAnchor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAK9C,KAAK,WAAW,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEpD,KAAK,mBAAmB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAChC,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,QAAQ,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;CACtC,CAAC;AAkEF;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,2BAA2B,CAClD,OAAO,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,GAC5C,UAAU,GAAG,IAAI,CAsBnB;AAED,wBAAgB,4CAA4C,SAE3D"}

package/dist/feature/getGeoJsonFeatureSortAnchor.js

@@ -0,0 +1,76 @@
+import GeoJSON from "ol/format/GeoJSON";
+import getExtentCentroid from "../extent/getCentroid";
+const geoJsonFormat = new GeoJSON();
+let hasLoggedNonPointGeometryFallbackWarning = false;
+function isFiniteBbox(bbox) {
+    return bbox.every(Number.isFinite);
+}
+function getBboxCenter(bbox) {
+    if (!isFiniteBbox(bbox)) {
+        return null;
+    }
+    const [minX, minY, maxX, maxY] = bbox;
+    return getExtentCentroid([minX, minY, maxX, maxY]);
+}
+function isLonLatPair(value) {
+    return (Array.isArray(value) &&
+        value.length >= 2 &&
+        typeof value[0] === "number" &&
+        typeof value[1] === "number" &&
+        Number.isFinite(value[0]) &&
+        Number.isFinite(value[1]));
+}
+function getPointCoordinates(geometry) {
+    if (geometry.type !== "Point") {
+        return null;
+    }
+    if (!isLonLatPair(geometry.coordinates)) {
+        return null;
+    }
+    return [geometry.coordinates[0], geometry.coordinates[1]];
+}
+function warnNonPointGeometryFallbackOnce() {
+    if (hasLoggedNonPointGeometryFallbackWarning) {
+        return;
+    }
+    hasLoggedNonPointGeometryFallbackWarning = true;
+    console.warn("@mapsight/lib-ol: deriving feature sort anchors from non-Point GeoJSON geometries; add feature.bbox where possible for better performance.");
+}
+function getNonPointGeometryCenter(geometry) {
+    warnNonPointGeometryFallbackOnce();
+    const olGeometry = geoJsonFormat.readGeometry(geometry);
+    if (!olGeometry) {
+        return null;
+    }
+    return getExtentCentroid(olGeometry.getExtent());
+}
+/**
+ * Returns a WGS84 lon/lat anchor suitable for `ol/sphere.getDistance`.
+ *
+ * Prefers `feature.bbox` when present. For Point geometries without bbox,
+ * reads coordinates directly. Other geometry types fall back to OpenLayers
+ * geometry parsing and extent center (with a one-time console warning).
+ */
+export default function getGeoJsonFeatureSortAnchor(feature) {
+    if (!feature) {
+        return null;
+    }
+    if (feature.bbox) {
+        const bboxCenter = getBboxCenter(feature.bbox);
+        if (bboxCenter) {
+            return bboxCenter;
+        }
+    }
+    const geometry = feature.geometry;
+    if (!geometry) {
+        return null;
+    }
+    if (geometry.type === "Point") {
+        return getPointCoordinates(geometry);
+    }
+    return getNonPointGeometryCenter(geometry);
+}
+export function resetGeoJsonFeatureSortAnchorWarningForTests() {
+    hasLoggedNonPointGeometryFallbackWarning = false;
+}
+//# sourceMappingURL=getGeoJsonFeatureSortAnchor.js.map

package/dist/feature/getGeoJsonFeatureSortAnchor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getGeoJsonFeatureSortAnchor.js","sourceRoot":"","sources":["../../src/js/feature/getGeoJsonFeatureSortAnchor.ts"],"names":[],"mappings":"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"}

package/dist/style/createCachedStyleFunction.d.ts

@@ -20,6 +20,7 @@ export type StyleFunctionOptions = {
     metricsCollector?: StyleFunctionMetricsCollector;
     declarationHashFunction: (env: MapsightStyleFunctionEnv, props: MapsightStyleFunctionProps, envHash: string, geometryType: GeometryType, styleName: string) => string;
     declarationFunction: (env: MapsightStyleFunctionEnv, props: MapsightStyleFunctionProps, geometryType: GeometryType, styleName: string) => unknown;
+    volatileHashFunction?: (env: MapsightStyleFunctionEnv, props: MapsightStyleFunctionProps, geometryType: GeometryType, styleName: string) => string;
     allowedProps?: Array<string> | false;
     allowedStyles?: Array<string> | false;
     cacheLevel1Size?: number;
@@ -33,6 +34,7 @@ export type StyleFunctionOptions = {
  * @param [metricsCollector] optional callback receiving per-invocation runtime metrics (hash timing, cache hit/miss, and declaration/style timings)
  * @param declarationHashFunction style declaration hash function
  * @param declarationFunction style declaration function
+ * @param [volatileHashFunction] optional volatile hash function for values that should trigger a cache miss when changed, even if the declaration hash is the same (e.g. for time-based styling)
  * @param [allowedProps=false] list of props allowed, false = all allowed
  * @param [allowedStyles=false] list of styles allowed, false = all allowed
  * @param [cacheLevel1Size=100] size of first level cache that caches feature geometry styles based on feature and environment state
@@ -41,5 +43,5 @@ export type StyleFunctionOptions = {
  *
  * @returns style function
  */
-export default function createCachedStyleFunction({ constructorsMap, metricsCollector, declarationHashFunction, declarationFunction, allowedProps, allowedStyles, cacheLevel1Size, cacheLevel2Size, cacheLevel3Size, }: StyleFunctionOptions): MapsightStyleFunction;
+export default function createCachedStyleFunction({ constructorsMap, metricsCollector, declarationHashFunction, declarationFunction, volatileHashFunction, allowedProps, allowedStyles, cacheLevel1Size, cacheLevel2Size, cacheLevel3Size, }: StyleFunctionOptions): MapsightStyleFunction;
 //# sourceMappingURL=createCachedStyleFunction.d.ts.map

package/dist/style/createCachedStyleFunction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCachedStyleFunction.d.ts","sourceRoot":"","sources":["../../src/js/style/createCachedStyleFunction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,IAAI,IAAI,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAa3D,OAAO,KAAK,EACX,qBAAqB,EACrB,wBAAwB,EACxB,0BAA0B,EAC1B,MAAM,oBAAoB,CAAC;AAmB5B,MAAM,MAAM,oBAAoB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,4BAA4B,EAAE,MAAM,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,CAC3C,OAAO,EAAE,oBAAoB,KACzB,IAAI,CAAC;AAEV,MAAM,MAAM,oBAAoB,GAAG;IAClC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,gBAAgB,CAAC,EAAE,6BAA6B,CAAC;IACjD,uBAAuB,EAAE,CACxB,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,KACb,MAAM,CAAC;IACZ,mBAAmB,EAAE,CACpB,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,0BAA0B,EACjC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,KACb,OAAO,CAAC;IACb,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACrC,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,EACjD,eAAe,EACf,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,EACnB,YAAoB,EACpB,aAAqB,EACrB,eAA4C,EAC5C,eAA4C,EAC5C,eAA4C,GAC5C,EAAE,oBAAoB,yBAgPtB"}
+{"version":3,"file":"createCachedStyleFunction.d.ts","sourceRoot":"","sources":["../../src/js/style/createCachedStyleFunction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,IAAI,IAAI,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAa3D,OAAO,KAAK,EACX,qBAAqB,EACrB,wBAAwB,EACxB,0BAA0B,EAC1B,MAAM,oBAAoB,CAAC;AAmB5B,MAAM,MAAM,oBAAoB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,4BAA4B,EAAE,MAAM,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,CAC3C,OAAO,EAAE,oBAAoB,KACzB,IAAI,CAAC;AAEV,MAAM,MAAM,oBAAoB,GAAG;IAClC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,gBAAgB,CAAC,EAAE,6BAA6B,CAAC;IACjD,uBAAuB,EAAE,CACxB,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,KACb,MAAM,CAAC;IACZ,mBAAmB,EAAE,CACpB,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,0BAA0B,EACjC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,KACb,OAAO,CAAC;IACb,oBAAoB,CAAC,EAAE,CACtB,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,0BAA0B,EACjC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,KACb,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACrC,aAAa,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,EACjD,eAAe,EACf,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,EACnB,oBAAoB,EACpB,YAAoB,EACpB,aAAqB,EACrB,eAA4C,EAC5C,eAA4C,EAC5C,eAA4C,GAC5C,EAAE,oBAAoB,yBAgRtB"}

package/dist/style/createCachedStyleFunction.js

@@ -3,6 +3,7 @@ import { ensureNonNullable } from "@mapsight/lib-js/nonNullable";
 import deriveGeometriesFromBase from "../geometry/deriveGeometriesFromBase.js";
 import declarationToGeometry from "./declarationToGeometry.js";
 import declarationToStyle from "./declarationToStyle.js";
+import { enterStyleFeatureScope } from "./styleFeatureScope.js";
 import { STYLE_ENV_FIELD_NAME, createPropsFilter } from "./styleFunction.js";
 const TYPE_GEOMETRY_COLLECTION = "GeometryCollection";
 const DEFAULT_STYLE = "default";
@@ -18,6 +19,7 @@ const DEFAULT_CACHE_LEVEL_3_SIZE = 100;
  * @param [metricsCollector] optional callback receiving per-invocation runtime metrics (hash timing, cache hit/miss, and declaration/style timings)
  * @param declarationHashFunction style declaration hash function
  * @param declarationFunction style declaration function
+ * @param [volatileHashFunction] optional volatile hash function for values that should trigger a cache miss when changed, even if the declaration hash is the same (e.g. for time-based styling)
  * @param [allowedProps=false] list of props allowed, false = all allowed
  * @param [allowedStyles=false] list of styles allowed, false = all allowed
  * @param [cacheLevel1Size=100] size of first level cache that caches feature geometry styles based on feature and environment state
@@ -26,15 +28,36 @@ const DEFAULT_CACHE_LEVEL_3_SIZE = 100;
  *
  * @returns style function
  */
-export default function createCachedStyleFunction({ constructorsMap, metricsCollector, declarationHashFunction, declarationFunction, allowedProps = false, allowedStyles = false, cacheLevel1Size = DEFAULT_CACHE_LEVEL_1_SIZE, cacheLevel2Size = DEFAULT_CACHE_LEVEL_2_SIZE, cacheLevel3Size = DEFAULT_CACHE_LEVEL_3_SIZE, }) {
+export default function createCachedStyleFunction({ constructorsMap, metricsCollector, declarationHashFunction, declarationFunction, volatileHashFunction, allowedProps = false, allowedStyles = false, cacheLevel1Size = DEFAULT_CACHE_LEVEL_1_SIZE, cacheLevel2Size = DEFAULT_CACHE_LEVEL_2_SIZE, cacheLevel3Size = DEFAULT_CACHE_LEVEL_3_SIZE, }) {
     const hasMetricsCollector = typeof metricsCollector === "function";
     const filterProps = createPropsFilter(allowedProps);
     const createHash = (value) => JSON.stringify(value);
     const cacheLevel1 = new LRUCache(cacheLevel1Size); // the first level cache caches feature geometry styles based on feature and environment state
     const cacheLevel2 = new LRUCache(cacheLevel2Size); // the second level cache caches style objects based on the rules that apply and the environment state
     const cacheLevel3 = new LRUCache(cacheLevel3Size); // the third level cache caches style objects based on the rules that apply and the environment state
+    function resolveStyleName(env) {
+        let styleName = DEFAULT_STYLE;
+        const envStyle = env[STYLE_ENV_FIELD_NAME];
+        if (typeof envStyle === "string") {
+            if (allowedStyles === false) {
+                styleName = envStyle;
+            }
+            else {
+                styleName =
+                    allowedStyles.indexOf(envStyle) > -1
+                        ? envStyle
+                        : DEFAULT_STYLE;
+            }
+        }
+        return styleName;
+    }
     function level1(env, props, envHash, propsHash, geometryType, metrics) {
+        const volatileHash = volatileHashFunction
+            ? volatileHashFunction(env, props, geometryType, resolveStyleName(env))
+            : "";
         const cacheHashL1 = envHash +
+            HASH_STRING_DELIMITER +
+            volatileHash +
             HASH_STRING_DELIMITER +
             geometryType +
             HASH_STRING_DELIMITER +
@@ -49,25 +72,15 @@ export default function createCachedStyleFunction({ constructorsMap, metricsColl
             }
         }
         if (!hasLevel1) {
-            cacheLevel1.set(cacheHashL1, level2(env, props, envHash, propsHash, geometryType, metrics));
+            cacheLevel1.set(cacheHashL1, level2(env, props, envHash, propsHash, geometryType, volatileHash, metrics));
         }
         return cacheLevel1.get(cacheHashL1);
     }
-    function level2(env, props, envHash, propsHash, geometryType, metrics) {
-        let styleName = DEFAULT_STYLE;
-        const envStyle = env[STYLE_ENV_FIELD_NAME];
-        if (typeof envStyle === "string") {
-            if (allowedStyles === false) {
-                styleName = envStyle;
-            }
-            else {
-                styleName =
-                    allowedStyles.indexOf(envStyle) > -1
-                        ? envStyle
-                        : DEFAULT_STYLE;
-            }
-        }
-        const cacheHashL2 = declarationHashFunction(env, props, envHash, geometryType, styleName);
+    function level2(env, props, envHash, propsHash, geometryType, volatileHash, metrics) {
+        const styleName = resolveStyleName(env);
+        const cacheHashL2 = declarationHashFunction(env, props, envHash, geometryType, styleName) +
+            HASH_STRING_DELIMITER +
+            volatileHash;
         if (cacheLevel2.containsKey(cacheHashL2)) {
             if (metrics) {
                 metrics.level2Hits += 1;
@@ -150,6 +163,7 @@ export default function createCachedStyleFunction({ constructorsMap, metricsColl
                 totalMs: 0,
             }
             : undefined;
+        const exit = enterStyleFeatureScope(feature);
         // subset of feature properties that are relevant for styling (also used for caching decisions)
         const filteredProps = filterProps(feature.getProperties());
         const envHashStart = hasMetricsCollector ? performance.now() : 0;
@@ -163,6 +177,7 @@ export default function createCachedStyleFunction({ constructorsMap, metricsColl
             metrics.propsHashMs = performance.now() - propsHashStart;
         }
         const styles = styleGeometryOrGeometryCollectionCached(env, filteredProps, envHash, propsHash, feature.getGeometry(), metrics);
+        exit();
         if (metrics && metricsCollector) {
             metrics.outputStylesCount = styles.length;
             metrics.totalMs = performance.now() - totalStart;

package/dist/style/createCachedStyleFunction.js.map

@@ -1 +1 @@
-{"version":3,"file":"createCachedStyleFunction.js","sourceRoot":"","sources":["../../src/js/style/createCachedStyleFunction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createCachedStyleFunction.js","sourceRoot":"","sources":["../../src/js/style/createCachedStyleFunction.ts"],"names":[],"mappings":"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"}

package/dist/style/styleFeatureScope.d.ts

@@ -0,0 +1,10 @@
+import type { FeatureLike } from "ol/Feature";
+export type StyleFeatureScopeHooks = {
+    enter: (feature: {
+        changed: () => void;
+    }) => void;
+    exit: () => void;
+};
+export declare function addStyleFeatureScopeHooks(newHook: StyleFeatureScopeHooks | null): void;
+export declare function enterStyleFeatureScope(feature: FeatureLike): () => void;
+//# sourceMappingURL=styleFeatureScope.d.ts.map

package/dist/style/styleFeatureScope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"styleFeatureScope.d.ts","sourceRoot":"","sources":["../../src/js/style/styleFeatureScope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AAE5C,MAAM,MAAM,sBAAsB,GAAG;IACpC,KAAK,EAAE,CAAC,OAAO,EAAE;QAAC,OAAO,EAAE,MAAM,IAAI,CAAA;KAAC,KAAK,IAAI,CAAC;IAChD,IAAI,EAAE,MAAM,IAAI,CAAC;CACjB,CAAC;AAIF,wBAAgB,yBAAyB,CACxC,OAAO,EAAE,sBAAsB,GAAG,IAAI,GACpC,IAAI,CAIN;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,WAAW,cAS1D"}

package/dist/style/styleFeatureScope.js

@@ -0,0 +1,16 @@
+const hooks = [];
+export function addStyleFeatureScopeHooks(newHook) {
+    if (newHook) {
+        hooks.push(newHook);
+    }
+}
+export function enterStyleFeatureScope(feature) {
+    if ("changed" in feature && typeof feature.changed === "function") {
+        hooks.forEach((hook) => hook.enter(feature));
+        return () => {
+            hooks.forEach((hook) => hook.exit());
+        };
+    }
+    return () => { };
+}
+//# sourceMappingURL=styleFeatureScope.js.map

package/dist/style/styleFeatureScope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"styleFeatureScope.js","sourceRoot":"","sources":["../../src/js/style/styleFeatureScope.ts"],"names":[],"mappings":"AAOA,MAAM,KAAK,GAAkC,EAAE,CAAC;AAEhD,MAAM,UAAU,yBAAyB,CACxC,OAAsC;IAEtC,IAAI,OAAO,EAAE,CAAC;QACb,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC;AACF,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAoB;IAC1D,IAAI,SAAS,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QACnE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7C,OAAO,GAAG,EAAE;YACX,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACtC,CAAC,CAAC;IACH,CAAC;IAED,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;AACjB,CAAC"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@mapsight/lib-ol",
   "description": "Mapsight OpenLayers Library",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "type": "module",
   "dependencies": {
     "@types/lodash": "^4.17.24",
     "lodash": "^4.18.1",
     "ol": "^10.9.0",
-    "@mapsight/lib-js": "^3.0.2"
+    "@mapsight/lib-js": "^3.0.4"
   },
   "devDependencies": {
     "tsc-alias": "^1.8.17"
@@ -18,6 +18,9 @@
       "default": "./dist/*.js"
     }
   },
+  "files": [
+    "dist"
+  ],
   "license": "UNLICENSED",
   "main": "index.js",
   "peerDependencies": {

package/src/js/coordinate/add.ts

@@ -1,13 +0,0 @@
-import type {Coordinate} from "ol/coordinate";
-
-import {ensureNonNullable} from "@mapsight/lib-js/nonNullable";
-
-export default function add(
-	[aX, aY]: Coordinate,
-	[bX, bY]: Coordinate,
-): [number, number] {
-	return [
-		ensureNonNullable(aX) + ensureNonNullable(bX),
-		ensureNonNullable(aY) + ensureNonNullable(bY),
-	];
-}

package/src/js/coordinate/addPixelPadding.ts

@@ -1,21 +0,0 @@
-import type {Coordinate} from "ol/coordinate";
-
-import type {Padding} from "../index";
-import add from "./add";
-import fromPixel from "./fromPixel";
-
-/**
- * @param resolution Resolution
- * @param coordinate Coordinate
- * @param padding Padding (in pixels) to be cleared inside the view. Values in the array are top, right, bottom and left padding. Default is [0, 0, 0, 0]. Required.
- * @returns coordinate with added pixel padding
- */
-export default function addPixelPadding(
-	resolution: number,
-	coordinate: Coordinate,
-	[top, right, bottom, left]: Padding = [0, 0, 0, 0],
-): Coordinate {
-	const pixelDelta = [(right - left) / 2, (bottom - top) / 2];
-
-	return add(coordinate, fromPixel(pixelDelta, resolution));
-}

package/src/js/coordinate/fromPixel.ts

@@ -1,10 +0,0 @@
-import type {Pixel} from "ol/pixel";
-
-import {ensureNonNullable} from "@mapsight/lib-js/nonNullable";
-
-export default function fromPixel([x, y]: Pixel, resolution: number) {
-	return [
-		ensureNonNullable(x) * resolution,
-		ensureNonNullable(y) * -1 * resolution,
-	];
-}

package/src/js/coordinate/scale.ts

@@ -1,7 +0,0 @@
-import type {Coordinate} from "ol/coordinate";
-
-import {ensureNonNullable} from "@mapsight/lib-js/nonNullable";
-
-export default function scale([x, y]: Coordinate, s: number): [number, number] {
-	return [ensureNonNullable(x) * s, ensureNonNullable(y) * s];
-}

package/src/js/coordinate/toPixel.ts

@@ -1,13 +0,0 @@
-import type {Coordinate} from "ol/coordinate";
-
-import {ensureNonNullable} from "@mapsight/lib-js/nonNullable";
-
-export default function toPixel(
-	[x, y]: Coordinate,
-	resolution: number,
-): [number, number] {
-	return [
-		ensureNonNullable(x) / resolution,
-		(ensureNonNullable(y) * -1) / resolution,
-	];
-}

package/src/js/coordinates/equals.ts

@@ -1,6 +0,0 @@
-import type {Coordinate} from "ol/coordinate";
-
-export default function equals(a: Coordinate, b: Coordinate) {
-	// FIXME: check index 2, 3, ...
-	return a[0] === b[0] && a[1] === b[1];
-}

package/src/js/coordinates/middleCoordinate.ts

@@ -1,7 +0,0 @@
-import type {Coordinate} from "ol/coordinate";
-
-import add from "../coordinate/add";
-
-export default function middleCoordinate(coordinates: Array<Coordinate>) {
-	return coordinates.reduce(add, [0, 0]).map((a) => a / coordinates.length);
-}

package/src/js/events/condition/clickOnFeature.ts

@@ -1,13 +0,0 @@
-import type {MapBrowserEvent} from "ol";
-
-/**
- * based on http://stackoverflow.com/questions/29396614/openlayers3-clicking-outside-feature-deselects-all-features
- *
- * @param e event
- * @returns return
- */
-export default function clickOnFeature(e: MapBrowserEvent<PointerEvent>) {
-	return (
-		e.type === "click" && !!e.map.forEachFeatureAtPixel(e.pixel, () => true)
-	);
-}

package/src/js/extent/getCentroid.ts

@@ -1,14 +0,0 @@
-import type {Extent} from "ol/extent";
-
-import {assertNonNullable} from "@mapsight/lib-js/nonNullable";
-
-export default function getCentroid([top, right, bottom, left]: Extent): [
-	number,
-	number,
-] {
-	assertNonNullable(top);
-	assertNonNullable(bottom);
-	assertNonNullable(right);
-	assertNonNullable(left);
-	return [top + (bottom - top) / 2, right + (left - right) / 2];
-}

package/src/js/extent/isFiniteExtent.ts

@@ -1,7 +0,0 @@
-import type {Extent} from "ol/extent";
-
-export default function isFiniteExtent(extent: Extent) {
-	return !extent.some(
-		(coordinate) => coordinate === Infinity || coordinate === -Infinity,
-	);
-}

package/src/js/extents/combineExtents.ts

@@ -1,11 +0,0 @@
-import type {Extent} from "ol/extent";
-import {createEmpty, extend} from "ol/extent";
-
-export default function combineExtents(extents: Array<Extent>) {
-	const combinedExtent = createEmpty();
-	extents
-		.filter((extent) => !!extent)
-		.forEach((extent) => extend(combinedExtent, extent));
-
-	return combinedExtent;
-}

package/src/js/feature/animator.ts

@@ -1,91 +0,0 @@
-// EXAMPLE:
-//
-//var animator = FeatureAnimator(ol, map, function (feature, vectorContext, time) {
-//	switch (feature.getGeometry().getType()) {
-//		case 'Polygon':
-//			var strokeStyle = new ol.style.Stroke({
-//				color: 'red',
-//				width: 4 * ol.easing.easeOut(time)
-//			});
-//			var fillStyle = new ol.style.Fill({
-//				color: 'yellow'
-//			});
-//
-//			vectorContext.setFillStrokeStyle(fillStyle, strokeStyle);
-//			vectorContext.drawPolygonGeometry(feature.getGeometry().clone(), null);
-//
-//			break;
-//		default:
-//	}
-//});
-//
-//if (!ol.has.TOUCH) {
-//	FeatureHitDetector(
-//		map,
-//		function (feature) {
-//			animator.start(feature);
-//			map.render();
-//			$map.addClass('feature-is-hit');
-//		},
-//		function (feature) {
-//			animator.stop();
-//			map.render();
-//			$map.removeClass('feature-is-hit');
-//		}
-//	);
-//}
-import type Feature from "ol/Feature";
-import type OlMap from "ol/Map";
-import {unByKey} from "ol/Observable";
-import type {EventsKey} from "ol/events";
-import {getVectorContext} from "ol/render";
-import type RenderEvent from "ol/render/Event";
-import type VectorContext from "ol/render/VectorContext";
-
-export type AnimationFunction = (
-	feature: Feature,
-	vectorContext: VectorContext,
-	progress: number,
-) => void;
-
-export default function animator(
-	map: OlMap,
-	animationFunction: AnimationFunction,
-	duration = 2000,
-) {
-	let listenerKey: EventsKey;
-	let isStopped = true;
-
-	function start(feature: Feature) {
-		const startTime = new Date().getTime();
-
-		function animate(event: RenderEvent) {
-			if (isStopped || !event.frameState) {
-				return;
-			}
-
-			const vectorContext = getVectorContext(event);
-
-			const elapsedTime = event.frameState.time - startTime;
-			animationFunction(feature, vectorContext, elapsedTime / duration);
-
-			if (elapsedTime > duration) {
-				stop();
-			} else {
-				event.frameState.animate = true; // tell OL3 to continue postcompose animation
-			}
-		}
-
-		isStopped = false;
-		listenerKey = map.on("postcompose", animate);
-	}
-
-	function stop() {
-		if (!isStopped) {
-			isStopped = true;
-			unByKey(listenerKey);
-		}
-	}
-
-	return {start: start, stop: stop};
-}