geojs 1.4.3 → 1.6.2

package/src/markerFeature.js

@@ -111,11 +111,11 @@ var markerFeature = function (arg) {
     pts = m_this.data().map(function (d, i) {
       var pt = position(d, i);
 
-      let r = radius(d, i),
-          swz = scaleWithZoom(d, i),
+      let swz = scaleWithZoom(d, i);
+      const r = radius(d, i),
           s = strokeWidth(d, i),
           so = Math.sign(strokeOffset(d, i));
-      let rwiths = r + s * (so + 1) / 2,  // radius with stroke
+      const rwiths = r + s * (so + 1) / 2,  // radius with stroke
           rwos = r + s * (so - 1) / 2;  // radius without stroke
       swz = markerFeature.scaleMode[swz] || (swz >= 1 && swz <= 3 ? swz : 0);
       switch (swz) {
@@ -155,7 +155,7 @@ var markerFeature = function (arg) {
    */
   this._approximateMaxRadius = function (zoom) {
     m_this._updateRangeTree();
-    let zoomFactor = Math.pow(2, zoom);
+    const zoomFactor = Math.pow(2, zoom);
     return Math.max(m_maxFixedRadius + m_maxZoomStroke * zoomFactor, m_maxZoomRadius * zoomFactor);
   };
 
@@ -344,10 +344,10 @@ var markerFeature = function (arg) {
       var d = data[i];
       let p = m_this.position()(d, i);
       let rad = radius(data[i], i),
-          swz = scaleWithZoom(data[i], i),
-          so = strokeOffset(data[i], i),
+          swz = scaleWithZoom(data[i], i);
+      const so = strokeOffset(data[i], i),
           s = swz ? strokeWidth(data[i], i) : 0;
-      let rwos = rad + s * (so - 1) / 2;  // radius without stroke
+      const rwos = rad + s * (so - 1) / 2;  // radius without stroke
       swz = markerFeature.scaleMode[swz] || (swz >= 1 && swz <= 3 ? swz : 0);
       rad = rwos + s;
       switch (swz) {
@@ -363,7 +363,7 @@ var markerFeature = function (arg) {
       }
       if (rad) {
         p = map.gcsToDisplay(p, fgcs);
-        let dist = util.distanceToPolygon2d(p, poly);
+        const dist = util.distanceToPolygon2d(p, poly);
         if (dist >= rad || (dist >= 0 && opts.partial === 'center') || (dist >= -rad && opts.partial && opts.partial !== 'center')) {
           found.push(d);
           ifound.push(i);

package/src/object.js

@@ -166,9 +166,7 @@ var object = function () {
    *   the handler that was passed to the function.
    */
   this.geoOnce = function (event, handler) {
-    let wrapper;
-
-    wrapper = function (args) {
+    const wrapper = function (args) {
       m_this.geoOff(event, wrapper);
       handler.call(m_this, args);
     };

package/src/osmLayer.js

@@ -44,6 +44,8 @@ var osmLayer = function (arg) {
     this.constructor.defaults,
     osmLayer.tileSources[this.constructor.defaults.source] || {},
     osmLayer.tileSources[arg.source] || {},
+    // don't name the layer based on the source
+    {name: ''},
     arg);
   tileLayer.call(this, arg);
 
@@ -93,7 +95,7 @@ var osmLayer = function (arg) {
    */
   this.source = function (source) {
     if (source === undefined) {
-      for (let key in osmLayer.tileSources) {
+      for (const key in osmLayer.tileSources) {
         if (osmLayer.tileSources[key].url === m_this.url()) {
           return key;
         }
@@ -126,13 +128,13 @@ osmLayer.defaults = $.extend({}, tileLayer.defaults, {
 /* Stamen's website (http://maps.stamen.com) as of 2019-08-28 says that the
  * maps they host may be used free of charge.  For http access, use a url like
  * http://{s}.tile.stamen.com/toner-lite/{z}/{x}/{y}.png */
-let StamenAttribution = 'Map tiles by <a href="http://stamen.com">Stamen ' +
+const StamenAttribution = 'Map tiles by <a href="http://stamen.com">Stamen ' +
   'Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">' +
   'CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap' +
   '</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.';
 
 /* Per Carto's website regarding basemap attribution: https://carto.com/help/working-with-data/attribution/#basemaps */
-let CartoAttribution = '<a href="https://carto.com"> Carto</a> ' + 'Contributors <a href="https://www.openstreetmap.org/"> OpenStreetMap</a>';
+const CartoAttribution = '<a href="https://carto.com"> Carto</a> ' + 'Contributors <a href="https://www.openstreetmap.org/"> OpenStreetMap</a>';
 
 /**
  * This is a list of known tile sources.  It can be added to via

package/src/pixelmapFeature.js

@@ -47,7 +47,7 @@ var util = require('./util');
  * @property {object[]} mappedColors This has one entry for each distinct index
  *    value.  Each entry has `first` and `last` with the first and last pixel
  *    locations where that index occurs.  Note that last is the inclusive value
- *    of the location (so its maximum possible value is `size -1`).
+ *    of the location (so its maximum possible value is `size - 1`).
  */
 
 /**

package/src/pointFeature.js

@@ -443,7 +443,7 @@ var pointFeature = function (arg) {
       rad += hasstroke ? strokeWidth(data[i], i) : 0;
       if (rad) {
         p = map.gcsToDisplay(p, fgcs);
-        let dist = util.distanceToPolygon2d(p, poly);
+        const dist = util.distanceToPolygon2d(p, poly);
         if (dist >= rad || (dist >= 0 && opts.partial === 'center') || (dist >= -rad && opts.partial && opts.partial !== 'center')) {
           found.push(d);
           ifound.push(i);

package/src/polygonFeature.js

@@ -113,7 +113,7 @@ var polygonFeature = function (arg) {
    *    `outer` and `inner` if it has any coordinates, or is `undefined`.
    */
   function getCoordinates(data, posFunc, polyFunc) {
-    let fcs = m_this.gcs(),
+    const fcs = m_this.gcs(),
         mapgcs = m_this.layer().map().gcs();
     data = data || m_this.data();
     posFunc = posFunc || m_this.style.get('position');
@@ -121,7 +121,7 @@ var polygonFeature = function (arg) {
     var coordinates = data.map(function (d, i) {
       var poly = polyFunc(d, i);
       if (!poly) {
-        return;
+        return undefined;
       }
       var outer, inner, range, coord, j, x, y, mapouter, mapinner, maprange;
 
@@ -350,9 +350,9 @@ var polygonFeature = function (arg) {
       let inside, partial;
       // do something similar to the line's polygonSearch
       for (let r = -1; r < coord.mapinner.length && !partial; r += 1) {
-        let record = r < 0 ? coord.mapouter : coord.mapinner[r];
+        const record = r < 0 ? coord.mapouter : coord.mapinner[r];
         for (let i = 0, len = record.length, j = len - 1; i < len; j = i, i += 1) {
-          let dist0 = util.distanceToPolygon2d(record[i], poly),
+          const dist0 = util.distanceToPolygon2d(record[i], poly),
               dist1 = util.distanceToPolygon2d(record[j], poly);
           if (dist0 * dist1 < 0) {
             partial = true;

package/src/registry.js

@@ -216,7 +216,7 @@ util.registerFeature = function (category, name, func, capabilities) {
  */
 util.createFeature = function (name, layer, renderer, arg) {
   var category = renderer.api(),
-      options = {'layer': layer, 'renderer': renderer};
+      options = {layer: layer, renderer: renderer};
   if (category in features && name in features[category]) {
     if (arg !== undefined) {
       $.extend(true, options, arg);

package/src/svg/svgRenderer.js

@@ -681,6 +681,9 @@ svgRenderer.supported = function () {
   // webpack expects optional dependencies to be wrapped in a try-catch
   try {
     svgRenderer.d3 = require('d3');
+    if (!svgRenderer.d3 || !svgRenderer.d3.rgb) {
+      svgRenderer.d3 = undefined;
+    }
   } catch (_error) {}
   return svgRenderer.d3 !== undefined;
 };

package/src/svg/vectorFeature.js

@@ -157,7 +157,7 @@ var svg_vectorFeature = function (arg) {
       .each(function (d) {
         var marker = d3.select(this);
         var markerData = d.head ? markerConfigs[endStyle(d.data, d.dataIndex)] : markerConfigs[originStyle(d.data, d.dataIndex)];
-        Object.keys(markerData.attrs).map(function (attrName) {
+        Object.keys(markerData.attrs).forEach(function (attrName) {
           marker.attr(attrName, markerData.attrs[attrName]);
         });
       })

package/src/tile.js

@@ -144,7 +144,7 @@ var tile = function (spec) {
   };
 
   /**
-   * Return a unique string representation of the given tile useble as a hash
+   * Return a unique string representation of the given tile usable as a hash
    * key.  Possibly extend later to include url information to make caches
    * aware of the tile source.
    *

package/src/tileLayer.js

@@ -121,10 +121,10 @@ function m_getTileSubdomain(x, y, z, subdomains) {
  * @private.
  */
 function m_tileUrlFromTemplate(base) {
-  var xPattern = new RegExp(/\$?\{[xX]\}/g),
-      yPattern = new RegExp(/\$?\{[yY]\}/g),
-      zPattern = new RegExp(/\$?\{[zZ]\}/g),
-      sPattern = new RegExp(/\$?\{(s|S|[sS]:[^{}]+|[^-{}]-[^-{}]|([^,{}]+,)+[^,{}]+)\}/);
+  var xPattern = /\$?\{[xX]\}/g,
+      yPattern = /\$?\{[yY]\}/g,
+      zPattern = /\$?\{[zZ]\}/g,
+      sPattern = /\$?\{(s|S|[sS]:[^{}]+|[^-{}]-[^-{}]|([^,{}]+,)+[^,{}]+)\}/;
   var url = base
       .replace(new RegExp(sPattern, 'g'), '{s}')
       .replace(xPattern, '{x}')

package/src/trackFeature.js

@@ -228,21 +228,21 @@ var trackFeature = function (arg) {
       if (d.posidx1 === undefined) {
         pos = m_tracks.positionFunc(tracks[i][d.posidx], d.posidx, tracks[i], i);
       } else {
-        pos0 = trans.forward(m_tracks.positionFunc(tracks[i][d.posidx0], d.posidx0, tracks[i], i));
-        pos1 = trans.forward(m_tracks.positionFunc(tracks[i][d.posidx1], d.posidx1, tracks[i], i));
+        pos0 = trans.forward(m_tracks.positionFunc(tracks[i][d.posidx0], d.posidx0, tracks[i], i), true);
+        pos1 = trans.forward(m_tracks.positionFunc(tracks[i][d.posidx1], d.posidx1, tracks[i], i), true);
         pos = trans.inverse({
           x: pos0.x * d.factor0 + pos1.x * d.factor1,
           y: pos0.y * d.factor0 + pos1.y * d.factor1,
           z: (pos0.z || 0) * d.factor0 + (pos1.z || 0) * d.factor1
-        });
+        }, true);
       }
       d.x = pos.x;
       d.y = pos.y;
       d.z = pos.z || 0;
       if (calcAngle) {
         if (d.posidx1 === undefined) {
-          pos0 = trans.forward(d.angidx0 === d.posidx ? pos : m_tracks.positionFunc(tracks[i][d.angidx0], d.angidx0, tracks[i], i));
-          pos1 = trans.forward(d.angidx1 === d.posidx ? pos : m_tracks.positionFunc(tracks[i][d.angidx1], d.angidx1, tracks[i], i));
+          pos0 = trans.forward(d.angidx0 === d.posidx ? pos : m_tracks.positionFunc(tracks[i][d.angidx0], d.angidx0, tracks[i], i), true);
+          pos1 = trans.forward(d.angidx1 === d.posidx ? pos : m_tracks.positionFunc(tracks[i][d.angidx1], d.angidx1, tracks[i], i), true);
         }
         d.angle = Math.atan2(pos1.y - pos0.y, pos1.x - pos0.x);
       }
@@ -319,25 +319,25 @@ var trackFeature = function (arg) {
     });
     if (hasMarker && !m_markerFeature) {
       if (!(registry.registries.features[m_this.layer().rendererName()] || {}).marker) {
-        let renderer = registry.rendererForFeatures(['marker']);
+        const renderer = registry.rendererForFeatures(['marker']);
         m_markerLayer = registry.createLayer('feature', m_this.layer().map(), {renderer: renderer});
         m_this.layer().addChild(m_markerLayer);
         m_this.layer().node().append(m_markerLayer.node());
       }
       m_markerFeature = (m_markerLayer || m_this.layer()).createFeature('marker');
-      let df = m_this.dependentFeatures();
+      const df = m_this.dependentFeatures();
       df.push(m_markerFeature);
       m_this.dependentFeatures(df);
     }
     if (hasText && !m_textFeature) {
       if (!(registry.registries.features[m_this.layer().rendererName()] || {}).text) {
-        let renderer = registry.rendererForFeatures(['text']);
+        const renderer = registry.rendererForFeatures(['text']);
         m_textLayer = registry.createLayer('feature', m_this.layer().map(), {renderer: renderer});
         m_this.layer().addChild(m_textLayer);
         m_this.layer().node().append(m_textLayer.node());
       }
       m_textFeature = (m_textLayer || m_this.layer()).createFeature('text');
-      let df = m_this.dependentFeatures();
+      const df = m_this.dependentFeatures();
       df.push(m_textFeature);
       m_this.dependentFeatures(df);
     }
@@ -348,7 +348,7 @@ var trackFeature = function (arg) {
         .gcs(m_this.gcs())
         .data(data)
         .position(m_this._headPosition);
-      let radiusFunc = m_markerFeature.style.get('radius');
+      const radiusFunc = m_markerFeature.style.get('radius');
       m_markerFeature.style('radius', (d, i) => {
         if (m_tracks.text[i] || m_tracks.startPosition[i].posidx < 0) {
           return 0;
@@ -728,7 +728,7 @@ var trackFeature = function (arg) {
    *    if the point was found in the current part of the track.
    */
   this.pointSearch = function (p) {
-    let result = m_lineFeatures.current.pointSearch(p),
+    const result = m_lineFeatures.current.pointSearch(p),
         past = m_lineFeatures.past.pointSearch(p),
         future = m_lineFeatures.future.pointSearch(p),
         marker = m_markerFeature ? m_markerFeature.pointSearch(p) : {index: []};
@@ -759,7 +759,7 @@ var trackFeature = function (arg) {
    *    the current part of the track.
    */
   this.polygonSearch = function (poly, opts) {
-    let result = m_lineFeatures.current.polygonSearch(poly, opts),
+    const result = m_lineFeatures.current.polygonSearch(poly, opts),
         past = m_lineFeatures.past.polygonSearch(poly, opts),
         future = m_lineFeatures.future.polygonSearch(poly, opts),
         marker = m_markerFeature ? m_markerFeature.polygonSearch(poly, opts) : {index: []};

package/src/transform.js

@@ -19,8 +19,8 @@ var maxTransformCacheSize = 10;
 
 /* A RegExp to detect if two transforms only different by the middle axis's
  * direction. */
-var axisPattern = new RegExp('^(.* |)\\+axis=e(n|s)u(| .*)$');
-var affinePattern = new RegExp(/(^|\s)\+(s[1-3][1-3]|[xyz]off)=\S/);
+var axisPattern = /^(.* |)\\+axis=e(n|s)u(| .*)$/;
+var affinePattern = /(^|\s)\+(s[1-3][1-3]|[xyz]off)=\S/;
 
 /**
  * This purpose of this class is to provide a generic interface for computing
@@ -49,13 +49,13 @@ var transform = function (options) {
   if (!(this instanceof transform)) {
     options = options || {};
     if (!(options.source in transformCache)) {
-      if (Object.size(transformCache) >= maxTransformCacheSize) {
+      if (Object.keys(transformCache).length >= maxTransformCacheSize) {
         transformCache = {};
       }
       transformCache[options.source] = {};
     }
     if (!(options.target in transformCache[options.source])) {
-      if (Object.size(transformCache[options.source]) >= maxTransformCacheSize) {
+      if (Object.keys(transformCache[options.source]).length >= maxTransformCacheSize) {
         transformCache[options.source] = {};
       }
       transformCache[options.source][options.target] = new transform(options);
@@ -193,7 +193,7 @@ var transform = function (options) {
       var mp = vec3.transformMat4(util.vec3AsArray(), [point.x, point.y, point.z || 0], m_source_matrix_inv);
       point = {x: mp[0], y: mp[1], z: mp[2]};
     }
-    var pt = m_proj.forward(point);
+    var pt = m_proj.forward(point, true);
     pt.z = point.z || 0;
     if (m_target_matrix) {
       var ip = vec3.transformMat4(util.vec3AsArray(), [pt.x, pt.y, pt.z], m_target_matrix);
@@ -214,7 +214,7 @@ var transform = function (options) {
       var mp = vec3.transformMat4(util.vec3AsArray(), [point.x, point.y, point.z || 0], m_target_matrix_inv);
       point = {x: mp[0], y: mp[1], z: mp[2]};
     }
-    var pt = m_proj.inverse(point);
+    var pt = m_proj.inverse(point, true);
     pt.z = point.z || 0;
     if (m_source_matrix) {
       var ip = vec3.transformMat4(util.vec3AsArray(), [pt.x, pt.y, pt.z], m_source_matrix);
@@ -359,7 +359,7 @@ transform.transformCoordinates = function (srcPrj, tgtPrj, coordinates, numberOf
   }
   var trans = transform({source: srcPrj, target: tgtPrj}), output;
   if (util.isObject(coordinates) && 'x' in coordinates && 'y' in coordinates) {
-    output = trans.forward({x: +coordinates.x, y: +coordinates.y, z: +coordinates.z || 0});
+    output = trans.forward({x: +coordinates.x, y: +coordinates.y, z: +coordinates.z || 0}, true);
     if ('z' in coordinates) {
       return output;
     }
@@ -368,7 +368,7 @@ transform.transformCoordinates = function (srcPrj, tgtPrj, coordinates, numberOf
   if (Array.isArray(coordinates) && coordinates.length === 1 &&
       util.isObject(coordinates[0]) && 'x' in coordinates[0] &&
       'y' in coordinates[0]) {
-    output = trans.forward({x: +coordinates[0].x, y: +coordinates[0].y, z: +coordinates[0].z || 0});
+    output = trans.forward({x: +coordinates[0].x, y: +coordinates[0].y, z: +coordinates[0].z || 0}, true);
     if ('z' in coordinates[0]) {
       return [output];
     }
@@ -549,7 +549,7 @@ transform.transformCoordinatesArray = function (trans, coordinates, numberOfComp
     initPoint.x = xAcc(i);
     initPoint.y = yAcc(i);
     initPoint.z = zAcc(i);
-    projPoint = trans.forward(initPoint);
+    projPoint = trans.forward(initPoint, true);
     writer(i, projPoint.x, projPoint.y, projPoint.z);
   }
   return output;
@@ -582,11 +582,12 @@ transform.transformCoordinatesFlatArray3 = function (srcPrj, tgtPrj, coordinates
   var src = proj4.Proj(srcPrj),
       tgt = proj4.Proj(tgtPrj),
       projPoint, initPoint = {};
+  const trans = new proj4(src, tgt);
   for (i = coordinates.length - 3; i >= 0; i -= 3) {
     initPoint.x = +coordinates[i];
     initPoint.y = +coordinates[i + 1];
     initPoint.z = +(coordinates[i + 2] || 0.0);
-    projPoint = proj4.transform(src, tgt, initPoint);
+    projPoint = trans.forward(initPoint, true);
     coordinates[i] = projPoint.x;
     coordinates[i + 1] = projPoint.y;
     coordinates[i + 2] = projPoint.z === undefined ? initPoint.z : projPoint.z;

package/src/ui/colorLegendWidget.js

@@ -109,10 +109,10 @@ var colorLegendWidget = function (arg) {
       var legendSvg = legendContainer
         .append('svg')
         .attr({
-          'class': 'svg',
-          'width': width,
-          'height': '40px',
-          'viewBox': -margin + ' 0 ' + width + ' 40'
+          class: 'svg',
+          width: width,
+          height: '40px',
+          viewBox: -margin + ' 0 ' + width + ' 40'
         });
 
       if (category.type === 'discrete') {
@@ -402,9 +402,9 @@ var colorLegendWidget = function (arg) {
     m_this.popup
       .style({
         // If the popup will be longer or almost longer than the container
-        'left': offset[0] - (offset[0] +
+        left: offset[0] - (offset[0] +
           popupWidth - containerWidth > -10 ? popupWidth : 0) + 'px',
-        'top': (offset[1] - 22) + 'px'
+        top: (offset[1] - 22) + 'px'
       })
       .transition()
       .duration(200)

package/src/ui/colorLegendWidget.styl

@@ -27,7 +27,7 @@
             stroke-width 0.7
           text
             font-size 12px
-  
+
   .color-legend-popup
     position absolute
     background white

package/src/ui/legendWidget.js

@@ -251,11 +251,11 @@ var legendWidget = function (arg) {
       .attr('rx', 3)
       .attr('ry', 3)
       .style({
-        'stroke': 'black',
+        stroke: 'black',
         'stroke-width': '1.5px',
-        'fill': 'white',
+        fill: 'white',
         'fill-opacity': 0.75,
-        'display': 'none'
+        display: 'none'
       });
     m_group.on('mousedown', function () {
       d3.event.stopPropagation();

package/src/ui/sliderWidget.js

@@ -131,7 +131,7 @@ var sliderWidget = function (arg) {
       .attr('cy', m_yscale(0.0) - m_width + 2)
       .attr('r', (m_width - 2) / 2)
       .style({
-        'cursor': 'pointer'
+        cursor: 'pointer'
       })
       .on('click', function () {
         var z = map.zoom();
@@ -171,7 +171,7 @@ var sliderWidget = function (arg) {
       .attr('cy', m_yscale(1.0) + m_width - 2)
       .attr('r', (m_width - 2) / 2)
       .style({
-        'cursor': 'pointer'
+        cursor: 'pointer'
       })
       .on('click', function () {
         var z = map.zoom();
@@ -237,7 +237,7 @@ var sliderWidget = function (arg) {
       .attr('width', m_width / 3)
       .attr('height', m_height - m_width * 3)
       .style({
-        'cursor': 'pointer'
+        cursor: 'pointer'
       })
       .on('click', function () {
         respond(d3.event, true);
@@ -257,7 +257,7 @@ var sliderWidget = function (arg) {
       .attr('width', m_width)
       .attr('height', m_nubSize)
       .style({
-        'cursor': 'pointer'
+        cursor: 'pointer'
       })
       .on('mousedown', function () {
         d3.select(document).on('mousemove.geo.slider', function () {

package/src/util/common.js

@@ -686,11 +686,11 @@ var util = {
    * @memberof geo.util
    */
   distanceToPolygon2d: function (pt, poly, onlySign) {
-    let outer = poly.outer || poly;
+    const outer = poly.outer || poly;
     let inside = false,
-        minDistSq, distSq, dist;
+        minDistSq, distSq;
     for (let i = 0, len = outer.length, j = len - 1; i < len; j = i, i += 1) {
-      let p0 = outer[i],
+      const p0 = outer[i],
           p1 = outer[j];
       if (((p0.y > pt.y) !== (p1.y > pt.y)) && (pt.x < (p1.x - p0.x) * (pt.y - p0.y) / (p1.y - p0.y) + p0.x)) {
         inside = !inside;
@@ -702,7 +702,7 @@ var util = {
     }
     if (poly.inner) {
       poly.inner.forEach(inner => {
-        let innerDist = util.distanceToPolygon2d(pt, inner, onlySign);
+        const innerDist = util.distanceToPolygon2d(pt, inner, onlySign);
         if (innerDist * innerDist < minDistSq) {
           minDistSq = innerDist * innerDist;
         }
@@ -711,7 +711,7 @@ var util = {
         }
       });
     }
-    dist = (inside ? 1 : -1) * Math.sqrt(minDistSq);
+    const dist = (inside ? 1 : -1) * Math.sqrt(minDistSq);
     return dist;
   },
 
@@ -738,8 +738,8 @@ var util = {
    * @memberof geo.util
    */
   crossedLineSegmentPolygon2d: function (pt1, pt2, poly) {
-    let outer = poly.outer || poly,
-        len = outer.length, i, j;
+    const outer = poly.outer || poly, len = outer.length;
+    let i, j;
     for (i = 0, j = len - 1; i < len; j = i, i += 1) {
       if (util.crossedLineSegments2d(pt1, pt2, outer[i], outer[j])) {
         return true;
@@ -817,6 +817,7 @@ var util = {
         if (idx) {
           return util.crossedLineSegments2d(pt1, pt2, line[idx - 1], linePt);
         }
+        return false;
       });
     });
     return result;
@@ -1166,7 +1167,7 @@ var util = {
         /* Create a containing div with the parent's class and id (so css
          * will be used), but override size and background. */
         container = $('<div>').attr({
-          'class': parent.attr('class'),
+          class: parent.attr('class'),
           id: parent.attr('id')
         }).css({
           width: '100%',

package/src/util/mockVGL.js

@@ -1,8 +1,6 @@
 /* eslint-disable camelcase */
-/* eslint-disable underscore/prefer-constant */
 
 var $ = require('jquery');
-var vgl = require('vgl');
 var webglRenderer = require('../webgl/webglRenderer');
 
 var _renderWindow, _supported;
@@ -85,6 +83,7 @@ module.exports.mockWebglRenderer = function mockWebglRenderer(supported) {
     enable: noop('enable'),
     enableVertexAttribArray: noop('enableVertexAttribArray'),
     finish: noop('finish'),
+    getError: noop('getError'),
     getExtension: incID('getExtension'),
     getParameter: function (key) {
       count('getParameter');
@@ -190,6 +189,8 @@ module.exports.mockWebglRenderer = function mockWebglRenderer(supported) {
  * @alias geo.util.restoreWebglRenderer
  */
 module.exports.restoreWebglRenderer = function () {
+  var vgl = require('vgl');
+
   if (vgl._mocked) {
     vgl.renderWindow = _renderWindow;
     webglRenderer.supported = _supported;

package/src/util/throttle.js

@@ -112,9 +112,9 @@ var throttle = function (delay, no_trailing, callback, accumulator, debounce_mod
     }
 
     // Clear any existing timeout.
-    void (
-      timeout_id && clearTimeout(timeout_id)
-    );
+    if (timeout_id) {
+      clearTimeout(timeout_id);
+    }
 
     if (debounce_mode === undefined && elapsed > delay) {
       // In throttle mode, if `delay` time has been exceeded, execute

package/src/vendor.js

@@ -5,8 +5,6 @@
  * @license BSD-3-Clause
  */
 
-require('./polyfills');
-
 var globals = {
   d3: require('d3'),
   hammerjs: require('hammerjs')

package/src/vtkjs/vtkjsRenderer.js

@@ -184,6 +184,9 @@ vtkjsRenderer.supported = function () {
   if ((!vtkjsRenderer.vtkjs || !vtkjsRenderer.vtkjs.Rendering) && window.vtk && window.vtk.Rendering) {
     vtkjsRenderer.vtkjs = window.vtk;
   }
+  if (!vtkjsRenderer.vtkjs || !vtkjsRenderer.vtkjs.Rendering) {
+    vtkjsRenderer.vtkjs = undefined;
+  }
   return vtkjsRenderer.vtkjs !== undefined;
 };
 

package/src/webgl/layer.js

@@ -141,7 +141,7 @@ var webgl_layer = function () {
             opacity,
             lowerTileLayers;
         layers.forEach(function (layer) {
-          let autoshare = layer.autoshareRenderer(),
+          const autoshare = layer.autoshareRenderer(),
               isTileLayer = layer instanceof tileLayer;
           if (!autoshare || !layer.renderer() || layer.renderer().api() !== webglRenderer.apiname) {
             renderer = null;

package/src/webgl/markerFeature.js

@@ -129,7 +129,7 @@ var webgl_markerFeature = function (arg) {
 
     posFunc = m_this.position();
 
-    for (let key in styleKeys) {
+    for (const key in styleKeys) {
       styleFunc[key] = m_this.style.get(key);
       if (!util.isFunction(m_this.style(key))) {
         styleUni[key] = styleFunc[key]();
@@ -183,7 +183,7 @@ var webgl_markerFeature = function (arg) {
         }
       }
       // unrolling this would speed it up
-      for (let key in styleKeys) {
+      for (const key in styleKeys) {
         styleVal[key] = styleUni[key] === undefined ? styleFunc[key](item, i) : styleUni[key];
       }
       styleVal.scaleWithZoom = markerFeature.scaleMode[styleVal.scaleWithZoom] || (styleVal.scaleWithZoom >= 1 && styleVal.scaleWithZoom <= 3 ? styleVal.scaleWithZoom : 0);
@@ -219,7 +219,7 @@ var webgl_markerFeature = function (arg) {
     }
 
     if (m_this._primitiveShapeAuto) {
-      let maxr = m_this._approximateMaxRadius(m_this.renderer().map().zoom());
+      const maxr = m_this._approximateMaxRadius(m_this.renderer().map().zoom());
       if ((m_this._primitiveShape === markerFeature.primitiveShapes.sprite && maxr > webglRenderer._maxPointSize) ||
           (m_this._primitiveShape !== markerFeature.primitiveShapes.sprite && maxr <= webglRenderer._maxPointSize)) {
         // Switch primitive
@@ -339,7 +339,7 @@ var webgl_markerFeature = function (arg) {
         needsRefresh = true;
       }
       if (key === sbkey) {
-        let mod = m_this.modified;
+        const mod = m_this.modified;
         if (!needsRefresh) {
           // don't allow modified to be adjusted if we don't need to refresh
           m_this.modified = () => {};

package/src/webgl/meshColored.js

@@ -140,11 +140,11 @@ var webgl_meshColored = function (arg) {
         posAttr = vgl.vertexAttribute('pos'),
         valueAttr = vgl.vertexAttribute('value'),
         opacityAttr = vgl.vertexAttribute('opacity'),
-        sourcePositions = vgl.sourceDataP3fv({'name': 'pos'}),
+        sourcePositions = vgl.sourceDataP3fv({name: 'pos'}),
         sourceValues = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.One, {'name': 'value'}),
+          1, vgl.vertexAttributeKeysIndexed.One, {name: 'value'}),
         sourceOpacity = vgl.sourceDataAnyfv(
-          1, vgl.vertexAttributeKeysIndexed.Two, {'name': 'opacity'}),
+          1, vgl.vertexAttributeKeysIndexed.Two, {name: 'opacity'}),
         primitive = new vgl.triangles();
     m_modelViewUniform = new vgl.modelViewOriginUniform('modelViewMatrix');