geojs 1.11.2 → 1.12.0

package/geo.lean.js

@@ -3014,7 +3014,6 @@ var rectangleAnnotation = function rectangleAnnotation(args, annotationName) {
       /* Should we ensure that the four points form a rectangle in the current
        * projection, though this might not be rectangular in another gcs? */
     }
-
     return m_this.options('corners');
   };
   this._coordinateOption = 'corners';
@@ -3981,7 +3980,6 @@ var annotationLayer = function annotationLayer(arg) {
     if (id !== undefined && id !== null) {
       id = +id; /* Cast to int */
     }
-
     var annotations = m_annotations.filter(function (annotation) {
       return annotation.id() === id;
     });
@@ -7592,7 +7590,7 @@ var feature = __webpack_require__(6837);
  * @property {geo.colorObject[]} [colorRange] Color lookup table.  Default is
  *   9-step color table.
  * @property {function} [scale] A scale converts a input domain into the
- *   the colorRange.  Default is `d3.scale.quantize()`.
+ *   the colorRange.  Default is `d3.scaleQuantize()`.
  * @property {function} [geoId] Given a geometry feature, return an identifier.
  * @property {function} [scalarId] Given a scalar element, return an
  *   identifier.
@@ -7665,7 +7663,7 @@ var choroplethFeature = function choroplethFeature(arg) {
         g: 0.236630659,
         b: 0.209939162
       }],
-      scale: d3.scale.quantize(),
+      scale: d3.scaleQuantize(),
       //accessor for ID on geodata feature
       geoId: function geoId(geoFeature) {
         return geoFeature.properties.GEO_ID;
@@ -7743,7 +7741,6 @@ var choroplethFeature = function choroplethFeature(arg) {
     } else {
       m_choropleth[arg1] = arg2; //if you pass in accessor for prop
     }
-
     m_this.modified();
     return m_this;
   };
@@ -10850,8 +10847,8 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var inherit = __webpack_require__(5699);
 var registerFileReader = (__webpack_require__(4647).registerFileReader);
 var fileReader = __webpack_require__(407);
@@ -11286,16 +11283,15 @@ var geojsonReader = function geojsonReader(arg) {
             // create an object with each property in m_options.polygonStyle,
             // mapping the values through the _style function.
             .style([{}].concat(Object.keys(m_options.polygonStyle)).reduce(function (styleObj, key) {
-              var _objectSpread5;
-              return _objectSpread((_objectSpread5 = {}, _defineProperty(_objectSpread5, key, ellipses.some(function (d) {
+              return _objectSpread(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, key, ellipses.some(function (d) {
                 return d.properties && d.properties[key] !== undefined;
-              }) ? m_this._style(key, m_options.polygonStyle[key]) : m_options.polygonStyle[key]), _defineProperty(_objectSpread5, "radius", function radius(d) {
+              }) ? m_this._style(key, m_options.polygonStyle[key]) : m_options.polygonStyle[key]), "radius", function radius(d) {
                 return d._props.radius;
-              }), _defineProperty(_objectSpread5, "radiusIncludesStroke", false), _defineProperty(_objectSpread5, "symbolValue", function symbolValue(d) {
+              }), "radiusIncludesStroke", false), "symbolValue", function symbolValue(d) {
                 return d._props.aspect;
-              }), _defineProperty(_objectSpread5, "rotation", function rotation(d) {
+              }), "rotation", function rotation(d) {
                 return d._props.rotation;
-              }), _defineProperty(_objectSpread5, "strokeOffset", 0), _defineProperty(_objectSpread5, "rotateWithMap", true), _defineProperty(_objectSpread5, "scaleWithZoom", markerFeature.scaleMode.fill), _objectSpread5), styleObj);
+              }), "strokeOffset", 0), "rotateWithMap", true), "scaleWithZoom", markerFeature.scaleMode.fill), styleObj);
             }));
             allFeatures.push(feature);
           }
@@ -14965,7 +14961,6 @@ var map = function map(arg) {
         if (queue.length && queue[0] !== 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]);
         }
@@ -16664,7 +16659,6 @@ var map = function map(arg) {
        * override this if needed. */
       m_animationQueue.push(window['requestAnimationFrame'](processAnimationFrame)); // eslint-disable-line dot-notation
     }
