geojs 1.7.2 → 1.8.1

package/geo.lean.js

@@ -60,6 +60,8 @@ var registerAnnotation = (__webpack_require__(4647).registerAnnotation);
 
 var lineFeature = __webpack_require__(4708);
 
+var markerFeature = __webpack_require__(7098);
+
 var pointFeature = __webpack_require__(2557);
 
 var polygonFeature = __webpack_require__(4343);
@@ -203,10 +205,19 @@ var annotation = function annotation(type, args) {
   delete m_options.name;
   delete m_options.label;
   delete m_options.description;
+
+  if (m_options.constraint) {
+    if (util.isFunction(m_options.constraint)) {
+      this._selectionConstraint = m_options.constraint;
+    } else {
+      this._selectionConstraint = constrainAspectRatio(m_options.constraint);
+    }
+  }
   /**
    * Clean up any resources that the annotation is using.
    */
 
+
   this._exit = function () {};
   /**
    * Get a unique annotation id.
@@ -540,7 +551,7 @@ var annotation = function annotation(type, args) {
     return m_this;
   };
   /**
-   * Set or get options.
+   * Get or set options.
    *
    * @param {string|object} [arg1] If `undefined`, return the options object.
    *    If a string, either set or return the option of that name.  If an
@@ -616,7 +627,7 @@ var annotation = function annotation(type, args) {
     return m_this;
   };
   /**
-   * Set or get style.
+   * Get or set style.
    *
    * @param {string|object} [arg1] If `undefined`, return the current style
    *    object.  If a string and `arg2` is undefined, return the style
@@ -1427,11 +1438,10 @@ function continuousVerticesProcessAction(m_this, evt, name) {
  *    finished rectangle.  This uses styles for {@link geo.polygonFeature}.
  * @property {geo.polygonFeature.styleSpec} [editStyle] The style to apply to a
  *    rectangle in edit mode.
- */
-
-/*
- * @typedef {object} geo.rectangleAnnotation.subspec
- * @typedef {geo.annotation.spec | geo.rectangleAnnotation.subspec} geo.rectangleAnnotation.spec
+ * @property {number|number[]|function} [constraint] If specified, an aspect
+ *    ratio or list of aspect ratios to constraint the rectangle to.  If a
+ *    function, a selection constraint function to call to adjust the
+ *    rectangle.
  */
 
 /**
@@ -1446,14 +1456,15 @@ function continuousVerticesProcessAction(m_this, evt, name) {
  * @extends geo.annotation
  *
  * @param {geo.rectangleAnnotation.spec?} [args] Options for the annotation.
+ * @param {string} [annotationName='rectangle'] Override the annotation name.
  */
 
 
-var rectangleAnnotation = function rectangleAnnotation(args) {
+var rectangleAnnotation = function rectangleAnnotation(args, annotationName) {
   'use strict';
 
   if (!(this instanceof rectangleAnnotation)) {
-    return new rectangleAnnotation(args);
+    return new rectangleAnnotation(args, annotationName);
   }
 
   args = $.extend(true, {}, {
@@ -1503,7 +1514,7 @@ var rectangleAnnotation = function rectangleAnnotation(args) {
   }, args || {});
   args.corners = args.corners || args.coordinates || [];
   delete args.coordinates;
-  annotation.call(this, 'rectangle', args);
+  annotation.call(this, annotationName || 'rectangle', args);
   var m_this = this,
       s_actions = this.actions,
       s_processEditAction = this.processEditAction;
@@ -1531,7 +1542,8 @@ var rectangleAnnotation = function rectangleAnnotation(args) {
             shift: false,
             ctrl: false
           },
-          selectionRectangle: true
+          selectionRectangle: true,
+          selectionConstraint: this._selectionConstraint
         }];
 
       default:
@@ -1572,8 +1584,13 @@ var rectangleAnnotation = function rectangleAnnotation(args) {
       x: evt.upperRight.x,
       y: evt.lowerLeft.y
     }, null)];
+
+    if (this._selectionConstraint && evt.mouse && evt.state.origin) {
+      this._selectionConstraint(evt.mouse.mapgcs, evt.state.origin.mapgcs, corners);
+    }
     /* Don't keep rectangles that have nearly zero area in display pixels */
 
+
     if (layer.displayDistance(corners[0], null, corners[1], null) * layer.displayDistance(corners[0], null, corners[3], null) < 0.01) {
       return 'remove';
     }
