geojs 1.10.0 → 1.10.1

package/geo.js

@@ -16879,13 +16879,15 @@ var map = function map(arg) {
    *    center.
    * @param {boolean} [ignoreDiscreteZoom] If `true`, ignore the discreteZoom
    *    option when determining the new view.
+   * @param {boolean} [ignoreClampBounds] If `true`, ignore the clampBounds
+   *    option when determining the new view.
    * @returns {number|this}
    * @fires geo.event.zoom
    * @fires geo.event.pan
    */
 
 
-  this.zoom = function (val, origin, ignoreDiscreteZoom) {
+  this.zoom = function (val, origin, ignoreDiscreteZoom, ignoreClampBounds) {
     if (val === undefined) {
       return m_zoom;
     }
@@ -16894,10 +16896,14 @@ var map = function map(arg) {
     /* If we are zooming around a point, ignore the clamp bounds */
 
     var aroundPoint = origin && (origin.mapgcs || origin.geo) && origin.map;
-    var ignoreClampBounds = aroundPoint;
+
+    if (aroundPoint) {
+      ignoreClampBounds = true;
+    }
     /* The ignoreDiscreteZoom flag is intended to allow non-integer zoom values
      * during animation. */
 
+
     val = m_this._fix_zoom(val, ignoreDiscreteZoom);
 
     if (val === m_zoom) {
@@ -16924,7 +16930,7 @@ var map = function map(arg) {
       m_this.pan({
         x: 0,
         y: 0
-      }, ignoreDiscreteZoom);
+      }, ignoreDiscreteZoom, ignoreClampBounds);
     }
 
     return m_this;
@@ -17670,6 +17676,8 @@ var map = function map(arg) {
    *    a value based on what canceled a transition, `transition`: the current
    *    transition that just completed, `next`: a boolean if another transition
    *    follows immediately.
+   * @param {boolean} [opts.endClamp=true] If `false`, the last center change
+   *    will not clamp to the bounds and zoom values.
    * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
    *    the interface gcs, `null` to use the map gcs, or any other transform.
    *    Applies only to `opts.center` and to converting zoom values to height,
@@ -17779,7 +17787,8 @@ var map = function map(arg) {
       zCoord: opts.zCoord,
       done: opts.done,
       duration: opts.duration,
-      zoomOrigin: opts.zoomOrigin
+      zoomOrigin: opts.zoomOrigin,
+      endClamp: opts.endClamp
     };
     m_transition.interp = opts.interp([m_transition.start.center.x, m_transition.start.center.y, opts.zCoord ? zoom2z(m_transition.start.zoom) : m_transition.start.zoom, m_transition.start.rotation], [m_transition.end.center ? m_transition.end.center.x : m_transition.start.center.x, m_transition.end.center ? m_transition.end.center.y : m_transition.start.center.y, opts.zCoord ? zoom2z(m_transition.end.zoom) : m_transition.end.zoom, m_transition.end.rotation]);
     /**
@@ -17831,10 +17840,11 @@ var map = function map(arg) {
           if (m_transition.end.center) {
             var needZoom = m_zoom !== m_this._fix_zoom(m_transition.end.zoom);
 
-            m_this.center(m_transition.end.center, null, needZoom, needZoom);
+            var noEndClamp = needZoom || opts.endClamp === false;
+            m_this.center(m_transition.end.center, null, noEndClamp, noEndClamp);
           }
 
-          m_this.zoom(m_transition.end.zoom, m_transition.zoomOrigin);
+          m_this.zoom(m_transition.end.zoom, m_transition.zoomOrigin, opts.endClamp === false, opts.endClamp === false);
           m_this.rotation(fix_rotation(m_transition.end.rotation));
         }
 
@@ -17874,7 +17884,7 @@ var map = function map(arg) {
           x: p[0],
           y: p[1]
         }, null);
-        m_this.zoom(p[2], m_transition.zoomOrigin, true);
+        m_this.zoom(p[2], m_transition.zoomOrigin, true, true);
       }
 
       m_this.rotation(p[3], undefined, true);
@@ -27813,7 +27823,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "4deaf9194bd7164462cae2b89ec30e85ead7ff6e";
+module.exports = "b37bd8311e8146b64ad199fccd0b4a5404d78157";
 
 /***/ }),
 
@@ -40938,7 +40948,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.0";
+module.exports = "1.10.1";
 
 /***/ }),
 

