@mapwhit/tilerenderer 1.0.0 → 1.1.1

package/src/source/pixels_to_tile_units.js

@@ -1,4 +1,4 @@
-const EXTENT = require('../data/extent');
+import EXTENT from '../data/extent.js';
 
 /**
  * Converts a pixel value at a the given zoom level to tile units.
@@ -12,6 +12,6 @@ const EXTENT = require('../data/extent');
  * @returns value in tile units
  * @private
  */
-module.exports = function (tile, pixelValue, z) {
+export default function (tile, pixelValue, z) {
   return pixelValue * (EXTENT / (tile.tileSize * 2 ** (z - tile.tileID.overscaledZ)));
-};
+}

package/src/source/query_features.js

@@ -1,11 +1,7 @@
-const assert = require('assert');
-const { mat4 } = require('@mapbox/gl-matrix');
+import glMatrix from '@mapbox/gl-matrix';
+import assert from 'assert';
 
-module.exports = {
-  queryRenderedFeatures,
-  queryRenderedSymbols,
-  querySourceFeatures
-};
+const { mat4 } = glMatrix;
 
 /*
  * Returns a matrix that can be used to convert from tile coordinates to viewport pixel coordinates.
@@ -35,7 +31,7 @@ function queryIncludes3DLayer(layers, styleLayers, sourceID) {
   return false;
 }
 
-function queryRenderedFeatures(sourceCache, styleLayers, queryGeometry, params, transform) {
+export function queryRenderedFeatures(sourceCache, styleLayers, queryGeometry, params, transform) {
   const has3DLayer = queryIncludes3DLayer(params?.layers, styleLayers, sourceCache.id);
   const maxPitchScaleFactor = transform.maxPitchScaleFactor();
   const tilesIn = sourceCache.tilesIn(queryGeometry, maxPitchScaleFactor, has3DLayer);
@@ -77,7 +73,14 @@ function queryRenderedFeatures(sourceCache, styleLayers, queryGeometry, params,
   return result;
 }
 
-function queryRenderedSymbols(styleLayers, sourceCaches, queryGeometry, params, collisionIndex, retainedQueryData) {
+export function queryRenderedSymbols(
+  styleLayers,
+  sourceCaches,
+  queryGeometry,
+  params,
+  collisionIndex,
+  retainedQueryData
+) {
   const result = {};
   const renderedSymbols = collisionIndex.queryRenderedSymbols(queryGeometry);
   const bucketQueryData = [];
@@ -141,7 +144,7 @@ function queryRenderedSymbols(styleLayers, sourceCaches, queryGeometry, params,
   return result;
 }
 
-function querySourceFeatures(sourceCache, params) {
+export function querySourceFeatures(sourceCache, params) {
   const tiles = sourceCache.getRenderableIds().map(id => {
     return sourceCache.getTileByID(id);
   });

package/src/source/raster_dem_tile_source.js

@@ -1,10 +1,10 @@
-const browser = require('../util/browser');
-const loadImage = require('../util/loader/image');
-const { calculateKey } = require('./tile_id');
-const RasterTileSource = require('./raster_tile_source');
-const DEMData = require('../data/dem_data');
+import DEMData from '../data/dem_data.js';
+import browser from '../util/browser.js';
+import loadImage from '../util/loader/image.js';
+import RasterTileSource from './raster_tile_source.js';
+import { calculateKey } from './tile_id.js';
 
-class RasterDEMTileSource extends RasterTileSource {
+export default class RasterDEMTileSource extends RasterTileSource {
   constructor(id, options, eventedParent) {
     super(id, options, eventedParent);
     this.type = 'raster-dem';
@@ -54,12 +54,16 @@ class RasterDEMTileSource extends RasterTileSource {
   }
 
   unloadTile(tile) {
-    if (tile.demTexture) this.map.painter.saveTileTexture(tile.demTexture);
+    if (tile.demTexture) {
+      this.map.painter.saveTileTexture(tile.demTexture);
+    }
     if (tile.fbo) {
       tile.fbo.destroy();
       delete tile.fbo;
     }
-    if (tile.dem) delete tile.dem;
+    if (tile.dem) {
+      delete tile.dem;
+    }
     delete tile.neighboringTiles;
 
     tile.state = 'unloaded';
@@ -71,8 +75,6 @@ async function loadDEMTile({ uid, rawImageData, encoding }) {
   return new DEMData(uid, rawImageData, encoding);
 }
 
-module.exports = RasterDEMTileSource;
-
 function getNeighboringTiles(tileID) {
   const {
     canonical: { x, y, z },

package/src/source/raster_tile_source.js

@@ -1,9 +1,9 @@
-const { pick } = require('../util/object');
-const loadImage = require('../util/loader/image');
-const { Event, ErrorEvent, Evented } = require('@mapwhit/events');
-const loadTileJSON = require('./load_tilejson');
-const TileBounds = require('./tile_bounds');
-const Texture = require('../render/texture');
+import { ErrorEvent, Event, Evented } from '@mapwhit/events';
+import Texture from '../render/texture.js';
+import loadImage from '../util/loader/image.js';
+import { pick } from '../util/object.js';
+import loadTileJSON from './load_tilejson.js';
+import TileBounds from './tile_bounds.js';
 
 class RasterTileSource extends Evented {
   constructor(id, options, eventedParent) {
@@ -28,7 +28,9 @@ class RasterTileSource extends Evented {
     try {
       const tileJSON = await loadTileJSON(this._options);
       Object.assign(this, tileJSON);
-      if (tileJSON.bounds) this.tileBounds = new TileBounds(tileJSON.bounds, this.minzoom, this.maxzoom);
+      if (tileJSON.bounds) {
+        this.tileBounds = new TileBounds(tileJSON.bounds, this.minzoom, this.maxzoom);
+      }
 
       // `content` is included here to prevent a race condition where `Style#_updateSources` is called
       // before the TileJSON arrives. this makes sure the tiles needed are loaded once TileJSON arrives
@@ -101,7 +103,9 @@ class RasterTileSource extends Evented {
   }
 
   unloadTile(tile) {
-    if (tile.texture) this.map.painter.saveTileTexture(tile.texture);
+    if (tile.texture) {
+      this.map.painter.saveTileTexture(tile.texture);
+    }
   }
 
   hasTransition() {
@@ -109,4 +113,4 @@ class RasterTileSource extends Evented {
   }
 }
 
-module.exports = RasterTileSource;
+export default RasterTileSource;

package/src/source/resources/glyphs.js

@@ -1,6 +1,5 @@
-const parseGlyphPBF = require('../../style/parse_glyph_pbf');
-
-module.exports = glyphCache;
+import parseGlyphPBF from '../../style/parse_glyph_pbf.js';
+export default glyphCache;
 
 const MAX_GLYPH_ID = 65535;
 

package/src/source/resources/index.js

@@ -1,8 +1,6 @@
-const makeGlyphs = require('./glyphs');
+import makeGlyphs from './glyphs.js';
 
-module.exports = { resources };
-
-function resources(opts) {
+export function resources(opts) {
   const glyphs = makeGlyphs(opts);
 
   return {

package/src/source/rtl_text_plugin.js

@@ -1,5 +1,5 @@
-const dynload = require('dynload');
-const browser = require('../util/browser');
+import dynload from 'dynload';
+import browser from '../util/browser.js';
 
 let pluginRequested = false;
 let pluginURL;
@@ -15,7 +15,7 @@ const rtlPlugin = {
   setRTLTextPlugin
 };
 
-function registerForPluginAvailability(callback) {
+export function registerForPluginAvailability(callback) {
   if (plugin.isLoaded()) {
     callback();
     return;
@@ -25,13 +25,13 @@ function registerForPluginAvailability(callback) {
   return () => _loadedCallbacks.splice(_loadedCallbacks.indexOf(callback), 1);
 }
 
-function clearRTLTextPlugin() {
+export function clearRTLTextPlugin() {
   _loadedCallbacks.length = 0;
   pluginRequested = false;
   pluginURL = undefined;
 }
 
-function setRTLTextPlugin(url, callback) {
+export function setRTLTextPlugin(url, callback) {
   if (pluginRequested) {
     throw new Error('setRTLTextPlugin cannot be called multiple times.');
   }
@@ -74,7 +74,7 @@ function registerRTLTextPlugin(loadedPlugin) {
 
 globalThis.registerRTLTextPlugin ??= registerRTLTextPlugin;
 
-async function loadScript(url) {
+function loadScript(url) {
   const { promise, resolve, reject } = Promise.withResolvers();
   const s = dynload(url);
   s.onload = () => resolve();
@@ -82,11 +82,11 @@ async function loadScript(url) {
   return promise;
 }
 
-const plugin = (rtlPlugin.plugin = {
+export const plugin = (rtlPlugin.plugin = {
   applyArabicShaping: null,
   processBidirectionalText: null,
   processStyledBidirectionalText: null,
   isLoaded: () => plugin.applyArabicShaping != null
 });
 
-module.exports = rtlPlugin;
+export default rtlPlugin;

package/src/source/source.js

@@ -1,4 +1,4 @@
-const { bindAll } = require('../util/object');
+import { bindAll } from '../util/object.js';
 
 /**
  * The `Source` interface must be implemented by each source type, including "core" types (`vector`, `raster`,
@@ -24,11 +24,11 @@ const { bindAll } = require('../util/object');
  * if they are floor-ed to the nearest integer.
  */
 