-
     var pos = m_animationQueue.indexOf(callback, 1);
     if (pos >= 0) {
       if (!action) {
@@ -20072,7 +20066,6 @@ markerFeature.symbols = {
   // possible other symbols:
   // half inner stellations (bowtie/hourglass), hash (#), inner curved shapes
 };
-
 ['flower', 'star', 'cross', 'jack', 'drop', 'arrow'].forEach(function (key) {
   for (var i = 2; i <= markerFeature.symbols[key + 'Max']; i += 1) {
     markerFeature.symbols[key + i] = markerFeature.symbols[key + 'Base'] - 2 + i;
@@ -25078,7 +25071,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "c1123d90202a0e8629d90d57aefed8d2fc800864";
+module.exports = "ee3d8be376e56abdc7e2d506b9a724b74fd945fd";
 
 /***/ }),
 
@@ -25245,11 +25238,11 @@ var svg_lineFeature = function svg_lineFeature(arg) {
           style[key] = wrapStyle(s_style[key]);
         }
       }
-      line = d3.svg.line().x(function (d) {
+      line = d3.line().x(function (d) {
         return m_this.featureGcsToDisplay(d).x;
       }).y(function (d) {
         return m_this.featureGcsToDisplay(d).y;
-      }).interpolate(m_this.style.get('closed')(item, idx) && ln.length > 2 ? 'linear-closed' : 'linear');
+      }).curve(m_this.style.get('closed')(item, idx) && ln.length > 2 ? d3.curveLinearClosed : d3.curveLinear);
       // item is an object representing a single line
       // m_this.line()(item) is an array of coordinates
       m_style = {
@@ -25393,7 +25386,6 @@ var svg_pathFeature = function svg_pathFeature(arg) {
     return new svg_pathFeature(arg);
   }
   var $ = __webpack_require__(5638);
-  var d3 = (__webpack_require__(2531).d3);
   var object = __webpack_require__(2738);
   var timestamp = __webpack_require__(6618);
   arg = arg || {};
@@ -25418,11 +25410,9 @@ var svg_pathFeature = function svg_pathFeature(arg) {
       diag;
     s_update.call(m_this);
     diag = function diag(d) {
-      var p = {
-        source: d.source,
-        target: d.target
-      };
-      return d3.svg.diagonal()(p);
+      // in d3 v3 this was "d3.svg.diagonal(d);".  See
+      // https://stackoverflow.com/questions/40845121/where-is-d3-svg-diagonal
+      return 'M' + d.source.x + ',' + d.source.y + 'C' + d.source.x + ',' + (d.source.y + d.target.y) / 2 + ' ' + d.target.x + ',' + (d.source.y + d.target.y) / 2 + ' ' + d.target.x + ',' + d.target.y;
     };
     tmp = [];
     data.forEach(function (d, i) {
@@ -26412,7 +26402,9 @@ var svgRenderer = function svgRenderer(arg) {
       rendersel;
     entries = selection.enter().append(append);
     selection.exit().remove();
-    rendersel = m_features[id].onlyRenderNew ? entries : selection;
+    // in d3 v3 this was
+    // rendersel = m_features[id].onlyRenderNew ? entries : selection;
+    rendersel = entries;
     setAttrs(rendersel, attributes);
     rendersel.attr('class', classes.concat([id]).join(' '));
     setStyles(rendersel, style);
@@ -26834,10 +26826,10 @@ var svg_vectorFeature = function svg_vectorFeature(arg) {
       }
       return markers;
     }, []);
+    markerGroup = m_this.renderer()._definitions().selectAll('g.marker-group#' + m_this._svgid());
     var sel = markerGroup.selectAll('marker.geo-vector-marker').data(markers);
-    sel.enter().append('marker').append('path');
     var renderer = m_this.renderer();
-    sel.each(function (d) {
+    sel.enter().append('marker').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).forEach(function (attrName) {
@@ -26851,7 +26843,7 @@ var svg_vectorFeature = function svg_vectorFeature(arg) {
       return renderer._convertColor(stroke)(d.data, d.dataIndex);
     }).style('opacity', function (d) {
       return opacity(d.data, d.dataIndex);
-    }).select('path').attr('d', function (d) {
+    }).append('path').attr('d', function (d) {
       return d.head ? markerConfigs[endStyle(d.data, d.dataIndex)].path : markerConfigs[originStyle(d.data, d.dataIndex)].path;
     });
     sel.exit().remove();
@@ -31643,12 +31635,7 @@ var colorLegendWidget = function colorLegendWidget(arg) {
     m_categories.forEach(function (category, index) {
       var legendContainer = container.append('div').attr('class', 'geojs-color-legend');
       legendContainer.append('div').attr('class', 'geojs-title').text(category.name);
-      var legendSvg = legendContainer.append('svg').attr({
-        class: 'svg',
-        width: width,
-        height: '40px',
-        viewBox: -margin + ' 0 ' + width + ' 40'
-      });
+      var legendSvg = legendContainer.append('svg').attr('class', 'svg').attr('width', width).attr('height', '40px').attr('viewBox', -margin + ' 0 ' + width + ' 40');
       if (category.type === 'discrete') {
         m_this._drawDiscrete(legendSvg, width - 2 * margin, category);
       } else if (category.type === 'continuous') {
@@ -31723,27 +31710,38 @@ var colorLegendWidget = function colorLegendWidget(arg) {
    * @param {geo.gui.colorLegendWidget.category} category The discrete type legend category
    */
   this._drawDiscrete = function (svg, width, category) {
+    /**
+     * Render the d3 axis object based on the axis d3 Scale.
+     * @param {object} axisScale d3 scale object
+     * @returns {object} d3 axis object
+     */
+    function createAxis(axisScale) {
+      var skip = Math.ceil(axisScale.domain().length / m_ticks);
+      var values = axisScale.domain().filter(function (d, i) {
+        return i % skip === 0;
+      });
+      return d3.axisBottom(axisScale).tickFormat(d3.format('.2s')).tickValues(values);
+    }
     if (['linear', 'log', 'sqrt', 'pow', 'quantile', 'ordinal'].indexOf(category.scale) === -1) {
       throw new Error('unsupported scale');
     }
     var valueRange, valueScale, colorScale, axisScale, axis, steps, ticks;
     if (category.scale === 'ordinal') {
-      colorScale = d3.scale.ordinal().domain(category.domain).range(category.colors);
+      colorScale = d3.scaleOrdinal().domain(category.domain).range(category.colors);
       m_this._renderDiscreteColors(svg, category.domain, colorScale, width, function (d) {
         return d;
       });
-      axisScale = d3.scale.ordinal().domain(category.domain).rangeRoundBands([0, width]);
-      axis = d3.svg.axis().scale(axisScale).tickValues(function () {
-        var skip = Math.ceil(category.domain.length / m_ticks);
-        return category.domain.filter(function (d, i) {
-          return i % skip === 0;
-        });
+      axisScale = d3.scaleBand().domain(category.domain).rangeRound([0, width]);
+      var skip = Math.ceil(category.domain.length / m_ticks);
+      var values = category.domain.filter(function (d, i) {
+        return i % skip === 0;
       });
+      axis = d3.axisBottom(axisScale).tickValues(values);
     } else if (category.scale === 'quantile') {
       valueRange = [0, category.colors.length];
       steps = util.range(0, category.colors.length - 1);
-      valueScale = d3.scale.quantile().domain(category.domain).range(steps);
-      colorScale = d3.scale.quantize().domain(valueRange).range(category.colors);
+      valueScale = d3.scaleQuantile().domain(category.domain).range(steps);
+      colorScale = d3.scaleQuantize().domain(valueRange).range(category.colors);
       m_this._renderDiscreteColors(svg, steps, colorScale, width, function (d) {
         return valueScale.invertExtent(d).join(' - ');
       });
@@ -31751,12 +31749,12 @@ var colorLegendWidget = function colorLegendWidget(arg) {
       axisDomain = axisDomain.concat(steps.map(function (step) {
         return valueScale.invertExtent(step)[1];
       }));
-      axisScale = d3.scale.ordinal().domain(axisDomain).rangePoints([0, width]);
+      axisScale = d3.scalePoint().domain(axisDomain).range([0, width]);
       axis = createAxis(axisScale);
     } else if (['linear', 'log', 'sqrt', 'pow'].indexOf(category.scale) !== -1) {
       valueRange = [0, category.colors.length];
-      valueScale = d3.scale[category.scale]().domain(category.domain).range(valueRange).nice();
-      colorScale = d3.scale.quantize().domain(valueRange).range(category.colors);
+      valueScale = d3['scale' + category.scale.charAt(0).toUpperCase() + category.scale.slice(1)]().domain(category.domain).range(valueRange).nice();
+      colorScale = d3.scaleQuantize().domain(valueRange).range(category.colors);
       steps = util.range(0, category.colors.length - 1);
       var precision = Math.max.apply(null, category.domain.map(function (number) {
         return getPrecision(number);
@@ -31766,29 +31764,15 @@ var colorLegendWidget = function colorLegendWidget(arg) {
       });
       ticks = steps.slice();
       ticks.push(category.colors.length);
-      axisScale = d3.scale.ordinal().domain(ticks.map(function (tick) {
+      axisScale = d3.scalePoint().domain(ticks.map(function (tick) {
         return valueScale.invert(tick);
-      })).rangePoints([0, width]);
+      })).range([0, width]);
       axis = createAxis(axisScale);
     }
     if (category.endAxisLabelOnly) {
       axis.tickValues([axisScale.domain()[0], axisScale.domain()[axisScale.domain().length - 1]]);
     }
     m_this._renderAxis(svg, axis);
-
-    /**
-     * Render the d3 axis object based on the axis d3 Scale.
-     * @param {object} axisScale d3 scale object
-     * @returns {object} d3 axis object
-     */
-    function createAxis(axisScale) {
-      return d3.svg.axis().scale(axisScale).tickFormat(d3.format('.2s')).tickValues(function () {
-        var skip = Math.ceil(axisScale.domain().length / m_ticks);
-        return axisScale.domain().filter(function (d, i) {
-          return i % skip === 0;
-        });
-      });
-    }
   };
 
   /**
@@ -31804,8 +31788,8 @@ var colorLegendWidget = function colorLegendWidget(arg) {
       return colorScale(d);
     }).attr('transform', function (d, i) {
       return 'translate(' + i * width / steps.length + ' ,0)';
-    }).on('mousemove', function (d) {
-      m_this._showPopup(getValue(d));
+    }).on('mousemove', function (evt, d) {
+      m_this._showPopup(evt, getValue(d));
     }).on('mouseout', m_this._hidePopup);
   };
 
@@ -31825,7 +31809,7 @@ var colorLegendWidget = function colorLegendWidget(arg) {
       range.push(width / (category.domain.length - 1) * i);
     }
     range.push(width);
-    axisScale = d3.scale[category.scale]().domain(category.domain).range(range).nice();
+    axisScale = d3['scale' + category.scale.charAt(0).toUpperCase() + category.scale.slice(1)]().domain(category.domain).range(range).nice();
     if (category.scale === 'log' && category.base) {
       axisScale.base(category.base);
     }
@@ -31842,12 +31826,12 @@ var colorLegendWidget = function colorLegendWidget(arg) {
       gradient.append('stop').attr('offset', (100 / (category.colors.length - 1) * i).toFixed(6) + '%').attr('stop-color', category.colors[i]);
     }
     gradient.append('stop').attr('offset', '100%').attr('stop-color', category.colors[category.colors.length - 1]);
-    svg.append('rect').attr('fill', 'url(#gradient' + id + ')').attr('width', width).attr('height', '20px').on('mousemove', function () {
-      var value = axisScale.invert(d3.mouse(this)[0]);
+    svg.append('rect').attr('fill', 'url(#gradient' + id + ')').attr('width', width).attr('height', '20px').on('mousemove', function (event) {
+      var value = axisScale.invert(d3.pointer(event)[0]);
       var text = m_this._popupFormatter(value, precision);
-      m_this._showPopup(text);
+      m_this._showPopup(event, text);
     }).on('mouseout', m_this._hidePopup);
-    axis = d3.svg.axis().scale(axisScale).ticks(m_ticks, '.2s');
+    axis = d3.axisBottom(axisScale).ticks(m_ticks, '.2s');
     if (category.endAxisLabelOnly) {
       axis.tickValues([category.domain[0], category.domain[category.domain.length - 1]]);
     }
@@ -31860,9 +31844,12 @@ var colorLegendWidget = function colorLegendWidget(arg) {
    * @param {object} axis d3 axis object
    */
   this._renderAxis = function (svg, axis) {
-    svg.append('g').attr('class', 'axis x').attr('transform', 'translate(0, 20)').call(function (g) {
+    svg.append('g').attr('class', 'axis x').attr('transform', 'translate(0, 20)')
+    /*
+    .call(function (g) {
       g.call(axis);
     });
+    */.call(axis);
   };
 
   /**
@@ -31881,19 +31868,18 @@ var colorLegendWidget = function colorLegendWidget(arg) {
 
   /**
    * Show the popup based on current mouse event.
+   * @param {d3.event} event The triggering d3 event.
    * @param {string} text content to be shown in the popup
    */
-  this._showPopup = function (text) {
+  this._showPopup = function (event, text) {
     // The cursor location relative to the container
-    var offset = d3.mouse(m_this.canvas());
+    var offset = d3.pointer(event, m_this.canvas());
     m_this.popup.text(text);
     var containerWidth = m_this.canvas().clientWidth;
-    var popupWidth = m_this.popup[0][0].clientWidth;
-    m_this.popup.style({
-      // If the popup will be longer or almost longer than the container
-      left: offset[0] - (offset[0] + popupWidth - containerWidth > -10 ? popupWidth : 0) + 'px',
-      top: offset[1] - 22 + 'px'
-    }).transition().duration(200).style('opacity', 1);
+    var popupWidth = m_this.popup.node().clientWidth;
+    m_this.popup
+    // If the popup will be longer or almost longer than the container
+    .style('left', offset[0] - (offset[0] + popupWidth - containerWidth > -10 ? popupWidth : 0) + 'px').style('top', offset[1] - 22 + 'px').transition().duration(200).style('opacity', 1);
   };
 
   /**
@@ -32184,8 +32170,8 @@ var legendWidget = function legendWidget(arg) {
    */
   this._scale = function () {
     return {
-      x: d3.scale.linear().domain([0, 1]).range([0, m_this.size().width]),
-      y: d3.scale.linear().domain([0, m_categories.length - 1]).range([m_padding / 2, m_this.size().height - m_padding / 2])
+      x: d3.scaleLinear().domain([0, 1]).range([0, m_this.size().width]),
+      y: d3.scaleLinear().domain([0, m_categories.length - 1]).range([m_padding / 2, m_this.size().height - m_padding / 2])
     };
   };
 
@@ -32213,15 +32199,10 @@ var legendWidget = function legendWidget(arg) {
     d3.select(m_this.canvas()).attr('width', w).attr('height', h);
     m_top = d3.select(m_this.canvas()).append('g');
     m_group = m_top.append('g').attr('transform', 'translate(' + [m_padding + 2, m_padding + 2] + ')');
-    m_border = m_group.append('rect').attr('x', -m_padding).attr('y', -m_padding).attr('width', w - 4).attr('height', h - 4).attr('rx', 3).attr('ry', 3).style({
-      stroke: 'black',
-      'stroke-width': '1.5px',
-      fill: 'white',
-      'fill-opacity': 0.75,
-      display: 'none'
-    });
-    m_group.on('mousedown', function () {
-      d3.event.stopPropagation();
+    m_border = m_group.append('rect').attr('x', -m_padding).attr('y', -m_padding).attr('width', w - 4).attr('height', h - 4).attr('rx', 3).attr('ry', 3);
+    m_border.style('stroke', 'black').style('stroke-width', '1.5px').style('fill', 'white').style('fill-opacity', 0.75).style('display', 'none');
+    m_group.on('mousedown', function (evt) {
+      evt.stopPropagation();
     });
     m_group.on('mouseover', function () {
       m_border.transition().duration(250).style('fill-opacity', 1);
@@ -32366,10 +32347,7 @@ var scaleWidget = function scaleWidget(arg) {
     m_this._createCanvas();
     m_this._appendCanvasToParent();
     m_this.reposition();
-    d3.select(m_this.canvas()).attr({
-      width: m_options.maxWidth,
-      height: m_options.maxHeight
-    });
+    d3.select(m_this.canvas()).attr('width', m_options.maxWidth).attr('height', m_options.maxHeight);
     // Update the scale on pan
     m_this.geoOn(geo_event.pan, m_this._update);
     m_this._render();
@@ -32479,8 +32457,7 @@ var scaleWidget = function scaleWidget(arg) {
     pixels = (vert ? m_options.maxHeight : m_options.maxWidth) - sw;
     /* Calculate the distance that the maximum length scale bar can occupy at
      * the location that the scale bar will be drawn. */
-    // svg.attr({width: width, height: height});
-    pt1 = $(svg[0][0]).offset();
+    pt1 = $(svg.node()).offset();
     pt1 = {
       x: pt1.left + (m_options.orientation === 'left' ? width - sw2 : sw2),
       y: pt1.top + (m_options.orientation === 'top' ? height - sw2 : sw2)
@@ -32500,15 +32477,9 @@ var scaleWidget = function scaleWidget(arg) {
     } else {
       width = value.pixels + sw;
     }
-    svg.attr({
-      width: width,
-      height: height
-    });
+    svg.attr('width', width).attr('height', height);
     if (svg.select('polyline').empty()) {
-      svg.append('polyline').classed('geojs-scale-widget-bar', true).attr({
-        fill: 'none',
-        'stroke-width': sw
-      });
+      svg.append('polyline').classed('geojs-scale-widget-bar', true).attr('fill', 'none').attr('stroke-width', sw);
     }
     if (svg.select('text').empty()) {
       svg.append('text').classed('geojs-scale-widget-text', true);
@@ -32516,39 +32487,19 @@ var scaleWidget = function scaleWidget(arg) {
     switch (m_options.orientation) {
       case 'bottom':
         pts = [[sw2, tl], [sw2, sw2], [width - sw2, sw2], [width - sw2, tl]];
-        svg.select('text').attr({
-          x: width / 2,
-          y: sw * 2,
-          'text-anchor': 'middle',
-          'dominant-baseline': 'hanging'
-        });
+        svg.select('text').attr('x', width / 2).attr('y', sw * 2).attr('text-anchor', 'middle').attr('dominant-baseline', 'hanging');
         break;
       case 'top':
         pts = [[sw2, height - tl], [sw2, height - sw2], [width - sw2, height - sw2], [width - sw2, height - tl]];
-        svg.select('text').attr({
-          x: width / 2,
-          y: height - sw * 2,
-          'text-anchor': 'middle',
-          'dominant-baseline': 'alphabetic'
-        });
+        svg.select('text').attr('x', width / 2).attr('y', height - sw * 2).attr('text-anchor', 'middle').attr('dominant-baseline', 'alphabetic');
         break;
       case 'left':
         pts = [[width - tl, sw2], [width - sw2, sw2], [width - sw2, height - sw2], [width - tl, height - sw2]];
-        svg.select('text').attr({
-          x: width - sw * 2,
-          y: height / 2,
-          'text-anchor': 'end',
-          'dominant-baseline': 'middle'
-        });
+        svg.select('text').attr('x', width - sw * 2).attr('y', height / 2).attr('text-anchor', 'end').attr('dominant-baseline', 'middle');
         break;
       case 'right':
         pts = [[tl, sw2], [sw2, sw2], [sw2, height - sw2], [tl, height - sw2]];
-        svg.select('text').attr({
-          x: sw * 2,
-          y: height / 2,
-          'text-anchor': 'start',
-          'dominant-baseline': 'middle'
-        });
+        svg.select('text').attr('x', sw * 2).attr('y', height / 2).attr('text-anchor', 'start').attr('dominant-baseline', 'middle');
         break;
     }
     svg.select('polyline').attr('points', pts.map(function (pt) {
@@ -32896,8 +32847,8 @@ var sliderWidget = function sliderWidget(arg) {
 
     // create d3 scales for positioning
     // TODO: make customizable and responsive
-    m_xscale = d3.scale.linear().domain([-4, 4]).range([0, m_width]);
-    m_yscale = d3.scale.linear().domain([0, 1]).range([m_width * 1.5, m_height - m_width * 1.5]);
+    m_xscale = d3.scaleLinear().domain([-4, 4]).range([0, m_width]);
+    m_yscale = d3.scaleLinear().domain([0, 1]).range([m_width * 1.5, m_height - m_width * 1.5]);
 
     // Create the main group element
     svg = svg.append('g').classed('geo-ui-slider', true);
@@ -32908,17 +32859,15 @@ var sliderWidget = function sliderWidget(arg) {
     m_plus.append('circle').datum({
       fill: 'white',
       stroke: null
-    }).classed('geo-zoom-in', true).attr('cx', m_xscale(0)).attr('cy', m_yscale(0.0) - m_width + 2).attr('r', (m_width - 2) / 2).style({
-      cursor: 'pointer'
-    }).on('click', function () {
+    }).classed('geo-zoom-in', true).attr('cx', m_xscale(0)).attr('cy', m_yscale(0.0) - m_width + 2).attr('r', (m_width - 2) / 2).style('cursor', 'pointer').on('click', function () {
       var z = map.zoom();
       map.transition({
         zoom: z + 1,
-        ease: d3.ease('cubic-in-out'),
+        ease: d3.easeCubicInOut,
         duration: 500
       });
-    }).on('mousedown', function () {
-      d3.event.stopPropagation();
+    }).on('mousedown', function (evt) {
+      evt.stopPropagation();
     });
     put_icon(m_plusIcon, m_plus, m_xscale(0), m_yscale(0) - m_width + 2, m_width + 4).style('cursor', 'pointer').style('pointer-events', 'none').select('path').datum({
       fill: 'black',
@@ -32930,17 +32879,15 @@ var sliderWidget = function sliderWidget(arg) {
     m_minus.append('circle').datum({
       fill: 'white',
       stroke: null
-    }).classed('geo-zoom-out', true).attr('cx', m_xscale(0)).attr('cy', m_yscale(1.0) + m_width - 2).attr('r', (m_width - 2) / 2).style({
-      cursor: 'pointer'
-    }).on('click', function () {
+    }).classed('geo-zoom-out', true).attr('cx', m_xscale(0)).attr('cy', m_yscale(1.0) + m_width - 2).attr('r', (m_width - 2) / 2).style('cursor', 'pointer').on('click', function () {
       var z = map.zoom();
       map.transition({
         zoom: z - 1,
-        ease: d3.ease('cubic-in-out'),
+        ease: d3.easeCubicInOut,
         duration: 500
       });
-    }).on('mousedown', function () {
-      d3.event.stopPropagation();
+    }).on('mousedown', function (evt) {
+      evt.stopPropagation();
     });
     put_icon(m_minusIcon, m_minus, m_xscale(0), m_yscale(1) + m_width - 2, m_width + 4).style('cursor', 'pointer').style('pointer-events', 'none').select('path').datum({
       fill: 'black',
@@ -32954,13 +32901,13 @@ var sliderWidget = function sliderWidget(arg) {
      * @param {boolean} [trans] Truthy for an animated transition.
      */
     function respond(evt, trans) {
-      var z = m_yscale.invert(d3.mouse(svg.node())[1]),
+      var z = m_yscale.invert(d3.pointer(event, svg.node())[1]),
         zrange = map.zoomRange();
       z = (1 - z) * (zrange.max - zrange.min) + zrange.min;
       if (trans) {
         map.transition({
           zoom: z,
-          ease: d3.ease('cubic-in-out'),
+          ease: d3.easeCubicInOut,
           duration: 500,
           done: m_this._update()
         });
@@ -32975,27 +32922,23 @@ var sliderWidget = function sliderWidget(arg) {
     svg.append('rect').datum({
       fill: 'white',
       stroke: 'black'
-    }).classed('geo-zoom-track', true).attr('x', m_xscale(0) - m_width / 6).attr('y', m_yscale(0)).attr('rx', m_width / 10).attr('ry', m_width / 10).attr('width', m_width / 3).attr('height', m_height - m_width * 3).style({
-      cursor: 'pointer'
-    }).on('click', function () {
-      respond(d3.event, true);
+    }).classed('geo-zoom-track', true).attr('x', m_xscale(0) - m_width / 6).attr('y', m_yscale(0)).attr('rx', m_width / 10).attr('ry', m_width / 10).attr('width', m_width / 3).attr('height', m_height - m_width * 3).style('cursor', 'pointer').on('click', function (evt) {
+      respond(evt, true);
     });
 
     // Create the nub
     m_nub = svg.append('rect').datum({
       fill: 'black',
       stroke: null
-    }).classed('geo-zoom-nub', true).attr('x', m_xscale(-4)).attr('y', m_yscale(0.5) - m_nubSize / 2).attr('rx', 3).attr('ry', 3).attr('width', m_width).attr('height', m_nubSize).style({
-      cursor: 'pointer'
-    }).on('mousedown', function () {
+    }).classed('geo-zoom-nub', true).attr('x', m_xscale(-4)).attr('y', m_yscale(0.5) - m_nubSize / 2).attr('rx', 3).attr('ry', 3).attr('width', m_width).attr('height', m_nubSize).style('cursor', 'pointer').on('mousedown', function (evt) {
       d3.select(document).on('mousemove.geo.slider', function () {
-        respond(d3.event);
+        respond(evt);
       });
       d3.select(document).on('mouseup.geo.slider', function () {
-        respond(d3.event);
+        respond(evt);
         d3.select(document).on('.geo.slider', null);
       });
-      d3.event.stopPropagation();
+      evt.stopPropagation();
     });
 
     /**
@@ -33050,7 +32993,7 @@ var sliderWidget = function sliderWidget(arg) {
     var map = m_this.layer().map(),
       zoomRange = map.zoomRange(),
       zoom = map.zoom(),
-      zoomScale = d3.scale.linear();
+      zoomScale = d3.scaleLinear();
     obj = obj || {};
     zoom = obj.value || zoom;
     zoomScale.domain([zoomRange.min, zoomRange.max]).range([1, 0]).clamp(true);
@@ -33149,7 +33092,7 @@ var svgWidget = function svgWidget(arg) {
 
     // svg widgets manage their own sizes, so make the resize handler a no-op
     m_renderer._resize = function () {};
-    m_this.canvas(m_renderer.canvas()[0][0]);
+    m_this.canvas(m_renderer.canvas().node());
   };
   return this;
 };
@@ -36956,7 +36899,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.11.2";
+module.exports = "1.12.0";
 
 /***/ }),
 
@@ -42680,7 +42623,6 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
               farBuf[dest3 + 1] = position[v2[nextkey] + 1];
               farBuf[dest3 + 2] = 0; // position[v2[nextkey] + 2];
             }
-
             if (updateFlags) {
               offkey = !orderk0 ? 'negStrokeOffset' : 'posStrokeOffset';
               flagsBuf[dest] = order[k][3] + v1.flags * flagsNearLineMult + v2.flags * flagsFarLineMult + v1[offkey] * flagsNearOffsetMult;
@@ -43187,7 +43129,6 @@ var webgl_markerFeature = function webgl_markerFeature(arg) {
         // ignore the z values until we support them
         position[i3 + 2] = 0; // posVal.z || 0;
       }
-
       position = transform.transformCoordinates(m_this.gcs(), m_this.layer().map().gcs(), position, 3);
       m_origin = new Float32Array(m_this.style.get('origin')(position));
       if (m_origin[0] || m_origin[1] || m_origin[2]) {
@@ -44204,7 +44145,6 @@ var webgl_pointFeature = function webgl_pointFeature(arg) {
         // ignore the z values until we support them
         position[i3 + 2] = 0; // posVal.z || 0;
       }
-
       position = transform.transformCoordinates(m_this.gcs(), m_this.layer().map().gcs(), position, 3);
       m_origin = new Float32Array(m_this.style.get('origin')(position));
       if (m_origin[0] || m_origin[1] || m_origin[2]) {
@@ -44832,7 +44772,6 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
           // ignore the z values until we support them
           geometry[d3 + 2] = 0; // c.z || 0;
         }
-
         geometry = {
           vertices: geometry,
           dimensions: 3,
@@ -66317,6 +66256,12 @@ Datum_exports.hermannskogel = {
   datumName: "Hermannskogel"
 };
 
+Datum_exports.militargeographische_institut = {
+  towgs84: "577.326,90.129,463.919,5.137,1.474,5.297,2.4232",
+  ellipse: "bessel",
+  datumName: "Militar-Geographische Institut"
+};
+
 Datum_exports.osni52 = {
   towgs84: "482.530,-130.596,564.557,-1.042,-0.214,-0.631,8.15",
   ellipse: "airy",
@@ -66429,9 +66374,6 @@ function nadgrid(key, data) {
   var view = new DataView(data);
   var isLittleEndian = detectLittleEndian(view);
   var header = readHeader(view, isLittleEndian);
-  if (header.nSubgrids > 1) {
-    console.log('Only single NTv2 subgrids are currently supported, subsequent sub grids are ignored');
-  }
   var subgrids = readSubgrids(view, header, isLittleEndian);
   var nadgrid = {header: header, subgrids: subgrids};
   loadedNadgrids[key] = nadgrid;
@@ -66518,6 +66460,7 @@ function readSubgrids(view, header, isLittleEndian) {
       count: subHeader.gridNodeCount,
       cvs: mapNodes(nodes)
     });
+    gridOffset += 176 + subHeader.gridNodeCount * 16;
   }
   return grids;
 }
@@ -66714,6 +66657,7 @@ function applyGridShift(source, inverse, point) {
   var output = {x: Number.NaN, y: Number.NaN};
   var onlyMandatoryGrids = false;
   var attemptedGrids = [];
+  outer:
   for (var i = 0; i < source.grids.length; i++) {
     var grid = source.grids[i];
     attemptedGrids.push(grid.name);
@@ -66729,19 +66673,22 @@ function applyGridShift(source, inverse, point) {
       }
       continue;
     }
-    var subgrid = grid.grid.subgrids[0];
-    // skip tables that don't match our point at all
-    var epsilon = (Math.abs(subgrid.del[1]) + Math.abs(subgrid.del[0])) / 10000.0;
-    var minX = subgrid.ll[0] - epsilon;
-    var minY = subgrid.ll[1] - epsilon;
-    var maxX = subgrid.ll[0] + (subgrid.lim[0] - 1) * subgrid.del[0] + epsilon;
-    var maxY = subgrid.ll[1] + (subgrid.lim[1] - 1) * subgrid.del[1] + epsilon;
-    if (minY > input.y || minX > input.x || maxY < input.y || maxX < input.x ) {
-      continue;
-    }
-    output = applySubgridShift(input, inverse, subgrid);
-    if (!isNaN(output.x)) {
-      break;
+    var subgrids = grid.grid.subgrids;
+    for (var j = 0, jj = subgrids.length; j < jj; j++) {
+      var subgrid = subgrids[j];
+      // skip tables that don't match our point at all
+      var epsilon = (Math.abs(subgrid.del[1]) + Math.abs(subgrid.del[0])) / 10000.0;
+      var minX = subgrid.ll[0] - epsilon;
+      var minY = subgrid.ll[1] - epsilon;
+      var maxX = subgrid.ll[0] + (subgrid.lim[0] - 1) * subgrid.del[0] + epsilon;
+      var maxY = subgrid.ll[1] + (subgrid.lim[1] - 1) * subgrid.del[1] + epsilon;
+      if (minY > input.y || minX > input.x || maxY < input.y || maxX < input.x ) {
+        continue;
+      }
+      output = applySubgridShift(input, inverse, subgrid);
+      if (!isNaN(output.x)) {
+        break outer;
+      }
     }
   }
   if (isNaN(output.x)) {
@@ -69240,7 +69187,7 @@ function inverse(p) {
   return p;
 }
 
-var names = ["Extended_Transverse_Mercator", "Extended Transverse Mercator", "etmerc", "Transverse_Mercator", "Transverse Mercator", "tmerc"];
+var names = ["Extended_Transverse_Mercator", "Extended Transverse Mercator", "etmerc", "Transverse_Mercator", "Transverse Mercator", "Gauss Kruger", "Gauss_Kruger", "tmerc"];
 /* harmony default export */ var etmerc = ({
   init: init,
   forward: forward,
@@ -72514,6 +72461,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _gauss__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9326);
 /* harmony import */ var _common_adjust_lon__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(759);
+/* harmony import */ var _common_hypot__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(110);
+
 
 
 
@@ -72552,7 +72501,7 @@ function inverse(p) {
 
   p.x /= this.k0;
   p.y /= this.k0;
-  if ((rho = Math.sqrt(p.x * p.x + p.y * p.y))) {
+  if ((rho = (0,_common_hypot__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(p.x, p.y))) {
     var c = 2 * Math.atan2(rho, this.R2);
     sinc = Math.sin(c);
     cosc = Math.cos(c);
@@ -73863,8 +73812,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var ARRAY_TYPES = [Int8Array, Uint8Array, Uint8ClampedArray, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
 
 /** @typedef {Int8ArrayConstructor | Uint8ArrayConstructor | Uint8ClampedArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Int32ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor} TypedArrayConstructor */