geojs 1.8.6 → 1.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.8.6",
+  "version": "1.8.9",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",

package/src/graphFeature.js

@@ -80,7 +80,7 @@ var graphFeature = function (arg) {
       arg.style === undefined ? {} : arg.style);
 
     m_this.style(defaultStyle);
-    m_this.nodes(function (d) { return d; });
+    m_this.nodes(util.identityFunction);
     return m_this;
   };
 

package/src/heatmapFeature.js

@@ -2,6 +2,7 @@ var $ = require('jquery');
 var inherit = require('./inherit');
 var feature = require('./feature');
 var transform = require('./transform');
+var util = require('./util');
 
 /**
  * Heatmap feature specification.
@@ -79,7 +80,7 @@ var heatmapFeature = function (arg) {
 
   this.featureType = 'heatmap';
 
-  m_position = arg.position || function (d) { return d; };
+  m_position = arg.position || util.identityFunction;
   m_intensity = arg.intensity || function (d) { return 1; };
   m_maxIntensity = arg.maxIntensity !== undefined ? arg.maxIntensity : null;
   m_minIntensity = arg.minIntensity !== undefined ? arg.minIntensity : null;

package/src/lineFeature.js

@@ -438,8 +438,8 @@ var lineFeature = function (arg) {
     });
 
     /* Set the reduced lines as the data and use simple accessors. */
-    m_this.style('position', function (d) { return d; });
-    m_this.style('line', function (d) { return d; });
+    m_this.style('position', util.identityFunction);
+    m_this.style('line', util.identityFunction);
     m_this.data(data);
     return m_this;
   };
@@ -465,7 +465,7 @@ var lineFeature = function (arg) {
         // Values of 2 and above appear smoothest.
         antialiasing: 2.0,
         closed: false,
-        line: function (d) { return d; },
+        line: util.identityFunction,
         position: (d) => Array.isArray(d) ? {x: d[0], y: d[1], z: d[2] || 0} : d,
         origin: (p) => (p.length >= 3 ? p.slice(0, 3) : [0, 0, 0])
       },

package/src/pixelmapFeature.js

@@ -285,7 +285,7 @@ var pixelmapFeature = function (arg) {
             a: 1
           };
         },
-        position: function (d) { return d; }
+        position: util.identityFunction
       },
       arg.style === undefined ? {} : arg.style
     );

package/src/polygonFeature.js

@@ -634,8 +634,8 @@ var polygonFeature = function (arg) {
     });
 
     /* Set the reduced polgons as the data and use simple accessors. */
-    m_this.style('position', function (d) { return d; });
-    m_this.style('polygon', function (d) { return d; });
+    m_this.style('position', util.identityFunction);
+    m_this.style('polygon', util.identityFunction);
     m_this.data(data);
     return m_this;
   };
