@mapwhit/tilerenderer 1.0.0 → 1.1.1

package/src/ui/map.js

@@ -1,21 +1,19 @@
-const { bindAll } = require('../util/object');
-const warn = require('../util/warn');
-
-const browser = require('../util/browser');
-const DOM = require('../util/dom');
-const loadImage = require('../util/loader/image');
-
-const Style = require('../style/style');
-const EvaluationParameters = require('../style/evaluation_parameters');
-const Painter = require('../render/painter');
-const Transform = require('../geo/transform');
-const Camera = require('./camera');
-const LngLat = require('../geo/lng_lat');
-const LngLatBounds = require('../geo/lng_lat_bounds');
-const { default: Point } = require('@mapbox/point-geometry');
-const { RGBAImage } = require('../util/image');
-const { Event, ErrorEvent } = require('@mapwhit/events');
-const taskQueue = require('../util/task_queue');
+import Point from '@mapbox/point-geometry';
+import { ErrorEvent, Event } from '@mapwhit/events';
+import LngLat from '../geo/lng_lat.js';
+import LngLatBounds from '../geo/lng_lat_bounds.js';
+import Transform from '../geo/transform.js';
+import Painter from '../render/painter.js';
+import EvaluationParameters from '../style/evaluation_parameters.js';
+import Style from '../style/style.js';
+import browser from '../util/browser.js';
+import DOM from '../util/dom.js';
+import { RGBAImage } from '../util/image.js';
+import loadImage from '../util/loader/image.js';
+import { bindAll } from '../util/object.js';
+import taskQueue from '../util/task_queue.js';
+import warn from '../util/warn.js';
+import Camera from './camera.js';
 
 const defaultMinZoom = 0;
 const defaultMaxZoom = 22;
