geojs 1.12.9 → 1.12.11

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # GeoJS Change Log
 
+## Version 1.12.10
+
+### Performance Improvements
+
+- Allow skipping event triggers on removeAnnotation and removeAllAnnotations ([#13521](../../pull/13521))
+
 ## Version 1.12.9
 
 ### Performance Improvements

package/geo.js

@@ -6865,7 +6865,7 @@ var _annotationLayer = function annotationLayer(arg) {
    *    gcs, `null` to use the map gcs, or any other transform.
    * @param {boolean} [update] If `false`, don't update the layer after adding
    *    the annotation.
-   * @param {boolean} [trigger] If `false`, do trigger add_before and add
+   * @param {boolean} [trigger] If `false`, do not trigger add_before and add
    *    events.
    * @returns {this} The current layer.
    * @fires geo.event.annotation.add_before
@@ -6943,10 +6943,11 @@ var _annotationLayer = function annotationLayer(arg) {
    *    the annotation.
    * @param {int} [pos] The posiiton of the annotation in the annotation list,
    *    if known.  This speeds up the process.
+   * @param {boolean} [trigger] If `false`, do not trigger remove event.
    * @returns {boolean} `true` if an annotation was removed.
    * @fires geo.event.annotation.remove
    */
-  this.removeAnnotation = function (annotation, update, pos) {
+  this.removeAnnotation = function (annotation, update, pos, trigger) {
     if (annotation.id && m_annotationIds[annotation.id()] !== undefined) {
       pos = m_annotations.indexOf(annotation);
       if (annotation === m_this.currentAnnotation) {
@@ -6961,9 +6962,11 @@ var _annotationLayer = function annotationLayer(arg) {
         m_this.modified();
         m_this.draw();
       }
-      m_this.geoTrigger(geo_event.annotation.remove, {
-        annotation: annotation
-      });
+      if (trigger !== false) {
+        m_this.geoTrigger(geo_event.annotation.remove, {
+          annotation: annotation
+        });
+      }
       return true;
     }
     return false;
@@ -6976,9 +6979,10 @@ var _annotationLayer = function annotationLayer(arg) {
    *    are in the create state.
    * @param {boolean} [update] If `false`, don't update the layer after
    *    removing the annotation.
+   * @param {boolean} [trigger] If `false`, do not trigger remove events.
    * @returns {number} The number of annotations that were removed.
    */
-  this.removeAllAnnotations = function (skipCreating, update) {
+  this.removeAllAnnotations = function (skipCreating, update, trigger) {
     var removed = 0,
       annotation;
     for (var pos = m_annotations.length - 1; pos >= 0; pos -= 1) {
@@ -6986,7 +6990,7 @@ var _annotationLayer = function annotationLayer(arg) {
       if (skipCreating && annotation.state() === geo_annotation.state.create) {
         continue;
       }
-      m_this.removeAnnotation(annotation, false, pos);
+      m_this.removeAnnotation(annotation, false, pos, trigger);
       removed += 1;
     }
     if (removed && update !== false) {
@@ -28095,7 +28099,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "540466ba3aa5e442250a9eb78abbf8f62e824a51";
+module.exports = "4aaa9a69bb5d4da14aa03fcdc6d92ff1d5f98a9e";
 
 /***/ }),
 
@@ -33769,13 +33773,13 @@ _transform.lookup = function (projection) {
   }
   code = parts[1];
   return $.ajax({
-    url: 'https://epsg.io/?q=' + code + '&format=json'
+    url: 'https://epsg.io/' + encodeURIComponent(code) + '.proj4'
   }).done(function (data) {
     var result = (data.results || [])[0];
-    if (!result || !result.proj4) {
+    if (!result) {
       return defer.reject(data).promise();
     }
-    proj4.defs(projection, result.proj4);
+    proj4.defs(projection, result);
     return $.when(proj4.defs[projection]);
   });
 };
@@ -39968,7 +39972,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.9";
+module.exports = "1.12.11";
 
 /***/ }),
 

package/geo.lean.js

@@ -3864,7 +3864,7 @@ var _annotationLayer = function annotationLayer(arg) {
    *    gcs, `null` to use the map gcs, or any other transform.
    * @param {boolean} [update] If `false`, don't update the layer after adding
    *    the annotation.
-   * @param {boolean} [trigger] If `false`, do trigger add_before and add
+   * @param {boolean} [trigger] If `false`, do not trigger add_before and add
    *    events.
    * @returns {this} The current layer.
    * @fires geo.event.annotation.add_before
@@ -3942,10 +3942,11 @@ var _annotationLayer = function annotationLayer(arg) {
    *    the annotation.
    * @param {int} [pos] The posiiton of the annotation in the annotation list,
    *    if known.  This speeds up the process.
+   * @param {boolean} [trigger] If `false`, do not trigger remove event.
    * @returns {boolean} `true` if an annotation was removed.
    * @fires geo.event.annotation.remove
    */
-  this.removeAnnotation = function (annotation, update, pos) {
+  this.removeAnnotation = function (annotation, update, pos, trigger) {
     if (annotation.id && m_annotationIds[annotation.id()] !== undefined) {
       pos = m_annotations.indexOf(annotation);
       if (annotation === m_this.currentAnnotation) {
@@ -3960,9 +3961,11 @@ var _annotationLayer = function annotationLayer(arg) {
         m_this.modified();
         m_this.draw();
       }
-      m_this.geoTrigger(geo_event.annotation.remove, {
-        annotation: annotation
-      });
+      if (trigger !== false) {
+        m_this.geoTrigger(geo_event.annotation.remove, {
+          annotation: annotation
+        });
+      }
       return true;
     }
     return false;
@@ -3975,9 +3978,10 @@ var _annotationLayer = function annotationLayer(arg) {
    *    are in the create state.
    * @param {boolean} [update] If `false`, don't update the layer after
    *    removing the annotation.
+   * @param {boolean} [trigger] If `false`, do not trigger remove events.
    * @returns {number} The number of annotations that were removed.
    */
-  this.removeAllAnnotations = function (skipCreating, update) {
+  this.removeAllAnnotations = function (skipCreating, update, trigger) {
     var removed = 0,
       annotation;
     for (var pos = m_annotations.length - 1; pos >= 0; pos -= 1) {
@@ -3985,7 +3989,7 @@ var _annotationLayer = function annotationLayer(arg) {
       if (skipCreating && annotation.state() === geo_annotation.state.create) {
         continue;
       }
-      m_this.removeAnnotation(annotation, false, pos);
+      m_this.removeAnnotation(annotation, false, pos, trigger);
       removed += 1;
     }
     if (removed && update !== false) {
@@ -25094,7 +25098,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "540466ba3aa5e442250a9eb78abbf8f62e824a51";
+module.exports = "4aaa9a69bb5d4da14aa03fcdc6d92ff1d5f98a9e";
 
 /***/ }),
 
@@ -30768,13 +30772,13 @@ _transform.lookup = function (projection) {
   }
   code = parts[1];
   return $.ajax({
-    url: 'https://epsg.io/?q=' + code + '&format=json'
+    url: 'https://epsg.io/' + encodeURIComponent(code) + '.proj4'
   }).done(function (data) {
     var result = (data.results || [])[0];
-    if (!result || !result.proj4) {
+    if (!result) {
       return defer.reject(data).promise();
     }
-    proj4.defs(projection, result.proj4);
+    proj4.defs(projection, result);
     return $.when(proj4.defs[projection]);
   });
 };
@@ -36967,7 +36971,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.9";
+module.exports = "1.12.11";
 
 /***/ }),