geojs 1.9.3 → 1.9.4

package/geo.js

@@ -31,10 +31,7 @@ var geo_action = {
   zoom: 'geo_action_zoom',
   zoomrotate: 'geo_action_zoom_rotate',
   zoomselect: 'geo_action_zoomselect',
-  // annotation actions
-  annotation_line: 'geo_annotation_line',
-  annotation_polygon: 'geo_annotation_polygon',
-  annotation_rectangle: 'geo_annotation_rectangle',
+  // annotation actions -- some are also added by the registry
   annotation_edit_handle: 'geo_annotation_edit_handle'
 };
 module.exports = geo_action;
@@ -221,6 +218,15 @@ var annotation = function annotation(type, args) {
   this.id = function () {
     return m_id;
   };
+  /**
+   * Assign a new id to this annotation.
+   */
+
+
+  this.newId = function () {
+    annotationId += 1;
+    m_id = annotationId;
+  };
   /**
    * Get or set the name of this annotation.
    *
@@ -4254,6 +4260,10 @@ var annotationLayer = function annotationLayer(arg) {
     var pos = $.inArray(annotation, m_annotations);
 
     if (pos < 0) {
+      while (m_this.annotationById(annotation.id())) {
+        annotation.newId();
+      }
+
       m_this.geoTrigger(geo_event.annotation.add_before, {
         annotation: annotation
       });
@@ -5188,13 +5198,19 @@ var annotationLayer = function annotationLayer(arg) {
   this.toPolygonList = function (opts) {
     var poly = [];
     opts = opts || {};
-    opts.annotationIndices = [];
+    var indices = [];
+
+    if (!opts.annotationIndices) {
+      opts.annotationIndices = {};
+    }
+
+    opts.annotationIndices[m_this.id()] = indices;
     m_annotations.forEach(function (annotation, idx) {
       if (annotation.toPolygonList) {
         annotation.toPolygonList(opts).forEach(function (p) {
           return poly.push(p);
         });
-        opts.annotationIndices.push(idx);
+        indices.push(idx);
       }
     });
     return poly;
@@ -5220,16 +5236,17 @@ var annotationLayer = function annotationLayer(arg) {
     var keepIds = {};
     var reusedIds = {};
     var correspond, exact, annot;
+    var indices = (opts.annotationIndices || {})[m_this.id()];
 
-    if (opts.annotationIndices && opts.correspond && opts.correspond.poly1 && opts.annotationIndices.length === opts.correspond.poly1.length) {
+    if (indices && opts.correspond && opts.correspond.poly1 && indices.length === opts.correspond.poly1.length) {
       correspond = opts.correspond.poly1;
       exact = opts.correspond.exact1;
       annot = m_this.annotations();
     }
 
-    if (keep !== 'all' && keep !== 'none') {
+    if (keep !== 'all' && keep !== 'none' && annot) {
       annot.forEach(function (oldAnnot, idx) {
-        if (opts.annotationIndices.indexOf(idx) < 0) {
+        if (indices.indexOf(idx) < 0) {
           keepIds[oldAnnot.id()] = true;
         }
       });
@@ -5256,7 +5273,7 @@ var annotationLayer = function annotationLayer(arg) {
         for (var i = 0; i < correspond.length; i += 1) {
           if (correspond[i] && correspond[i].indexOf(idx) >= 0) {
             var _ret = function () {
-              var orig = annot[opts.annotationIndices[i]];
+              var orig = annot[indices[i]];
 
               if (keep !== 'all' && keep !== 'none' && exact && exact[i] && exact[i].indexOf(idx) >= 0) {
                 keepIds[orig.id()] = true;
@@ -5308,7 +5325,7 @@ var annotationLayer = function annotationLayer(arg) {
 
 
     polyAnnot.forEach(function (p) {
-      m_this.addAnnotation(registry.createAnnotation('polygon', p), m_this.gcs(), false);
+      m_this.addAnnotation(registry.createAnnotation('polygon', p), m_this.map().gcs(), false);
       update = true;
     });
 
@@ -19028,8 +19045,8 @@ var Mousetrap = __webpack_require__(3345);
  *      event must occur within this time in milliseconds of the mouse down
  *      event for it to be considered a click.
  * @property {boolean|number} [click.cancelOnMove=true] If true, don't generate
- *      click events if the mouse moved at all.  If a positive number, the distance
- *      at which to cancel click events when the mouse moves.
+ *      click events if the mouse moved at all.  If a positive number, the
+ *      distance at which to cancel click events when the mouse moves.
  * @property {object} [keyboard] An object describing which keyboard events are
  *      handled.
  * @property {object} [keyboard.actions] An object with different actions that
@@ -19042,6 +19059,9 @@ var Mousetrap = __webpack_require__(3345);
  *      an object with keys of the meta keys that are required to be down or
  *      up for that scale action to trigger.  If the value of the meta key is
  *      truthy, it must be down.  If `false`, it must be up.
+ * @property {string[]} [keyboard.metakeyMouseEvents] A list of meta keys
+ * *    that, when typed singly, trigger a repeat of the last mousemove or
+ *      actionmove event so that listeners can  update metakey information.
  * @property {boolean} [keyboard.focusHighlight=true] If truthy, when the map
  *      gains focus, a highlight style is shown around it.  This gives an
  *      indicator that keyboard events will affect the map, but may not be
@@ -19341,6 +19361,11 @@ var mapInteractor = function mapInteractor(args) {
         }
       },
 
+      /* This is a list of meta keys that when typed singly trigger a repeat
+       * of the last mousemove or actionmove event so that listeners can
+       * update metakey information. */
+      metakeyMouseEvents: ['shift', 'ctrl', 'shift+ctrl', 'shift+alt', 'shift+meta'],
+
       /* if focusHighlight is truthy, then a class is added to the map such
        * that when the map gets focus, it is indicated inside the border of
        * the map -- browsers usually show focus on the outside, which isn't
@@ -19768,6 +19793,43 @@ var mapInteractor = function mapInteractor(args) {
       m_touchHandler.lastEventType = evtType[2];
     }
   };
+  /**
+   * Repeat a mousemove or actionmove event with new metakey information.
+   *
+   * @param {event} [evt] A Mousetrap event with the key change.
+   * @fires geo.event.mousemove
+   * @fires geo.event.actionmove
+   */
+
+
+  this._repeatMouseMoveEvent = function (evt) {
+    if (!m_mouse || !m_mouse.modifiers) {
+      return;
+    }
+
+    var old = {
+      alt: m_mouse.modifiers.alt,
+      ctrl: m_mouse.modifiers.ctrl,
+      meta: m_mouse.modifiers.meta,
+      shift: m_mouse.modifiers.shift
+    };
+
+    m_this._getMouseModifiers(evt);
+
+    if (m_mouse.modifiers.alt === old.alt && m_mouse.modifiers.ctrl === old.ctrl && m_mouse.modifiers.meta === old.meta && m_mouse.modifiers.shift === old.shift) {
+      return;
+    }
+
+    if (m_state.boundDocumentHandlers) {
+      m_this.map().geoTrigger(geo_event.actionmove, {
+        state: m_this.state(),
+        mouse: m_this.mouse(),
+        event: evt
+      });
+    } else {
+      m_this.map().geoTrigger(geo_event.mousemove, m_this.mouse());
+    }
+  };
   /**
    * Retrigger a mouse movement with the current mouse state.
    * @fires geo.event.mousemove
@@ -19836,6 +19898,14 @@ var mapInteractor = function mapInteractor(args) {
         }
       }
 
+      if (m_options.keyboard.metakeyMouseEvents) {
+        m_options.keyboard.metakeyMouseEvents.forEach(function (meta) {
+          m_keyHandler.bind(meta, m_this._repeatMouseMoveEvent, 'keydown');
+          m_keyHandler.bind(meta, m_this._repeatMouseMoveEvent, 'keyup');
+          bound.push(meta);
+        });
+      }
+
       m_boundKeys = bound;
     }
 
@@ -21384,7 +21454,7 @@ var mapInteractor = function mapInteractor(args) {
         preventDefault: function preventDefault() {},
         simulated: true
       };
-      m_keyHandler.trigger(keys);
+      m_keyHandler.trigger(keys, options.event);
       return;
     }
 
@@ -26603,6 +26673,8 @@ module.exports = quadFeature;
 
 var $ = __webpack_require__(5638);
 
+var geo_action = __webpack_require__(7839);
+
 var widgets = {
   dom: {}
 };
@@ -27061,6 +27133,7 @@ util.registerAnnotation = function (name, func, features) {
     func: func,
     features: features || {}
   };
+  geo_action['annotation_' + name] = 'geo_annotation_' + name;
   return old;
 };
 /**
@@ -27577,7 +27650,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "965d40f46507df035bc01450d2bd15c3ed06368d";
+module.exports = "f6ebaf74f3f8b523860d8b780cbd38782bdd81ca";
 
 /***/ }),
 
