geojs 1.7.1 → 1.8.0

package/src/geojsonReader.js

@@ -31,6 +31,8 @@ var geojsonReader = function (arg) {
 
   var $ = require('jquery');
   var convertColor = require('./util').convertColor;
+  var markerFeature = require('./markerFeature');
+  var transform = require('./transform');
 
   var m_this = this,
       m_options = {
@@ -309,6 +311,22 @@ var geojsonReader = function (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.
@@ -384,7 +402,7 @@ var geojsonReader = function (arg) {
         }
 
         // process polygons
-        const polygons = features.filter(f => f.geometry.type === 'Polygon');
+        const polygons = features.filter(f => f.geometry.type === 'Polygon' && !_isEllipse(f));
         if (polygons.length) {
           feature = m_this.layer().createFeature('polygon');
           if (feature) {
@@ -410,6 +428,55 @@ var geojsonReader = function (arg) {
             allFeatures.push(feature);
           }
         }
+        // handle ellipses and circle
+        const ellipses = features.filter(_isEllipse);
+        if (ellipses.length) {
+          feature = m_this.layer().createFeature('marker');
+          if (feature) {
+            ellipses.forEach((d) => {
+              const map = m_this.layer().map();
+              const coord = transform.transformCoordinates(map.ingcs(), map.gcs(), d.geometry.coordinates[0]);
+              const w = ((coord[0][0] - coord[1][0]) ** 2 + (coord[0][1] - coord[1][1]) ** 2) ** 0.5;
+              const h = ((coord[0][0] - coord[3][0]) ** 2 + (coord[0][1] - coord[3][1]) ** 2) ** 0.5;
+              const radius = Math.max(w, h) / 2 / map.unitsPerPixel(0);
+              const aspect = w ? h / w : 1e20;
+              const rotation = -Math.atan2(coord[1][1] - coord[0][1], coord[1][0] - coord[0][0]);
+              const 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((d) => 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(
+                  (styleObj, key) => ({
+                    [key]: ellipses.some(d => d.properties && d.properties[key] !== undefined) ?
+                      m_this._style(key, m_options.polygonStyle[key]) :
+                      m_options.polygonStyle[key],
+                    radius: (d) => d._props.radius,
+                    radiusIncludesStroke: false,
+                    symbolValue: (d) => d._props.aspect,
+                    rotation: (d) => d._props.rotation,
+                    strokeOffset: 0,
+                    rotateWithMap: true,
+                    scaleWithZoom: markerFeature.scaleMode.fill,
+                    ...styleObj
+                  }
+                  ))
+              );
+            allFeatures.push(feature);
+          }
+        }
         if (done) {
           done(allFeatures);
         }

package/src/layer.js

@@ -174,7 +174,7 @@ var layer = function (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
       });
     }

package/src/map.js

@@ -569,8 +569,7 @@ var map = function (arg) {
   };
 
   /**
-   * 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.

package/src/mapInteractor.js

@@ -181,6 +181,11 @@ var mapInteractor = function (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.
        */
@@ -781,7 +786,7 @@ var mapInteractor = function (args) {
   };
 
   /**
-   * 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.
@@ -912,16 +917,26 @@ var mapInteractor = function (args) {
         map = m_this.map(),
         display = {}, gcs = {};
 
-    // TODO: clamp to map bounds
+    let mousexy = mouse.map;
+    if (m_state.actionRecord && util.isFunction(m_state.actionRecord.selectionConstraint)) {
+      const constraint = m_state.actionRecord.selectionConstraint(mouse.mapgcs, origin.mapgcs);
+      mousexy = constraint ? map.gcsToDisplay(constraint.pos, null) : mousexy;
+    } else if (mouse.modifiers.shift) {
+      const width =  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 = {

package/src/markerFeature.js

@@ -21,7 +21,8 @@ var pointFeature = require('./pointFeature');
  * @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
@@ -32,6 +33,10 @@ var pointFeature = require('./pointFeature');
  * @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.
@@ -47,7 +52,7 @@ var pointFeature = require('./pointFeature');
  * @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.
  */
@@ -98,6 +103,7 @@ var markerFeature = function (arg) {
     var pts, 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');
 
@@ -115,8 +121,10 @@ var markerFeature = function (arg) {
       const r = radius(d, i),
           s = strokeWidth(d, i),
           so = Math.sign(strokeOffset(d, i));
-      const rwiths = r + s * (so + 1) / 2,  // radius with stroke
-          rwos = r + s * (so - 1) / 2;  // radius without stroke
+      let ris = radiusIncludesStroke(d, i);
+      ris = ris === undefined ? true : ris;
+      const rwiths = ris ? r + s * (so + 1) / 2 : r + s,  // radius with stroke
+          rwos = ris ? r + s * (so - 1) / 2 : r;  // radius without stroke
       swz = markerFeature.scaleMode[swz] || (swz >= 1 && swz <= 3 ? swz : 0);
       switch (swz) {
         case markerFeature.scaleMode.stroke:
@@ -174,6 +182,7 @@ var markerFeature = function (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');
 
@@ -223,7 +232,9 @@ var markerFeature = function (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
+      let 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),
           dx, dy, rad2;
@@ -287,6 +298,7 @@ var markerFeature = function (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, min, max, corners,
@@ -347,7 +359,9 @@ var markerFeature = function (arg) {
           swz = scaleWithZoom(data[i], i);
       const so = strokeOffset(data[i], i),
           s = swz ? strokeWidth(data[i], i) : 0;
-      const rwos = rad + s * (so - 1) / 2;  // radius without stroke
+      let ris = radiusIncludesStroke(d, i);
+      ris = ris === undefined ? true : ris;
+      const rwos = ris ? rad + s * (so - 1) / 2 : rad;  // radius without stroke
       swz = markerFeature.scaleMode[swz] || (swz >= 1 && swz <= 3 ? swz : 0);
       rad = rwos + s;
       switch (swz) {
@@ -393,6 +407,7 @@ var markerFeature = function (arg) {
           {},
           {
             radius: 6.25,
+            radiusIncludesStroke: true,
             strokeColor: { r: 0.851, g: 0.604, b: 0.0 },
             strokeOffset: -1.0,
             strokeOpacity: 1.0,

package/src/tileLayer.js

@@ -676,7 +676,10 @@ var tileLayer = function (arg) {
   this._getTiles = function (maxLevel, bounds, sorted, onlyIfChanged) {
     var i, j, tiles = [], index, nTilesLevel,
         start, end, indexRange, source, center, changed = false, old, level,
-        minLevel = (m_this._options.keepLower ? m_this._options.minLevel : Math.max(maxLevel, m_this._options.minLevel));
+        minLevel = (
+          m_this._options.keepLower ?
+            m_this._options.minLevel :
+            Math.min(Math.max(maxLevel, m_this._options.minLevel), m_this._options.maxLevel));
     if (maxLevel < minLevel) {
       maxLevel = minLevel;
     }
@@ -1533,7 +1536,9 @@ var tileLayer = function (arg) {
        * semi-transparent layers. */
       if ((doneLoading || m_this._isCovered(tile)) &&
           zoom !== tile.index.level &&
-          (zoom >= m_this._options.minLevel || tile.index.level !== m_this._options.minLevel)) {
+          (zoom >= m_this._options.minLevel || tile.index.level !== m_this._options.minLevel) &&
+          (zoom < m_this._options.maxLevel || tile.index.level !== m_this._options.maxLevel)
+      ) {
         return true;
       }
     }
@@ -1667,9 +1672,9 @@ var tileLayer = function (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

package/src/trackFeature.js

@@ -451,7 +451,7 @@ var trackFeature = function (arg) {
   };
 
   /**
-   * 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

package/src/ui/colorLegendWidget.js

@@ -125,7 +125,7 @@ var colorLegendWidget = function (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.

package/src/ui/scaleWidget.js

@@ -298,7 +298,7 @@ var scaleWidget = function (arg) {
   };
 
   /**
-   * 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

package/src/webgl/markerFeature.js

@@ -120,7 +120,8 @@ var webgl_markerFeature = function (arg) {
           symbolValue: 1,
           rotation: 1,
           scaleWithZoom: 0,
-          rotateWithMap: 0
+          rotateWithMap: 0,
+          radiusIncludesStroke: 0
         },
         vpf = m_this.verticesPerFeature(),
         data = m_this.data(),
@@ -191,7 +192,7 @@ var webgl_markerFeature = function (arg) {
         styleVal.scaleWithZoom +
         (styleVal.rotateWithMap ? 4 : 0) +
         // bit 3 reserved
-        ((Math.sign(styleVal.strokeOffset) + 1) * 16) +
+        ((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);

package/src/webgl/webglRenderer.js

@@ -184,11 +184,12 @@ var webglRenderer = function (arg) {
       renderState.m_renderer = m_viewer;
       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();
+      const 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);
     m_viewer = null;
     s_exit();