@@ -183,7 +181,9 @@ class Map extends Camera {
 
     this.resize();
 
-    if (options.style) this.setStyle(options.style);
+    if (options.style) {
+      this.setStyle(options.style);
+    }
 
     this.on('style.load', function () {
       if (this.transform.unmodified) {
@@ -359,7 +359,9 @@ class Map extends Camera {
       this.transform.minZoom = minZoom;
       this._update();
 
-      if (this.getZoom() < minZoom) this.setZoom(minZoom);
+      if (this.getZoom() < minZoom) {
+        this.setZoom(minZoom);
+      }
 
       return this;
     }
@@ -391,7 +393,9 @@ class Map extends Camera {
       this.transform.maxZoom = maxZoom;
       this._update();
 
-      if (this.getZoom() > maxZoom) this.setZoom(maxZoom);
+      if (this.getZoom() > maxZoom) {
+        this.setZoom(maxZoom);
+      }
 
       return this;
     }
@@ -554,8 +558,6 @@ class Map extends Camera {
     //     queryRenderedFeatures(geometry: PointLike | [PointLike, PointLike], options?: Object)
     //     queryRenderedFeatures(options?: Object)
     //
-    // There no way to express that in a way that's compatible with both flow and documentation.js.
-    // Related: https://github.com/facebook/flow/issues/1556
     if (arguments.length === 2) {
       geometry = arguments[0];
       options = arguments[1];
@@ -691,8 +693,10 @@ class Map extends Camera {
    * @returns {boolean} A Boolean indicating whether the style is fully loaded.
    */
   isStyleLoaded() {
-    if (!this.style) return warn.once('There is no style added to the map.');
-    return this.style.loaded();
+    if (!this.style) {
+      return warn.once('There is no style added to the map.');
+    }
+    return this.style.loaded(true);
   }
 
   /**
@@ -742,7 +746,9 @@ class Map extends Camera {
       const source = sources[id];
       const tiles = source._tiles;
       for (const tile of tiles.values()) {
-        if (!(tile.state === 'loaded' || tile.state === 'errored')) return false;
+        if (!(tile.state === 'loaded' || tile.state === 'errored')) {
+          return false;
+        }
       }
     }
     return true;
@@ -1242,8 +1248,12 @@ class Map extends Camera {
    * @returns {boolean} A Boolean indicating whether the map is fully loaded.
    */
   loaded() {
-    if (this._styleDirty || this._sourcesDirty) return false;
-    if (!this.style || !this.style.loaded()) return false;
+    if (this._styleDirty || this._sourcesDirty) {
+      return false;
+    }
+    if (!this.style || !this.style.loaded()) {
+      return false;
+    }
     return true;
   }
 
@@ -1256,7 +1266,9 @@ class Map extends Camera {
    * @private
    */
   _update(updateStyle) {
-    if (!this.style) return;
+    if (!this.style) {
+      return;
+    }
 
     this._styleDirty = this._styleDirty || updateStyle;
     this._sourcesDirty = true;
@@ -1395,7 +1407,9 @@ class Map extends Camera {
       window.removeEventListener('online', this._onWindowOnline, false);
     }
     const extension = this.painter.context.gl.getExtension('WEBGL_lose_context');
-    if (extension) extension.loseContext();
+    if (extension) {
+      extension.loseContext();
+    }
     removeNode(this._canvasContainer);
     removeNode(this._controlContainer);
     this._container.classList.remove('mapboxgl-map');
@@ -1434,7 +1448,9 @@ class Map extends Camera {
     return !!this._showTileBoundaries;
   }
   set showTileBoundaries(value) {
-    if (this._showTileBoundaries === value) return;
+    if (this._showTileBoundaries === value) {
+      return;
+    }
     this._showTileBoundaries = value;
     this._update();
   }
@@ -1454,7 +1470,9 @@ class Map extends Camera {
     return !!this._showCollisionBoxes;
   }
   set showCollisionBoxes(value) {
-    if (this._showCollisionBoxes === value) return;
+    if (this._showCollisionBoxes === value) {
+      return;
+    }
     this._showCollisionBoxes = value;
     if (value) {
       // When we turn collision boxes on we have to generate them for existing tiles
@@ -1482,7 +1500,9 @@ class Map extends Camera {
     return !!this._showOverdrawInspector;
   }
   set showOverdrawInspector(value) {
-    if (this._showOverdrawInspector === value) return;
+    if (this._showOverdrawInspector === value) {
+      return;
+    }
     this._showOverdrawInspector = value;
     this._update();
   }
@@ -1523,7 +1543,7 @@ class Map extends Camera {
   }
 }
 
-module.exports = Map;
+export default Map;
 
 function removeNode(node) {
   if (node.parentNode) {

package/src/util/async.js

@@ -8,16 +8,22 @@
  * called with an array, containing the results of each async call.
  * @private
  */
-exports.all = function (array, fn, callback) {
-  if (!array.length) return callback(null, []);
+export function all(array, fn, callback) {
+  if (!array.length) {
+    return callback(null, []);
+  }
   let remaining = array.length;
   const results = new Array(array.length);
   let error = null;
   array.forEach((item, i) => {
     fn(item, (err, result) => {
-      if (err) error = err;
+      if (err) {
+        error = err;
+      }
       results[i] = result;
-      if (--remaining === 0) callback(error, results);
+      if (--remaining === 0) {
+        callback(error, results);
+      }
     });
   });
-};
+}

package/src/util/browser.js

@@ -49,4 +49,4 @@ const exported = {
   }
 };
 
-module.exports = exported;
+export default exported;

package/src/util/callback.js

@@ -1,24 +1,18 @@
-module.exports = {
-  callback,
-  callbackWithSpread,
-  callbackWithNoResult
-};
-
-function callback(fn, promise) {
+export function callback(fn, promise) {
   if (fn) {
     promise.then(result => fn(null, result), fn);
   }
   return promise;
 }
 
-function callbackWithSpread(fn, promise) {
+export function callbackWithSpread(fn, promise) {
   if (fn) {
     promise.then(result => fn(null, ...result), fn);
   }
   return promise;
 }
 
-function callbackWithNoResult(fn, promise) {
+export function callbackWithNoResult(fn, promise) {
   if (fn) {
     promise.then(() => fn(null), fn);
   }

package/src/util/classify_rings.js

@@ -1,10 +1,11 @@
-const { default: quickselect } = require('quickselect');
-
-const { calculateSignedArea } = require('./util');
+import quickselect from 'quickselect';
+import { calculateSignedArea } from './util.js';
 
 // classifies an array of rings into polygons with outer rings and holes
-module.exports = function classifyRings(rings, maxRings) {
-  if (rings.length <= 1) return [rings];
+export default function classifyRings(rings, maxRings) {
+  if (rings.length <= 1) {
+    return [rings];
+  }
 
   const polygons = [];
   let polygon;
@@ -12,11 +13,15 @@ module.exports = function classifyRings(rings, maxRings) {
 
   for (const ring of rings) {
     const area = calculateSignedArea(ring);
-    if (area === 0) continue;
+    if (area === 0) {
+      continue;
+    }
 
     ring.area = Math.abs(area);
 
-    if (ccw === undefined) ccw = area < 0;
+    if (ccw === undefined) {
+      ccw = area < 0;
+    }
 
     if (ccw === area < 0) {
       append(polygon);
@@ -40,4 +45,4 @@ module.exports = function classifyRings(rings, maxRings) {
     }
     polygons.push(polygon);
   }
-};
+}

package/src/util/color_ramp.js

@@ -1,4 +1,4 @@
-const { RGBAImage } = require('./image');
+import { RGBAImage } from './image.js';
 
 /**
  * Given an expression that should evaluate to a color ramp, return
@@ -6,7 +6,7 @@ const { RGBAImage } = require('./image');
  *
  * @private
  */
-module.exports = function renderColorRamp(expression, colorRampEvaluationParameter) {
+export default function renderColorRamp(expression, colorRampEvaluationParameter) {
   const colorRampData = new Uint8Array(256 * 4);
   const evaluationGlobals = {};
   for (let i = 0, j = 0; i < 256; i++, j += 4) {
@@ -21,4 +21,4 @@ module.exports = function renderColorRamp(expression, colorRampEvaluationParamet
   }
 
   return new RGBAImage({ width: 256, height: 1 }, colorRampData);
-};
+}

package/src/util/config.js

@@ -1,12 +1,14 @@
-const { Evented } = require('@mapwhit/events');
+import { Evented } from '@mapwhit/events';
+import browser from './browser.js';
 
 function getDefaultWorkerCount() {
-  const browser = require('./browser');
   return Math.max(Math.floor(browser.hardwareConcurrency / 2), 1);
 }
 
 const config = new Evented();
 
+export default config;
+
 config.set = function set(c) {
   Object.assign(config, c);
   config.notify();
@@ -20,5 +22,3 @@ config.set({
   WORKER_COUNT: getDefaultWorkerCount(),
   WORKER_URL: ''
 });
-
-module.exports = config;

package/src/util/dictionary_coder.js

@@ -1,6 +1,5 @@
-const assert = require('assert');
-
-module.exports = dictionaryCoder;
+import assert from 'assert';
+export default dictionaryCoder;
 
 function dictionaryCoder(strings) {
   const numberToString = strings.sort();

package/src/util/dom.js

@@ -1,10 +1,14 @@
 const DOM = {};
-module.exports = DOM;
+export default DOM;
 
 DOM.create = function (tagName, className, container) {
   const el = window.document.createElement(tagName);
-  if (className) el.className = className;
-  if (container) container.appendChild(el);
+  if (className) {
+    el.className = className;
+  }
+  if (container) {
+    container.appendChild(el);
+  }
   return el;
 };
 

package/src/util/find_pole_of_inaccessibility.js

@@ -1,7 +1,6 @@
-const { default: Queue } = require('tinyqueue');
-
-const { default: Point } = require('@mapbox/point-geometry');
-const { distToSegmentSquared } = require('./intersection_tests');
+import Point from '@mapbox/point-geometry';
+import Queue from 'tinyqueue';
+import { distToSegmentSquared } from './intersection_tests.js';
 
 /**
  * Finds an approximation of a polygon's Pole Of Inaccessibiliy https://en.wikipedia.org/wiki/Pole_of_inaccessibility
@@ -13,7 +12,7 @@ const { distToSegmentSquared } = require('./intersection_tests');
  * @returns Pole of Inaccessibiliy.
  * @private
  */
-module.exports = function (polygonRings, precision = 1, debug = false) {
+export default function (polygonRings, precision = 1, debug = false) {
   // find the bounding box of the outer ring
   let minX = Number.POSITIVE_INFINITY;
   let minY = Number.POSITIVE_INFINITY;
@@ -22,10 +21,18 @@ module.exports = function (polygonRings, precision = 1, debug = false) {
   const outerRing = polygonRings[0];
   for (let i = 0; i < outerRing.length; i++) {
     const p = outerRing[i];
-    if (!i || p.x < minX) minX = p.x;
-    if (!i || p.y < minY) minY = p.y;
-    if (!i || p.x > maxX) maxX = p.x;
-    if (!i || p.y > maxY) maxY = p.y;
+    if (!i || p.x < minX) {
+      minX = p.x;
+    }
+    if (!i || p.y < minY) {
+      minY = p.y;
+    }
+    if (!i || p.x > maxX) {
+      maxX = p.x;
+    }
+    if (!i || p.y > maxY) {
+      maxY = p.y;
+    }
   }
 
   const width = maxX - minX;
@@ -36,7 +43,9 @@ module.exports = function (polygonRings, precision = 1, debug = false) {
   // a priority queue of cells in order of their "potential" (max distance to polygon)
   const cellQueue = new Queue(undefined, compareMax);
 
-  if (cellSize === 0) return new Point(minX, minY);
+  if (cellSize === 0) {
+    return new Point(minX, minY);
+  }
 
   // cover polygon with initial cells
   for (let x = minX; x < maxX; x += cellSize) {
@@ -56,11 +65,15 @@ module.exports = function (polygonRings, precision = 1, debug = false) {
     // update the best cell if we found a better one
     if (cell.d > bestCell.d || !bestCell.d) {
       bestCell = cell;
-      if (debug) console.log('found best %d after %d probes', Math.round(1e4 * cell.d) / 1e4, numProbes);
+      if (debug) {
+        console.log('found best %d after %d probes', Math.round(1e4 * cell.d) / 1e4, numProbes);
+      }
     }
 
     // do not drill down further if there's no chance of a better solution
-    if (cell.max - bestCell.d <= precision) continue;
+    if (cell.max - bestCell.d <= precision) {
+      continue;
+    }
 
     // split the cell into four cells
     h = cell.h / 2;
@@ -77,7 +90,7 @@ module.exports = function (polygonRings, precision = 1, debug = false) {
   }
 
   return bestCell.p;
-};
+}
 
 function compareMax(a, b) {
   return b.max - a.max;
@@ -102,7 +115,9 @@ function pointToPolygonDist(p, polygon) {
       const a = ring[i];
       const b = ring[j];
 
-      if (a.y > p.y !== b.y > p.y && p.x < ((b.x - a.x) * (p.y - a.y)) / (b.y - a.y) + a.x) inside = !inside;
+      if (a.y > p.y !== b.y > p.y && p.x < ((b.x - a.x) * (p.y - a.y)) / (b.y - a.y) + a.x) {
+        inside = !inside;
+      }
 
       minDistSq = Math.min(minDistSq, distToSegmentSquared(p, a, b));
     }

package/src/util/group_layers.js

@@ -1,4 +1,4 @@
-module.exports = groupBySource;
+export default groupBySource;
 
 /**
  * Given an collection of layers, divide them by property 'source', then by 'source-layer',

package/src/util/image.js

@@ -1,4 +1,4 @@
-const assert = require('assert');
+import assert from 'assert';
 
 function createImage(image, { width, height }, channels, data) {
   if (!data) {
@@ -75,7 +75,7 @@ function copyImage(srcImg, dstImg, srcPt, dstPt, size, channels) {
   return dstImg;
 }
 
-class AlphaImage {
+export class AlphaImage {
   constructor(size, data) {
     createImage(this, size, 1, data);
   }
@@ -95,7 +95,7 @@ class AlphaImage {
 
 // Not premultiplied, because ImageData is not premultiplied.
 // UNPACK_PREMULTIPLY_ALPHA_WEBGL must be used when uploading to a texture.
-class RGBAImage {
+export class RGBAImage {
   constructor(size, data) {
     createImage(this, size, 4, data);
   }
@@ -112,8 +112,3 @@ class RGBAImage {
     copyImage(srcImg, dstImg, srcPt, dstPt, size, 4);
   }
 }
-
-module.exports = {
-  AlphaImage,
-  RGBAImage
-};

package/src/util/interpolate.js

@@ -1,4 +1,4 @@
-module.exports = interpolate;
+export default interpolate;
 
 function interpolate(a, b, t) {
   return a * (1 - t) + b * t;