geojs 1.13.0 → 1.14.0

package/geo.js

@@ -4333,6 +4333,7 @@ var _annotation = function annotation(type, args) {
 /**
  * Return actions needed for the specified state of this annotation.
  *
+ * @private
  * @param {object} m_this The current annotation instance.
  * @param {function} s_actions The parent actions method.
  * @param {string|undefined} state The state to return actions for.  Defaults
@@ -4366,6 +4367,7 @@ function continuousVerticesActions(m_this, s_actions, state, name, originalArgs)
 /**
  * Process actions to allow drawing continuous vertices for an annotation.
  *
+ * @private
  * @param {object} m_this The current annotation instance.
  * @param {geo.event} evt The action event.
  * @param {string} name The name of this annotation.
@@ -4425,6 +4427,7 @@ function continuousVerticesProcessAction(m_this, evt, name) {
  * that the aspect ratio of a rectangle-like selection is a specific value or
  * range of values.
  *
+ * @private
  * @param {number|number[]|geo.geoSize|geo.geoSize[]} ratio Either a single
  *   aspect ratio, a single size, or a list of allowed aspect ratios and sizes.
  *   For instance, 1 will require that the selection square, 2 would require
@@ -18192,11 +18195,13 @@ var _map2 = function map(arg) {
    *    option when determining the new view.
    * @param {boolean} [ignoreClampBounds] If `true`, ignore the clampBounds
    *    option when determining the new view.
+   * @param {boolean} [noTrigger] If truthy, do not trigger a pan or zoom
+   *    event.  If 'pan', only trigger the zoom event.
    * @returns {number|this}
    * @fires geo.event.zoom
    * @fires geo.event.pan
    */
-  this.zoom = function (val, origin, ignoreDiscreteZoom, ignoreClampBounds) {
+  this.zoom = function (val, origin, ignoreDiscreteZoom, ignoreClampBounds, noTrigger) {
     if (val === undefined) {
       return m_zoom;
     }
@@ -18221,22 +18226,52 @@ var _map2 = function map(arg) {
       zoomLevel: m_zoom,
       screenPosition: origin ? origin.map : undefined
     };
-    m_this.geoTrigger(geo_event.zoom, evt);
+    if (!noTrigger || noTrigger === 'pan') {
+      m_this.geoTrigger(geo_event.zoom, evt);
+    }
     if (aroundPoint) {
       var shifted = m_this.gcsToDisplay(origin.mapgcs || origin.geo, origin.mapgcs ? null : undefined);
       m_this.pan({
         x: origin.map.x - shifted.x,
         y: origin.map.y - shifted.y
-      }, ignoreDiscreteZoom, true);
+      }, ignoreDiscreteZoom, true, noTrigger);
     } else {
       m_this.pan({
         x: 0,
         y: 0
-      }, ignoreDiscreteZoom, ignoreClampBounds);
+      }, ignoreDiscreteZoom, ignoreClampBounds, noTrigger);
     }
     return m_this;
   };
 
+  /**
+   * Set zoom level and center of the map.
+   *
+   * @param {number} zoom The new zoom level to set.
+   * @param {geo.geoPosition} center The new center of the
+   * @param {string|geo.transform|null} [gcs] `undefined` to use the interface
+   *    gcs, `null` to use the map gcs, or any other transform.  The center is
+   *    converted from this gcs to the map projection.
+   * @param {geo.geoPosition} origin.geo The gcs coordinates of the zoom
+   *    center.
+   * @param {geo.screenPosition} origin.map The display coordinates of the zoom
+   *    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.
+   * @param {boolean} [noTrigger] If truthy, do not trigger a pan or zoom
+   *    event.
+   * @returns {this}
+   * @fires geo.event.zoom
+   * @fires geo.event.pan
+   */
+  this.zoomAndCenter = function (zoom, center, gcs, ignoreDiscreteZoom, ignoreClampBounds, noTrigger) {
+    this.zoom(zoom, undefined, ignoreDiscreteZoom, ignoreClampBounds, noTrigger || 'pan');
+    this.center(center, gcs, ignoreDiscreteZoom, ignoreClampBounds, noTrigger);
+    return this;
+  };
+
   /**
    * Pan the map by a number of display pixels.
    *
@@ -18250,10 +18285,11 @@ var _map2 = function map(arg) {
    *    view.  When `'limited'`, the `clampBoundsX` and `clampBoundsY` options
    *    are selectively enforced so that the map will not end up more out of
    *    bounds than its current state.
+   * @param {boolean} [noTrigger] If truthy, do not trigger a pan event.
    * @returns {this}
    * @fires geo.event.pan
    */
