@loaders.gl/mvt 4.2.0-alpha.4 → 4.2.0-alpha.6

package/dist/lib/geojson-tiler/clip.js

@@ -1,172 +1,210 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+// Forked from https://github.com/mapbox/geojson-vt under compatible ISC license
 import { createFeature } from "./feature.js";
+/* eslint-disable no-continue */
+/**
+ * Clip features between two vertical or horizontal axis-parallel lines:
+ *     |        |
+ *  ___|___     |     /
+ * /   |   \____|____/
+ *     |        |
+ *
+ * @param k1 and k2 are the line coordinates
+ * @param axis: 0 for x, 1 for y
+ * @param minAll and maxAll: minimum and maximum coordinate value for all features
+ */
+// eslint-disable-next-line max-params, complexity, max-statements
 export function clip(features, scale, k1, k2, axis, minAll, maxAll, options) {
-  k1 /= scale;
-  k2 /= scale;
-  if (minAll >= k1 && maxAll < k2) {
-    return features;
-  } else if (maxAll < k1 || minAll >= k2) {
-    return null;
-  }
-  const clipped = [];
-  for (const feature of features) {
-    const geometry = feature.geometry;
-    let type = feature.type;
-    const min = axis === 0 ? feature.minX : feature.minY;
-    const max = axis === 0 ? feature.maxX : feature.maxY;
-    if (min >= k1 && max < k2) {
-      clipped.push(feature);
-      continue;
-    } else if (max < k1 || min >= k2) {
-      continue;
+    k1 /= scale;
+    k2 /= scale;
+    if (minAll >= k1 && maxAll < k2) {
+        return features;
     }
-    let newGeometry = [];
-    if (type === 'Point' || type === 'MultiPoint') {
-      clipPoints(geometry, newGeometry, k1, k2, axis);
-    } else if (type === 'LineString') {
-      clipLine(geometry, newGeometry, k1, k2, axis, false, options.lineMetrics);
-    } else if (type === 'MultiLineString') {
-      clipLines(geometry, newGeometry, k1, k2, axis, false);
-    } else if (type === 'Polygon') {
-      clipLines(geometry, newGeometry, k1, k2, axis, true);
-    } else if (type === 'MultiPolygon') {
-      for (const polygon of geometry) {
-        const newPolygon = [];
-        clipLines(polygon, newPolygon, k1, k2, axis, true);
-        if (newPolygon.length) {
-          newGeometry.push(newPolygon);
-        }
-      }
+    // trivial accept
+    else if (maxAll < k1 || minAll >= k2) {
+        return null; // trivial reject
     }
-    if (newGeometry.length) {
-      if (options.lineMetrics && type === 'LineString') {
-        for (const line of newGeometry) {
-          clipped.push(createFeature(feature.id, type, line, feature.tags));
-        }
-        continue;
-      }
-      if (type === 'LineString' || type === 'MultiLineString') {
-        if (newGeometry.length === 1) {
-          type = 'LineString';
-          newGeometry = newGeometry[0];
-        } else {
-          type = 'MultiLineString';
-        }
-      }
-      if (type === 'Point' || type === 'MultiPoint') {
-        type = newGeometry.length === 3 ? 'Point' : 'MultiPoint';
-      }
-      clipped.push(createFeature(feature.id, type, newGeometry, feature.tags));
+    const clipped = [];
+    for (const feature of features) {
+        const geometry = feature.geometry;
+        let type = feature.type;
+        const min = axis === 0 ? feature.minX : feature.minY;
+        const max = axis === 0 ? feature.maxX : feature.maxY;
+        if (min >= k1 && max < k2) {
+            // trivial accept
+            clipped.push(feature);
+            continue;
+        }
+        else if (max < k1 || min >= k2) {
+            // trivial reject
+            continue;
+        }
+        let newGeometry = [];
+        if (type === 'Point' || type === 'MultiPoint') {
+            clipPoints(geometry, newGeometry, k1, k2, axis);
+        }
+        else if (type === 'LineString') {
+            clipLine(geometry, newGeometry, k1, k2, axis, false, options.lineMetrics);
+        }
+        else if (type === 'MultiLineString') {
+            clipLines(geometry, newGeometry, k1, k2, axis, false);
+        }
+        else if (type === 'Polygon') {
+            clipLines(geometry, newGeometry, k1, k2, axis, true);
+        }
+        else if (type === 'MultiPolygon') {
+            for (const polygon of geometry) {
+                const newPolygon = [];
+                clipLines(polygon, newPolygon, k1, k2, axis, true);
+                if (newPolygon.length) {
+                    newGeometry.push(newPolygon);
+                }
+            }
+        }
+        if (newGeometry.length) {
+            if (options.lineMetrics && type === 'LineString') {
+                for (const line of newGeometry) {
+                    clipped.push(createFeature(feature.id, type, line, feature.tags));
+                }
+                continue;
+            }
+            if (type === 'LineString' || type === 'MultiLineString') {
+                if (newGeometry.length === 1) {
+                    type = 'LineString';
+                    // @ts-expect-error TODO - use proper GeoJSON geometry types
+                    newGeometry = newGeometry[0];
+                }
+                else {
+                    type = 'MultiLineString';
+                }
+            }
+            if (type === 'Point' || type === 'MultiPoint') {
+                type = newGeometry.length === 3 ? 'Point' : 'MultiPoint';
+            }
+            clipped.push(createFeature(feature.id, type, newGeometry, feature.tags));
+        }
     }
-  }
-  return clipped.length ? clipped : null;
+    return clipped.length ? clipped : null;
 }
 function clipPoints(geom, newGeom, k1, k2, axis) {
-  for (let i = 0; i < geom.length; i += 3) {
-    const a = geom[i + axis];
-    if (a >= k1 && a <= k2) {
-      addPoint(newGeom, geom[i], geom[i + 1], geom[i + 2]);
+    for (let i = 0; i < geom.length; i += 3) {
+        const a = geom[i + axis];
+        if (a >= k1 && a <= k2) {
+            addPoint(newGeom, geom[i], geom[i + 1], geom[i + 2]);
+        }
     }
-  }
 }
+// eslint-disable-next-line max-params, complexity, max-statements
 function clipLine(geom, newGeom, k1, k2, axis, isPolygon, trackMetrics) {
-  let slice = newSlice(geom);
-  const intersect = axis === 0 ? intersectX : intersectY;
-  let len = geom.start;
-  let segLen;
-  let t;
-  for (let i = 0; i < geom.length - 3; i += 3) {
-    const ax = geom[i];
-    const ay = geom[i + 1];
-    const az = geom[i + 2];
-    const bx = geom[i + 3];
-    const by = geom[i + 4];
-    const a = axis === 0 ? ax : ay;
-    const b = axis === 0 ? bx : by;
-    let exited = false;
-    if (trackMetrics) {
-      segLen = Math.sqrt(Math.pow(ax - bx, 2) + Math.pow(ay - by, 2));
-    }
-    if (a < k1) {
-      if (b > k1) {
-        t = intersect(slice, ax, ay, bx, by, k1);
+    let slice = newSlice(geom);
+    const intersect = axis === 0 ? intersectX : intersectY;
+    let len = geom.start;
+    let segLen;
+    let t;
+    for (let i = 0; i < geom.length - 3; i += 3) {
+        const ax = geom[i];
+        const ay = geom[i + 1];
+        const az = geom[i + 2];
+        const bx = geom[i + 3];
+        const by = geom[i + 4];
+        const a = axis === 0 ? ax : ay;
+        const b = axis === 0 ? bx : by;
+        let exited = false;
         if (trackMetrics) {
-          slice.start = len + segLen * t;
+            segLen = Math.sqrt(Math.pow(ax - bx, 2) + Math.pow(ay - by, 2));
+        }
+        if (a < k1) {
+            // ---|-->  | (line enters the clip region from the left)
+            if (b > k1) {
+                t = intersect(slice, ax, ay, bx, by, k1);
+                if (trackMetrics) {
+                    slice.start = len + segLen * t;
+                }
+            }
+        }
+        else if (a > k2) {
+            // |  <--|--- (line enters the clip region from the right)
+            if (b < k2) {
+                t = intersect(slice, ax, ay, bx, by, k2);
+                if (trackMetrics) {
+                    slice.start = len + segLen * t;
+                }
+            }
+        }
+        else {
+            addPoint(slice, ax, ay, az);
+        }
+        if (b < k1 && a >= k1) {
+            // <--|---  | or <--|-----|--- (line exits the clip region on the left)
+            t = intersect(slice, ax, ay, bx, by, k1);
+            exited = true;
+        }
+        if (b > k2 && a <= k2) {
+            // |  ---|--> or ---|-----|--> (line exits the clip region on the right)
+            t = intersect(slice, ax, ay, bx, by, k2);
+            exited = true;
+        }
+        if (!isPolygon && exited) {
+            if (trackMetrics) {
+                slice.end = len + segLen * t;
+            }
+            newGeom.push(slice);
+            slice = newSlice(geom);
         }
-      }
-    } else if (a > k2) {
-      if (b < k2) {
-        t = intersect(slice, ax, ay, bx, by, k2);
         if (trackMetrics) {
-          slice.start = len + segLen * t;
+            len += segLen;
         }
-      }
-    } else {
-      addPoint(slice, ax, ay, az);
-    }
-    if (b < k1 && a >= k1) {
-      t = intersect(slice, ax, ay, bx, by, k1);
-      exited = true;
-    }
-    if (b > k2 && a <= k2) {
-      t = intersect(slice, ax, ay, bx, by, k2);
-      exited = true;
     }
-    if (!isPolygon && exited) {
-      if (trackMetrics) {
-        slice.end = len + segLen * t;
-      }
-      newGeom.push(slice);
-      slice = newSlice(geom);
+    // add the last point
+    let last = geom.length - 3;
+    const ax = geom[last];
+    const ay = geom[last + 1];
+    const az = geom[last + 2];
+    const a = axis === 0 ? ax : ay;
+    if (a >= k1 && a <= k2)
+        addPoint(slice, ax, ay, az);
+    // close the polygon if its endpoints are not the same after clipping
+    last = slice.length - 3;
+    if (isPolygon && last >= 3 && (slice[last] !== slice[0] || slice[last + 1] !== slice[1])) {
+        addPoint(slice, slice[0], slice[1], slice[2]);
     }
-    if (trackMetrics) {
-      len += segLen;
+    // add the final slice
+    if (slice.length) {
+        newGeom.push(slice);
     }
-  }
-  let last = geom.length - 3;
-  const ax = geom[last];
-  const ay = geom[last + 1];
-  const az = geom[last + 2];
-  const a = axis === 0 ? ax : ay;
-  if (a >= k1 && a <= k2) addPoint(slice, ax, ay, az);
-  last = slice.length - 3;
-  if (isPolygon && last >= 3 && (slice[last] !== slice[0] || slice[last + 1] !== slice[1])) {
-    addPoint(slice, slice[0], slice[1], slice[2]);
-  }
-  if (slice.length) {
-    newGeom.push(slice);
-  }
 }
 class Slice extends Array {
-  constructor() {
-    super(...arguments);
-    this.size = void 0;
-    this.start = void 0;
-    this.end = void 0;
-  }
+    size;
+    start;
+    end;
 }
 function newSlice(line) {
-  const slice = [];
-  slice.size = line.size;
-  slice.start = line.start;
-  slice.end = line.end;
-  return slice;
+    const slice = [];
+    slice.size = line.size;
+    slice.start = line.start;
+    slice.end = line.end;
+    return slice;
 }
+// eslint-disable-next-line max-params
 function clipLines(geom, newGeom, k1, k2, axis, isPolygon) {
-  for (const line of geom) {
-    clipLine(line, newGeom, k1, k2, axis, isPolygon, false);
-  }
+    for (const line of geom) {
+        clipLine(line, newGeom, k1, k2, axis, isPolygon, false);
+    }
 }
 function addPoint(out, x, y, z) {
-  out.push(x, y, z);
+    out.push(x, y, z);
 }
+// eslint-disable-next-line max-params
 function intersectX(out, ax, ay, bx, by, x) {
-  const t = (x - ax) / (bx - ax);
-  addPoint(out, x, ay + (by - ay) * t, 1);
-  return t;
+    const t = (x - ax) / (bx - ax);
+    addPoint(out, x, ay + (by - ay) * t, 1);
+    return t;
 }
+// eslint-disable-next-line max-params
 function intersectY(out, ax, ay, bx, by, y) {
-  const t = (y - ay) / (by - ay);
-  addPoint(out, ax + (bx - ax) * t, y, 1);
-  return t;
+    const t = (y - ay) / (by - ay);
+    addPoint(out, ax + (bx - ax) * t, y, 1);
+    return t;
 }
-//# sourceMappingURL=clip.js.map

package/dist/lib/geojson-tiler/convert.d.ts

@@ -1,5 +1,5 @@
 import type { Feature } from '@loaders.gl/schema';
-import type { GeoJSONTileFeature } from './tile';
+import type { GeoJSONTileFeature } from "./tile.js";
 export declare function convert(data: Feature, options: any): GeoJSONTileFeature[];
 export type ConvertFeatureOptions = {
     maxZoom?: number;

package/dist/lib/geojson-tiler/convert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../src/lib/geojson-tiler/convert.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,QAAQ,CAAC;AAO/C,wBAAgB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,KAAA,GAAG,kBAAkB,EAAE,CAcpE;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC"}
+{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../src/lib/geojson-tiler/convert.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAC,kBAAkB,EAAC,kBAAe;AAO/C,wBAAgB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,KAAA,GAAG,kBAAkB,EAAE,CAcpE;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC"}

package/dist/lib/geojson-tiler/convert.js

@@ -1,116 +1,132 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+// Forked from https://github.com/mapbox/geojson-vt under compatible ISC license
 import { simplify } from "./simplify.js";
 import { createFeature } from "./feature.js";
+// converts GeoJSON feature into an intermediate projected JSON vector format with simplification data
 export function convert(data, options) {
-  const features = [];
-  if (data.type === 'FeatureCollection') {
-    for (let i = 0; i < data.features.length; i++) {
-      convertFeature(features, data.features[i], options, i);
-    }
-  } else if (data.type === 'Feature') {
-    convertFeature(features, data, options);
-  } else {
-    convertFeature(features, {
-      geometry: data
-    }, options);
-  }
-  return features;
+    const features = [];
+    if (data.type === 'FeatureCollection') {
+        for (let i = 0; i < data.features.length; i++) {
+            convertFeature(features, data.features[i], options, i);
+        }
+    }
+    else if (data.type === 'Feature') {
+        convertFeature(features, data, options);
+    }
+    else {
+        // single geometry or a geometry collection
+        convertFeature(features, { geometry: data }, options);
+    }
+    return features;
 }
 function convertFeature(features, geojson, options, index) {
-  if (!geojson.geometry) {
-    return;
-  }
-  const coords = geojson.geometry.coordinates;
-  const type = geojson.geometry.type;
-  const tolerance = Math.pow(options.tolerance / ((1 << options.maxZoom) * options.extent), 2);
-  let geometry = [];
-  let id = geojson.id;
-  if (options.promoteId) {
-    id = geojson.properties[options.promoteId];
-  } else if (options.generateId) {
-    id = index || 0;
-  }
-  if (type === 'Point') {
-    convertPoint(coords, geometry);
-  } else if (type === 'MultiPoint') {
-    for (const p of coords) {
-      convertPoint(p, geometry);
-    }
-  } else if (type === 'LineString') {
-    convertLine(coords, geometry, tolerance, false);
-  } else if (type === 'MultiLineString') {
-    if (options.lineMetrics) {
-      for (const line of coords) {
-        geometry = [];
-        convertLine(line, geometry, tolerance, false);
-        features.push(createFeature(id, 'LineString', geometry, geojson.properties));
-      }
-      return;
-    } else {
-      convertLines(coords, geometry, tolerance, false);
-    }
-  } else if (type === 'Polygon') {
-    convertLines(coords, geometry, tolerance, true);
-  } else if (type === 'MultiPolygon') {
-    for (const polygon of coords) {
-      const newPolygon = [];
-      convertLines(polygon, newPolygon, tolerance, true);
-      geometry.push(newPolygon);
-    }
-  } else if (type === 'GeometryCollection') {
-    for (const singleGeometry of geojson.geometry.geometries) {
-      convertFeature(features, {
-        id,
-        geometry: singleGeometry,
-        properties: geojson.properties
-      }, options, index);
-    }
-    return;
-  } else {
-    throw new Error('Input data is not a valid GeoJSON object.');
-  }
-  features.push(createFeature(id, type, geometry, geojson.properties));
+    if (!geojson.geometry) {
+        return;
+    }
+    const coords = geojson.geometry.coordinates;
+    const type = geojson.geometry.type;
+    const tolerance = Math.pow(options.tolerance / ((1 << options.maxZoom) * options.extent), 2);
+    let geometry = [];
+    let id = geojson.id;
+    if (options.promoteId) {
+        id = geojson.properties[options.promoteId];
+    }
+    else if (options.generateId) {
+        id = index || 0;
+    }
+    if (type === 'Point') {
+        convertPoint(coords, geometry);
+    }
+    else if (type === 'MultiPoint') {
+        for (const p of coords) {
+            convertPoint(p, geometry);
+        }
+    }
+    else if (type === 'LineString') {
+        convertLine(coords, geometry, tolerance, false);
+    }
+    else if (type === 'MultiLineString') {
+        if (options.lineMetrics) {
+            // explode into linestrings to be able to track metrics
+            for (const line of coords) {
+                geometry = [];
+                convertLine(line, geometry, tolerance, false);
+                features.push(createFeature(id, 'LineString', geometry, geojson.properties));
+            }
+            return;
+        }
+        else {
+            convertLines(coords, geometry, tolerance, false);
+        }
+    }
+    else if (type === 'Polygon') {
+        convertLines(coords, geometry, tolerance, true);
+    }
+    else if (type === 'MultiPolygon') {
+        for (const polygon of coords) {
+            const newPolygon = [];
+            convertLines(polygon, newPolygon, tolerance, true);
+            geometry.push(newPolygon);
+        }
+    }
+    else if (type === 'GeometryCollection') {
+        for (const singleGeometry of geojson.geometry.geometries) {
+            convertFeature(features, {
+                id,
+                geometry: singleGeometry,
+                properties: geojson.properties
+            }, options, index);
+        }
+        return;
+    }
+    else {
+        throw new Error('Input data is not a valid GeoJSON object.');
+    }
+    features.push(createFeature(id, type, geometry, geojson.properties));
 }
 function convertPoint(coords, out) {
-  out.push(projectX(coords[0]), projectY(coords[1]), 0);
+    out.push(projectX(coords[0]), projectY(coords[1]), 0);
 }
 function convertLine(ring, out, tolerance, isPolygon) {
-  let x0, y0;
-  let size = 0;
-  for (let j = 0; j < ring.length; j++) {
-    const x = projectX(ring[j][0]);
-    const y = projectY(ring[j][1]);
-    out.push(x, y, 0);
-    if (j > 0) {
-      if (isPolygon) {
-        size += (x0 * y - x * y0) / 2;
-      } else {
-        size += Math.sqrt(Math.pow(x - x0, 2) + Math.pow(y - y0, 2));
-      }
-    }
-    x0 = x;
-    y0 = y;
-  }
-  const last = out.length - 3;
-  out[2] = 1;
-  simplify(out, 0, last, tolerance);
-  out[last + 2] = 1;
-  out.size = Math.abs(size);
-  out.start = 0;
-  out.end = out.size;
+    let x0, y0;
+    let size = 0;
+    for (let j = 0; j < ring.length; j++) {
+        const x = projectX(ring[j][0]);
+        const y = projectY(ring[j][1]);
+        out.push(x, y, 0);
+        if (j > 0) {
+            if (isPolygon) {
+                size += (x0 * y - x * y0) / 2; // area
+            }
+            else {
+                size += Math.sqrt(Math.pow(x - x0, 2) + Math.pow(y - y0, 2)); // length
+            }
+        }
+        x0 = x;
+        y0 = y;
+    }
+    const last = out.length - 3;
+    out[2] = 1;
+    simplify(out, 0, last, tolerance);
+    out[last + 2] = 1;
+    out.size = Math.abs(size);
+    out.start = 0;
+    out.end = out.size;
 }
 function convertLines(rings, out, tolerance, isPolygon) {
-  for (let i = 0; i < rings.length; i++) {
-    const geom = [];
-    convertLine(rings[i], geom, tolerance, isPolygon);
-    out.push(geom);
-  }
+    for (let i = 0; i < rings.length; i++) {
+        const geom = [];
+        convertLine(rings[i], geom, tolerance, isPolygon);
+        out.push(geom);
+    }
 }
 function projectX(x) {
-  return x / 360 + 0.5;
+    return x / 360 + 0.5;
 }
 function projectY(y) {
-  const sin = Math.sin(y * Math.PI / 180);
-  const y2 = 0.5 - 0.25 * Math.log((1 + sin) / (1 - sin)) / Math.PI;
-  return y2 < 0 ? 0 : y2 > 1 ? 1 : y2;
+    const sin = Math.sin((y * Math.PI) / 180);
+    const y2 = 0.5 - (0.25 * Math.log((1 + sin) / (1 - sin))) / Math.PI;
+    return y2 < 0 ? 0 : y2 > 1 ? 1 : y2;
 }
-//# sourceMappingURL=convert.js.map

package/dist/lib/geojson-tiler/feature.d.ts

@@ -1,3 +1,3 @@
-import { GeoJSONTileFeature } from './tile';
+import { GeoJSONTileFeature } from "./tile.js";
 export declare function createFeature(id: any, type: any, geom: any, tags: any): GeoJSONTileFeature;
 //# sourceMappingURL=feature.d.ts.map

package/dist/lib/geojson-tiler/feature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature.d.ts","sourceRoot":"","sources":["../../../src/lib/geojson-tiler/feature.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,kBAAkB,EAAC,MAAM,QAAQ,CAAC;AAE1C,wBAAgB,aAAa,CAAC,EAAE,KAAA,EAAE,IAAI,KAAA,EAAE,IAAI,KAAA,EAAE,IAAI,KAAA,GAAG,kBAAkB,CA8BtE"}
+{"version":3,"file":"feature.d.ts","sourceRoot":"","sources":["../../../src/lib/geojson-tiler/feature.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,kBAAkB,EAAC,kBAAe;AAE1C,wBAAgB,aAAa,CAAC,EAAE,KAAA,EAAE,IAAI,KAAA,EAAE,IAAI,KAAA,EAAE,IAAI,KAAA,GAAG,kBAAkB,CA8BtE"}