geojs 1.7.3 → 1.8.2

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/pixelmapLayer.js

@@ -41,6 +41,12 @@ var pixelmapLayer = function (arg) {
     return new pixelmapLayer(arg);
   }
   arg = arg || {};
+  /* Don't extend data from args -- it can be very slow */
+  let argdata;
+  if (arg.data) {
+    argdata = arg.data;
+    delete arg.data;
+  }
   arg = $.extend(
     true,
     {},
@@ -99,8 +105,8 @@ var pixelmapLayer = function (arg) {
       pixelmapArgs.color = arg.color;
     }
     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;
     m_this.data = m_pixelmapFeature.data;

package/src/registry.js

@@ -313,7 +313,12 @@ util.createLayer = function (name, map, arg) {
       options.features = layerDefaultFeatures[name];
     }
     if (arg !== undefined) {
+      const argdata = arg.data;
+      delete arg.data;
       $.extend(true, options, arg);
+      if (argdata) {
+        options.data = argdata;
+      }
     }
     layer = layers[name](options);
     layer.layerName = name;

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/tileLayer.js

@@ -148,7 +148,10 @@ var webgl_tileLayer = function () {
    *    triggered this.  If `undefined`, clear the quads but don't redraw.
    */
   this._clearQuads = function (evt) {
-    if (evt && (!evt.layer || !(evt.layer instanceof tileLayer))) {
+    if (evt && (!evt.layer || !(evt.layer instanceof tileLayer) || !evt.layer.autoshareRenderer() || (
+      (evt.event === geo_event.layerAdd || evt.event === geo_event.layerRemove) &&
+      m_this.map().layers().every(l => l === evt.layer || evt.layer.zIndex() > l.zIndex())
+    ))) {
       return;
     }
     m_this.clear();