@maplibre/geojson-vt 6.1.1 → 6.2.0

package/src/geojsonvt.ts

@@ -19,7 +19,8 @@ export const defaultOptions: GeoJSONVTOptions = {
     updateable: false,
     cluster: false,
     clusterOptions: defaultClusterOptions,
-    debug: 0
+    debug: 0,
+    worldCoordinates: false
 };
 
 /**
@@ -62,7 +63,7 @@ export class GeoJSONVT {
     }
 
     private initializeIndex(features: GeoJSONVTInternalFeature[], options: GeoJSONVTOptions) {
-        this.tileIndex = options.cluster ? new ClusterTileIndex(options.clusterOptions) : new TileIndex(options);
+        this.tileIndex = options.cluster ? new ClusterTileIndex(options.clusterOptions, options.worldCoordinates) : new TileIndex(options);
         if (!features.length) return;
         this.tileIndex.initialize(features);
     }
@@ -117,7 +118,7 @@ export class GeoJSONVT {
 
         for (const feature of source) {
             if (feature.id == undefined) continue;
-            if (predicate(featureToGeoJSON(feature))) continue;
+            if (predicate(featureToGeoJSON(feature, this.options.worldCoordinates))) continue;
             affected.push(feature);
             removeIds.add(feature.id);
         }
@@ -131,7 +132,7 @@ export class GeoJSONVT {
      */
     getData(): GeoJSON.GeoJSON {
         if (!this.options.updateable) throw new Error('to retrieve data the `updateable` option must be set to true');
-        return convertToGeoJSON(this.source);
+        return convertToGeoJSON(this.source, this.options.worldCoordinates);
     }
     
     /**

package/src/simplify.test.ts

@@ -71,3 +71,21 @@ test('does not throw max call stack error on bad long input', () => {
         simplify(coords, 0, coords.length, 2e-15);
     }).not.toThrow();
 });
+
+test('does not throw max call stack error when splitting off one vertex at a time due to zig-zag', () => {
+    // the old recursive implementation overflows at ~5000 vertices; the work is quadratic, so keep it small
+    const n = 6000;
+    const coords: number[] = [];
+    for (let i = 0; i < n; i++) {
+        coords.push(i / n, 0.5 + (i % 2 ? 1 : -1) * (1 + i * 1e-4) * 1e-3, 0);
+    }
+
+    expect(() => {
+        simplify(coords, 0, coords.length - 3, 1e-12);
+    }).not.toThrow();
+    let kept = 0;
+    for (let i = 5; i < coords.length - 3; i += 3) {
+        if (coords[i] > 0) kept++;
+    }
+    expect(kept).toBe(n - 2);
+});

package/src/simplify.ts

@@ -6,6 +6,16 @@
  * @param sqTolerance - square tolerance value
  */
 export function simplify(coords: number[], first: number, last: number, sqTolerance: number) {
+    const stack = [first, last];
+
+    while (stack.length) {
+        last = stack.pop();
+        first = stack.pop();
+        simplifySegment(coords, first, last, sqTolerance, stack);
+    }
+}
+
+function simplifySegment(coords: number[], first: number, last: number, sqTolerance: number, stack: number[]) {
     let maxSqDist = sqTolerance;
     const mid = first + ((last - first) >> 1);
     let minPosToMid = last - first;
@@ -38,9 +48,9 @@ export function simplify(coords: number[], first: number, last: number, sqTolera
     }
 
     if (maxSqDist > sqTolerance) {
-        if (index - first > 3) simplify(coords, first, index, sqTolerance);
         coords[index + 2] = maxSqDist;
-        if (last - index > 3) simplify(coords, index, last, sqTolerance);
+        if (index - first > 3) stack.push(first, index);
+        if (last - index > 3) stack.push(index, last);
     }
 }
 

package/src/tile-index.ts

@@ -23,7 +23,7 @@ export class TileIndex implements GeoJSONVTTileIndex {
 
     initialize(features: GeoJSONVTInternalFeature[]): void {
         // start slicing from the top tile down
-        this.splitTile(features, 0, 0, 0);
+        this.splitTile(this.clipToWorld(features), 0, 0, 0);
 
         if (this.options.debug) {
             if (features.length) console.log('features: %d, points: %d', this.tiles[0].numFeatures, this.tiles[0].numPoints);
@@ -45,8 +45,9 @@ export class TileIndex implements GeoJSONVTTileIndex {
 
         // re-generate root tile with updated feature set
         const [z, x, y] = [0, 0, 0];
-        const rootTile = createTile(source, z, x, y, options);
-        rootTile.source = source;
+        const rootSource = this.clipToWorld(source);
+        const rootTile = createTile(rootSource, z, x, y, options);
+        rootTile.source = rootSource;
 
         // update tile index with new root tile - ready for getTile calls
         const id = toID(z, x, y);
@@ -83,6 +84,7 @@ export class TileIndex implements GeoJSONVTTileIndex {
         const {extent, debug} = this.options;
         
         const z2 = 1 << z;
+        if (this.options.worldCoordinates && (x < 0 || x >= z2)) return null; // a row outside the world has no tile either
         x = (x + z2) & (z2 - 1); // wrap tile x coordinate
 
         const id = toID(z, x, y);
@@ -119,6 +121,18 @@ export class TileIndex implements GeoJSONVTTileIndex {
         return transformTile(this.tiles[id], extent);
     }
 
+    /**
+     * The features the top tile starts from: all of them in a wrapping world, where wrapping already put them inside,
+     * and only what lies inside the world square and its buffer with `worldCoordinates`. The index keeps the rest, so
+     * an update can still move a feature in from outside.
+     */
+    private clipToWorld(features: GeoJSONVTInternalFeature[]): GeoJSONVTInternalFeature[] {
+        if (!this.options.worldCoordinates) return features;
+        const buffer = this.options.buffer / this.options.extent;
+        const inX = clip(features, 1, -buffer, 1 + buffer, AxisType.X, -Infinity, Infinity, this.options) || [];
+        return clip(inX, 1, -buffer, 1 + buffer, AxisType.Y, -Infinity, Infinity, this.options) || [];
+    }
+
     /**
      * splits features from a parent tile to sub-tiles.
      * z, x, and y are the coordinates of the parent tile

package/src/wrap.ts

@@ -4,6 +4,8 @@ import type { GeoJSONVTInternalFeature, GeoJSONVTOptions, SliceArray, SliceFixed
 import {createFeature, optimizeLineMemory} from './feature';
 
 export function wrap(features: GeoJSONVTInternalFeature[], options: GeoJSONVTOptions): GeoJSONVTInternalFeature[] {
+    if (options.worldCoordinates) return features;
+
     const buffer = options.buffer / options.extent;
     let merged = features;