@mapwhit/tilerenderer 0.52.1 → 1.1.0

package/src/geo/lng_lat_bounds.js

@@ -1,4 +1,4 @@
-const LngLat = require('./lng_lat');
+import LngLat from './lng_lat.js';
 
 /**
  * A `LngLatBounds` object represents a geographical bounding box,
@@ -73,7 +73,9 @@ class LngLatBounds {
       sw2 = obj._sw;
       ne2 = obj._ne;
 
-      if (!sw2 || !ne2) return this;
+      if (!sw2 || !ne2) {
+        return this;
+      }
     } else {
       if (Array.isArray(obj)) {
         if (obj.every(Array.isArray)) {
@@ -231,7 +233,9 @@ class LngLatBounds {
    * llb;   // = LngLatBounds {_sw: LngLat {lng: -73.9876, lat: 40.7661}, _ne: LngLat {lng: -73.9397, lat: 40.8002}}
    */
   static convert(input) {
-    if (!input || input instanceof LngLatBounds) return input;
+    if (!input || input instanceof LngLatBounds) {
+      return input;
+    }
     return new LngLatBounds(input);
   }
 }
@@ -250,4 +254,4 @@ class LngLatBounds {
  * var v3 = [[-73.9876, 40.7661], [-73.9397, 40.8002]];
  */
 
-module.exports = LngLatBounds;
+export default LngLatBounds;

package/src/geo/transform.js

@@ -1,13 +1,14 @@
-const LngLat = require('./lng_lat');
-
-const { default: Point } = require('@mapbox/point-geometry');
-const Coordinate = require('./coordinate');
-const { wrap, clamp } = require('../util/util');
-const interpolate = require('../util/interpolate');
-const tileCover = require('../util/tile_cover');
-const { UnwrappedTileID } = require('../source/tile_id');
-const EXTENT = require('../data/extent');
-const { vec4, mat4, mat2 } = require('@mapbox/gl-matrix');
+import glMatrix from '@mapbox/gl-matrix';
+import Point from '@mapbox/point-geometry';
+import EXTENT from '../data/extent.js';
+import { UnwrappedTileID } from '../source/tile_id.js';
+import interpolate from '../util/interpolate.js';
+import tileCover from '../util/tile_cover.js';
+import { clamp, wrap } from '../util/util.js';
+import Coordinate from './coordinate.js';
+import LngLat from './lng_lat.js';
+
+const { mat2, mat4, vec4 } = glMatrix;
 
 /**
  * A single transform, generally used for a single tile to be
@@ -57,7 +58,9 @@ class Transform {
     return this._minZoom;
   }
   set minZoom(zoom) {
-    if (this._minZoom === zoom) return;
+    if (this._minZoom === zoom) {
+      return;
+    }
     this._minZoom = zoom;
     this.zoom = Math.max(this.zoom, zoom);
   }
@@ -66,7 +69,9 @@ class Transform {
     return this._maxZoom;
   }
   set maxZoom(zoom) {
-    if (this._maxZoom === zoom) return;
+    if (this._maxZoom === zoom) {
+      return;
+    }
     this._maxZoom = zoom;
     this.zoom = Math.min(this.zoom, zoom);
   }
@@ -101,7 +106,9 @@ class Transform {
   }
   set bearing(bearing) {
     const b = (-wrap(bearing, -180, 180) * Math.PI) / 180;
-    if (this.angle === b) return;
+    if (this.angle === b) {
+      return;
+    }
     this._unmodified = false;
     this.angle = b;
     this._calcMatrices();
@@ -116,7 +123,9 @@ class Transform {
   }
   set pitch(pitch) {
     const p = (clamp(pitch, 0, 60) / 180) * Math.PI;
-    if (this._pitch === p) return;
+    if (this._pitch === p) {
+      return;
+    }
     this._unmodified = false;
     this._pitch = p;
     this._calcMatrices();
@@ -127,7 +136,9 @@ class Transform {
   }
   set fov(fov) {
     fov = Math.max(0.01, Math.min(60, fov));
-    if (this._fov === fov) return;
+    if (this._fov === fov) {
+      return;
+    }
     this._unmodified = false;
     this._fov = (fov / 180) * Math.PI;
     this._calcMatrices();
@@ -138,7 +149,9 @@ class Transform {
   }
   set zoom(zoom) {
     const z = Math.min(Math.max(zoom, this.minZoom), this.maxZoom);
-    if (this._zoom === z) return;
+    if (this._zoom === z) {
+      return;
+    }
     this._unmodified = false;
     this._zoom = z;
     this.scale = this.zoomScale(z);
@@ -152,7 +165,9 @@ class Transform {
     return this._center;
   }
   set center(center) {
-    if (center.lat === this._center.lat && center.lng === this._center.lng) return;
+    if (center.lat === this._center.lat && center.lng === this._center.lng) {
+      return;
+    }
     this._unmodified = false;
     this._center = center;
     this._constrain();
@@ -192,7 +207,9 @@ class Transform {
       const extraWorldCopy = 1;
 
       for (let w = w0 - extraWorldCopy; w <= w1 + extraWorldCopy; w++) {
-        if (w === 0) continue;
+        if (w === 0) {
+          continue;
+        }
         result.push(new UnwrappedTileID(w, tileID));
       }
     }
@@ -215,8 +232,12 @@ class Transform {
     let z = this.coveringZoomLevel(options);
     const actualZ = z;
 
-    if (options.minzoom !== undefined && z < options.minzoom) return [];
-    if (options.maxzoom !== undefined && z > options.maxzoom) z = options.maxzoom;
+    if (options.minzoom !== undefined && z < options.minzoom) {
+      return [];
+    }
+    if (options.maxzoom !== undefined && z > options.maxzoom) {
+      z = options.maxzoom;
+    }
 
     const centerCoord = this.pointCoordinate(this.centerPoint, z);
     const centerPoint = new Point(centerCoord.column - 0.5, centerCoord.row - 0.5);
@@ -346,7 +367,9 @@ class Transform {
   }
 
   pointCoordinate(p, zoom) {
-    if (zoom === undefined) zoom = this.tileZoom;
+    if (zoom === undefined) {
+      zoom = this.tileZoom;
+    }
 
     const targetZ = 0;
     // since we don't know the correct projected z value for the point,
@@ -414,7 +437,9 @@ class Transform {
   }
 
   _constrain() {
-    if (!this.center || !this.width || !this.height || this._constraining) return;
+    if (!this.center || !this.width || !this.height || this._constraining) {
+      return;
+    }
 
     this._constraining = true;
 
@@ -458,16 +483,24 @@ class Transform {
       const y = this.y;
       const h2 = size.y / 2;
 
-      if (y - h2 < minY) y2 = minY + h2;
-      if (y + h2 > maxY) y2 = maxY - h2;
+      if (y - h2 < minY) {
+        y2 = minY + h2;
+      }
+      if (y + h2 > maxY) {
+        y2 = maxY - h2;
+      }
     }
 
     if (this.lngRange) {
       const x = this.x;
       const w2 = size.x / 2;
 
-      if (x - w2 < minX) x2 = minX + w2;
-      if (x + w2 > maxX) x2 = maxX - w2;
+      if (x - w2 < minX) {
+        x2 = minX + w2;
+      }
+      if (x + w2 > maxX) {
+        x2 = maxX - w2;
+      }
     }
 
     // pan the map if the screen goes off the range
@@ -480,7 +513,9 @@ class Transform {
   }
 
   _calcMatrices() {
-    if (!this.height) return;
+    if (!this.height) {
+      return;
+    }
 
     this.cameraToCenterDistance = (0.5 / Math.tan(this._fov / 2)) * this.height;
 
@@ -542,7 +577,9 @@ class Transform {
 
     // inverse matrix for conversion from screen coordinaes to location
     m = mat4.invert(new Float64Array(16), this.pixelMatrix);
-    if (!m) throw new Error('failed to invert matrix');
+    if (!m) {
+      throw new Error('failed to invert matrix');
+    }
     this.pixelMatrixInverse = m;
 
     this._posMatrixCache = {};
@@ -551,7 +588,9 @@ class Transform {
 
   maxPitchScaleFactor() {
     // calcMatrices hasn't run yet
-    if (!this.pixelMatrixInverse) return 1;
+    if (!this.pixelMatrixInverse) {
+      return 1;
+    }
 
     const coord = this.pointCoordinate(new Point(0, 0)).zoomTo(this.zoom);
     const p = [coord.column * this.tileSize, coord.row * this.tileSize, 0, 1];
@@ -612,4 +651,4 @@ class Transform {
   }
 }
 
-module.exports = Transform;
+export default Transform;

package/src/gl/color_mode.js

@@ -1,4 +1,4 @@
-const { Color } = require('@mapwhit/style-expressions');
+import { Color } from '@mapwhit/style-expressions';
 
 const ZERO = 0x0000;
 const ONE = 0x0001;
@@ -18,4 +18,4 @@ class ColorMode {
   }
 }
 
-module.exports = ColorMode;
+export default ColorMode;

package/src/gl/context.js

@@ -1,40 +1,39 @@
-const IndexBuffer = require('./index_buffer');
-
-const VertexBuffer = require('./vertex_buffer');
-const Framebuffer = require('./framebuffer');
-const ColorMode = require('./color_mode');
-const { deepEqual } = require('../util/object');
-const {
+import { deepEqual } from '../util/object.js';
+import ColorMode from './color_mode.js';
+import Framebuffer from './framebuffer.js';
+import IndexBuffer from './index_buffer.js';
+import {
+  ActiveTextureUnit,
+  BindElementBuffer,
+  BindFramebuffer,
+  BindRenderbuffer,
+  BindTexture,
+  BindVertexArrayOES,
+  BindVertexBuffer,
+  Blend,
+  BlendColor,
+  BlendFunc,
   ClearColor,
   ClearDepth,
   ClearStencil,
   ColorMask,
+  CullFace,
+  CullFaceSide,
+  DepthFunc,
   DepthMask,
-  StencilMask,
-  StencilFunc,
-  StencilOp,
-  StencilTest,
   DepthRange,
   DepthTest,
-  DepthFunc,
-  Blend,
-  BlendFunc,
-  BlendColor,
-  CullFace,
-  CullFaceSide,
   FrontFace,
-  Program,
-  ActiveTextureUnit,
-  Viewport,
-  BindFramebuffer,
-  BindRenderbuffer,
-  BindTexture,
-  BindVertexBuffer,
-  BindElementBuffer,
-  BindVertexArrayOES,
   PixelStoreUnpack,
-  PixelStoreUnpackPremultiplyAlpha
-} = require('./value');
+  PixelStoreUnpackPremultiplyAlpha,
+  Program,
+  StencilFunc,
+  StencilMask,
+  StencilOp,
+  StencilTest,
+  Viewport
+} from './value.js';
+import VertexBuffer from './vertex_buffer.js';
 
 class Context {
   constructor(gl) {
@@ -190,4 +189,4 @@ class Context {
   }
 }
 
-module.exports = Context;
+export default Context;

package/src/gl/cull_face_mode.js

@@ -19,4 +19,4 @@ class CullFaceMode {
 CullFaceMode.disabled = new CullFaceMode(false, BACK, CCW);
 CullFaceMode.backCCW = new CullFaceMode(true, BACK, CCW);
 
-module.exports = CullFaceMode;
+export default CullFaceMode;

package/src/gl/depth_mode.js

@@ -15,4 +15,4 @@ DepthMode.ReadWrite = true;
 
 DepthMode.disabled = new DepthMode(ALWAYS, DepthMode.ReadOnly, [0, 1]);
 
-module.exports = DepthMode;
+export default DepthMode;

package/src/gl/framebuffer.js

@@ -1,4 +1,4 @@
-const { ColorAttachment, DepthAttachment } = require('./value');
+import { ColorAttachment, DepthAttachment } from './value.js';
 
 class Framebuffer {
   constructor(context, width, height) {
@@ -16,13 +16,17 @@ class Framebuffer {
     const gl = this.context.gl;
 
     const texture = this.colorAttachment.get();
-    if (texture) gl.deleteTexture(texture);
+    if (texture) {
+      gl.deleteTexture(texture);
+    }
 
     const renderbuffer = this.depthAttachment.get();
-    if (renderbuffer) gl.deleteRenderbuffer(renderbuffer);
+    if (renderbuffer) {
+      gl.deleteRenderbuffer(renderbuffer);
+    }
 
     gl.deleteFramebuffer(this.framebuffer);
   }
 }
 
-module.exports = Framebuffer;
+export default Framebuffer;

package/src/gl/index_buffer.js

@@ -1,4 +1,4 @@
-const assert = require('assert');
+import assert from 'assert';
 
 class IndexBuffer {
   constructor(context, array, dynamicDraw) {
@@ -49,4 +49,4 @@ class IndexBuffer {
   }
 }
 
-module.exports = IndexBuffer;
+export default IndexBuffer;

package/src/gl/stencil_mode.js

@@ -14,4 +14,4 @@ class StencilMode {
 
 StencilMode.disabled = new StencilMode({ func: ALWAYS, mask: 0 }, 0, 0, KEEP, KEEP, KEEP);
 
-module.exports = StencilMode;
+export default StencilMode;