@mapwhit/tilerenderer 0.52.1 → 1.1.0

package/src/util/util.js

@@ -1,6 +1,5 @@
-const UnitBezier = require('@mapbox/unitbezier');
-
-const Coordinate = require('../geo/coordinate');
+import UnitBezier from '@mapbox/unitbezier';
+import Coordinate from '../geo/coordinate.js';
 
 /**
  * @module util
@@ -14,9 +13,13 @@ const Coordinate = require('../geo/coordinate');
  *
  * @private
  */
-function easeCubicInOut(t) {
-  if (t <= 0) return 0;
-  if (t >= 1) return 1;
+export function easeCubicInOut(t) {
+  if (t <= 0) {
+    return 0;
+  }
+  if (t >= 1) {
+    return 1;
+  }
   const t2 = t * t;
   const t3 = t2 * t;
   return 4 * (t < 0.5 ? t3 : 3 * (t - t2) + t3 - 0.75);
@@ -32,7 +35,7 @@ function easeCubicInOut(t) {
  * @param p2y control point 2 y coordinate
  * @private
  */
-function bezier(p1x, p1y, p2x, p2y) {
+export function bezier(p1x, p1y, p2x, p2y) {
   const bezier = new UnitBezier(p1x, p1y, p2x, p2y);
   return function (t) {
     return bezier.solve(t);
@@ -45,7 +48,7 @@ function bezier(p1x, p1y, p2x, p2y) {
  *
  * @private
  */
-const ease = bezier(0.25, 0.1, 0.25, 1);
+export const ease = bezier(0.25, 0.1, 0.25, 1);
 
 /**
  * constrain n to the given range via min + max
@@ -56,7 +59,7 @@ const ease = bezier(0.25, 0.1, 0.25, 1);
  * @returns the clamped value
  * @private
  */
-function clamp(n, min, max) {
+export function clamp(n, min, max) {
   return Math.min(max, Math.max(min, n));
 }
 
@@ -69,7 +72,7 @@ function clamp(n, min, max) {
  * @returns constrained number
  * @private
  */
-function wrap(n, min, max) {
+export function wrap(n, min, max) {
   const d = max - min;
   const w = ((((n - min) % d) + d) % d) + min;
   return w === min ? max : w;
@@ -81,7 +84,7 @@ function wrap(n, min, max) {
  * @returns centerpoint
  * @private
  */
-function getCoordinatesCenter(coords) {
+export function getCoordinatesCenter(coords) {
   let minX = Number.POSITIVE_INFINITY;
   let minY = Number.POSITIVE_INFINITY;
   let maxX = Number.NEGATIVE_INFINITY;
@@ -108,7 +111,7 @@ function getCoordinatesCenter(coords) {
  * @returns true for a counter clockwise set of points
  */
 // http://bryceboe.com/2006/10/23/line-segment-intersection-algorithm/
-function isCounterClockwise(a, b, c) {
+export function isCounterClockwise(a, b, c) {
   return (c.y - a.y) * (b.x - a.x) > (b.y - a.y) * (c.x - a.x);
 }
 
@@ -120,7 +123,7 @@ function isCounterClockwise(a, b, c) {
  * @private
  * @param ring Exterior or interior ring
  */
-function calculateSignedArea(ring) {
+export function calculateSignedArea(ring) {
   let sum = 0;
   const len = ring.length;
   let p2 = ring[len - 1]; // last point
@@ -138,10 +141,12 @@ function calculateSignedArea(ring) {
  * @param points array of points
  * @return true if the points are a closed polygon
  */
-function isClosedPolygon(points) {
+export function isClosedPolygon(points) {
   // If it is 2 points that are the same then it is a point
   // If it is 3 points with start and end the same then it is a line
-  if (points.length < 4) return false;
+  if (points.length < 4) {
+    return false;
+  }
 
   const p1 = points[0];
   const p2 = points[points.length - 1];
@@ -162,7 +167,7 @@ function isClosedPolygon(points) {
  * @return cartesian coordinates in [x, y, z]
  */
 
-function sphericalToCartesian([r, azimuthal, polar]) {
+export function sphericalToCartesian([r, azimuthal, polar]) {
   // We abstract "north"/"up" (compass-wise) to be 0° when really this is 90° (π/2):
   // correct for that here
   azimuthal += 90;
@@ -177,16 +182,3 @@ function sphericalToCartesian([r, azimuthal, polar]) {
     z: r * Math.cos(polar)
   };
 }
-
-module.exports = {
-  easeCubicInOut,
-  bezier,
-  ease,
-  clamp,
-  wrap,
-  getCoordinatesCenter,
-  isCounterClockwise,
-  calculateSignedArea,
-  isClosedPolygon,
-  sphericalToCartesian
-};

package/src/util/vectortile_to_geojson.js

@@ -34,11 +34,13 @@ class Feature {
       geometry: this.geometry
     };
     for (const i in this) {
-      if (i === '_geometry' || i === '_vectorTileFeature') continue;
+      if (i === '_geometry' || i === '_vectorTileFeature') {
+        continue;
+      }
       json[i] = this[i];
     }
     return json;
   }
 }
 
-module.exports = Feature;
+export default Feature;

package/src/util/verticalize_punctuation.js

@@ -1,6 +1,6 @@
-const { charHasRotatedVerticalOrientation } = require('./script_detection');
+import { charHasRotatedVerticalOrientation } from './script_detection.js';
 
-const verticalizedCharacterMap = {
+export const verticalizedCharacterMap = {
   '!': '︕',
   '#': '＃',
   $: '＄',
@@ -86,7 +86,7 @@ const verticalizedCharacterMap = {
   '｣': '﹂'
 };
 
-function verticalizePunctuation(input) {
+export default function verticalizePunctuation(input) {
   let output = '';
 
   for (let i = 0; i < input.length; i++) {
@@ -106,7 +106,3 @@ function verticalizePunctuation(input) {
 
   return output;
 }
-
-verticalizePunctuation.verticalizedCharacterMap = verticalizedCharacterMap;
-
-module.exports = verticalizePunctuation;

package/src/util/warn.js

@@ -6,7 +6,7 @@
  */
 const warnOnceHistory = {};
 
-function once(message) {
+function warnOnce(message) {
   if (!warnOnceHistory[message]) {
     console.warn(message);
     warnOnceHistory[message] = true;
@@ -15,7 +15,7 @@ function once(message) {
 
 function noop() {}
 
+const once = typeof console !== 'undefined' ? warnOnce : noop;
+
 // console isn't defined in some WebWorkers, see #2558
-module.exports = {
-  once: typeof console !== 'undefined' ? once : noop
-};
+export default { once };

package/src/util/web_worker.js

@@ -1,5 +1,5 @@
-const config = require('./config');
+import config from './config.js';
 
-module.exports = function () {
+export default function () {
   return new window.Worker(config.WORKER_URL);
-};
+}

package/src/worker.js

@@ -1,4 +1 @@
-const worker = require('./source/worker');
-
-/* global self */
-worker(self);
+/* intentionaly empty for now */

package/src/source/resources/images.js

@@ -1,68 +0,0 @@
-module.exports = images;
-
-function images({ actor, mapId }) {
-  const cache = new Map(); // id -> image
-  const inProgress = new Map(); // id -> promise
-
-  return {
-    getImages
-  };
-
-  async function getImages({ icons }) {
-    const missing = new Set();
-    const result = {};
-    for (const id of icons) {
-      if (cache.has(id)) {
-        const image = cache.get(id);
-        if (image) {
-          result[id] = image;
-        }
-      } else {
-        missing.add(id);
-      }
-    }
-    if (missing.size === 0) {
-      // All images are already in the cache
-      return result;
-    }
-    const active = new Set();
-    const needed = [...missing];
-    // Check if any of the missing images are already being fetched
-    for (const id of missing) {
-      if (inProgress.has(id)) {
-        active.add(inProgress.get(id));
-        missing.delete(id);
-      }
-    }
-    if (missing.size > 0) {
-      // Fetch the remaining images
-      await fetchMissing([...missing]);
-    }
-    if (active.size > 0) {
-      await Promise.all(active);
-    }
-    for (const id of needed) {
-      const image = cache.get(id);
-      if (image) {
-        result[id] = image;
-      }
-    }
-    return result;
-  }
-
-  async function fetchMissing(icons) {
-    const promise = actor.send('getImages', { icons }, mapId);
-    for (const id of icons) {
-      inProgress.set(id, promise);
-    }
-    const result = await promise;
-    // Add the fetched images to the cache
-    for (const id of icons) {
-      cache.set(id, result[id]);
-    }
-    // Remove the fetched images from the inProgress set
-    for (const id of icons) {
-      inProgress.delete(id);
-    }
-  }
-}

package/src/source/worker.js

@@ -1,110 +0,0 @@
-require('../util/polyfill');
-
-const Actor = require('../util/actor');
-
-const StyleLayerIndex = require('../style/style_layer_index');
-const VectorTileWorkerSource = require('./vector_tile_worker_source');
-const GeoJSONWorkerSource = require('./geojson_worker_source');
-const assert = require('assert');
-const { plugin: globalRTLTextPlugin } = require('./rtl_text_plugin');
-const DEMData = require('../data/dem_data');
-const { resources } = require('./resources');
-
-class Worker {
-  #resources = {};
-
-  constructor(self) {
-    this.self = self;
-    this.actor = new Actor(self, this);
-
-    this.actors = {};
-    this.layerIndexes = {};
-
-    this.workerSourceTypes = {
-      vector: VectorTileWorkerSource,
-      geojson: GeoJSONWorkerSource
-    };
-
-    // [mapId][sourceType][sourceName] => worker source instance
-    this.workerSources = {};
-
-    this.self.registerWorkerSource = (name, WorkerSource) => {
-      if (this.workerSourceTypes[name]) {
-        throw new Error(`Worker source with name "${name}" already registered.`);
-      }
-      this.workerSourceTypes[name] = WorkerSource;
-    };
-
-    this.self.registerRTLTextPlugin = rtlTextPlugin => {
-      if (globalRTLTextPlugin.isLoaded()) {
-        throw new Error('RTL text plugin already registered.');
-      }
-      globalRTLTextPlugin['applyArabicShaping'] = rtlTextPlugin.applyArabicShaping;
-      globalRTLTextPlugin['processBidirectionalText'] = rtlTextPlugin.processBidirectionalText;
-      globalRTLTextPlugin['processStyledBidirectionalText'] = rtlTextPlugin.processStyledBidirectionalText;
-    };
-  }
-
-  setLayers(mapId, layers) {
-    this.getLayerIndex(mapId).replace(layers);
-  }
-
-  updateLayers(mapId, params) {
-    this.getLayerIndex(mapId).update(params.layers, params.removedIds);
-  }
-
-  loadTile(mapId, params) {
-    assert(params.type);
-    return this.getWorkerSource(mapId, params.type, params.source).loadTile(params);
-  }
-
-  loadDEMTile(mapId, params) {
-    const { uid, rawImageData, encoding } = params;
-    return new DEMData(uid, rawImageData, encoding);
-  }
-
-  removeSource(mapId, params) {
-    const { type, source } = params;
-    assert(type);
-    assert(source);
-
-    const worker = this.workerSources?.[mapId]?.[type]?.[source];
-    if (worker) {
-      delete this.workerSources[mapId][type][source];
-      worker.removeSource?.(params);
-    }
-  }
-
-  loadRTLTextPlugin(map, pluginURL) {
-    if (!globalRTLTextPlugin.isLoaded()) {
-      this.self.importScripts(pluginURL);
-      if (!globalRTLTextPlugin.isLoaded()) {
-        throw new Error(`RTL Text Plugin failed to import scripts from ${pluginURL}`);
-      }
-    }
-  }
-
-  getLayerIndex(mapId) {
-    return (this.layerIndexes[mapId] ??= new StyleLayerIndex());
-  }
-
-  getResources(mapId) {
-    return (this.#resources[mapId] ??= resources(this.actor, mapId));
-  }
-
-  getWorkerSource(mapId, type, source) {
-    this.workerSources[mapId] ??= {};
-    this.workerSources[mapId][type] ??= {};
-
-    return (this.workerSources[mapId][type][source] ??= this.createWorkerSource(type, mapId));
-  }
-
-  createWorkerSource(type, mapId) {
-    const WorkerSource = this.workerSourceTypes[type];
-    return new WorkerSource(this.getResources(mapId), this.getLayerIndex(mapId));
-  }
-}
-
-module.exports = function createWorker(self) {
-  return new Worker(self);
-};

package/src/source/worker_source.js

@@ -1,14 +0,0 @@
-/**
- * May be implemented by custom source types to provide code that can be run on
- * the WebWorkers. In addition to providing a custom
- * {@link WorkerSource#loadTile}, any other methods attached to a `WorkerSource`
- * implementation may also be targeted by the {@link Source} via
- * `dispatcher.send('source-type.methodname', params, callback)`.
- *
- * @see {@link Map#addSourceType}
- * @private
- *
- * @class WorkerSource
- * @param actor
- * @param layerIndex
- */

package/src/style-spec/deref.js

@@ -1,51 +0,0 @@
-const refProperties = require('./util/ref_properties');
-
-function deref(layer, parent) {
-  const result = {};
-
-  for (const k in layer) {
-    if (k !== 'ref') {
-      result[k] = layer[k];
-    }
-  }
-
-  refProperties.forEach(k => {
-    if (k in parent) {
-      result[k] = parent[k];
-    }
-  });
-
-  return result;
-}
-
-module.exports = derefLayers;
-
-/**
- * Given an array of layers, some of which may contain `ref` properties
- * whose value is the `id` of another property, return a new array where
- * such layers have been augmented with the 'type', 'source', etc. properties
- * from the parent layer, and the `ref` property has been removed.
- *
- * The input is not modified. The output may contain references to portions
- * of the input.
- *
- * @private
- * @param {Array<Layer>} layers
- * @returns {Array<Layer>}
- */
-function derefLayers(layers) {
-  layers = layers.slice();
-
-  const map = Object.create(null);
-  for (let i = 0; i < layers.length; i++) {
-    map[layers[i].id] = layers[i];
-  }
-
-  for (let i = 0; i < layers.length; i++) {
-    if ('ref' in layers[i]) {
-      layers[i] = deref(layers[i], map[layers[i].ref]);
-    }
-  }
-
-  return layers;
-}

package/src/style-spec/group_by_layout.js

@@ -1,46 +0,0 @@
-const refProperties = require('./util/ref_properties');
-
-function stringify(obj) {
-  if (obj == null) return 'null';
-  const type = typeof obj;
-  if (type === 'number' || type === 'boolean' || type === 'string') return obj;
-
-  if (Array.isArray(obj)) {
-    return '[' + obj.map(val => stringify(val)).join(',') + ']';
-  }
-
-  const keys = Object.keys(obj).sort();
-  return '{' + keys.map(key => `${key}:${stringify(obj[key])}`).join(',') + '}';
-}
-
-function getKey(layer) {
-  return refProperties.map(k => stringify(layer[k])).join('/');
-}
-
-module.exports = groupByLayout;
-
-/**
- * Given an array of layers, return an array of arrays of layers where all
- * layers in each group have identical layout-affecting properties. These
- * are the properties that were formerly used by explicit `ref` mechanism
- * for layers: 'type', 'source', 'source-layer', 'minzoom', 'maxzoom',
- * 'filter', and 'layout'.
- *
- * The input is not modified. The output layers are references to the
- * input layers.
- *
- * @private
- * @param {Array<Layer>} layers
- * @returns {Array<Array<Layer>>}
- */
-function groupByLayout(layers) {
-  const groups = {};
-
-  for (const l of layers) {
-    const k = getKey(l);
-    const group = (groups[k] ??= []);
-    group.push(l);
-  }
-
-  return Object.values(groups);
-}

package/src/util/actor.js

@@ -1,108 +0,0 @@
-const { serialize, deserialize } = require('./web_worker_transfer');
-
-module.exports = actor;
-
-/**
- * An implementation of the [Actor design pattern](http://en.wikipedia.org/wiki/Actor_model)
- * that maintains the relationship between asynchronous tasks and the objects
- * that spin them off - in this case, tasks like parsing parts of styles,
- * owned by the styles
- *
- * @param {WebWorker} target
- * @param {WebWorker} parent
- * @param {string|number} mapId A unique identifier for the Map instance using this Actor.
- * @private
- */
-
-function actor(target, parent, mapId, name) {
-  const promises = new Map();
-  let callbackID = Number.MIN_SAFE_INTEGER;
-  target.addEventListener('message', receive, false);
-
-  return {
-    send,
-    receive,
-    remove,
-    name
-  };
-
-  /**
-   * Sends a message from a main-thread map to a Worker or from a Worker back to
-   * a main-thread map instance.
-   *
-   * @param type The name of the target method to invoke or '[source-type].[source-name].name' for a method on a WorkerSource.
-   * @param targetMapId A particular mapId to which to send this message.
-   * @private
-   */
-  function send(type, data, targetMapId) {
-    const id = `${mapId}:${callbackID++}`;
-    const p = Promise.withResolvers();
-    promises.set(id, p);
-    postMessage(targetMapId, id, type, data);
-    return p.promise;
-  }
-
-  async function receive(message) {
-    const { data } = message;
-    const { id, type, targetMapId } = data;
-
-    if (targetMapId && mapId !== targetMapId) return;
-
-    if (type === '<response>') {
-      const p = promises.get(id);
-      if (p) {
-        promises.delete(id);
-        if (data.error) {
-          p.reject(deserialize(data.error));
-        } else {
-          p.resolve(deserialize(data.data));
-        }
-      }
-      return;
-    }
-
-    if (typeof id !== 'undefined') {
-      let perform;
-      if (parent[type]) {
-        // data.type == 'loadTile' etc.
-        perform = () => parent[type](data.sourceMapId, deserialize(data.data));
-      } else if (parent.getWorkerSource) {
-        // data.type == sourcetype.method
-        const [sourcetype, method] = type.split('.');
-        const params = deserialize(data.data);
-        const workerSource = parent.getWorkerSource(data.sourceMapId, sourcetype, params.source);
-        perform = () => workerSource[method](params);
-      } else {
-        return;
-      }
-      try {
-        const result = await perform();
-        postMessage(data.sourceMapId, id, '<response>', result);
-      } catch (err) {
-        postMessage(data.sourceMapId, id, '<response>', undefined, err);
-      }
-      return;
-    }
-
-    parent[type](deserialize(data.data));
-  }
-
-  function remove() {
-    target.removeEventListener('message', receive, false);
-  }
-
-  function postMessage(targetMapId, id, type, data, err) {
-    const buffers = [];
-    const payload = {
-      targetMapId,
-      sourceMapId: mapId,
-      type,
-      id,
-      data: serialize(data, buffers)
-    };
-    if (err) {
-      payload.error = serialize(err);
-    }
-    target.postMessage(payload, buffers);
-  }
-}

package/src/util/dispatcher.js

@@ -1,65 +0,0 @@
-const uniqueId = require('./unique_id');
-const actor = require('./actor');
-
-module.exports = dispatcher;
-
-/**
- * Responsible for sending messages from a {@link Source} to an associated
- * {@link WorkerSource}.
- *
- * @private
- */
-function dispatcher(workerPool, parent, makeActor = actor) {
-  // exposed to allow stubbing in unit tests
-
-  let currentActor = -1;
-  const id = uniqueId();
-  const workers = workerPool.acquire(id);
-  const actors = workers.map((worker, i) => makeActor(worker, parent, id, `Worker ${i}`));
-
-  /**
-   * Broadcast a message to all Workers.
-   */
-  function broadcast(type, data) {
-    const tasks = actors.map(actor => actor.send(type, data));
-    return Promise.all(tasks);
-  }
-
-  // Use round robin to send requests to web workers.
-  function nextActorId() {
-    currentActor += 1;
-    if (currentActor === actors.length) {
-      currentActor = 0;
-    }
-    return currentActor;
-  }
-
-  /**
-   * Send a message to a Worker.
-   * @param targetID The ID of the Worker to which to send this message. Omit to allow the dispatcher to choose.
-   * @returns The ID of the worker to which the message was sent.
-   */
-  function send(type, data, targetID = nextActorId()) {
-    return actors[targetID]?.send(type, data) ?? Promise.resolve();
-  }
-
-  function remove() {
-    actors.forEach(actor => actor.remove());
-    actors.length = 0;
-    workerPool.release(id);
-  }
-
-  function nextWorkerId(workerId = nextActorId()) {
-    return workerId;
-  }
-
-  return {
-    get id() {
-      return id;
-    },
-    broadcast,
-    send,
-    nextWorkerId,
-    remove
-  };
-}

package/src/util/global_worker_pool.js

@@ -1,15 +0,0 @@
-const workerPool = require('./worker_pool');
-
-let globalWorkerPool;
-
-/**
- * Creates (if necessary) and returns the single, global WorkerPool instance
- * to be shared across each Map
- * @private
- */
-module.exports = function getGlobalWorkerPool() {
-  if (!globalWorkerPool) {
-    globalWorkerPool = workerPool();
-  }
-  return globalWorkerPool;
-};