-  this.pan = function (delta, ignoreDiscreteZoom, ignoreClampBounds) {
+  this.pan = function (delta, ignoreDiscreteZoom, ignoreClampBounds, noTrigger) {
     var evt = {
       screenDelta: delta
     };
@@ -18294,7 +18330,9 @@ var _map2 = function map(arg) {
       x: m_width / 2,
       y: m_height / 2
     });
-    m_this.geoTrigger(geo_event.pan, evt);
+    if (!noTrigger) {
+      m_this.geoTrigger(geo_event.pan, evt);
+    }
     m_this.modified();
     return m_this;
   };
@@ -18356,7 +18394,7 @@ var _map2 = function map(arg) {
   /**
    * Get or set the center of the map in the given geographic coordinates.
    *
-   * @param {geo.geoPosition} coordinates If specified, the new center of the
+   * @param {geo.geoPosition} [coordinates] If specified, the new center of the
    *    map.
    * @param {string|geo.transform|null} [gcs] `undefined` to use the interface
    *    gcs, `null` to use the map gcs, or any other transform.  If setting the
@@ -18369,10 +18407,11 @@ var _map2 = function map(arg) {
    *    view.  When `'limited'`, the `clampBoundsX` and `clampBoundsY` options
    *    are selectively enforced so that the map will not end up more out of
    *    bounds than its current state.
+   * @param {boolean} [noTrigger] If truthy, do not trigger a pan event.
    * @returns {geo.geoPosition|this}
    * @fires geo.event.pan
    */
-  this.center = function (coordinates, gcs, ignoreDiscreteZoom, ignoreClampBounds) {
+  this.center = function (coordinates, gcs, ignoreDiscreteZoom, ignoreClampBounds, noTrigger) {
     var center;
     if (coordinates === undefined) {
       center = Object.assign({}, m_this.worldToGcs(m_center, gcs));
@@ -18384,12 +18423,14 @@ var _map2 = function map(arg) {
     camera_bounds(m_this.boundsFromZoomAndCenter(m_zoom, center, m_rotation, null, ignoreDiscreteZoom, ignoreClampBounds), m_rotation);
     m_this.modified();
     // trigger a pan event
-    m_this.geoTrigger(geo_event.pan, {
-      screenDelta: {
-        x: 0,
-        y: 0
-      }
-    });
+    if (!noTrigger) {
+      m_this.geoTrigger(geo_event.pan, {
+        screenDelta: {
+          x: 0,
+          y: 0
+        }
+      });
+    }
     return m_this;
   };
 
@@ -19148,7 +19189,7 @@ var _map2 = function map(arg) {
 
       // This might have consequences in terms of bounds/zoom clamping.
       // What behavior do we expect from this method in that case?
-      m_this.zoom(nav.zoom);
+      m_this.zoom(nav.zoom, undefined, undefined, undefined, 'pan');
       m_this.center(nav.center, null);
     }
     return m_this.boundsFromZoomAndCenter(m_zoom, m_center, m_rotation, gcs, true);
@@ -24113,7 +24154,7 @@ var _osmLayer = function osmLayer(arg) {
       queue: m_this._queue,
       overlap: m_this._options.tileOverlap,
       scale: m_this._options.tileScale,
-      url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, urlParams.level || 0, m_this._options.subdomains),
+      url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0), m_this._options.subdomains),
       crossDomain: m_this._options.crossDomain
     });
   };
@@ -24827,7 +24868,7 @@ var _pixelmapLayer = function pixelmapLayer(arg) {
       queue: m_this._queue,
       overlap: m_this._options.tileOverlap,
       scale: m_this._options.tileScale,
-      url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, urlParams.level || 0, m_this._options.subdomains),
+      url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0), m_this._options.subdomains),
       crossDomain: m_this._options.crossDomain
     });
   };
@@ -28123,7 +28164,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "d7faab33bc71a282eea9deea55df6937d29c5300";
+module.exports = "43f61353e44a71f669a4f0d631f102a517605fe9";
 
 /***/ }),
 
@@ -30766,6 +30807,7 @@ function modulo(a, b) {
 /**
  * Pick a subdomain from a list of subdomains based on a the tile location.
  *
+ * @private
  * @param {number} x The x tile coordinate.
  * @param {number} y The y tile coordinate.
  * @param {number} z The tile layer.
@@ -30785,9 +30827,9 @@ function m_getTileSubdomain(x, y, z, subdomains) {
  * all equivalent.  The comma-separated list can have subdomains that are of
  * any length; the string and range both use one-character subdomains.
  *
+ * @private
  * @param {string} base The tile format string
  * @returns {function} A conversion function.
- * @private.
  */
 function m_tileUrlFromTemplate(base) {
   var xPattern = /\$?\{[xX]\}/g,
@@ -31282,7 +31324,7 @@ var _tileLayer = function tileLayer(arg) {
         y: m_this._options.tileHeight
       },
       queue: m_this._queue,
-      url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, urlParams.level || 0, m_this._options.subdomains)
+      url: m_this._options.url.call(m_this, urlParams.x, urlParams.y, Math.max(urlParams.level || 0, 0), m_this._options.subdomains)
     });
   };
 
