geojs 1.8.6 → 1.8.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # GeoJS Change Log
 
+## Version 1.8.7
+
+### Improvements
+
+- Add some code paths to reduce transform calls ([#1207](../../pull/1207))
+
 ## Version 1.8.6
 
 ### Improvements

package/geo.js

@@ -27053,7 +27053,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "819c5c82371d5348c2f142a62331b89ed86e01ff";
+module.exports = "493ff30a20fb5c5febb2c3521372398121e0cdee";
 
 /***/ }),
 
@@ -33921,6 +33921,22 @@ transform.vincentyDistance = function (pt1, pt2, gcs, baseGcs, ellipsoid, maxIte
     alpha2: Math.atan2(cosU1 * Math.sin(lambda), -sinU1 * cosU2 + cosU1 * sinU2 * Math.cos(lambda))
   };
 };
+/**
+ * Return a boolean indicating if the projections only differ in their y
+ * coordinate.
+ *
+ * @param {string} srcPrj The source projection.
+ * @param {string} tgtPrj The destination projection.
+ * @returns {boolean} truthy if only the y coordinate is different between
+ *    projections.
+ */
+
+
+transform.onlyInvertedY = function (srcPrj, tgtPrj) {
+  var smatch = srcPrj.match(axisPattern),
+      tmatch = tgtPrj.match(axisPattern);
+  return smatch && tmatch && smatch[1] === tmatch[1] && smatch[3] === tmatch[3];
+};
 /* Expose proj4 to make it easier to debug */
 
 
@@ -39552,7 +39568,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.8.6";
+module.exports = "1.8.7";
 
 /***/ }),
 
@@ -40783,6 +40799,9 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
       negStrokeOffset: 0
     }],
         v = vert[1],
+        target_gcs = m_this.gcs(),
+        map_gcs = m_this.layer().map().gcs(),
+        simpleInverse = transform.onlyInvertedY(target_gcs, map_gcs),
         pos,
         posIdx3,
         firstpos,
@@ -40863,7 +40882,7 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
         for (j = 0; j < lineItem.length; j += 1) {
           pos = posFunc(lineItem[j], j, d, i);
           position.push(pos.x);
-          position.push(pos.y);
+          position.push(simpleInverse ? -pos.y : pos.y);
           position.push(pos.z || 0.0);
 
           if (!j) {
@@ -40886,7 +40905,10 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
         }
       }
 
-      position = transform.transformCoordinates(m_this.gcs(), m_this.layer().map().gcs(), position, 3);
+      if (!simpleInverse) {
+        position = transform.transformCoordinates(target_gcs, map_gcs, position, 3);
+      }
+
       m_origin = new Float32Array(m_this.style.get('origin')(position));
 
       if (m_origin[0] || m_origin[1] || m_origin[2]) {
@@ -43410,6 +43432,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         items = [],
         target_gcs = m_this.gcs(),
         map_gcs = m_this.layer().map().gcs(),
+        simpleInverse = transform.onlyInvertedY(target_gcs, map_gcs),
         numPts = 0,
         geom = m_mapper.geometryData(),
         color,
@@ -43460,7 +43483,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         for (i = d3 = 0; i < outer.length; i += 1, d3 += 3) {
           c = posFunc(outer[i], i, item, itemIndex);
           geometry[d3] = c.x;
-          geometry[d3 + 1] = c.y; // ignore the z values until we support them
+          geometry[d3 + 1] = simpleInverse ? -c.y : c.y; // ignore the z values until we support them
 
           geometry[d3 + 2] = 0; // c.z || 0;
         }
@@ -43484,7 +43507,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
             for (i = 0; i < hole.length; i += 1, d3 += 3) {
               c = posFunc(hole[i], i, item, itemIndex);
               geometry.vertices[d3] = c.x;
-              geometry.vertices[d3 + 1] = c.y; // ignore the z values until we support them
+              geometry.vertices[d3 + 1] = simpleInverse ? -c.y : c.y; // ignore the z values until we support them
 
               geometry.vertices[d3 + 2] = 0; // c.z || 0;
             }
@@ -43492,7 +43515,10 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         } // transform to map gcs
 
 
-        geometry.vertices = transform.transformCoordinates(target_gcs, map_gcs, geometry.vertices, geometry.dimensions);
+        if (!simpleInverse) {
+          geometry.vertices = transform.transformCoordinates(target_gcs, map_gcs, geometry.vertices, geometry.dimensions);
+        }
+
         record = {
           // triangulate
           triangles: earcut(geometry.vertices, geometry.holes, geometry.dimensions),

package/geo.lean.js

@@ -27053,7 +27053,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "819c5c82371d5348c2f142a62331b89ed86e01ff";
+module.exports = "493ff30a20fb5c5febb2c3521372398121e0cdee";
 
 /***/ }),
 