@@ -1593,35 +1610,19 @@ var rectangleAnnotation = function rectangleAnnotation(args) {
     var opt = m_this.options(),
         state = m_this.state(),
         features;
+    features = [];
 
-    switch (state) {
-      case annotationState.create:
-        features = [];
-
-        if (opt.corners && opt.corners.length >= 4) {
-          features = [{
-            polygon: {
-              polygon: opt.corners,
-              style: m_this.styleForState(state)
-            }
-          }];
-        }
-
-        break;
-
-      default:
-        features = [{
-          polygon: {
-            polygon: opt.corners,
-            style: m_this.styleForState(state)
-          }
-        }];
-
-        if (state === annotationState.edit) {
-          m_this._addEditHandles(features, opt.corners);
+    if (opt.corners && opt.corners.length >= 4) {
+      features = [{
+        polygon: {
+          polygon: opt.corners,
+          style: m_this.styleForState(state)
         }
+      }];
+    }
 
-        break;
+    if (state === annotationState.edit) {
+      m_this._addEditHandles(features, opt.corners);
     }
 
     return features;
@@ -1719,6 +1720,10 @@ var rectangleAnnotation = function rectangleAnnotation(args) {
     corners[2] = $.extend({}, evt.mapgcs);
     corners[1] = map.displayToGcs(c1, null);
     corners[3] = map.displayToGcs(c3, null);
+
+    if (this._selectionConstraint) {
+      this._selectionConstraint(evt.mapgcs, corners[0], corners);
+    }
   };
   /**
    * Handle a mouse move on this annotation.
@@ -1859,6 +1864,11 @@ var rectangleAnnotation = function rectangleAnnotation(args) {
         corners[(index + 1) % 4].y += delta1.y;
         corners[(index + 3) % 4].x += delta2.x;
         corners[(index + 3) % 4].y += delta2.y;
+
+        if (this._selectionConstraint) {
+          corners = this._selectionConstraint(evt.mouse.mapgcs, evt.state.origin.mapgcs, corners, 'vertex', ang, index).corners;
+        }
+
         m_this.options('corners', corners);
         return true;
 
@@ -1878,6 +1888,11 @@ var rectangleAnnotation = function rectangleAnnotation(args) {
         corners[index].y += delta.y;
         corners[(index + 1) % 4].x += delta.x;
         corners[(index + 1) % 4].y += delta.y;
+
+        if (this._selectionConstraint) {
+          corners = this._selectionConstraint(evt.mouse.mapgcs, evt.state.origin.mapgcs, corners, 'edge', ang, index).corners;
+        }
+
         m_this.options('corners', corners);
         return true;
     }
@@ -1890,6 +1905,140 @@ inherit(rectangleAnnotation, annotation);
 var rectangleRequiredFeatures = {};
 rectangleRequiredFeatures[polygonFeature.capabilities.feature] = true;
 registerAnnotation('rectangle', rectangleAnnotation, rectangleRequiredFeatures);
+/**
+ * Square annotation class.
+ *
+ * Squares are a subset of rectangles with a fixed aspect ratio.
+ *
+ * @class
+ * @alias geo.squareAnnotation
+ * @extends geo.annotation
+ *
+ * @param {geo.squareAnnotation.spec?} [args] Options for the annotation.
+ * @param {string} [annotationName='square'] Override the annotation name.
+ */
+
+var squareAnnotation = function squareAnnotation(args, annotationName) {
+  'use strict';
+
+  args = $.extend({}, args, {
+    constraint: 1
+  });
+
+  if (!(this instanceof squareAnnotation)) {
+    return new squareAnnotation(args, annotationName);
+  }
+
+  rectangleAnnotation.call(this, args, annotationName || 'square');
+};
+
+inherit(squareAnnotation, rectangleAnnotation);
+var squareRequiredFeatures = {};
+squareRequiredFeatures[polygonFeature.capabilities.feature] = true;
+registerAnnotation('square', squareAnnotation, squareRequiredFeatures);
+/**
+ * Ellipse annotation class.
+ *
+ * Ellipses are always rendered as markers.
+ *
+ * @class
+ * @alias geo.ellipseAnnotation
+ * @extends geo.annotation
+ *
+ * @param {geo.ellipseAnnotation.spec?} [args] Options for the annotation.
+ * @param {string} [annotationName='ellipse'] Override the annotation name.
+ */
+
+var ellipseAnnotation = function ellipseAnnotation(args, annotationName) {
+  'use strict';
+
+  if (!(this instanceof ellipseAnnotation)) {
+    return new ellipseAnnotation(args, annotationName);
+  }
+
+  rectangleAnnotation.call(this, args, annotationName || 'ellipse');
+  var m_this = this;
+  /**
+   * Get a list of renderable features for this annotation.
+   *
+   * @returns {array} An array of features.
+   */
+
+  this.features = function () {
+    var opt = m_this.options(),
+        state = m_this.state(),
+        features;
+    features = [];
+
+    if (opt.corners && opt.corners.length >= 4) {
+      var style = m_this.styleForState(state);
+      var w = Math.pow(Math.pow(opt.corners[0].x - opt.corners[1].x, 2) + Math.pow(opt.corners[0].y - opt.corners[1].y, 2), 0.5);
+      var h = Math.pow(Math.pow(opt.corners[0].x - opt.corners[3].x, 2) + Math.pow(opt.corners[0].y - opt.corners[3].y, 2), 0.5);
+      var radius = Math.max(w, h) / 2 / m_this.layer().map().unitsPerPixel(0);
+      var aspect = w ? h / w : 1e20;
+      var rotation = -Math.atan2(opt.corners[1].y - opt.corners[0].y, opt.corners[1].x - opt.corners[0].x);
+      features = [{
+        marker: {
+          x: (opt.corners[0].x + opt.corners[1].x + opt.corners[2].x + opt.corners[3].x) / 4,
+          y: (opt.corners[0].y + opt.corners[1].y + opt.corners[2].y + opt.corners[3].y) / 4,
+          style: $.extend({}, style, {
+            radius: radius,
+            symbolValue: aspect,
+            rotation: rotation,
+            strokeOffset: 0,
+            radiusIncludesStroke: false,
+            scaleWithZoom: markerFeature.scaleMode.fill,
+            rotateWithMap: true,
+            strokeOpacity: style.stroke === false ? 0 : style.strokeOpacity,
+            fillOpacity: style.fill === false ? 0 : style.fillOpacity
+          })
+        }
+      }];
+    }
+
+    if (state === annotationState.edit) {
+      m_this._addEditHandles(features, opt.corners);
+    }
+
+    return features;
+  };
+};
+
+inherit(ellipseAnnotation, rectangleAnnotation);
+var ellipseRequiredFeatures = {};
+ellipseRequiredFeatures[markerFeature.capabilities.feature] = true;
+registerAnnotation('ellipse', ellipseAnnotation, ellipseRequiredFeatures);
+/**
+ * Circle annotation class.
+ *
+ * Circles are a subset of rectangles with a fixed aspect ratio.
+ *
+ * @class
+ * @alias geo.circleAnnotation
+ * @extends geo.annotation
+ *
+ * @param {geo.circleAnnotation.spec?} [args] Options for the annotation.
+ * @param {string} [annotationName='circle'] Override the annotation name.
+ */
+
+var circleAnnotation = function circleAnnotation(args, annotationName) {
+  'use strict';
+
+  args = $.extend({}, args, {
+    constraint: 1
+  });
+
+  if (!(this instanceof circleAnnotation)) {
+    return new circleAnnotation(args, annotationName);
+  }
+
+  ellipseAnnotation.call(this, args, annotationName || 'circle');
+};
+
+inherit(circleAnnotation, ellipseAnnotation);
+var circleRequiredFeatures = {};
+circleRequiredFeatures[markerFeature.capabilities.feature] = true;
+registerAnnotation('circle', circleAnnotation, circleRequiredFeatures);
 /**
  * Polygon annotation specification.  Extends {@link geo.annotation.spec}.
  *
@@ -2852,6 +3001,154 @@ inherit(pointAnnotation, annotation);
 var pointRequiredFeatures = {};
 pointRequiredFeatures[pointFeature.capabilities.feature] = true;
 registerAnnotation('point', pointAnnotation, pointRequiredFeatures);
+/**
+ * Return a function that can be used as a selectionConstraint that requires
+ * that the aspect ratio of a rectangle-like selection is a specific value or
+ * range of values.
+ *
+ * @param {number|number[]} ratio Either a single aspect ratio or a list of
+ *   allowed aspect ratios.  For instance, 1 will require that the selection
+ *   square, 2 would require that it is twice as wide as tall, [2, 1/2] would
+ *   allow it to be twice as wide or half as wide as it is tall.
+ * @returns {function} A function that can be passed to the mapIterator
+ *   selectionConstraint or to an annotation constraint function.
+ */
+
+function constrainAspectRatio(ratio) {
+  var ratios = Array.isArray(ratio) ? ratio : [ratio];
+  /**
+   * Constrain a mouse action or annotation action to a list of aspect ratios.
+   *
+   * @param {geo.geoPosition} pos Mouse or new location in map gcs.
+   * @param {geo.geoPosition} origin Origin in map gcs when the activity
+   *    started.
+   * @param {geo.geoPosition} [corners] If specified, an array of corner
+   *    locations in mapgcs.  This may be modified.
+   * @param {string?} [mode] 'edge', 'vertex' or falsy.  A falsy value implies
+   *    this is just the most recent point in the annotation, otherwise it is
+   *    the portion of the annotation being modified.
+   * @param {number} [ang] A list of angles of each side of the polygon
+   *    represented by corners or the original annotation.
+   * @param {integer} [index] The specific vertex or edge that is being
+   *    modified.
+   * @returns {object} An object with the ``origin`` (this is what is passed
+   *    in), a new position as ``pos``, and the updated corners as ``corners``.
+   */
+
+  function constraintFunction(pos, origin, corners, mode, ang, index) {
+    var newpos = pos;
+    var best;
+
+    if (!corners) {
+      corners = [{
+        x: origin.x,
+        y: origin.y
+      }, {
+        x: pos.x,
+        y: origin.y
+      }, {
+        x: pos.x,
+        y: pos.y
+      }, {
+        x: origin.x,
+        y: pos.y
+      }];
+    }
+
+    if (mode) {
+      /* Edit a vertex or edge */
+      var i1 = (index + 1) % 4;
+      var i2 = (index + 2) % 4;
+      var i3 = (index + 3) % 4;
+      var dist1 = Math.pow(Math.pow(corners[index].x - corners[i1].x, 2) + Math.pow(corners[index].y - corners[i1].y, 2), 0.5);
+      var dist3 = Math.pow(Math.pow(corners[index].x - corners[i3].x, 2) + Math.pow(corners[index].y - corners[i3].y, 2), 0.5);
+      var area = Math.abs(dist1 * dist3);
+      var shape, edge;
+      ratios.forEach(function (ratio) {
+        if (ratio !== 1 && !(index % 2)) {
+          ratio = 1.0 / ratio;
+        }
+
+        var width = Math.pow(area * ratio, 0.5);
+        var score = Math.pow(width - dist3, 2) + Math.pow(width / ratio - dist1, 2);
+
+        if (best === undefined || score < best) {
+          best = score;
+          shape = {
+            w: width,
+            h: width / ratio
+          };
+        }
+      });
+      var ang1 = ang[i1];
+      var delta1 = {
+        x: -shape.w * Math.cos(ang1),
+        y: -shape.w * Math.sin(ang1)
+      };
+      var ang2 = ang[index];
+      var delta2 = {
+        x: -shape.h * Math.cos(ang2),
+        y: -shape.h * Math.sin(ang2)
+      };
+
+      switch (mode) {
+        case 'vertex':
+          corners[index].x = corners[i2].x + delta1.x + delta2.x;
+          corners[index].y = corners[i2].y + delta1.y + delta2.y;
+          corners[i1].x = corners[i2].x + delta1.x;
+          corners[i1].y = corners[i2].y + delta1.y;
+          corners[i3].x = corners[i2].x + delta2.x;
+          corners[i3].y = corners[i2].y + delta2.y;
+          break;
+
+        case 'edge':
+          edge = {
+            x: (corners[i2].x + corners[i3].x) * 0.5,
+            y: (corners[i2].y + corners[i3].y) * 0.5
+          };
+          corners[i2].x = edge.x + delta2.x / 2;
+          corners[i2].y = edge.y + delta2.y / 2;
+          corners[index].x = edge.x + delta1.x - delta2.x / 2;
+          corners[index].y = edge.y + delta1.y - delta2.y / 2;
+          corners[i1].x = edge.x + delta1.x + delta2.x / 2;
+          corners[i1].y = edge.y + delta1.y + delta2.y / 2;
+          corners[i3].x = edge.x - delta2.x / 2;
+          corners[i3].y = edge.y - delta2.y / 2;
+          break;
+      }
+    } else {
+      /* Not in edit vertex or edge mode */
+      var _area = Math.abs((pos.x - origin.x) * (pos.y - origin.y));
+
+      ratios.forEach(function (ratio) {
+        var width = Math.pow(_area * ratio, 0.5);
+        var adjusted = {
+          x: origin.x + Math.sign(pos.x - origin.x) * width,
+          y: origin.y + Math.sign(pos.y - origin.y) * width / ratio
+        };
+        var score = Math.pow(adjusted.x - pos.x, 2) + Math.pow(adjusted.y - pos.y, 2);
+
+        if (best === undefined || score < best) {
+          best = score;
+          newpos = adjusted;
+        }
+      });
+      corners[0].y = corners[1].y = origin.y;
+      corners[0].x = corners[3].x = origin.x;
+      corners[1].x = corners[2].x = newpos.x;
+      corners[2].y = corners[3].y = newpos.y;
+    }
+
+    return {
+      corners: corners,
+      origin: origin,
+      pos: newpos
+    };
+  }
+
+  return constraintFunction;
+}
+
 module.exports = {
   state: annotationState,
   actionOwner: annotationActionOwner,
@@ -2860,8 +3157,12 @@ module.exports = {
   pointAnnotation: pointAnnotation,
   polygonAnnotation: polygonAnnotation,
   rectangleAnnotation: rectangleAnnotation,
+  squareAnnotation: squareAnnotation,
+  ellipseAnnotation: ellipseAnnotation,
+  circleAnnotation: circleAnnotation,
   _editHandleFeatureLevel: editHandleFeatureLevel,
-  defaultEditHandleStyle: defaultEditHandleStyle
+  defaultEditHandleStyle: defaultEditHandleStyle,
+  constrainAspectRatio: constrainAspectRatio
 };
 
 /***/ }),
@@ -3508,11 +3809,13 @@ var annotationLayer = function annotationLayer(arg) {
    *    {@link geo.listAnnotations}.
    * @param {geo.annotation} [editAnnotation] If `arg === this.modes.edit`,
    *    this is the annotation that should be edited.
+   * @param {object} [options] Additional options to pass when creating an
+   *    annotation.
    * @returns {string|null|this} The current mode or the layer.
    * @fires geo.event.annotation.mode
    */
 
-  this.mode = function (arg, editAnnotation) {
+  this.mode = function (arg, editAnnotation, options) {
     if (arg === undefined) {
       return m_mode;
     }
@@ -3553,37 +3856,22 @@ var annotationLayer = function annotationLayer(arg) {
         m_this.currentAnnotation = null;
       }
 
-      switch (m_mode) {
-        case m_this.modes.edit:
-          m_this.currentAnnotation = editAnnotation;
-          m_this.currentAnnotation.state(geo_annotation.state.edit);
-          m_this.modified();
-          break;
-
-        case 'line':
-          createAnnotation = geo_annotation.lineAnnotation;
-          break;
-
-        case 'point':
-          createAnnotation = geo_annotation.pointAnnotation;
-          break;
-
-        case 'polygon':
-          createAnnotation = geo_annotation.polygonAnnotation;
-          break;
-
-        case 'rectangle':
-          createAnnotation = geo_annotation.rectangleAnnotation;
-          break;
+      if (m_mode === m_this.modes.edit) {
+        m_this.currentAnnotation = editAnnotation;
+        m_this.currentAnnotation.state(geo_annotation.state.edit);
+        m_this.modified();
+      } else if (registry.registries.annotations[m_mode]) {
+        createAnnotation = registry.registries.annotations[m_mode].func;
       }
 
       m_this.map().interactor().removeAction(undefined, undefined, geo_annotation.actionOwner);
 
       if (createAnnotation) {
-        m_this.currentAnnotation = createAnnotation({
+        options = $.extend({}, options || {}, {
           state: geo_annotation.state.create,
           layer: m_this
         });
+        m_this.currentAnnotation = createAnnotation(options);
         m_this.addAnnotation(m_this.currentAnnotation, null);
         actions = m_this.currentAnnotation.actions(geo_annotation.state.create);
         $.each(actions, function (idx, action) {
@@ -3718,7 +4006,7 @@ var annotationLayer = function annotationLayer(arg) {
 
       options.style = options.style || {};
       options.labelStyle = options.labelStyle || {};
-      delete options.annotationType; // the geoJSON reader can only emit line, polygon, and point
+      delete options.annotationType; // the geoJSON reader can emit line, polygon, point, and marker
 
       switch (feature.featureType) {
         case 'line':
@@ -3752,6 +4040,10 @@ var annotationLayer = function annotationLayer(arg) {
 
           break;
 
+        case 'marker':
+          position = data.geometry.coordinates[0].slice(0, 4);
+          break;
+
         case 'point':
           position = [feature.position()(data, data_idx)];
           break;
@@ -4066,7 +4358,7 @@ var annotationLayer = function annotationLayer(arg) {
 
 
               var style = {};
-              $.each(['closed', 'fill', 'fillColor', 'fillOpacity', 'line', 'lineCap', 'lineJoin', 'polygon', 'position', 'radius', 'stroke', 'strokeColor', 'strokeOffset', 'strokeOpacity', 'strokeWidth', 'uniformPolygon'], function (keyidx, key) {
+              $.each(['closed', 'fill', 'fillColor', 'fillOpacity', 'line', 'lineCap', 'lineJoin', 'polygon', 'position', 'radius', 'radiusIncludesStroke', 'rotateWithMap', 'rotation', 'scaleWithZoom', 'stroke', 'strokeColor', 'strokeOffset', 'strokeOpacity', 'strokeWidth', 'symbolValue', 'uniformPolygon'], function (keyidx, key) {
                 var origFunc;
 
                 if (feature.style()[key] !== undefined) {
@@ -8138,6 +8430,16 @@ geo_event.layerAdd = 'geo_layerAdd';
  */
 
 geo_event.layerRemove = 'geo_layerRemove';
+/**
+ * Triggered when a layer z-index is changed.
+ *
+ * @event geo.event.layerMove
+ * @type {geo.event.base}
+ * @property {geo.map} target The current map.
+ * @property {geo.layer} layer The old layer that was removed.
+ */
+
+geo_event.layerMove = 'geo_layerMove';
 /**
  * Triggered when the map's zoom level is changed.
  *
@@ -10779,6 +11081,10 @@ var geojsonReader = function geojsonReader(arg) {
 
   var convertColor = (__webpack_require__(4634).convertColor);
 
+  var markerFeature = __webpack_require__(7098);
+
+  var transform = __webpack_require__(6853);
+
   var m_this = this,
       m_options = _objectSpread(_objectSpread({}, arg), {}, {
     pointStyle: _objectSpread({
@@ -11067,6 +11373,20 @@ var geojsonReader = function geojsonReader(arg) {
 
   this.read = function (file, done, progress) {
     var promise = new Promise(function (resolve, reject) {
+      /**
+       * Check if a feature is a circle or an ellipse.
+       *
+       * @param {geojson.object} f A geojson feature.
+       * @returns {boolean} true if this should be rendered as an ellipse or
+       *   circle.
+       */
+      function _isEllipse(f) {
+        if (f.geometry.type !== 'Polygon' || f.geometry.coordinates.length !== 1 || f.geometry.coordinates[0].length !== 5) {
+          return false;
+        }
+
+        return (f.properties || {}).annotationType === 'ellipse' || (f.properties || {}).annotationType === 'circle';
+      }
       /**
        * Given a parsed GeoJSON object, convert it into features on the
        * reader's layer.
@@ -11074,6 +11394,8 @@ var geojsonReader = function geojsonReader(arg) {
        * @param {geojson.object|false} object Either a parse GeoJSON object or
        *    `false` for an error.
        */
+
+
       function _done(object) {
         if (object === false) {
           if (done) {
@@ -11140,7 +11462,7 @@ var geojsonReader = function geojsonReader(arg) {
 
 
         var polygons = features.filter(function (f) {
-          return f.geometry.type === 'Polygon';
+          return f.geometry.type === 'Polygon' && !_isEllipse(f);
         });
 
         if (polygons.length) {
@@ -11161,6 +11483,53 @@ var geojsonReader = function geojsonReader(arg) {
             }));
             allFeatures.push(feature);
           }
+        } // handle ellipses and circle
+
+
+        var ellipses = features.filter(_isEllipse);
+
+        if (ellipses.length) {
+          feature = m_this.layer().createFeature('marker');
+
+          if (feature) {
+            ellipses.forEach(function (d) {
+              var map = m_this.layer().map();
+              var coord = transform.transformCoordinates(map.ingcs(), map.gcs(), d.geometry.coordinates[0]);
+              var w = Math.pow(Math.pow(coord[0][0] - coord[1][0], 2) + Math.pow(coord[0][1] - coord[1][1], 2), 0.5);
+              var h = Math.pow(Math.pow(coord[0][0] - coord[3][0], 2) + Math.pow(coord[0][1] - coord[3][1], 2), 0.5);
+              var radius = Math.max(w, h) / 2 / map.unitsPerPixel(0);
+              var aspect = w ? h / w : 1e20;
+              var rotation = -Math.atan2(coord[1][1] - coord[0][1], coord[1][0] - coord[0][0]);
+              var pos = transform.transformCoordinates(map.gcs(), map.ingcs(), {
+                x: (coord[0][0] + coord[1][0] + coord[2][0] + coord[3][0]) / 4,
+                y: (coord[0][1] + coord[1][1] + coord[2][1] + coord[3][1]) / 4
+              });
+              d._props = {
+                pos: pos,
+                radius: radius,
+                aspect: aspect,
+                rotation: rotation
+              };
+            });
+            feature.data(ellipses).position(function (d) {
+              return d._props.pos;
+            }) // 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 d.properties && d.properties[key] !== undefined;
+              }) ? m_this._style(key, m_options.polygonStyle[key]) : m_options.polygonStyle[key]), _defineProperty(_objectSpread5, "radius", function radius(d) {
+                return d._props.radius;
+              }), _defineProperty(_objectSpread5, "radiusIncludesStroke", false), _defineProperty(_objectSpread5, "symbolValue", function symbolValue(d) {
+                return d._props.aspect;
+              }), _defineProperty(_objectSpread5, "rotation", function rotation(d) {
+                return d._props.rotation;
+              }), _defineProperty(_objectSpread5, "strokeOffset", 0), _defineProperty(_objectSpread5, "rotateWithMap", true), _defineProperty(_objectSpread5, "scaleWithZoom", markerFeature.scaleMode.fill), _objectSpread5), styleObj);
+            }));
+            allFeatures.push(feature);
+          }
         }
 
         if (done) {
@@ -13723,7 +14092,7 @@ var layer = function layer(arg) {
     if (zIndex !== m_zIndex) {
       m_zIndex = zIndex;
       m_node.css('z-index', m_zIndex);
-      m_this.geoTrigger(geo_event.layerRemove, {
+      m_this.geoTrigger(geo_event.layerMove, {
         layer: m_this
       });
     }
@@ -15660,8 +16029,7 @@ var map = function map(arg) {
     return m_this;
   };
   /**
-   * Set center of the map to the given geographic coordinates, or get the
-   * current center.  Uses bare objects {x: 0, y: 0}.
+   * Get or set the center of the map in the given geographic coordinates.
    *
    * @param {geo.geoPosition} coordinates If specified, the new center of the
    *    map.
@@ -17971,6 +18339,11 @@ var mapInteractor = function mapInteractor(args) {
      * selectionRectangle: truthy if a selection rectangle should be shown
      *    during the action.  This can be the name of an event that will be
      *    triggered when the selection is complete.
+     * selectionConstraint: if a function and a selection rectangle is being
+     *    drawn, this is a function that takes (mousexy, originxy, state)
+     *    with the coordinates objects with x, y in display coordinates.
+     *    The function returns a modified x, y for the mouse coordinates, or
+     *    undefined for no change.
      * name: a string that can be used to reference this action.
      * owner: a string that can be used to reference this action.
      */
@@ -18707,7 +19080,7 @@ var mapInteractor = function mapInteractor(args) {
     return m_this;
   };
   /**
-   * Sets or gets map for this interactor, adds draw region layer if needed.
+   * Get or set the map for this interactor, adds draw region layer if needed.
    *
    * @param {geo.map} [val] Either a new map object for `undefined` to return
    *    the current map object.
@@ -18864,16 +19237,28 @@ var mapInteractor = function mapInteractor(args) {
         mouse = m_this.mouse(),
         map = m_this.map(),
         display = {},
-        gcs = {}; // TODO: clamp to map bounds
-    // Get the display coordinates
+        gcs = {};
+    var mousexy = mouse.map;
+
+    if (m_state.actionRecord && util.isFunction(m_state.actionRecord.selectionConstraint)) {
+      var constraint = m_state.actionRecord.selectionConstraint(mouse.mapgcs, origin.mapgcs);
+      mousexy = constraint ? map.gcsToDisplay(constraint.pos, null) : mousexy;
+    } else if (mouse.modifiers.shift) {
+      var width = Math.pow(Math.abs((mousexy.x - origin.map.x) * (mousexy.y - origin.map.y)), 0.5);
+      mousexy = {
+        x: origin.map.x + Math.sign(mousexy.x - origin.map.x) * width,
+        y: origin.map.y + Math.sign(mousexy.y - origin.map.y) * width
+      };
+    } // Get the display coordinates
+
 
     display.upperLeft = {
-      x: Math.min(origin.map.x, mouse.map.x),
-      y: Math.min(origin.map.y, mouse.map.y)
+      x: Math.min(origin.map.x, mousexy.x),
+      y: Math.min(origin.map.y, mousexy.y)
     };
     display.lowerRight = {
-      x: Math.max(origin.map.x, mouse.map.x),
-      y: Math.max(origin.map.y, mouse.map.y)
+      x: Math.max(origin.map.x, mousexy.x),
+      y: Math.max(origin.map.y, mousexy.y)
     };
     display.upperRight = {
       x: display.lowerRight.x,
@@ -20243,7 +20628,8 @@ var pointFeature = __webpack_require__(2557);
  * @property {number|function} [radius=5] Radius of each marker in pixels.
  *   This includes the stroke width if `strokeOffset` is -1, excludes it if
  *   `strokeOffset` is 1, and includes half the stroke width if `strokeOffset`
- *    is 0.
+ *    is 0.  Note that is `radiusIncludesStroke` is `false`, this never
+ *   includes the stroke width.
  * @property {geo.geoColor|function} [strokeColor] Color to stroke each marker.
  * @property {number|function} [strokeOpacity=1] Opacity for each marker's
  *   stroke.  Opacity is on a [0-1] scale.  Set this or `strokeWidth` to zero
@@ -20254,6 +20640,10 @@ var pointFeature = __webpack_require__(2557);
  * @property {number|function} [strokeOffset=-1] The position of the stroke
  *   compared to the radius.  This can only be -1, 0, or 1 (the sign of the
  *   value is used).
+ * @property {boolean|function} [radiusIncludeStroke=true] If truthy or
+ *   undefined, the `radius` includes the `strokeWidth` based on the
+ *   `strokeOffset`.  If defined and falsy, the radius does not include the
+ *   `strokeWidth`.
  * @property {geo.geoColor|function} [fillColor] Color to fill each marker.
  * @property {number|function} [fillOpacity=1] Opacity for each marker.
  *   Opacity is on a [0-1] scale.  Set to zero to have no fill.
@@ -20269,7 +20659,7 @@ var pointFeature = __webpack_require__(2557);
  * @property {boolean|function} [rotateWithMap=false] If truthy, rotate symbols
  *   with the map.  If falsy, symbol orientation is absolute.
  * @property {number[]|function} [origin] Origin in map gcs coordinates used
- *   for to ensure high precision drawing in this location.  When called as a
+ *   to ensure high precision drawing in this location.  When called as a
  *   function, this is passed the maker positions as a single continuous array
  *   in map gcs coordinates.  It defaults to the first marker's position.
  */
@@ -20329,6 +20719,7 @@ var markerFeature = function markerFeature(arg) {
         position,
         radius = m_this.style.get('radius'),
         strokeWidth = m_this.style.get('strokeWidth'),
+        radiusIncludesStroke = m_this.style.get('radiusIncludesStroke'),
         strokeOffset = m_this.style.get('strokeOffset'),
         scaleWithZoom = m_this.style.get('scaleWithZoom');
     position = m_this.position();
@@ -20342,9 +20733,11 @@ var markerFeature = function markerFeature(arg) {
       var r = radius(d, i),
           s = strokeWidth(d, i),
           so = Math.sign(strokeOffset(d, i));
-      var rwiths = r + s * (so + 1) / 2,
+      var ris = radiusIncludesStroke(d, i);
+      ris = ris === undefined ? true : ris;
+      var rwiths = ris ? r + s * (so + 1) / 2 : r + s,
           // radius with stroke
-      rwos = r + s * (so - 1) / 2; // radius without stroke
+      rwos = ris ? r + s * (so - 1) / 2 : r; // radius without stroke
 
       swz = markerFeature.scaleMode[swz] || (swz >= 1 && swz <= 3 ? swz : 0);
 
@@ -20419,6 +20812,7 @@ var markerFeature = function markerFeature(arg) {
     corners,
         radius = m_this.style.get('radius'),
         strokeWidth = m_this.style.get('strokeWidth'),
+        radiusIncludesStroke = m_this.style.get('radiusIncludesStroke'),
         strokeOffset = m_this.style.get('strokeOffset'),
         scaleWithZoom = m_this.style.get('scaleWithZoom');
     data = m_this.data();
@@ -20476,7 +20870,9 @@ var markerFeature = function markerFeature(arg) {
           swz = scaleWithZoom(data[i], i),
           so = strokeOffset(data[i], i),
           s = swz ? strokeWidth(data[i], i) : 0;
-      var rwos = rad + s * (so - 1) / 2; // radius without stroke
+      var ris = radiusIncludesStroke(d, i);
+      ris = ris === undefined ? true : ris;
+      var rwos = ris ? rad + s * (so - 1) / 2 : rad; // radius without stroke
 
       rad = rwos + s;
       var p = m_this.position()(d, i),
@@ -20548,6 +20944,7 @@ var markerFeature = function markerFeature(arg) {
         data = m_this.data(),
         radius = m_this.style.get('radius'),
         strokeWidth = m_this.style.get('strokeWidth'),
+        radiusIncludesStroke = m_this.style.get('radiusIncludesStroke'),
         strokeOffset = m_this.style.get('strokeOffset'),
         scaleWithZoom = m_this.style.get('scaleWithZoom'),
         idx,
@@ -20650,7 +21047,9 @@ var markerFeature = function markerFeature(arg) {
           swz = scaleWithZoom(data[i], i);
       var so = strokeOffset(data[i], i),
           s = swz ? strokeWidth(data[i], i) : 0;
-      var rwos = rad + s * (so - 1) / 2; // radius without stroke
+      var ris = radiusIncludesStroke(d, i);
+      ris = ris === undefined ? true : ris;
+      var rwos = ris ? rad + s * (so - 1) / 2 : rad; // radius without stroke
 
       swz = markerFeature.scaleMode[swz] || (swz >= 1 && swz <= 3 ? swz : 0);
       rad = rwos + s;
@@ -20701,6 +21100,7 @@ var markerFeature = function markerFeature(arg) {
     arg = $.extend(true, {}, {
       style: $.extend({}, {
         radius: 6.25,
+        radiusIncludesStroke: true,
         strokeColor: {
           r: 0.851,
           g: 0.604,
@@ -22651,6 +23051,15 @@ var pixelmapLayer = function pixelmapLayer(arg) {
   }
 
   arg = arg || {};
+  /* Don't extend data from args -- it can be very slow */
+
+  var argdata;
+
+  if (arg.data) {
+    argdata = arg.data;
+    delete arg.data;
+  }
+
   arg = $.extend(true, {}, this.constructor.defaults, arg);
   tileLayer.call(this, arg);
   var s_init = this._init,
@@ -22711,8 +23120,8 @@ var pixelmapLayer = function pixelmapLayer(arg) {
 
     m_pixelmapFeature = m_this.createFeature('pixelmap', pixelmapArgs);
 
-    if (arg.data) {
-      m_pixelmapFeature.data(arg.data);
+    if (argdata) {
+      m_pixelmapFeature.data(argdata);
     }
 
     m_this.style = m_pixelmapFeature.style;
@@ -25643,7 +26052,13 @@ util.createLayer = function (name, map, arg) {
     }
 
     if (arg !== undefined) {
+      var argdata = arg.data;
+      delete arg.data;
       $.extend(true, options, arg);
+
+      if (argdata) {
+        options.data = argdata;
+      }
     }
 
     layer = layers[name](options);
@@ -26252,7 +26667,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "0e6b086c99eaaca5976d0391664d9527c4076aa3";
+module.exports = "b5206cc793635de028b4834eaad4a1c7d73e5b56";
 
 /***/ }),
 
@@ -30951,9 +31366,9 @@ var tileLayer = function tileLayer(arg) {
   /**
    * Get/set the baseQuad.
    *
-   * @property {object} [baseQuad] A quad feature element to draw before below
-   *   any tile layers.  If specified, this uses the quad defaults, so this is
-   *   a ``geo.quadFeature.position`` object with, typically, an ``image``
+   * @property {object} [baseQuad] A quad feature element to draw below any
+   *   tile layers.  If specified, this uses the quad defaults, so this is a
+   *   ``geo.quadFeature.position`` object with, typically, an ``image``
    *   property added to it.  The quad positions are in the map gcs
    *   coordinates.
    * @name geo.tileLayer.baseQuad
@@ -31677,7 +32092,7 @@ var trackFeature = function trackFeature(arg) {
     return result;
   };
   /**
-   * Set or get style.
+   * Get or set style.
    *
    * @param {string|object} [arg1] If `undefined`, return the current style
    *    object.  If a string and `arg2` is undefined, return the style
@@ -33470,7 +33885,7 @@ var colorLegendWidget = function colorLegendWidget(arg) {
     });
   };
   /**
-   * Set or get categories.
+   * Get or set categories.
    * @param {geo.gui.colorLegendWidget.category[]} [categories] If `undefined`,
    * return the current legend categories array. If an array is provided,
    * remove current legends and recreate with the new categories.
@@ -34495,7 +34910,7 @@ var scaleWidget = function scaleWidget(arg) {
     m_this._render();
   };
   /**
-   * Set or get options.
+   * Get or set options.
    *
    * @param {string|object} [arg1] If `undefined`, return the options object.
    *    If a string, either set or return the option of that name.  If an
@@ -38716,7 +39131,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.7.2";
+module.exports = "1.8.1";
 
 /***/ }),
 
@@ -40712,7 +41127,8 @@ var webgl_markerFeature = function webgl_markerFeature(arg) {
       symbolValue: 1,
       rotation: 1,
       scaleWithZoom: 0,
-      rotateWithMap: 0
+      rotateWithMap: 0,
+      radiusIncludesStroke: 0
     },
         vpf = m_this.verticesPerFeature(),
         data = m_this.data(),
@@ -40792,7 +41208,7 @@ var webgl_markerFeature = function webgl_markerFeature(arg) {
 
       styleVal.scaleWithZoom = markerFeature.scaleMode[styleVal.scaleWithZoom] || (styleVal.scaleWithZoom >= 1 && styleVal.scaleWithZoom <= 3 ? styleVal.scaleWithZoom : 0);
       styleVal.symbolComputed = styleVal.scaleWithZoom + (styleVal.rotateWithMap ? 4 : 0) + // bit 3 reserved
-      (Math.sign(styleVal.strokeOffset) + 1) * 16 + styleVal.symbol * 64;
+      (Math.sign(styleVal.radiusIncludesStroke !== undefined && styleVal.radiusIncludesStroke ? styleVal.strokeOffset : 1) + 1) * 16 + styleVal.symbol * 64;
 
       if (styleVal.symbolValue && styleVal.symbol >= markerFeature.symbols.arrow && styleVal.symbol < markerFeature.symbols.arrow + markerFeature.symbols.arrowMax) {
         styleVal.symbolValue = packFloats(styleVal.symbolValue);
@@ -44071,10 +44487,12 @@ var webglRenderer = function webglRenderer(arg) {
       renderState.m_context = m_this._glContext();
       m_viewer.exit(renderState);
 
-      if (m_this._glContext() !== vgl.GL && m_this._glContext().getExtension('WEBGL_lose_context') && m_this._glContext().getExtension('WEBGL_lose_context').loseContext) {
-        m_this._glContext().getExtension('WEBGL_lose_context').loseContext();
+      var context = m_this._glContext();
+
+      if (context !== vgl.GL && context.getExtension('WEBGL_lose_context') && context.getExtension('WEBGL_lose_context').loseContext) {
+        context.getExtension('WEBGL_lose_context').loseContext();
       }
-    } // make sure we clear shaders associated with the generate context, too
+    } // make sure we clear shaders associated with the generated context, too
 
 
     vgl.clearCachedShaders(vgl.GL);
@@ -74018,25 +74436,25 @@ var MAX_ITER = 20;
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "cN": function() { return /* binding */ PJD_3PARAM; },
-/* harmony export */   "iM": function() { return /* binding */ PJD_7PARAM; },
+/* harmony export */   "Be": function() { return /* binding */ SRS_WGS84_ESQUARED; },
+/* harmony export */   "Er": function() { return /* binding */ SRS_WGS84_SEMIMINOR; },
 /* harmony export */   "Hp": function() { return /* binding */ PJD_GRIDSHIFT; },
 /* harmony export */   "JP": function() { return /* binding */ PJD_WGS84; },
+/* harmony export */   "Pn": function() { return /* binding */ R2D; },
 /* harmony export */   "Qf": function() { return /* binding */ PJD_NODATUM; },
+/* harmony export */   "Qg": function() { return /* binding */ FORTPI; },
+/* harmony export */   "Qx": function() { return /* binding */ D2R; },
+/* harmony export */   "U2": function() { return /* binding */ SPI; },
+/* harmony export */   "cN": function() { return /* binding */ PJD_3PARAM; },
+/* harmony export */   "cp": function() { return /* binding */ EPSLN; },
 /* harmony export */   "ht": function() { return /* binding */ SRS_WGS84_SEMIMAJOR; },
-/* harmony export */   "Er": function() { return /* binding */ SRS_WGS84_SEMIMINOR; },
-/* harmony export */   "Be": function() { return /* binding */ SRS_WGS84_ESQUARED; },
-/* harmony export */   "uK": function() { return /* binding */ SEC_TO_RAD; },
+/* harmony export */   "iM": function() { return /* binding */ PJD_7PARAM; },
 /* harmony export */   "pj": function() { return /* binding */ HALF_PI; },
 /* harmony export */   "s3": function() { return /* binding */ SIXTH; },
-/* harmony export */   "y1": function() { return /* binding */ RA4; },
-/* harmony export */   "zJ": function() { return /* binding */ RA6; },
-/* harmony export */   "cp": function() { return /* binding */ EPSLN; },
-/* harmony export */   "Qx": function() { return /* binding */ D2R; },
-/* harmony export */   "Pn": function() { return /* binding */ R2D; },
-/* harmony export */   "Qg": function() { return /* binding */ FORTPI; },
+/* harmony export */   "uK": function() { return /* binding */ SEC_TO_RAD; },
 /* harmony export */   "uo": function() { return /* binding */ TWO_PI; },
-/* harmony export */   "U2": function() { return /* binding */ SPI; }
+/* harmony export */   "y1": function() { return /* binding */ RA4; },
+/* harmony export */   "zJ": function() { return /* binding */ RA6; }
 /* harmony export */ });
 var PJD_3PARAM = 1;
 var PJD_7PARAM = 2;
@@ -74076,11 +74494,11 @@ var SPI = 3.14159265359;
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "Lv": function() { return /* binding */ compareDatums; },
 /* harmony export */   "Gu": function() { return /* binding */ geodeticToGeocentric; },
+/* harmony export */   "Lv": function() { return /* binding */ compareDatums; },
+/* harmony export */   "QN": function() { return /* binding */ geocentricFromWgs84; },
 /* harmony export */   "Xu": function() { return /* binding */ geocentricToGeodetic; },
-/* harmony export */   "jJ": function() { return /* binding */ geocentricToWgs84; },
-/* harmony export */   "QN": function() { return /* binding */ geocentricFromWgs84; }
+/* harmony export */   "jJ": function() { return /* binding */ geocentricToWgs84; }
 /* harmony export */ });
 /* harmony import */ var _constants_values__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8217);
 
@@ -75869,7 +76287,7 @@ function Projection(srsCode,callback) {
   extend(this, json); // transfer everything over from the projection because we don't know what we'll need
   extend(this, ourProj); // transfer all the methods from the projection
 
-  // copy the 4 things over we calulated in deriveConstants.sphere
+  // copy the 4 things over we calculated in deriveConstants.sphere
   this.a = sphere_.a;
   this.b = sphere_.b;
   this.rf = sphere_.rf;
@@ -77199,6 +77617,8 @@ var robin = __webpack_require__(4402);
 var geocent = __webpack_require__(1258);
 // EXTERNAL MODULE: ../node_modules/proj4/lib/projections/tpers.js
 var tpers = __webpack_require__(6470);
+// EXTERNAL MODULE: ../node_modules/proj4/lib/projections/geos.js
+var geos = __webpack_require__(813);
 ;// CONCATENATED MODULE: ../node_modules/proj4/projs.js
 
 
@@ -77226,6 +77646,7 @@ var tpers = __webpack_require__(6470);
 
 
 
+
 
 
 /* harmony default export */ function proj4_projs(proj4){
@@ -77257,6 +77678,7 @@ var tpers = __webpack_require__(6470);
   proj4.Proj.projections.add(robin["default"]);
   proj4.Proj.projections.add(geocent["default"]);
   proj4.Proj.projections.add(tpers["default"]);
+  proj4.Proj.projections.add(geos["default"]);
 }
 ;// CONCATENATED MODULE: ../node_modules/proj4/lib/index.js
 
@@ -77291,11 +77713,11 @@ proj4_projs(core);
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
-/* harmony export */   "phi1z": function() { return /* binding */ phi1z; },
-/* harmony export */   "names": function() { return /* binding */ names; }
+/* harmony export */   "names": function() { return /* binding */ names; },
+/* harmony export */   "phi1z": function() { return /* binding */ phi1z; }
 /* harmony export */ });
 /* harmony import */ var _common_msfnz__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4541);
 /* harmony import */ var _common_qsfnz__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(3998);
@@ -77441,8 +77863,8 @@ var names = ["Albers_Conic_Equal_Area", "Albers", "aea"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -77674,8 +78096,8 @@ var names = ["Azimuthal_Equidistant", "aeqd"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -77940,8 +78362,8 @@ var names = ["cea"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -78005,8 +78427,8 @@ var names = ["Equirectangular", "Equidistant_Cylindrical", "eqc"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -78147,8 +78569,8 @@ var names = ["Equidistant_Conic", "eqdc"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -78580,8 +79002,8 @@ var names = ["gauss"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -78613,14 +79035,187 @@ var names = ["Geocentric", 'geocentric', "geocent", "Geocent"];
 
 /***/ }),
 
-/***/ 4655:
+/***/ 813:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "init": function() { return /* binding */ init; },
+/* harmony export */   "names": function() { return /* binding */ names; }
+/* harmony export */ });
+/* harmony import */ var _common_hypot__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(110);
+
+
+function init() {
+    this.flip_axis = (this.sweep === 'x' ? 1 : 0);
+    this.h = Number(this.h);
+    this.radius_g_1 = this.h / this.a;
+
+    if (this.radius_g_1 <= 0 || this.radius_g_1 > 1e10) {
+        throw new Error();
+    }
+
+    this.radius_g = 1.0 + this.radius_g_1;
+    this.C = this.radius_g * this.radius_g - 1.0;
+
+    if (this.es !== 0.0) {
+        var one_es = 1.0 - this.es;
+        var rone_es = 1 / one_es;
+
+        this.radius_p = Math.sqrt(one_es);
+        this.radius_p2 = one_es;
+        this.radius_p_inv2 = rone_es;
+
+        this.shape = 'ellipse'; // Use as a condition in the forward and inverse functions.
+    } else {
+        this.radius_p = 1.0;
+        this.radius_p2 = 1.0;
+        this.radius_p_inv2 = 1.0;
+
+        this.shape = 'sphere';  // Use as a condition in the forward and inverse functions.
+    }
+
+    if (!this.title) {
+        this.title = "Geostationary Satellite View";
+    }
+}
+
+function forward(p) {
+    var lon = p.x;
+    var lat = p.y;
+    var tmp, v_x, v_y, v_z;
+    lon = lon - this.long0;
+
+    if (this.shape === 'ellipse') {
+        lat = Math.atan(this.radius_p2 * Math.tan(lat));
+        var r = this.radius_p / (0,_common_hypot__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this.radius_p * Math.cos(lat), Math.sin(lat));
+
+        v_x = r * Math.cos(lon) * Math.cos(lat);
+        v_y = r * Math.sin(lon) * Math.cos(lat);
+        v_z = r * Math.sin(lat);
+
+        if (((this.radius_g - v_x) * v_x - v_y * v_y - v_z * v_z * this.radius_p_inv2) < 0.0) {
+            p.x = Number.NaN;
+            p.y = Number.NaN;
+            return p;
+        }
+
+        tmp = this.radius_g - v_x;
+        if (this.flip_axis) {
+            p.x = this.radius_g_1 * Math.atan(v_y / (0,_common_hypot__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(v_z, tmp));
+            p.y = this.radius_g_1 * Math.atan(v_z / tmp);
+        } else {
+            p.x = this.radius_g_1 * Math.atan(v_y / tmp);
+            p.y = this.radius_g_1 * Math.atan(v_z / (0,_common_hypot__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(v_y, tmp));
+        }
+    } else if (this.shape === 'sphere') {
+        tmp = Math.cos(lat);
+        v_x = Math.cos(lon) * tmp;
+        v_y = Math.sin(lon) * tmp;
+        v_z = Math.sin(lat);
+        tmp = this.radius_g - v_x;
+
+        if (this.flip_axis) {
+            p.x = this.radius_g_1 * Math.atan(v_y / (0,_common_hypot__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(v_z, tmp));
+            p.y = this.radius_g_1 * Math.atan(v_z / tmp);
+        } else {
+            p.x = this.radius_g_1 * Math.atan(v_y / tmp);
+            p.y = this.radius_g_1 * Math.atan(v_z / (0,_common_hypot__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(v_y, tmp));
+        }
+    }
+    p.x = p.x * this.a;
+    p.y = p.y * this.a;
+    return p;
+}
+
+function inverse(p) {
+    var v_x = -1.0;
+    var v_y = 0.0;
+    var v_z = 0.0;
+    var a, b, det, k;
+
+    p.x = p.x / this.a;
+    p.y = p.y / this.a;
+
+    if (this.shape === 'ellipse') {
+        if (this.flip_axis) {
+            v_z = Math.tan(p.y / this.radius_g_1);
+            v_y = Math.tan(p.x / this.radius_g_1) * (0,_common_hypot__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(1.0, v_z);
+        } else {
+            v_y = Math.tan(p.x / this.radius_g_1);
+            v_z = Math.tan(p.y / this.radius_g_1) * (0,_common_hypot__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(1.0, v_y);
+        }
+
+        var v_zp = v_z / this.radius_p;
+        a = v_y * v_y + v_zp * v_zp + v_x * v_x;
+        b = 2 * this.radius_g * v_x;
+        det = (b * b) - 4 * a * this.C;
+
+        if (det < 0.0) {
+            p.x = Number.NaN;
+            p.y = Number.NaN;
+            return p;
+        }
+
+        k = (-b - Math.sqrt(det)) / (2.0 * a);
+        v_x = this.radius_g + k * v_x;
+        v_y *= k;
+        v_z *= k;
+
+        p.x = Math.atan2(v_y, v_x);
+        p.y = Math.atan(v_z * Math.cos(p.x) / v_x);
+        p.y = Math.atan(this.radius_p_inv2 * Math.tan(p.y));
+    } else if (this.shape === 'sphere') {
+        if (this.flip_axis) {
+            v_z = Math.tan(p.y / this.radius_g_1);
+            v_y = Math.tan(p.x / this.radius_g_1) * Math.sqrt(1.0 + v_z * v_z);
+        } else {
+            v_y = Math.tan(p.x / this.radius_g_1);
+            v_z = Math.tan(p.y / this.radius_g_1) * Math.sqrt(1.0 + v_y * v_y);
+        }
+
+        a = v_y * v_y + v_z * v_z + v_x * v_x;
+        b = 2 * this.radius_g * v_x;
+        det = (b * b) - 4 * a * this.C;
+        if (det < 0.0) {
+            p.x = Number.NaN;
+            p.y = Number.NaN;
+            return p;
+        }
+
+        k = (-b - Math.sqrt(det)) / (2.0 * a);
+        v_x = this.radius_g + k * v_x;
+        v_y *= k;
+        v_z *= k;
+
+        p.x = Math.atan2(v_y, v_x);
+        p.y = Math.atan(v_z * Math.cos(p.x) / v_x);
+    }
+    p.x = p.x + this.long0;
+    return p;
+}
+
+var names = ["Geostationary Satellite View", "Geostationary_Satellite", "geos"];
+/* harmony default export */ __webpack_exports__["default"] = ({
+    init: init,
+    forward: forward,
+    inverse: inverse,
+    names: names,
+});
+
+
+
+/***/ }),
+
+/***/ 4655:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -78870,8 +79465,8 @@ var names = ["gstmerg", "gstmerc"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -78992,12 +79587,12 @@ var names = ["Krovak", "krovak"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "S_POLE": function() { return /* binding */ S_POLE; },
-/* harmony export */   "N_POLE": function() { return /* binding */ N_POLE; },
 /* harmony export */   "EQUIT": function() { return /* binding */ EQUIT; },
+/* harmony export */   "N_POLE": function() { return /* binding */ N_POLE; },
 /* harmony export */   "OBLIQ": function() { return /* binding */ OBLIQ; },
-/* harmony export */   "init": function() { return /* binding */ init; },
+/* harmony export */   "S_POLE": function() { return /* binding */ S_POLE; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -79312,8 +79907,8 @@ var names = ["Lambert Azimuthal Equal Area", "Lambert_Azimuthal_Equal_Area", "la
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -79462,7 +80057,9 @@ var names = [
   "Lambert_Conformal_Conic",
   "Lambert_Conformal_Conic_1SP",
   "Lambert_Conformal_Conic_2SP",
-  "lcc"
+  "lcc",
+  "Lambert Conic Conformal (1SP)",
+  "Lambert Conic Conformal (2SP)"
 ];
 
 /* harmony default export */ __webpack_exports__["default"] = ({
@@ -79481,8 +80078,8 @@ var names = [
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ identity; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ identity; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -79512,8 +80109,8 @@ var names = ["longlat", "identity"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -79632,8 +80229,8 @@ var names = ["Mercator", "Popular Visualisation Pseudo Mercator", "Mercator_1SP"
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -79700,8 +80297,8 @@ var names = ["Miller_Cylindrical", "mill"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -79800,10 +80397,10 @@ var names = ["Mollweide", "moll"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "iterations": function() { return /* binding */ iterations; },
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
+/* harmony export */   "iterations": function() { return /* binding */ iterations; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
 /* harmony import */ var _constants_values__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8217);
@@ -80043,8 +80640,8 @@ var names = ["New_Zealand_Map_Grid", "nzmg"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -80303,8 +80900,8 @@ var names = ["Hotine_Oblique_Mercator", "Hotine Oblique Mercator", "Hotine_Obliq
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -80412,8 +81009,8 @@ var names = ["ortho"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -80571,8 +81168,8 @@ var names = ["Polyconic", "poly"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -80955,8 +81552,8 @@ var names = ["Quadrilateralized Spherical Cube", "Quadrilateralized_Spherical_Cu
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -81133,8 +81730,8 @@ var names = ["Robinson", "robin"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -81270,8 +81867,8 @@ var names = ["Sinusoidal", "sinu"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -81371,11 +81968,11 @@ var names = ["somerc"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "ssfn_": function() { return /* binding */ ssfn_; },
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
-/* harmony export */   "names": function() { return /* binding */ names; }
+/* harmony export */   "names": function() { return /* binding */ names; },
+/* harmony export */   "ssfn_": function() { return /* binding */ ssfn_; }
 /* harmony export */ });
 /* harmony import */ var _constants_values__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8217);
 /* harmony import */ var _common_sign__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7676);
@@ -81567,8 +82164,8 @@ var names = ["stere", "Stereographic_South_Pole", "Polar Stereographic (variant
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -81648,8 +82245,8 @@ var names = ["Stereographic_North_Pole", "Oblique_Stereographic", "Polar_Stereog
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -81842,8 +82439,8 @@ var names = ["Fast_Transverse_Mercator", "Fast Transverse Mercator"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -82098,8 +82695,8 @@ var names = ["Universal Transverse Mercator System", "utm"];
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "forward": function() { return /* binding */ forward; },
+/* harmony export */   "init": function() { return /* binding */ init; },
 /* harmony export */   "inverse": function() { return /* binding */ inverse; },
 /* harmony export */   "names": function() { return /* binding */ names; }
 /* harmony export */ });
@@ -82253,6 +82850,7 @@ var map = {
 	"./etmerc.js": 516,
 	"./gauss.js": 9326,
 	"./geocent.js": 1258,
+	"./geos.js": 813,
 	"./gnom.js": 4655,
 	"./gstmerc.js": 2653,
 	"./krovak.js": 6235,