@@ -36819,6 +36861,7 @@ var m_memoizeConvertColor = {
  * be returned quickly.  If the memoization table gets over a certain size,
  * just reset it.
  *
+ * @private
  * @param {geo.geoColor} origColor The original color specification.
  * @param {geo.geoColorObject} resultColor The result of the conversion.
  * @returns {geo.geoColorObject} The `resultColor`.
@@ -37604,6 +37647,7 @@ var util = {
     };
     var layerParams = {
       maxLevel: maxLevel,
+      minLevel: Math.min(0, maxLevel),
       wrapX: false,
       wrapY: false,
       tileOffset: function tileOffset() {
@@ -38031,7 +38075,7 @@ var util = {
    * @param {object} target target object to modify.
    * @param {object} sources object(s) to merge into the target.
    * @returns {object} The merged object.
-   * @member geo.util
+   * @memberof geo.util
    */
   deepMerge: function deepMerge(target) {
     for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -38776,6 +38820,7 @@ __webpack_require__(5637), __webpack_require__(208), __webpack_require__(269), /
  *    elements, falsy for vertices.
  * @returns {geo.meshFeature.meshColoredInfo} An object with the colored mesh
  *    information.
+ * @memberof geo.util
  */
 function createColoredMesh(feature, elementValues) {
   var util = __webpack_require__(642);
@@ -39154,6 +39199,7 @@ var AlternateOpNames = {
  *
  * @param {object[]} seglist A PolyBool segment list.
  * @returns {geo.polygonList|undefined} A polygon list.
+ * @private
  */
 function seglistToPolygonList(seglist) {
   // This single line doesn't arrange holes correctly
@@ -39238,6 +39284,7 @@ function seglistToPolygonList(seglist) {
  *      around 0.11 mm in ground distance.
  * @param {object} seglist A seglist array as used by the polybool library.
  * @returns {object} A seglist array.
+ * @private
  */
 function polygonOperationSeglist(op, epsilon, seglist) {
   op = 'select' + op.charAt(0).toUpperCase() + op.slice(1);
@@ -39307,6 +39354,7 @@ function polygonOperationSeglist(op, epsilon, seglist) {
  * @param {geo.util.polyop.spec} [opts] Options for the operation.  Only used
  *    if poly is an object with a toPolygonList method.
  * @returns {geo.polygonList} A list of polygons.
+ * @memberof geo.util.polyops
  */
 function toPolygonList(poly, mode, opts) {
   mode = mode || {};
@@ -39401,6 +39449,7 @@ function toPolygonList(poly, mode, opts) {
  * @param {geo.util.polyop.spec} [opts] Options for the operation.  Only used
  *    if ``mode.style`` is an object with a fromPolygonList method.
  * @returns {geo.polygonAny} A polygon in one of several formats.
+ * @memberof geo.util.polyops
  */
 function fromPolygonList(poly, mode, opts) {
   if (mode.style.fromPolygonList) {
@@ -39439,6 +39488,7 @@ function fromPolygonList(poly, mode, opts) {
 /**
  * Use a minimum style for output to include all of the results.
  *
+ * @private
  * @param {geo.polygonList} polylist A list of polygons.
  * @param {string} style the proposed style.
  * @returns {string} The preferred style.
@@ -39469,6 +39519,7 @@ function minimumPolygonStyle(polylist, style) {
  * Generate the correspondence between the source polygons and the output
  * polygons.  A polygon corresponds if it has at least two points in common.
  *
+ * @private
  * @param {geo.polygonList} poly1 First set of source polygons.
  * @param {geo.polygonList} poly2 Second set of source polygons.
  * @param {geo.polygonList} newpoly Output polygons.
@@ -39536,6 +39587,7 @@ function generateCorrespondence(poly1, poly2, newpoly, results) {
 /**
  * Perform a general operation of a set of polygons.
  *
+ * @private
  * @param {string} op The operation to handle.  One of union, intersect,
  *    difference, or xor.
  * @param {geo.polygonAny|geo.util.polyop.spec} poly1 Either the first polygon
@@ -39619,6 +39671,7 @@ function generalOperationProcess(op, poly1, poly2, opts) {
 /**
  * Generate a polygon function for a specific operation.
  *
+ * @private
  * @param {string} op The operation to handle.  One of union, intersect,
  *    difference, or xor.
  * @returns {function} a function for the polygons.
@@ -39996,7 +40049,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.13.0";
+module.exports = "1.14.0";
 
 /***/ }),
 
@@ -45150,6 +45203,7 @@ var webgl_layer = function webgl_layer() {
    * @param {number} [opacity] If specified, set the opacity.  Otherwise,
    *    return the opacity.
    * @returns {number|this} The current opacity or the current layer.
+   * @memberof geo.webgl.layer
    */
   this.opacity = function (opacity) {
     var result = s_opacity.apply(m_this, arguments);
@@ -45166,6 +45220,7 @@ var webgl_layer = function webgl_layer() {
    *    get it.
    * @returns {boolean|this} either the visibility (if getting) or the layer
    *    (if setting).
+   * @memberof geo.webgl.layer
    */
   this.visible = function (val) {
     if (val === undefined) {
@@ -45190,6 +45245,7 @@ var webgl_layer = function webgl_layer() {
    *    truthy, allow other layers to have the same z-index.  Otherwise,
    *    ensure that other layers have distinct z-indices from this one.
    * @returns {number|this}
+   * @memberof geo.webgl.layer
    */
   this.zIndex = function (zIndex, allowDuplicate) {
     var result = s_zIndex.apply(m_this, arguments);
@@ -45214,6 +45270,7 @@ var webgl_layer = function webgl_layer() {
    * @param {geo.webgl.webglRenderer} newRenderer The renderer to move to.
    * @param {boolean} [rerender=false] If truthy, rerender after the switch.
    * @returns {this}
+   * @memberof geo.webgl.layer
    */
   this.switchRenderer = function (newRenderer, rerender) {
     if (newRenderer instanceof webglRenderer && newRenderer !== m_this.renderer()) {
@@ -45252,6 +45309,7 @@ var webgl_layer = function webgl_layer() {
    * Initialize after the layer is added to the map.
    *
    * @returns {this}
+   * @memberof geo.webgl.layer
    */
   this._init = function () {
     var map = m_this.map();
@@ -45963,6 +46021,7 @@ var vgl = __webpack_require__(1611);
  * @param {vgl.renderState} renderState An object that contains the context
  *   used for drawing.
  * @param {number} textureUnit The number of the texture unit [0-15].
+ * @private
  */
 function activateTextureUnit(renderState, textureUnit) {
   if (textureUnit >= 0 && textureUnit <= 31) {
@@ -47629,6 +47688,7 @@ var pointFeature = __webpack_require__(7541);
  * @param {this} m_this The point-like feature.
  * @param {object} [arg] Feature definition object that might specify the
  *      primitive shape.
+ * @memberof geo.webgl
  */
 function pointUtil(m_this, arg) {
   arg = arg || {};
@@ -48690,6 +48750,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
    * Add a tile to the list of quads.
    *
    * @param {geo.tile} tile The tile to add and draw.
+   * @memberof geo.webgl.tileLayer
    */
   this._drawTile = function (tile) {
     if (!m_quadFeature) {
@@ -48782,6 +48843,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
    * @param {boolean} [val] If specified, change the visibility, otherwise
    *    return it.
    * @returns {boolean|this} The current visibility or the layer.
+   * @memberof geo.webgl.tileLayer
    */
   this.visible = function (val) {
     if (val === undefined) {
@@ -48806,6 +48868,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
    *    truthy, allow other layers to have the same z-index.  Otherwise,
    *    ensure that other layers have distinct z-indices from this one.
    * @returns {number|this}
+   * @memberof geo.webgl.tileLayer
    */
   this.zIndex = function (zIndex, allowDuplicate) {
     if (zIndex !== undefined) {
@@ -48820,6 +48883,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
    *
    * @param {geo.event} [evt] If specified, the layer add or remove event that
    *    triggered this.  If `undefined`, clear the quads but don't redraw.
+   * @memberof geo.webgl.tileLayer
    */
   this._clearQuads = function (evt) {
     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(function (l) {
@@ -48841,6 +48905,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
    *
    * @param {object} request A value to pass to the parent class.
    * @returns {this}
+   * @memberof geo.webgl.tileLayer
    */
   this._update = function (request) {
     s_update.call(m_this, request);
@@ -48853,6 +48918,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
 
   /**
    * Cleanup.  This purges the texture and tile cache.
+   * @memberof geo.webgl.tileLayer
    */
   this._cleanup = function () {
     var tile;
@@ -48870,6 +48936,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
 
   /**
    * Destroy.
+   * @memberof geo.webgl.tileLayer
    */
   this._exit = function () {
     var map = m_this.map();
@@ -48884,6 +48951,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
 
   /**
    * Initialize after the layer is added to the map.
+   * @memberof geo.webgl.tileLayer
    */
   this._init = function () {
     s_init.apply(m_this, arguments);