package/geo.lean.js

@@ -16879,13 +16879,15 @@ var map = function map(arg) {
    *    center.
    * @param {boolean} [ignoreDiscreteZoom] If `true`, ignore the discreteZoom
    *    option when determining the new view.
+   * @param {boolean} [ignoreClampBounds] If `true`, ignore the clampBounds
+   *    option when determining the new view.
    * @returns {number|this}
    * @fires geo.event.zoom
    * @fires geo.event.pan
    */
 
 
-  this.zoom = function (val, origin, ignoreDiscreteZoom) {
+  this.zoom = function (val, origin, ignoreDiscreteZoom, ignoreClampBounds) {
     if (val === undefined) {
       return m_zoom;
     }
@@ -16894,10 +16896,14 @@ var map = function map(arg) {
     /* If we are zooming around a point, ignore the clamp bounds */
 
     var aroundPoint = origin && (origin.mapgcs || origin.geo) && origin.map;
-    var ignoreClampBounds = aroundPoint;
+
+    if (aroundPoint) {
+      ignoreClampBounds = true;
+    }
     /* The ignoreDiscreteZoom flag is intended to allow non-integer zoom values
      * during animation. */
 
+
     val = m_this._fix_zoom(val, ignoreDiscreteZoom);
 
     if (val === m_zoom) {
@@ -16924,7 +16930,7 @@ var map = function map(arg) {
       m_this.pan({
         x: 0,
         y: 0
-      }, ignoreDiscreteZoom);
+      }, ignoreDiscreteZoom, ignoreClampBounds);
     }
 
     return m_this;
@@ -17670,6 +17676,8 @@ var map = function map(arg) {
    *    a value based on what canceled a transition, `transition`: the current
    *    transition that just completed, `next`: a boolean if another transition
    *    follows immediately.
+   * @param {boolean} [opts.endClamp=true] If `false`, the last center change
+   *    will not clamp to the bounds and zoom values.
    * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
    *    the interface gcs, `null` to use the map gcs, or any other transform.
    *    Applies only to `opts.center` and to converting zoom values to height,
@@ -17779,7 +17787,8 @@ var map = function map(arg) {
       zCoord: opts.zCoord,
       done: opts.done,
       duration: opts.duration,
-      zoomOrigin: opts.zoomOrigin
+      zoomOrigin: opts.zoomOrigin,
+      endClamp: opts.endClamp
     };
     m_transition.interp = opts.interp([m_transition.start.center.x, m_transition.start.center.y, opts.zCoord ? zoom2z(m_transition.start.zoom) : m_transition.start.zoom, m_transition.start.rotation], [m_transition.end.center ? m_transition.end.center.x : m_transition.start.center.x, m_transition.end.center ? m_transition.end.center.y : m_transition.start.center.y, opts.zCoord ? zoom2z(m_transition.end.zoom) : m_transition.end.zoom, m_transition.end.rotation]);
     /**
@@ -17831,10 +17840,11 @@ var map = function map(arg) {
           if (m_transition.end.center) {
             var needZoom = m_zoom !== m_this._fix_zoom(m_transition.end.zoom);
 
-            m_this.center(m_transition.end.center, null, needZoom, needZoom);
+            var noEndClamp = needZoom || opts.endClamp === false;
+            m_this.center(m_transition.end.center, null, noEndClamp, noEndClamp);
           }
 
-          m_this.zoom(m_transition.end.zoom, m_transition.zoomOrigin);
+          m_this.zoom(m_transition.end.zoom, m_transition.zoomOrigin, opts.endClamp === false, opts.endClamp === false);
           m_this.rotation(fix_rotation(m_transition.end.rotation));
         }
 
@@ -17874,7 +17884,7 @@ var map = function map(arg) {
           x: p[0],
           y: p[1]
         }, null);
-        m_this.zoom(p[2], m_transition.zoomOrigin, true);
+        m_this.zoom(p[2], m_transition.zoomOrigin, true, true);
       }
 
       m_this.rotation(p[3], undefined, true);
@@ -27813,7 +27823,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "4deaf9194bd7164462cae2b89ec30e85ead7ff6e";
+module.exports = "b37bd8311e8146b64ad199fccd0b4a5404d78157";
 
 /***/ }),
 
@@ -40938,7 +40948,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.10.0";
+module.exports = "1.10.1";
 
 /***/ }),