@@ -40171,6 +40244,7 @@ function generateCorrespondence(poly1, poly2, newpoly, results) {
     results[ekey] = Array(poly.length);
     poly.forEach(function (p, idx) {
       var found = {};
+      var missed = 0;
       p.forEach(function (h) {
         return h.forEach(function (pt) {
           var key = '_' + pt[0] + '_' + pt[1];
@@ -40179,11 +40253,13 @@ function generateCorrespondence(poly1, poly2, newpoly, results) {
             pts[key].forEach(function (val) {
               found[val] = (found[val] || 0) + 1;
             });
+          } else {
+            missed += 1;
           }
         });
       });
       Object.keys(found).forEach(function (nidx) {
-        if (found[nidx] === counts[+nidx]) {
+        if (found[nidx] === counts[+nidx] && !missed && p.length === newpoly[+nidx].length) {
           if (!results[ekey][idx]) {
             results[ekey][idx] = [];
           }
@@ -40699,7 +40775,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.9.3";
+module.exports = "1.9.4";
 
 /***/ }),
 

package/geo.lean.js

@@ -31,10 +31,7 @@ var geo_action = {
   zoom: 'geo_action_zoom',
   zoomrotate: 'geo_action_zoom_rotate',
   zoomselect: 'geo_action_zoomselect',
-  // annotation actions
-  annotation_line: 'geo_annotation_line',
-  annotation_polygon: 'geo_annotation_polygon',
-  annotation_rectangle: 'geo_annotation_rectangle',
+  // annotation actions -- some are also added by the registry
   annotation_edit_handle: 'geo_annotation_edit_handle'
 };
 module.exports = geo_action;
@@ -221,6 +218,15 @@ var annotation = function annotation(type, args) {
   this.id = function () {
     return m_id;
   };
+  /**
+   * Assign a new id to this annotation.
+   */
+
+
+  this.newId = function () {
+    annotationId += 1;
+    m_id = annotationId;
+  };
   /**
    * Get or set the name of this annotation.
    *
@@ -4254,6 +4260,10 @@ var annotationLayer = function annotationLayer(arg) {
     var pos = $.inArray(annotation, m_annotations);
 
     if (pos < 0) {
+      while (m_this.annotationById(annotation.id())) {
+        annotation.newId();
+      }
+
       m_this.geoTrigger(geo_event.annotation.add_before, {
         annotation: annotation
       });
@@ -5188,13 +5198,19 @@ var annotationLayer = function annotationLayer(arg) {
   this.toPolygonList = function (opts) {
     var poly = [];
     opts = opts || {};
-    opts.annotationIndices = [];
+    var indices = [];
+
+    if (!opts.annotationIndices) {
+      opts.annotationIndices = {};
+    }
+
+    opts.annotationIndices[m_this.id()] = indices;
     m_annotations.forEach(function (annotation, idx) {
       if (annotation.toPolygonList) {
         annotation.toPolygonList(opts).forEach(function (p) {
           return poly.push(p);
         });
-        opts.annotationIndices.push(idx);
+        indices.push(idx);
       }
     });
     return poly;
@@ -5220,16 +5236,17 @@ var annotationLayer = function annotationLayer(arg) {
     var keepIds = {};
     var reusedIds = {};
     var correspond, exact, annot;
+    var indices = (opts.annotationIndices || {})[m_this.id()];
 
-    if (opts.annotationIndices && opts.correspond && opts.correspond.poly1 && opts.annotationIndices.length === opts.correspond.poly1.length) {
+    if (indices && opts.correspond && opts.correspond.poly1 && indices.length === opts.correspond.poly1.length) {
       correspond = opts.correspond.poly1;
       exact = opts.correspond.exact1;
       annot = m_this.annotations();
     }
 
-    if (keep !== 'all' && keep !== 'none') {
+    if (keep !== 'all' && keep !== 'none' && annot) {
       annot.forEach(function (oldAnnot, idx) {
-        if (opts.annotationIndices.indexOf(idx) < 0) {
+        if (indices.indexOf(idx) < 0) {
           keepIds[oldAnnot.id()] = true;
         }
       });
@@ -5256,7 +5273,7 @@ var annotationLayer = function annotationLayer(arg) {
         for (var i = 0; i < correspond.length; i += 1) {
           if (correspond[i] && correspond[i].indexOf(idx) >= 0) {
             var _ret = function () {
-              var orig = annot[opts.annotationIndices[i]];
+              var orig = annot[indices[i]];
 
               if (keep !== 'all' && keep !== 'none' && exact && exact[i] && exact[i].indexOf(idx) >= 0) {
                 keepIds[orig.id()] = true;
@@ -5308,7 +5325,7 @@ var annotationLayer = function annotationLayer(arg) {
 
 
     polyAnnot.forEach(function (p) {
-      m_this.addAnnotation(registry.createAnnotation('polygon', p), m_this.gcs(), false);
+      m_this.addAnnotation(registry.createAnnotation('polygon', p), m_this.map().gcs(), false);
       update = true;
     });
 
@@ -19028,8 +19045,8 @@ var Mousetrap = __webpack_require__(3345);
  *      event must occur within this time in milliseconds of the mouse down
  *      event for it to be considered a click.
  * @property {boolean|number} [click.cancelOnMove=true] If true, don't generate
- *      click events if the mouse moved at all.  If a positive number, the distance
- *      at which to cancel click events when the mouse moves.
+ *      click events if the mouse moved at all.  If a positive number, the
+ *      distance at which to cancel click events when the mouse moves.
  * @property {object} [keyboard] An object describing which keyboard events are
  *      handled.
  * @property {object} [keyboard.actions] An object with different actions that
@@ -19042,6 +19059,9 @@ var Mousetrap = __webpack_require__(3345);
  *      an object with keys of the meta keys that are required to be down or
  *      up for that scale action to trigger.  If the value of the meta key is
  *      truthy, it must be down.  If `false`, it must be up.
+ * @property {string[]} [keyboard.metakeyMouseEvents] A list of meta keys
+ * *    that, when typed singly, trigger a repeat of the last mousemove or
+ *      actionmove event so that listeners can  update metakey information.
  * @property {boolean} [keyboard.focusHighlight=true] If truthy, when the map
  *      gains focus, a highlight style is shown around it.  This gives an
  *      indicator that keyboard events will affect the map, but may not be
@@ -19341,6 +19361,11 @@ var mapInteractor = function mapInteractor(args) {
         }
       },
 
+      /* This is a list of meta keys that when typed singly trigger a repeat
+       * of the last mousemove or actionmove event so that listeners can
+       * update metakey information. */
+      metakeyMouseEvents: ['shift', 'ctrl', 'shift+ctrl', 'shift+alt', 'shift+meta'],
+
       /* if focusHighlight is truthy, then a class is added to the map such
        * that when the map gets focus, it is indicated inside the border of
        * the map -- browsers usually show focus on the outside, which isn't
@@ -19768,6 +19793,43 @@ var mapInteractor = function mapInteractor(args) {
       m_touchHandler.lastEventType = evtType[2];
     }
   };
+  /**
+   * Repeat a mousemove or actionmove event with new metakey information.
+   *
+   * @param {event} [evt] A Mousetrap event with the key change.
+   * @fires geo.event.mousemove
+   * @fires geo.event.actionmove
+   */
+
+
+  this._repeatMouseMoveEvent = function (evt) {
+    if (!m_mouse || !m_mouse.modifiers) {
+      return;
+    }
+
+    var old = {
+      alt: m_mouse.modifiers.alt,
+      ctrl: m_mouse.modifiers.ctrl,
+      meta: m_mouse.modifiers.meta,
+      shift: m_mouse.modifiers.shift
+    };
+
+    m_this._getMouseModifiers(evt);
+
+    if (m_mouse.modifiers.alt === old.alt && m_mouse.modifiers.ctrl === old.ctrl && m_mouse.modifiers.meta === old.meta && m_mouse.modifiers.shift === old.shift) {
+      return;
+    }
+
+    if (m_state.boundDocumentHandlers) {
+      m_this.map().geoTrigger(geo_event.actionmove, {
+        state: m_this.state(),
+        mouse: m_this.mouse(),
+        event: evt
+      });
+    } else {
+      m_this.map().geoTrigger(geo_event.mousemove, m_this.mouse());
+    }
+  };
   /**
    * Retrigger a mouse movement with the current mouse state.
    * @fires geo.event.mousemove
@@ -19836,6 +19898,14 @@ var mapInteractor = function mapInteractor(args) {
         }
       }
 
+      if (m_options.keyboard.metakeyMouseEvents) {
+        m_options.keyboard.metakeyMouseEvents.forEach(function (meta) {
+          m_keyHandler.bind(meta, m_this._repeatMouseMoveEvent, 'keydown');
+          m_keyHandler.bind(meta, m_this._repeatMouseMoveEvent, 'keyup');
+          bound.push(meta);
+        });
+      }
+
       m_boundKeys = bound;
     }
 
@@ -21384,7 +21454,7 @@ var mapInteractor = function mapInteractor(args) {
         preventDefault: function preventDefault() {},
         simulated: true
       };
-      m_keyHandler.trigger(keys);
+      m_keyHandler.trigger(keys, options.event);
       return;
     }
 
@@ -26603,6 +26673,8 @@ module.exports = quadFeature;
 
 var $ = __webpack_require__(5638);
 
+var geo_action = __webpack_require__(7839);
+
 var widgets = {
   dom: {}
 };
@@ -27061,6 +27133,7 @@ util.registerAnnotation = function (name, func, features) {
     func: func,
     features: features || {}
   };
+  geo_action['annotation_' + name] = 'geo_annotation_' + name;
   return old;
 };
 /**
@@ -27577,7 +27650,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "965d40f46507df035bc01450d2bd15c3ed06368d";
+module.exports = "f6ebaf74f3f8b523860d8b780cbd38782bdd81ca";
 
 /***/ }),
 
@@ -40171,6 +40244,7 @@ function generateCorrespondence(poly1, poly2, newpoly, results) {
     results[ekey] = Array(poly.length);
     poly.forEach(function (p, idx) {
       var found = {};
+      var missed = 0;
       p.forEach(function (h) {
         return h.forEach(function (pt) {
           var key = '_' + pt[0] + '_' + pt[1];
@@ -40179,11 +40253,13 @@ function generateCorrespondence(poly1, poly2, newpoly, results) {
             pts[key].forEach(function (val) {
               found[val] = (found[val] || 0) + 1;
             });
+          } else {
+            missed += 1;
           }
         });
       });
       Object.keys(found).forEach(function (nidx) {
-        if (found[nidx] === counts[+nidx]) {
+        if (found[nidx] === counts[+nidx] && !missed && p.length === newpoly[+nidx].length) {
           if (!results[ekey][idx]) {
             results[ekey][idx] = [];
           }
@@ -40699,7 +40775,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.9.3";
+module.exports = "1.9.4";
 
 /***/ }),