geojs 1.12.10 → 1.13.0

package/geo.js

@@ -19222,6 +19222,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 +22809,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 +22966,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
@@ -25233,9 +25261,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 +25401,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 +28123,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "4353a25de740301aeb481c62d29e493abbbe7b9e";
+module.exports = "d7faab33bc71a282eea9deea55df6937d29c5300";
 
 /***/ }),
 
@@ -33773,13 +33797,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]);
   });
 };
@@ -39972,7 +39996,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.10";
+module.exports = "1.13.0";
 
 /***/ }),
 

package/geo.lean.js

@@ -16221,6 +16221,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.
    *
@@ -19780,9 +19808,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],
@@ -19939,18 +19965,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
@@ -22232,9 +22260,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],
@@ -22374,9 +22400,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],
@@ -25098,7 +25122,7 @@ module.exports = _sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "4353a25de740301aeb481c62d29e493abbbe7b9e";
+module.exports = "d7faab33bc71a282eea9deea55df6937d29c5300";
 
 /***/ }),
 
@@ -30772,13 +30796,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]);
   });
 };
@@ -36971,7 +36995,7 @@ module.exports = _vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.12.10";
+module.exports = "1.13.0";
 
 /***/ }),