@mapwhit/tilerenderer 1.3.0 → 1.5.0

package/src/util/script_detection.js

@@ -415,6 +415,15 @@ export function charHasRotatedVerticalOrientation(char) {
   return !(charHasUprightVerticalOrientation(char) || charHasNeutralVerticalOrientation(char));
 }
 
+export function charInRTLScript(char) {
+  // Main blocks for Hebrew, Arabic, Thaana and other RTL scripts
+  return (
+    (char >= 0x0590 && char <= 0x08ff) ||
+    isChar['Arabic Presentation Forms-A'](char) ||
+    isChar['Arabic Presentation Forms-B'](char)
+  );
+}
+
 export function charInSupportedScript(char, canRenderRTL) {
   // This is a rough heuristic: whether we "can render" a script
   // actually depends on the properties of the font being used
@@ -423,13 +432,7 @@ export function charInSupportedScript(char, canRenderRTL) {
 
   // Even in Latin script, we "can't render" combinations such as the fi
   // ligature, but we don't consider that semantically significant.
-  if (
-    !canRenderRTL &&
-    ((char >= 0x0590 && char <= 0x08ff) ||
-      isChar['Arabic Presentation Forms-A'](char) ||
-      isChar['Arabic Presentation Forms-B'](char))
-  ) {
-    // Main blocks for Hebrew, Arabic, Thaana and other RTL scripts
+  if (!canRenderRTL && charInRTLScript(char)) {
     return false;
   }
   if (
@@ -448,6 +451,15 @@ export function charInSupportedScript(char, canRenderRTL) {
   return true;
 }
 
+export function stringContainsRTLText(chars) {
+  for (const char of chars) {
+    if (charInRTLScript(char.charCodeAt(0))) {
+      return true;
+    }
+  }
+  return false;
+}
+
 export function isStringInSupportedScript(chars, canRenderRTL) {
   for (const char of chars) {
     if (!charInSupportedScript(char.charCodeAt(0), canRenderRTL)) {

package/src/util/vectortile_to_geojson.js

@@ -6,16 +6,15 @@ export default class GeoJSONFeature {
   #geometry;
   #xyz;
 
-  constructor(vectorTileFeature, z, x, y) {
+  constructor(vectorTileFeature, z, x, y, id) {
     this.type = 'Feature';
 
     this.#vectorTileFeature = vectorTileFeature;
     this.#xyz = { z, x, y };
 
     this.properties = vectorTileFeature.properties;
-
-    if (vectorTileFeature.id != null) {
-      this.id = vectorTileFeature.id;
+    if (id !== undefined) {
+      this.id = id;
     }
   }
 

package/src/source/geojson_worker_source.js

@@ -1,97 +0,0 @@
-import rewind from '@mapwhit/geojson-rewind';
-import geojsonvt from 'geojson-vt';
-import Supercluster from 'supercluster';
-import GeoJSONWrapper from './geojson_wrapper.js';
-import { makeSingleSourceLayerWorkerTile as makeWorkerTile } from './worker_tile.js';
-
-/**
- * The {@link WorkerSource} implementation that supports {@link GeoJSONSource}.
- *
- */
-class GeoJSONWorkerSource {
-  constructor(resources, layerIndex) {
-    this.resources = resources;
-    this.layerIndex = layerIndex;
-  }
-  /**
-   * Fetches (if appropriate), parses, and index geojson data into tiles. This
-   * preparatory method must be called before {@link GeoJSONWorkerSource#loadTile}
-   * can correctly serve up tiles.
-   *
-   * Defers to {@link GeoJSONWorkerSource#loadGeoJSON} for the fetching/parsing,
-   * expecting `callback(error, data)` to be called with either an error or a
-   * parsed GeoJSON object.
-   *
-   * @param params
-   * @param callback
-   */
-  loadData(params) {
-    const data = loadJSON(params);
-    this._geoJSONIndex = null;
-    this._createGeoJSONIndex = params.cluster
-      ? () => {
-          rewind(data, true);
-          return new Supercluster(params.superclusterOptions).load(data.features);
-        }
-      : () => {
-          rewind(data, true);
-          return geojsonvt(data, params.geojsonVtOptions);
-        };
-  }
-
-  getTile(tileID) {
-    if (!this._geoJSONIndex) {
-      if (!this._createGeoJSONIndex) {
-        return; // we couldn't load the file
-      }
-
-      try {
-        this._geoJSONIndex = this._createGeoJSONIndex();
-      } finally {
-        this._createGeoJSONIndex = null;
-      }
-    }
-    const { z, x, y } = tileID.canonical;
-    return this._geoJSONIndex.getTile(z, x, y);
-  }
-
-  /**
-   * Implements {@link WorkerSource#loadTile}.
-   */
-  async loadTile(params) {
-    const { tileID, source } = params;
-    const geoJSONTile = this.getTile(tileID);
-    if (!geoJSONTile) {
-      return; // nothing in the given tile
-    }
-    const sourceLayer = new GeoJSONWrapper(geoJSONTile.features);
-    const layerFamilies = this.layerIndex.familiesBySource.get(source);
-    if (!layerFamilies) {
-      return;
-    }
-    const features = new Array(sourceLayer.length);
-    for (let index = 0; index < sourceLayer.length; index++) {
-      features[index] = { feature: sourceLayer.feature(index), index, sourceLayerIndex: 0 };
-    }
-
-    const result = await makeWorkerTile(params, features, layerFamilies.get(sourceLayer.name), this.resources);
-
-    result.vectorTile = sourceLayer;
-    return result;
-  }
-}
-
-/**
- * Fetch and parse GeoJSON according to the given params.
- *
- * @param data Literal GeoJSON data. Must be provided.
- */
-function loadJSON({ data, source }) {
-  try {
-    return typeof data === 'string' ? JSON.parse(data) : data;
-  } catch {
-    throw new Error(`Input data given to '${source}' is not a valid GeoJSON object.`);
-  }
-}
-
-export default GeoJSONWorkerSource;