geojs 1.12.11 → 1.13.1

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
@@ -19222,6 +19225,34 @@ var _map2 = function map(arg) {
     return m_this;
   };
 
+  /**
+   * Get the corners of the map.  Since the map can be rotated, this is
+   * necessarily not the same as the overall bounds, which is the orthogonal
+   * bounding box.
+   *
+   * @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
+   *    bounds, they are converted from this gcs to the map projection.  The
+   *    returned bounds are converted from the map projection to this gcs.
+   * @returns {geo.geoPosition[]} The corners of the map in the order
+   *    upper-left, upper-right, lower-right, lower-left.
+   */
+  this.corners = function (gcs) {
+    return [m_this.displayToGcs({
+      x: 0,
+      y: 0
+    }, gcs), m_this.displayToGcs({
+      x: m_width,
+      y: 0
+    }, gcs), m_this.displayToGcs({
+      x: m_width,
+      y: m_height
+    }, gcs), m_this.displayToGcs({
+      x: 0,
+      y: m_height
+    }, gcs)];
+  };
+
   /**
    * Get the center zoom level necessary to display the given bounds.
    *
@@ -22781,9 +22812,7 @@ var _markerFeature = function markerFeature(arg) {
 
     // Find markers inside the bounding box
     idx = m_rangeTree.range(min.x, min.y, max.x, max.y);
-    idx.sort(function (a, b) {
-      return a - b;
-    });
+    idx = Uint32Array.from(idx).sort();
     // Filter by circular region
     idx.forEach(function (i) {
       var d = data[i],
@@ -22940,18 +22969,20 @@ var _markerFeature = function markerFeature(arg) {
     };
     // Find markers inside the bounding box.  Only these could be in the polygon
     idx = m_rangeTree.range(min.x, min.y, max.x, max.y);
-    // sort by index
-    idx.sort(function (a, b) {
-      return a - b;
-    });
+    /* sort by index.  This had been
+     *  idx.sort((a, b) => a - b);
+     * but this requires continual casting from int to str and back, so using
+     * a Uint32Array is faster, though potentially limits the maximum number of
+     * markers. */
+    idx = Uint32Array.from(idx).sort();
     // filter markers within the polygon
     idx.forEach(function (i) {
       var d = data[i];
       var p = m_this.position()(d, i);
-      var rad = radius(data[i], i),
-        swz = scaleWithZoom(data[i], i);
-      var so = strokeOffset(data[i], i),
-        s = swz ? strokeWidth(data[i], i) : 0;
+      var rad = radius(d, i),
+        swz = scaleWithZoom(d, i);
+      var so = strokeOffset(d, i),
+        s = swz ? strokeWidth(d, i) : 0;
       var ris = radiusIncludesStroke(d, i);
       ris = ris === undefined ? true : ris;
       var rwos = ris ? rad + s * (so - 1) / 2 : rad; // radius without stroke
@@ -24085,7 +24116,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
     });
   };
@@ -24799,7 +24830,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
     });
   };
@@ -25233,9 +25264,7 @@ var _pointFeature = function pointFeature(arg) {
 
     // Find points inside the bounding box
     idx = m_rangeTree.range(min.x, min.y, max.x, max.y);
-    idx.sort(function (a, b) {
-      return a - b;
-    });
+    idx = Uint32Array.from(idx).sort();
     // Filter by circular region
     idx.forEach(function (i) {
       var d = data[i],
@@ -25375,9 +25404,7 @@ var _pointFeature = function pointFeature(arg) {
     // Find points inside the bounding box.  Only these could be in the polygon
     idx = m_rangeTree.range(min.x, min.y, max.x, max.y);
     // sort by index
-    idx.sort(function (a, b) {
-      return a - b;
-    });
+    idx = Uint32Array.from(idx).sort();
     // filter points within the polygon
     idx.forEach(function (i) {
       var d = data[i],
@@ -28099,7 +28126,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "4aaa9a69bb5d4da14aa03fcdc6d92ff1d5f98a9e";
+module.exports = "9174d2af787e4421e022dca6933c5ee848294c1a";
 
 /***/ }),
 
@@ -30742,6 +30769,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.
@@ -30761,9 +30789,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,
@@ -31258,7 +31286,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)
     });
   };
 
@@ -36795,6 +36823,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`.
@@ -37580,6 +37609,7 @@ var util = {
     };
     var layerParams = {
       maxLevel: maxLevel,
+      minLevel: Math.min(0, maxLevel),
       wrapX: false,
       wrapY: false,
       tileOffset: function tileOffset() {
@@ -38007,7 +38037,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++) {
@@ -38752,6 +38782,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);
@@ -39130,6 +39161,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
@@ -39214,6 +39246,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);
@@ -39283,6 +39316,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 || {};
@@ -39377,6 +39411,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) {
@@ -39415,6 +39450,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.
@@ -39445,6 +39481,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.
@@ -39512,6 +39549,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
@@ -39595,6 +39633,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.
@@ -39972,7 +40011,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.11";
+module.exports = "1.13.1";
 
 /***/ }),
 
@@ -45126,6 +45165,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);
@@ -45142,6 +45182,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) {
@@ -45166,6 +45207,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);
@@ -45190,6 +45232,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()) {
@@ -45228,6 +45271,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();
@@ -45939,6 +45983,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) {
@@ -47605,6 +47650,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 || {};
@@ -48666,6 +48712,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) {
@@ -48758,6 +48805,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) {
@@ -48782,6 +48830,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) {
@@ -48796,6 +48845,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) {
@@ -48817,6 +48867,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);
@@ -48829,6 +48880,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
 
   /**
    * Cleanup.  This purges the texture and tile cache.
+   * @memberof geo.webgl.tileLayer
    */
   this._cleanup = function () {
     var tile;
@@ -48846,6 +48898,7 @@ var webgl_tileLayer = function webgl_tileLayer() {
 
   /**
    * Destroy.
+   * @memberof geo.webgl.tileLayer
    */
   this._exit = function () {
     var map = m_this.map();
@@ -48860,6 +48913,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);