geojs 1.12.6 → 1.12.7

package/geo.js

@@ -6876,8 +6876,7 @@ var _annotationLayer = function annotationLayer(arg) {
    * @fires geo.event.annotation.add
    */
   this.addAnnotation = function (annotation, gcs, update) {
-    var pos = $.inArray(annotation, m_annotations);
-    if (pos < 0) {
+    if (m_annotationIds[annotation.id()] === undefined) {
       while (m_this.annotationById(annotation.id())) {
         annotation.newId();
       }
@@ -6909,12 +6908,14 @@ var _annotationLayer = function annotationLayer(arg) {
    * @param {geo.annotation} annotation The annotation to remove.
    * @param {boolean} [update] If `false`, don't update the layer after removing
    *    the annotation.
+   * @param {int} [pos] The posiiton of the annotation in the annotation list,
+   *    if known.  This speeds up the process.
    * @returns {boolean} `true` if an annotation was removed.
    * @fires geo.event.annotation.remove
    */
-  this.removeAnnotation = function (annotation, update) {
-    var pos = $.inArray(annotation, m_annotations);
-    if (pos >= 0) {
+  this.removeAnnotation = function (annotation, update, pos) {
+    if (annotation.id && m_annotationIds[annotation.id()] !== undefined) {
+      pos = $.inArray(annotation, m_annotations);
       if (annotation === m_this.currentAnnotation) {
         m_this.currentAnnotation = null;
       }
@@ -6930,8 +6931,9 @@ var _annotationLayer = function annotationLayer(arg) {
       m_this.geoTrigger(geo_event.annotation.remove, {
         annotation: annotation
       });
+      return true;
     }
-    return pos >= 0;
+    return false;
   };
 
   /**
@@ -6945,15 +6947,13 @@ var _annotationLayer = function annotationLayer(arg) {
    */
   this.removeAllAnnotations = function (skipCreating, update) {
     var removed = 0,
-      annotation,
-      pos = 0;
-    while (pos < m_annotations.length) {
+      annotation;
+    for (var pos = m_annotations.length - 1; pos >= 0; pos -= 1) {
       annotation = m_annotations[pos];
       if (skipCreating && annotation.state() === geo_annotation.state.create) {
-        pos += 1;
         continue;
       }
-      m_this.removeAnnotation(annotation, false);
+      m_this.removeAnnotation(annotation, false, pos);
       removed += 1;
     }
     if (removed && update !== false) {
@@ -22528,7 +22528,7 @@ var pointFeature = __webpack_require__(7541);
  * @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
+ * @property {boolean|function} [radiusIncludesStroke=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`.
@@ -28060,7 +28060,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "689846cc4aaa81643bd60b9d9afd9c8dd08bd8ff";
+module.exports = "62002290dca8a13aae8b6efc44341c14b02b427e";
 
 /***/ }),
 
@@ -39933,7 +39933,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.6";
+module.exports = "1.12.7";
 
 /***/ }),
 

package/geo.lean.js

@@ -3875,8 +3875,7 @@ var _annotationLayer = function annotationLayer(arg) {
    * @fires geo.event.annotation.add
    */
   this.addAnnotation = function (annotation, gcs, update) {
-    var pos = $.inArray(annotation, m_annotations);
-    if (pos < 0) {
+    if (m_annotationIds[annotation.id()] === undefined) {
       while (m_this.annotationById(annotation.id())) {
         annotation.newId();
       }
@@ -3908,12 +3907,14 @@ var _annotationLayer = function annotationLayer(arg) {
    * @param {geo.annotation} annotation The annotation to remove.
    * @param {boolean} [update] If `false`, don't update the layer after removing
    *    the annotation.
+   * @param {int} [pos] The posiiton of the annotation in the annotation list,
+   *    if known.  This speeds up the process.
    * @returns {boolean} `true` if an annotation was removed.
    * @fires geo.event.annotation.remove
    */
-  this.removeAnnotation = function (annotation, update) {
-    var pos = $.inArray(annotation, m_annotations);
-    if (pos >= 0) {
+  this.removeAnnotation = function (annotation, update, pos) {
+    if (annotation.id && m_annotationIds[annotation.id()] !== undefined) {
+      pos = $.inArray(annotation, m_annotations);
       if (annotation === m_this.currentAnnotation) {
         m_this.currentAnnotation = null;
       }
@@ -3929,8 +3930,9 @@ var _annotationLayer = function annotationLayer(arg) {
       m_this.geoTrigger(geo_event.annotation.remove, {
         annotation: annotation
       });
+      return true;
     }
-    return pos >= 0;
+    return false;
   };
 
   /**
@@ -3944,15 +3946,13 @@ var _annotationLayer = function annotationLayer(arg) {
    */
   this.removeAllAnnotations = function (skipCreating, update) {
     var removed = 0,
-      annotation,
-      pos = 0;
-    while (pos < m_annotations.length) {
+      annotation;
+    for (var pos = m_annotations.length - 1; pos >= 0; pos -= 1) {
       annotation = m_annotations[pos];
       if (skipCreating && annotation.state() === geo_annotation.state.create) {
-        pos += 1;
         continue;
       }
-      m_this.removeAnnotation(annotation, false);
+      m_this.removeAnnotation(annotation, false, pos);
       removed += 1;
     }
     if (removed && update !== false) {
@@ -19527,7 +19527,7 @@ var pointFeature = __webpack_require__(7541);
  * @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
+ * @property {boolean|function} [radiusIncludesStroke=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`.
@@ -25059,7 +25059,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "689846cc4aaa81643bd60b9d9afd9c8dd08bd8ff";
+module.exports = "62002290dca8a13aae8b6efc44341c14b02b427e";
 
 /***/ }),
 
@@ -36932,7 +36932,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.6";
+module.exports = "1.12.7";
 
 /***/ }),