geojs 1.5.0 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",
@@ -13,15 +13,15 @@
   },
   "dependencies": {
     "color-name": "^1.1.4",
-    "earcut": "^2.2.2",
+    "earcut": "^2.2.3",
     "gl-mat3": "^2.0.0",
     "gl-mat4": "^1.2.0",
     "gl-vec3": "^1.1.3",
     "gl-vec4": "^1.0.1",
-    "jquery": "^3.5.1",
+    "jquery": "^3.6.0",
     "kdbush": "^3.0.0",
     "mousetrap": "^1.6.5",
-    "proj4": "2.6.0",
+    "proj4": "^2.7.5",
     "vgl": "0.3.11"
   },
   "optionalDependencies": {
@@ -30,90 +30,77 @@
     "vtk.js": "^14.3.2"
   },
   "devDependencies": {
-    "@semantic-release/changelog": "^5.0.1",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.5",
-    "babel-plugin-istanbul": "^4.1.6",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
+    "@babel/core": "^7.16.5",
+    "@babel/plugin-proposal-class-properties": "^7.16.5",
+    "@babel/preset-env": "^7.16.5",
+    "babel-loader": "^8.2.3",
+    "babel-plugin-istanbul": "^6.1.1",
     "bootstrap": "^3.4.1",
     "bootswatch": "^3.4.1",
-    "codemirror": "^5.54.0",
-    "colorbrewer": "1.3.0",
-    "css-loader": "^0.28.11",
-    "docco": "^0.7.0",
-    "eslint": "^5.16.0",
-    "eslint-config-semistandard": "^13.0.0",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-node": "^7.0.1",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "expose-loader": "^0.7.5",
-    "express": "^4.17.1",
-    "file-loader": "^2.0.0",
-    "forever": "^0.15.2",
-    "fs-extra": "^7.0.0",
-    "glob": "^7.1.6",
+    "codemirror": "^5.65.0",
+    "colorbrewer": "^1.5.1",
+    "css-loader": "^6.5.1",
+    "docco": "^0.9.1",
+    "eslint": "^8.5.0",
+    "eslint-config-semistandard": "^16.0.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "expose-loader": "^3.1.0",
+    "express": "^4.17.2",
+    "forever": "^4.0.1",
+    "fs-extra": "^10.0.0",
+    "glob": "^7.2.0",
     "glslang-validator-prebuilt": "0.0.6",
-    "imports-loader": "^0.8.0",
+    "imports-loader": "^3.1.1",
     "istanbul-combine": "^0.3.0",
     "istanbul-instrumenter-loader": "^3.0.1",
     "jaguarjs-jsdoc": "^1.0.2",
-    "jasmine-core": "^3.5.0",
-    "js-yaml": "^3.14.0",
-    "jsdoc": "^3.6.4",
+    "jasmine-core": "^4.0.0",
+    "js-yaml": "^4.1.0",
+    "jsdoc": "^3.6.7",
     "jsdoc-autoprivate": "0.0.1",
-    "jsonlint-mod": "^1.7.5",
+    "jsonlint-mod": "^1.7.6",
     "jstransformer-markdown-it": "^2.0.0",
-    "karma": "^3.1.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.2",
-    "karma-firefox-launcher": "^1.3.0",
-    "karma-jasmine": "^2.0.0",
-    "karma-jasmine-html-reporter": "^1.5.4",
-    "karma-phantomjs-launcher": "^1.0.0",
-    "karma-phantomjs-shim": "^1.5.0",
-    "karma-sinon": "^1.0.4",
-    "karma-sourcemap-loader": "^0.3.7",
+    "karma": "^6.3.9",
+    "karma-chrome-launcher": "^3.1.0",
+    "karma-coverage": "^2.1.0",
+    "karma-firefox-launcher": "^2.1.2",
+    "karma-jasmine": "^4.0.1",
+    "karma-jasmine-html-reporter": "^1.7.0",
+    "karma-sinon": "^1.0.5",
+    "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.32",
-    "karma-webpack": "^3.0.5",
+    "karma-webpack": "^5.0.0",
     "nib": "^1.1.2",
-    "pako": "^1.0.11",
-    "phantomjs-prebuilt": "^2.1.5",
-    "pug": "^3.0.1",
-    "pug-lint": "^2.4.0",
+    "pako": "^2.0.4",
+    "pug": "^3.0.2",
+    "pug-lint": "^2.6.0",
     "pug-load": "^3.0.0",
-    "raw-body": "^2.1.6",
-    "resemblejs": "^3.2.4",
-    "semantic-release": "^17.4.3",
+    "raw-body": "^2.4.2",
+    "resemblejs": "^4.0.0",
+    "semantic-release": "^18.0.0",
     "serve-index": "^1.9.1",
     "shader-loader": "^1.3.1",
-    "sinon": "^1.17.7",
+    "sinon": "^12.0.1",
     "string-replace-webpack-plugin": "^0.1.3",
-    "style-loader": "^0.23.1",
-    "stylus": "^0.54.7",
-    "stylus-loader": "^3.0.2",
+    "style-loader": "^3.3.1",
+    "stylus": "^0.56.0",
+    "stylus-loader": "^6.2.0",
+    "terser-webpack-plugin": "^5.3.0",
     "touch-emulator": "^1.0.0",
-    "typeface-lato": "^0.0.75",
-    "uglifyjs-webpack-plugin": "^1.2.5",
-    "url-loader": "^1.1.2",
-    "webpack": "^3.12.0",
-    "webpack-merge": "^4.2.2"
+    "typeface-lato": "^1.1.13",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1",
+    "webpack-merge": "^5.8.0"
   },
   "release": {
     "plugins": [
       "@semantic-release/commit-analyzer",
       "@semantic-release/release-notes-generator",
       "@semantic-release/npm",
-      [
-        "@semantic-release/changelog",
-        {
-          "changelogFile": "CHANGELOG.md",
-          "changelogTitle": "# GeoJS Change Log"
-        }
-      ],
       [
         "@semantic-release/github",
         {
@@ -148,20 +135,20 @@
     "lint": "eslint --cache . --max-warnings=0",
     "puglint": "pug-lint src examples",
     "glsllint": "find . \\( -name '*.frag' \\) -exec sh -c 'for n; do python scripts/preprocess_glsl.py \"$n\" | node_modules/glslang-validator-prebuilt/bin/glslangValidator --stdin -S frag || exit 1; done' sh {} \\+ && find . \\( -name '*.vert' \\) -exec sh -c 'for n; do python scripts/preprocess_glsl.py \"$n\" | node_modules/glslang-validator-prebuilt/bin/glslangValidator --stdin -S vert || exit 1; done' sh {} \\+",
-    "test-headless": "GEOJS_TEST_CASE=tests/test-unit.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch,PhantomJS",
-    "test-headless-all": "GEOJS_TEST_CASE=tests/test-unit.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch,PhantomJS",
+    "test-headless": "GEOJS_TEST_CASE=tests/test-unit.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch",
+    "test-headless-all": "GEOJS_TEST_CASE=tests/test-unit.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch",
     "test-headed": "GEOJS_TEST_CASE=tests/test-headed.js karma start karma-cov.conf.js --single-run --browsers ChromeFull",
     "tets-headed-all": "GEOJS_TEST_CASE=tests/test-headed.js karma start karma-cov.conf.js --single-run --browsers ChromeFull,FirefoxWithProxy",
     "test-headed-xvfb": "GEOJS_TEST_CASE=tests/test-headed.js xvfb-run -s '-ac -screen 0 1280x1024x24' karma start karma-cov.conf.js --single-run --browsers ChromeFull",
     "test-webglheadless": "GEOJS_TEST_CASE=tests/test-gl.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch",
     "test-webglheadless-all": "GEOJS_TEST_CASE=tests/test-gl.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch",
-    "test-tutorials": "GEOJS_TEST_CASE=tests/tutorials.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,PhantomJS",
-    "test-tutorialsci-all": "GEOJS_TEST_CASE=tests/tutorials.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch,PhantomJS",
+    "test-tutorials": "GEOJS_TEST_CASE=tests/tutorials.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch",
+    "test-tutorialsci-all": "GEOJS_TEST_CASE=tests/tutorials.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch",
     "get-data-files": "node scripts/datastore.js dist/data",
     "ci-clean": "git clean -fxd dist -e dist/data jsdoc/tmpl jsdoc/static images lcov",
     "ci": "npm run ci-build && npm run ci-test",
-    "ci-build": "(webpack --config webpack.config.js & webpack --config webpack-lean.config.js & npm run docs & npm run get-data-files & npm run lint & npm run puglint & npm run glsllint & npm run build-examples & npm run build-tutorials & wait)",
-    "ci-test": "npm run test-headless && npm run test-headed && npm run test-webglheadless && npm run test-tutorials && npm run combine-coverage",
+    "ci-build": "bash -c '(webpack --config webpack.config.js & webpack --config webpack-lean.config.js & npm run docs & npm run get-data-files & npm run lint & npm run puglint & npm run glsllint & npm run build-examples & npm run build-tutorials & wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n)'",
+    "ci-test": "npm run test-headless && npm run test-webglheadless && npm run test-headed && npm run test-tutorials && npm run combine-coverage",
     "ci-xvfb": "npm run ci-clean && npm run ci-build && TEST_SAVE_IMAGE='all' xvfb-run -s '-ac -screen 0 1280x1024x24' npm run ci-test",
     "start": "karma start karma.conf.js",
     "combine-coverage": "istanbul-combine -d dist/cobertura -r cobertura 'dist/coverage/json/**/coverage-final.json'",
@@ -172,7 +159,7 @@
     "website": "cd website && npx hexo server",
     "setup-website": "cd website && npm install",
     "build-website": "npm run ci-build && npm run ci-build-website",
-    "ci-build-website": "cp -a dist/built/. website/source/built && (npm run build-website-examples & npm run build-website-tutorials & wait) && cd dist && find data \\( -name tiles -o -name base-images -o -name '*-hash-stamp' -o -name '*.tgz' \\) -prune -o \\( -print0 \\) | cpio -pmdL0 ../website/source && cp -ar apidocs/. ../website/source/apidocs && cd ../website && npm install && rm -f db.json && npx hexo generate",
+    "ci-build-website": "cp -a dist/built/. website/source/built && bash -c '(npm run build-website-examples & npm run build-website-tutorials & wait -n && wait -n)' && cd dist && find data \\( -name tiles -o -name base-images -o -name '*-hash-stamp' -o -name '*.tgz' \\) -prune -o \\( -print0 \\) | cpio -pmdL0 ../website/source && cp -ar apidocs/. ../website/source/apidocs && cd ../website && npm install && rm -f db.json && npx hexo generate",
     "prepublishOnly": "webpack --config webpack.config.js && webpack --config webpack-lean.config.js && cp dist/built/*.js .",
     "semantic-release": "semantic-release"
   },

package/src/annotationLayer.js

@@ -91,19 +91,19 @@ var annotationLayer = function (arg) {
       m_keyHandler;
 
   var geojsonStyleProperties = {
-    'closed': {dataType: 'boolean', keys: ['closed', 'close']},
-    'fill': {dataType: 'boolean', keys: ['fill']},
-    'fillColor': {dataType: 'color', keys: ['fillColor', 'fill-color', 'marker-color', 'fill']},
-    'fillOpacity': {dataType: 'opacity', keys: ['fillOpacity', 'fill-opacity']},
-    'lineCap': {dataType: 'text', keys: ['lineCap', 'line-cap']},
-    'lineJoin': {dataType: 'text', keys: ['lineJoin', 'line-join']},
-    'radius': {dataType: 'positive', keys: ['radius']},
-    'scaled': {dataType: 'booleanOrNumber', keys: ['scaled']},
-    'stroke': {dataType: 'boolean', keys: ['stroke']},
-    'strokeColor': {dataType: 'color', keys: ['strokeColor', 'stroke-color', 'stroke']},
-    'strokeOffset': {dataType: 'number', keys: ['strokeOffset', 'stroke-offset']},
-    'strokeOpacity': {dataType: 'opacity', keys: ['strokeOpacity', 'stroke-opacity']},
-    'strokeWidth': {dataType: 'positive', keys: ['strokeWidth', 'stroke-width']}
+    closed: {dataType: 'boolean', keys: ['closed', 'close']},
+    fill: {dataType: 'boolean', keys: ['fill']},
+    fillColor: {dataType: 'color', keys: ['fillColor', 'fill-color', 'marker-color', 'fill']},
+    fillOpacity: {dataType: 'opacity', keys: ['fillOpacity', 'fill-opacity']},
+    lineCap: {dataType: 'text', keys: ['lineCap', 'line-cap']},
+    lineJoin: {dataType: 'text', keys: ['lineJoin', 'line-join']},
+    radius: {dataType: 'positive', keys: ['radius']},
+    scaled: {dataType: 'booleanOrNumber', keys: ['scaled']},
+    stroke: {dataType: 'boolean', keys: ['stroke']},
+    strokeColor: {dataType: 'color', keys: ['strokeColor', 'stroke-color', 'stroke']},
+    strokeOffset: {dataType: 'number', keys: ['strokeOffset', 'stroke-offset']},
+    strokeOpacity: {dataType: 'opacity', keys: ['strokeOpacity', 'stroke-opacity']},
+    strokeWidth: {dataType: 'positive', keys: ['strokeWidth', 'stroke-width']}
   };
   var textFeatureDataTypes = {
     offset: 'coordinate2',

package/src/canvas/heatmapFeature.js

@@ -84,7 +84,7 @@ var canvas_heatmapFeature = function (arg) {
     gaussian = m_this.style('gaussian');
     scale = m_this.style('scaleWithZoom');
     if (scale) {
-      let zoom = this.layer().map().zoom();
+      const zoom = this.layer().map().zoom();
       scale = Math.pow(2, zoom);
       r *= scale;
       blur *= scale;
@@ -306,7 +306,7 @@ var canvas_heatmapFeature = function (arg) {
   this._renderOnCanvas = function (context2d, map) {
 
     if (m_renderTime.timestamp() < m_this.buildTime().timestamp()) {
-      let starttime = Date.now();
+      const starttime = Date.now();
       var data = m_this.data() || [],
           radius = m_this.style('radius') + m_this.style('blurRadius'),
           binned = m_this.binned(),

package/src/choroplethFeature.js

@@ -209,8 +209,8 @@ var choroplethFeature = function (arg) {
     newFeature
       .polygon(function (d) {
         return {
-          'outer': d.coordinates[0],
-          'inner': d.coordinates[1] // undefined but ok
+          outer: d.coordinates[0],
+          inner: d.coordinates[1] // undefined but ok
         };
       })
       .position(function (d) {
@@ -220,7 +220,7 @@ var choroplethFeature = function (arg) {
         };
       })
       .style({
-        'fillColor': fillColor
+        fillColor: fillColor
       });
 
     return newFeature;

package/src/feature.js

@@ -423,10 +423,10 @@ var feature = function (arg) {
   this._handleBrush = function (brush) {
     let corners = [brush.gcs.lowerLeft, brush.gcs.lowerRight, brush.gcs.upperRight, brush.gcs.upperLeft];
     if (m_this.layer()) {
-      let map = m_this.layer().map();
+      const map = m_this.layer().map();
       corners = transform.transformCoordinates(map.gcs(), map.ingcs(), corners);
     }
-    let search = m_this.polygonSearch(corners);
+    const search = m_this.polygonSearch(corners);
 
     feature.eventID += 1;
     search.index.forEach(function (idx, i) {
@@ -451,10 +451,10 @@ var feature = function (arg) {
   this._handleBrushend = function (brush) {
     let corners = [brush.gcs.lowerLeft, brush.gcs.lowerRight, brush.gcs.upperRight, brush.gcs.upperLeft];
     if (m_this.layer()) {
-      let map = m_this.layer().map();
+      const map = m_this.layer().map();
       corners = transform.transformCoordinates(map.gcs(), map.ingcs(), corners);
     }
-    let search = m_this.polygonSearch(corners);
+    const search = m_this.polygonSearch(corners);
 
     feature.eventID += 1;
     search.index.forEach(function (idx, i) {

package/src/geojsonReader.js

@@ -324,7 +324,8 @@ var geojsonReader = function (arg) {
           reject(new Error('Failed to parse GeoJSON'));
           return;
         }
-        let features, allFeatures = [], points, lines, polygons, feature;
+        let features, feature;
+        const allFeatures = [];
 
         try {
           features = m_this._featureArray(object);
@@ -334,7 +335,7 @@ var geojsonReader = function (arg) {
         }
 
         // process points
-        points = features.filter(f => f.geometry.type === 'Point');
+        const points = features.filter(f => f.geometry.type === 'Point');
         if (points.length) {
           feature = m_this.layer().createFeature('point');
           if (feature) {
@@ -358,7 +359,7 @@ var geojsonReader = function (arg) {
         }
 
         // process lines
-        lines = features.filter(f => f.geometry.type === 'LineString');
+        const lines = features.filter(f => f.geometry.type === 'LineString');
         if (lines.length) {
           feature = m_this.layer().createFeature('line');
           if (feature) {
@@ -383,7 +384,7 @@ var geojsonReader = function (arg) {
         }
 
         // process polygons
-        polygons = features.filter(f => f.geometry.type === 'Polygon');
+        const polygons = features.filter(f => f.geometry.type === 'Polygon');
         if (polygons.length) {
           feature = m_this.layer().createFeature('polygon');
           if (feature) {

package/src/index.js

@@ -1,7 +1,7 @@
 // License headers that will be preserved in distributed bundles.
 /**
  * GeoJS
- * @copyright 2013-2018, Kitware, Inc.
+ * @copyright 2013-2022, Kitware, Inc.
  * @license Apache-2.0
  * @namespace geo
  */

package/src/isolineFeature.js

@@ -872,13 +872,13 @@ var isolineFeature = function (arg) {
  */
 isolineFeature.rotationFunction = function (mode, map) {
   var functionList = {
-    'higher': function (d) {
+    higher: function (d) {
       return d.rotation;
     },
-    'lower': function (d) {
+    lower: function (d) {
       return d.rotation + Math.PI;
     },
-    'map': function (d) {
+    map: function (d) {
       var r = d.rotation,
           rt = util.wrapAngle(r, true);
       if (rt > Math.PI / 2 || rt < -Math.PI / 2) {
@@ -886,7 +886,7 @@ isolineFeature.rotationFunction = function (mode, map) {
       }
       return r;
     },
-    'screen': function (d) {
+    screen: function (d) {
       var r = d.rotation,
           rt = util.wrapAngle(r + map.rotation(), true);
       if (rt > Math.PI / 2 || rt < -Math.PI / 2) {

package/src/lineFeature.js

@@ -313,8 +313,8 @@ var lineFeature = function (arg) {
       if (p.y > max.y) { max.y = p.y; }
     });
     m_this._updatePointSearchInfo();
-    let scale = map.unitsPerPixel(map.zoom()),
-        i, j, record, u, v, r;
+    const scale = map.unitsPerPixel(map.zoom());
+    let i, j, record, u, v, r;
     for (i = 0; i < m_pointSearchInfo.length; i += 1) {
       record = m_pointSearchInfo[i];
       if (!record.max ||
@@ -342,7 +342,7 @@ var lineFeature = function (arg) {
             (strokeWidthFunc(line[record[j].i], record[j].i, data[i], i) <= 0 && strokeWidthFunc(line[record[j].j], record[j].j, data[i], i) <= 0)) {
           continue;
         }
-        let dist0 = util.distanceToPolygon2d(u, poly),
+        const dist0 = util.distanceToPolygon2d(u, poly),
             dist1 = util.distanceToPolygon2d(v, poly);
         if ((dist0 > -r * scale && dist0 < r * scale) || (dist1 > -r * scale && dist1 < r & scale) || dist0 * dist1 < 0) {
           partial = true;
@@ -354,7 +354,7 @@ var lineFeature = function (arg) {
         }
         // if a point of the polygon is near the line formed by u-v, this is
         // also partial
-        let r2scaled = r * r * scale * scale;
+        const r2scaled = r * r * scale * scale;
         for (let k = 0; k < poly.outer.length && !partial; k += 1) {
           partial = util.distance2dToLineSquared(poly.outer[k], u, v) < r2scaled;
         }

package/src/map.js

@@ -214,7 +214,7 @@ var map = function (arg) {
          * existing requestAnimationFrame.  By using a property of window,
          * tests can override this if needed. */
         if (queue.length && queue[0] !== m_animationQueue[0]) {
-          window['cancelAnimationFrame'](m_animationQueue[0]);
+          window['cancelAnimationFrame'](m_animationQueue[0]); // eslint-disable-line dot-notation
         }
         for (var i = queue.length ? 1 : 0; i < m_animationQueue.length; i += 1) {
           queue.push(m_animationQueue[i]);
@@ -1897,7 +1897,7 @@ var map = function (arg) {
        * explicitly using window.requestAnimationFrame, we prevent the
        * stripping of 'window' off of the reference and allow our tests to
        * override this if needed. */
-      m_animationQueue.push(window['requestAnimationFrame'](processAnimationFrame));
+      m_animationQueue.push(window['requestAnimationFrame'](processAnimationFrame)); // eslint-disable-line dot-notation
     }
     var pos = m_animationQueue.indexOf(callback, 1);
     if (pos >= 0) {

package/src/mapInteractor.js

@@ -718,6 +718,9 @@ var mapInteractor = function (args) {
       var Hammer;
       try {
         Hammer = require('hammerjs');
+        if (!Hammer || !Hammer.Manager) {
+          Hammer = undefined;
+        }
       } catch (_error) {}
       if (Hammer !== undefined) {
         var recog = [],

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

@@ -93,7 +93,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 +126,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/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}')