-const vector = require('./vector_tile_source');
-const raster = require('./raster_tile_source');
-const rasterDem = require('./raster_dem_tile_source');
-const geojson = require('./geojson_source');
-const image = require('./image_source');
+import geojson from './geojson_source.js';
+import image from './image_source.js';
+import rasterDem from './raster_dem_tile_source.js';
+import raster from './raster_tile_source.js';
+import vector from './vector_tile_source.js';
 
 const sourceTypes = {
   vector,
@@ -47,7 +47,7 @@ const sourceTypes = {
  * with that type's requirements.
  * @returns {Source}
  */
-function create(id, specification, eventedParent, { resources, layerIndex, showTileBoundaries }) {
+export function create(id, specification, eventedParent, { resources, layerIndex, showTileBoundaries }) {
   const source = new sourceTypes[specification.type](id, specification, eventedParent, {
     resources,
     layerIndex,
@@ -58,16 +58,10 @@ function create(id, specification, eventedParent, { resources, layerIndex, showT
   return source;
 }
 
-function getType(name) {
+export function getType(name) {
   return sourceTypes[name];
 }
 
-function setType(name, type) {
+export function setType(name, type) {
   sourceTypes[name] = type;
 }
-
-module.exports = {
-  create,
-  getType,
-  setType
-};

package/src/source/source_cache.js

@@ -1,13 +1,13 @@
-const { create: createSource } = require('./source');
-const Tile = require('./tile');
-const { Event, ErrorEvent, Evented } = require('@mapwhit/events');
-const TileCache = require('./tile_cache');
-const Coordinate = require('../geo/coordinate');
-const EXTENT = require('../data/extent');
-const { default: Point } = require('@mapbox/point-geometry');
-const browser = require('../util/browser');
-const { OverscaledTileID } = require('./tile_id');
-const SourceFeatureState = require('./source_state');
+import Point from '@mapbox/point-geometry';
+import { ErrorEvent, Event, Evented } from '@mapwhit/events';
+import EXTENT from '../data/extent.js';
+import Coordinate from '../geo/coordinate.js';
+import browser from '../util/browser.js';
+import { create as createSource } from './source.js';
+import SourceFeatureState from './source_state.js';
+import Tile from './tile.js';
+import TileCache from './tile_cache.js';
+import { OverscaledTileID } from './tile_id.js';
 
 /**
  * `SourceCache` is responsible for
@@ -34,14 +34,20 @@ class SourceCache extends Evented {
     this.id = id;
 
     this.on('data', e => {
-      if (e.dataType !== 'source') return;
-      if (e.sourceDataType === 'metadata') this.#sourceLoaded = true;
+      if (e.dataType !== 'source') {
+        return;
+      }
+      if (e.sourceDataType === 'metadata') {
+        this.#sourceLoaded = true;
+      }
 
       // for sources with mutable data, this event fires when the underlying data
       // to a source is changed. (i.e. GeoJSONSource#setData and ImageSource#serCoordinates)
       if (this.#sourceLoaded && !this.#paused && e.sourceDataType === 'content') {
         this.reload();
-        if (this.transform) this.update(this.transform);
+        if (this.transform) {
+          this.update(this.transform);
+        }
       }
     });
 
@@ -69,16 +75,29 @@ class SourceCache extends Evented {
   }
 
   /**
-   * Return true if no tile data is pending, tiles will not change unless
+   * Return `true` if no tile data is pending, tiles will not change unless
    * an additional API call is received.
+   * If `ignoreTilesLoading` is set, return `true` even when tiles are pending,
+   * otherwise there is no way to check that source is ready after loading style.
+   * Without `ignoreTilesLoading` the state of style being loaded or not depends on
+   * the tiles being in the process of loading or not.
    */
-  loaded() {
-    if (this.#sourceErrored) return true;
+  loaded(ignoreTilesLoading) {
+    if (this.#sourceErrored) {
+      return true;
+    }
 
-    if (!this.#sourceLoaded) return false;
+    if (!this.#sourceLoaded) {
+      return false;
+    }
 
+    if (ignoreTilesLoading) {
+      return true;
+    }
     for (const tile of this._tiles.values()) {
-      if (tile.state !== 'loaded' && tile.state !== 'errored') return false;
+      if (tile.state !== 'loaded' && tile.state !== 'errored') {
+        return false;
+      }
     }
     return true;
   }
@@ -92,12 +111,18 @@ class SourceCache extends Evented {
   }
 
   resume() {
-    if (!this.#paused) return;
+    if (!this.#paused) {
+      return;
+    }
     const shouldReload = this.#shouldReloadOnResume;
     this.#paused = false;
     this.#shouldReloadOnResume = false;
-    if (shouldReload) this.reload();
-    if (this.transform) this.update(this.transform);
+    if (shouldReload) {
+      this.reload();
+    }
+    if (this.transform) {
+      this.update(this.transform);
+    }
   }
 
   _loadTile(tile) {
@@ -170,7 +195,9 @@ class SourceCache extends Evented {
     this._cache.reset();
 
     this._tiles.forEach(tile => {
-      if (tile.state !== 'errored') this._reloadTile(tile, 'reloading');
+      if (tile.state !== 'errored') {
+        this._reloadTile(tile, 'reloading');
+      }
     });
   }
 
@@ -191,15 +218,23 @@ class SourceCache extends Evented {
   _tileLoadError(tile, err) {
     tile.state = 'errored';
     // ignore do nothing strategy
-    if (err.doNothing) return;
-    if (err.status !== 404) this._source.fire(new ErrorEvent(err, { tile }));
+    if (err.doNothing) {
+      return;
+    }
+    if (err.status !== 404) {
+      this._source.fire(new ErrorEvent(err, { tile }));
+    }
     // continue to try loading parent/children tiles if a tile doesn't exist (404)
-    else this.update(this.transform);
+    else {
+      this.update(this.transform);
+    }
   }
 
   _tileLoaded(tile, err) {
     tile.timeAdded = browser.now();
-    if (this.getSource().type === 'raster-dem' && tile.dem) this._backfillDEM(tile);
+    if (this.getSource().type === 'raster-dem' && tile.dem) {
+      this._backfillDEM(tile);
+    }
     this._state.initializeTileState(tile, this.map ? this.map.painter : null);
 
     this._source.fire(new Event('data', { dataType: 'source', tile: tile, coord: tile.tileID }));
@@ -226,7 +261,9 @@ class SourceCache extends Evented {
       const dy = borderTile.tileID.canonical.y - tile.tileID.canonical.y;
       const dim = 2 ** tile.tileID.canonical.z;
       const borderId = borderTile.tileID.key;
-      if (dx === 0 && dy === 0) return;
+      if (dx === 0 && dy === 0) {
+        return;
+      }
 
       if (Math.abs(dy) > 1) {
         return;
@@ -239,9 +276,13 @@ class SourceCache extends Evented {
           dx -= dim;
         }
       }
-      if (!borderTile.dem || !tile.dem) return;
+      if (!borderTile.dem || !tile.dem) {
+        return;
+      }
       tile.dem.backfillBorder(borderTile.dem, dx, dy);
-      if (tile.neighboringTiles?.[borderId]) tile.neighboringTiles[borderId].backfilled = true;
+      if (tile.neighboringTiles?.[borderId]) {
+        tile.neighboringTiles[borderId].backfilled = true;
+      }
     }
   }
   /**
@@ -277,8 +318,9 @@ class SourceCache extends Evented {
         !tile.hasData() ||
         tile.tileID.overscaledZ <= zoom ||
         tile.tileID.overscaledZ > maxCoveringZoom
-      )
+      ) {
         continue;
+      }
 
       // loop through parents and retain the topmost loaded one if found
       let topmostLoadedID = tile.tileID;
@@ -311,7 +353,9 @@ class SourceCache extends Evented {
   findLoadedParent(tileID, minCoveringZoom) {
     for (let z = tileID.overscaledZ - 1; z >= minCoveringZoom; z--) {
       const parent = tileID.scaledTo(z);
-      if (!parent) return;
+      if (!parent) {
+        return;
+      }
       const tile = this._tiles.get(parent.key);
       if (tile?.hasData()) {
         return tile;
@@ -434,7 +478,9 @@ class SourceCache extends Evented {
       const fadingTiles = new Set();
       for (const [id, tileID] of retain) {
         const tile = this._tiles.get(id);
-        if (!tile || (tile.fadeEndTime && tile.fadeEndTime <= browser.now())) continue;
+        if (!tile || (tile.fadeEndTime && tile.fadeEndTime <= browser.now())) {
+          continue;
+        }
 
         // if the tile is loaded but still fading in, find parents to cross-fade with it
         const parentTile = this.findLoadedParent(tileID, minCoveringZoom);
@@ -466,7 +512,9 @@ class SourceCache extends Evented {
 
     // Remove the tiles we don't need anymore.
     for (const [id, tile] of this._tiles) {
-      if (retain.has(id)) continue;
+      if (retain.has(id)) {
+        continue;
+      }
       if (tile.hasSymbolBuckets && !tile.holdingForFade()) {
         tile.setHoldDuration(this.map._fadeDuration);
       } else if (!tile.hasSymbolBuckets || tile.symbolFadeFinished()) {
@@ -496,7 +544,9 @@ class SourceCache extends Evented {
       // retain the tile even if it's not loaded because it's an ideal tile.
       retain.set(tileID.key, tileID);
 
-      if (tile.hasData()) continue;
+      if (tile.hasData()) {
+        continue;
+      }
 
       if (zoom < this._source.maxzoom) {
         // save missing tiles that potentially have loaded children
@@ -510,7 +560,9 @@ class SourceCache extends Evented {
     for (const tileID of idealTileIDs) {
       let tile = this._tiles.get(tileID.key);
 
-      if (tile.hasData()) continue;
+      if (tile.hasData()) {
+        continue;
+      }
 
       // The tile we require is not yet loaded or does not exist;
       // Attempt to find children that fully cover it.
@@ -532,8 +584,9 @@ class SourceCache extends Evented {
           retain.has(children[1].key) &&
           retain.has(children[2].key) &&
           retain.has(children[3].key)
-        )
+        ) {
           continue; // tile is covered by children
+        }
       }
 
       // We couldn't find child tiles that entirely cover the ideal tile; look for parents now.
@@ -547,7 +600,9 @@ class SourceCache extends Evented {
         const parentId = tileID.scaledTo(overscaledZ);
 
         // Break parent tile ascent if this route has been previously checked by another child.
-        if (checked.has(parentId.key)) break;
+        if (checked.has(parentId.key)) {
+          break;
+        }
         checked.add(parentId.key);
 
         tile = this.getTile(parentId);
@@ -559,7 +614,9 @@ class SourceCache extends Evented {
           // Save the current values, since they're the parent of the next iteration
           // of the parent tile ascent loop.
           parentWasRequested = tile.wasRequested();
-          if (tile.hasData()) break;
+          if (tile.hasData()) {
+            break;
+          }
         }
       }
     }
@@ -573,7 +630,9 @@ class SourceCache extends Evented {
    */
   _addTile(tileID) {
     let tile = this._tiles.get(tileID.key);
-    if (tile) return tile;
+    if (tile) {
+      return tile;
+    }
 
     tile = this._cache.getAndRemove(tileID);
     if (tile) {
@@ -590,13 +649,11 @@ class SourceCache extends Evented {
         err => this._tileLoadError(tile, err)
       );
     }
-
-    // Impossible, but silence flow.
-    if (!tile) return null;
-
     tile.uses++;
     this._tiles.set(tileID.key, tile);
-    if (!cached) this._source.fire(new Event('dataloading', { tile: tile, coord: tile.tileID, dataType: 'source' }));
+    if (!cached) {
+      this._source.fire(new Event('dataloading', { tile: tile, coord: tile.tileID, dataType: 'source' }));
+    }
 
     return tile;
   }
@@ -607,12 +664,16 @@ class SourceCache extends Evented {
    */
   _removeTile(id) {
     const tile = this._tiles.get(id);
-    if (!tile) return;
+    if (!tile) {
+      return;
+    }
 
     tile.uses--;
     this._tiles.delete(id);
 
-    if (tile.uses > 0) return;
+    if (tile.uses > 0) {
+      return;
+    }
 
     if (tile.hasData()) {
       this._cache.add(tile);
@@ -630,7 +691,9 @@ class SourceCache extends Evented {
     this.#shouldReloadOnResume = false;
     this.#paused = false;
 
-    for (const id of this._tiles.keys()) this._removeTile(id);
+    for (const id of this._tiles.keys()) {
+      this._removeTile(id);
+    }
 
     this._cache.reset();
   }
@@ -645,7 +708,9 @@ class SourceCache extends Evented {
     const tileResults = [];
 
     const transform = this.transform;
-    if (!transform) return tileResults;
+    if (!transform) {
+      return tileResults;
+    }
 
     const cameraPointQueryGeometry = has3DLayer
       ? transform.getCameraQueryGeometry(pointQueryGeometry)
@@ -777,4 +842,4 @@ function isRasterType(type) {
   return type === 'raster' || type === 'image';
 }
 
-module.exports = SourceCache;
+export default SourceCache;