@@ -719,7 +719,7 @@ var polygonFeature = function (arg) {
         strokeStyle: 'solid',
         strokeColor: {r: 0.0, g: 1.0, b: 1.0},
         strokeOpacity: 1.0,
-        polygon: function (d) { return d; },
+        polygon: util.identityFunction,
         position: (d) => Array.isArray(d) ? {x: d[0], y: d[1], z: d[2] || 0} : d,
         origin: (items) => {
           for (let i = 0; i < items.length; i += 1) {

package/src/quadFeature.js

@@ -699,7 +699,7 @@ var quadFeature = function (arg) {
         previewImage: null,
         image: function (d) { return d.image; },
         video: function (d) { return d.video; },
-        position: function (d) { return d; }
+        position: util.identityFunction
       },
       arg.style === undefined ? {} : arg.style
     );

package/src/trackFeature.js

@@ -814,8 +814,8 @@ var trackFeature = function (arg) {
       true,
       {},
       {
-        track: (d) => d,
-        position: (d) => d,
+        track: util.identityFunction,
+        position: util.identityFunction,
         time: (d, i) => (d.t !== undefined ? d.t : i)
       },
       arg.style === undefined ? {} : arg.style

package/src/transform.js

@@ -19,7 +19,7 @@ var maxTransformCacheSize = 10;
 
 /* A RegExp to detect if two transforms only different by the middle axis's
  * direction. */
-var axisPattern = /^(.* |)\\+axis=e(n|s)u(| .*)$/;
+var axisPattern = /^(.* |)\+axis=e(n|s)u(| .*)$/;
 var affinePattern = /(^|\s)\+(s[1-3][1-3]|[xyz]off)=\S/;
 
 /**
@@ -767,6 +767,21 @@ transform.vincentyDistance = function (pt1, pt2, gcs, baseGcs, ellipsoid, maxIte
   };
 };
 
+/**
+ * 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) {
+  const 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 */
 transform.proj4 = proj4;
 

package/src/util/common.js

@@ -1443,6 +1443,17 @@ var util = {
     return value !== null && value !== undefined && (type === 'object' || type === 'function');
   },
 
+  /**
+   * Return the first value passed to the function.  Using this function for
+   * identity calls can allow some code to bypass making such a call entirely.
+   *
+   * @param {*} d Any value.
+   * @returns {*} The passed value.
+   */
+  identityFunction: function (d) {
+    return d;
+  },
+
   ///////////////////////////////////////////////////////////////////////////
   /*
    * Utility member properties.

package/src/vectorFeature.js

@@ -1,5 +1,6 @@
 var inherit = require('./inherit');
 var feature = require('./feature');
+var util = require('./util');
 
 /**
  * Object specification for a graph feature.
@@ -120,7 +121,7 @@ var vectorFeature = function (arg) {
         originStyle: 'none',
         endStyle: 'arrow',
         origin: {x: 0, y: 0, z: 0},
-        delta: function (d) { return d; },
+        delta: util.identityFunction,
         scale: null // size scaling factor (null -> renderer decides)
       },
       arg.style === undefined ? {} : arg.style

package/src/webgl/lineFeature.js

@@ -134,6 +134,8 @@ var webgl_lineFeature = function (arg) {
           strokeOffset: 0, posStrokeOffset: 0, negStrokeOffset: 0
         }],
         v = vert[1],
+        target_gcs = m_this.gcs(),
+        map_gcs = m_this.layer().map().gcs(),
         pos, posIdx3, firstpos, firstPosIdx3,
         lineFunc = m_this.line(),
         strokeWidthFunc = m_this.style.get('strokeWidth'), strokeWidthVal,
@@ -175,6 +177,7 @@ var webgl_lineFeature = function (arg) {
     if (!onlyStyle) {
       var position = [],
           posFunc = m_this.position();
+      posFunc = posFunc === util.identityFunction ? null : posFunc;
       lineItemList = new Array(data.length);
       closed = new Array(data.length);
       for (i = 0; i < data.length; i += 1) {
@@ -186,7 +189,7 @@ var webgl_lineFeature = function (arg) {
         }
         numSegments += lineItem.length - 1;
         for (j = 0; j < lineItem.length; j += 1) {
-          pos = posFunc(lineItem[j], j, d, i);
+          pos = posFunc ? posFunc(lineItem[j], j, d, i) : lineItem[j];
           position.push(pos.x);
           position.push(pos.y);
           position.push(pos.z || 0.0);
@@ -208,8 +211,7 @@ var webgl_lineFeature = function (arg) {
         }
       }
 
-      position = transform.transformCoordinates(
-        m_this.gcs(), m_this.layer().map().gcs(), position, 3);
+      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]) {
         for (i = 0; i < position.length; i += 3) {

package/src/webgl/polygonFeature.js

@@ -97,11 +97,13 @@ var webgl_polygonFeature = function (arg) {
 
     if (!onlyStyle) {
       posFunc = m_this.style.get('position');
+      posFunc = posFunc === util.identityFunction ? null : posFunc;
       polyFunc = m_this.style.get('polygon');
+      polyFunc = polyFunc === util.identityFunction ? null : polyFunc;
       m_this.data().forEach(function (item, itemIndex) {
         var polygon, outer, geometry, c;
 
-        polygon = polyFunc(item, itemIndex);
+        polygon = polyFunc ? polyFunc(item, itemIndex) : item;
         if (!polygon) {
           return;
         }
@@ -115,7 +117,7 @@ var webgl_polygonFeature = function (arg) {
          * test). */
         geometry = new Array(outer.length * 3);
         for (i = d3 = 0; i < outer.length; i += 1, d3 += 3) {
-          c = posFunc(outer[i], i, item, itemIndex);
+          c = posFunc ? posFunc(outer[i], i, item, itemIndex) : outer[i];
           geometry[d3] = c.x;
           geometry[d3 + 1] = c.y;
           // ignore the z values until we support them
@@ -132,7 +134,7 @@ var webgl_polygonFeature = function (arg) {
             original = original.concat(hole);
             geometry.holes.push(d3 / 3);
             for (i = 0; i < hole.length; i += 1, d3 += 3) {
-              c = posFunc(hole[i], i, item, itemIndex);
+              c = posFunc ? posFunc(hole[i], i, item, itemIndex) : hole[i];
               geometry.vertices[d3] = c.x;
               geometry.vertices[d3 + 1] = c.y;
               // ignore the z values until we support them