@@ -33921,6 +33921,22 @@ transform.vincentyDistance = function (pt1, pt2, gcs, baseGcs, ellipsoid, maxIte
     alpha2: Math.atan2(cosU1 * Math.sin(lambda), -sinU1 * cosU2 + cosU1 * sinU2 * Math.cos(lambda))
   };
 };
+/**
+ * Return a boolean indicating if the projections only differ in their y
+ * coordinate.
+ *
+ * @param {string} srcPrj The source projection.
+ * @param {string} tgtPrj The destination projection.
+ * @returns {boolean} truthy if only the y coordinate is different between
+ *    projections.
+ */
+
+
+transform.onlyInvertedY = function (srcPrj, tgtPrj) {
+  var smatch = srcPrj.match(axisPattern),
+      tmatch = tgtPrj.match(axisPattern);
+  return smatch && tmatch && smatch[1] === tmatch[1] && smatch[3] === tmatch[3];
+};
 /* Expose proj4 to make it easier to debug */
 
 
@@ -39552,7 +39568,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.8.6";
+module.exports = "1.8.7";
 
 /***/ }),
 
@@ -40783,6 +40799,9 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
       negStrokeOffset: 0
     }],
         v = vert[1],
+        target_gcs = m_this.gcs(),
+        map_gcs = m_this.layer().map().gcs(),
+        simpleInverse = transform.onlyInvertedY(target_gcs, map_gcs),
         pos,
         posIdx3,
         firstpos,
@@ -40863,7 +40882,7 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
         for (j = 0; j < lineItem.length; j += 1) {
           pos = posFunc(lineItem[j], j, d, i);
           position.push(pos.x);
-          position.push(pos.y);
+          position.push(simpleInverse ? -pos.y : pos.y);
           position.push(pos.z || 0.0);
 
           if (!j) {
@@ -40886,7 +40905,10 @@ var webgl_lineFeature = function webgl_lineFeature(arg) {
         }
       }
 
-      position = transform.transformCoordinates(m_this.gcs(), m_this.layer().map().gcs(), position, 3);
+      if (!simpleInverse) {
+        position = transform.transformCoordinates(target_gcs, map_gcs, position, 3);
+      }
+
       m_origin = new Float32Array(m_this.style.get('origin')(position));
 
       if (m_origin[0] || m_origin[1] || m_origin[2]) {
@@ -43410,6 +43432,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         items = [],
         target_gcs = m_this.gcs(),
         map_gcs = m_this.layer().map().gcs(),
+        simpleInverse = transform.onlyInvertedY(target_gcs, map_gcs),
         numPts = 0,
         geom = m_mapper.geometryData(),
         color,
@@ -43460,7 +43483,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         for (i = d3 = 0; i < outer.length; i += 1, d3 += 3) {
           c = posFunc(outer[i], i, item, itemIndex);
           geometry[d3] = c.x;
-          geometry[d3 + 1] = c.y; // ignore the z values until we support them
+          geometry[d3 + 1] = simpleInverse ? -c.y : c.y; // ignore the z values until we support them
 
           geometry[d3 + 2] = 0; // c.z || 0;
         }
@@ -43484,7 +43507,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
             for (i = 0; i < hole.length; i += 1, d3 += 3) {
               c = posFunc(hole[i], i, item, itemIndex);
               geometry.vertices[d3] = c.x;
-              geometry.vertices[d3 + 1] = c.y; // ignore the z values until we support them
+              geometry.vertices[d3 + 1] = simpleInverse ? -c.y : c.y; // ignore the z values until we support them
 
               geometry.vertices[d3 + 2] = 0; // c.z || 0;
             }
@@ -43492,7 +43515,10 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         } // transform to map gcs
 
 
-        geometry.vertices = transform.transformCoordinates(target_gcs, map_gcs, geometry.vertices, geometry.dimensions);
+        if (!simpleInverse) {
+          geometry.vertices = transform.transformCoordinates(target_gcs, map_gcs, geometry.vertices, geometry.dimensions);
+        }
+
         record = {
           // triangulate
           triangles: earcut(geometry.vertices, geometry.holes, geometry.dimensions),