geojs 1.8.7 → 1.8.8

package/CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ### Improvements
 
+- Reduce polygon and position function calls ([#1208](../../pull/1208))
+
+## Version 1.8.7
+
+### Improvements
+
 - Add some code paths to reduce transform calls ([#1207](../../pull/1207))
 
 ## Version 1.8.6

package/geo.js

@@ -12042,9 +12042,7 @@ var graphFeature = function graphFeature(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;
   };
   /**
@@ -12466,6 +12464,8 @@ var inherit = __webpack_require__(5699);
 var feature = __webpack_require__(6837);
 
 var transform = __webpack_require__(6853);
+
+var util = __webpack_require__(4634);
 /**
  * Heatmap feature specification.
  *
@@ -12544,10 +12544,7 @@ var heatmapFeature = function heatmapFeature(arg) {
       m_gcsPosition,
       s_init = this._init;
   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;
@@ -15668,12 +15665,8 @@ var lineFeature = function lineFeature(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;
   };
@@ -15701,9 +15694,7 @@ var lineFeature = function lineFeature(arg) {
       // Values of 2 and above appear smoothest.
       antialiasing: 2.0,
       closed: false,
-      line: function line(d) {
-        return d;
-      },
+      line: util.identityFunction,
       position: function position(d) {
         return Array.isArray(d) ? {
           x: d[0],
@@ -23324,9 +23315,7 @@ var pixelmapFeature = function pixelmapFeature(arg) {
           a: 1
         };
       },
-      position: function position(d) {
-        return d;
-      }
+      position: util.identityFunction
     }, arg.style === undefined ? {} : arg.style);
 
     if (arg.position !== undefined) {
@@ -25022,12 +25011,8 @@ var polygonFeature = function polygonFeature(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;
   };
@@ -25123,9 +25108,7 @@ var polygonFeature = function polygonFeature(arg) {
         b: 1.0
       },
       strokeOpacity: 1.0,
-      polygon: function polygon(d) {
-        return d;
-      },
+      polygon: util.identityFunction,
       position: function position(d) {
         return Array.isArray(d) ? {
           x: d[0],
@@ -26014,9 +25997,7 @@ var quadFeature = function quadFeature(arg) {
       video: function video(d) {
         return d.video;
       },
-      position: function position(d) {
-        return d;
-      }
+      position: util.identityFunction
     }, arg.style === undefined ? {} : arg.style);
 
     if (arg.position !== undefined) {
@@ -27053,7 +27034,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "493ff30a20fb5c5febb2c3521372398121e0cdee";
+module.exports = "e4988e06092d4bee858b11f2d0109a6bfe77dfbb";
 
 /***/ }),
 
@@ -32927,12 +32908,8 @@ var trackFeature = function trackFeature(arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
     var style = $.extend(true, {}, {
-      track: function track(d) {
-        return d;
-      },
-      position: function position(d) {
-        return d;
-      },
+      track: util.identityFunction,
+      position: util.identityFunction,
       time: function time(d, i) {
         return d.t !== undefined ? d.t : i;
       }
@@ -33007,7 +32984,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/;
 /**
  * This purpose of this class is to provide a generic interface for computing
@@ -38579,6 +38556,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 identityFunction(d) {
+    return d;
+  },
   ///////////////////////////////////////////////////////////////////////////
 
   /*
@@ -39408,6 +39396,8 @@ module.exports = {
 var inherit = __webpack_require__(5699);
 
 var feature = __webpack_require__(6837);
+
+var util = __webpack_require__(4634);
 /**
  * Object specification for a graph feature.
  *
@@ -39534,9 +39524,7 @@ var vectorFeature = function vectorFeature(arg) {
         y: 0,
         z: 0
       },
-      delta: function delta(d) {
-        return d;
-      },
+      delta: util.identityFunction,
       scale: null // size scaling factor (null -> renderer decides)
 
     }, arg.style === undefined ? {} : arg.style);
@@ -39568,7 +39556,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.8.7";
+module.exports = "1.8.8";
 
 /***/ }),
 
@@ -40865,6 +40853,7 @@ var webgl_lineFeature = function webgl_lineFeature(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);
 
@@ -40880,7 +40869,7 @@ var webgl_lineFeature = function webgl_lineFeature(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(simpleInverse ? -pos.y : pos.y);
           position.push(pos.z || 0.0);
@@ -43459,10 +43448,12 @@ var webgl_polygonFeature = function webgl_polygonFeature(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;
@@ -43481,7 +43472,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         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] = simpleInverse ? -c.y : c.y; // ignore the z values until we support them
 
@@ -43505,7 +43496,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
             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] = simpleInverse ? -c.y : c.y; // ignore the z values until we support them
 

package/geo.lean.js

@@ -12042,9 +12042,7 @@ var graphFeature = function graphFeature(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;
   };
   /**
@@ -12466,6 +12464,8 @@ var inherit = __webpack_require__(5699);
 var feature = __webpack_require__(6837);
 
 var transform = __webpack_require__(6853);
+
+var util = __webpack_require__(4634);
 /**
  * Heatmap feature specification.
  *
@@ -12544,10 +12544,7 @@ var heatmapFeature = function heatmapFeature(arg) {
       m_gcsPosition,
       s_init = this._init;
   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;
@@ -15668,12 +15665,8 @@ var lineFeature = function lineFeature(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;
   };
@@ -15701,9 +15694,7 @@ var lineFeature = function lineFeature(arg) {
       // Values of 2 and above appear smoothest.
       antialiasing: 2.0,
       closed: false,
-      line: function line(d) {
-        return d;
-      },
+      line: util.identityFunction,
       position: function position(d) {
         return Array.isArray(d) ? {
           x: d[0],
@@ -23324,9 +23315,7 @@ var pixelmapFeature = function pixelmapFeature(arg) {
           a: 1
         };
       },
-      position: function position(d) {
-        return d;
-      }
+      position: util.identityFunction
     }, arg.style === undefined ? {} : arg.style);
 
     if (arg.position !== undefined) {
@@ -25022,12 +25011,8 @@ var polygonFeature = function polygonFeature(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;
   };
@@ -25123,9 +25108,7 @@ var polygonFeature = function polygonFeature(arg) {
         b: 1.0
       },
       strokeOpacity: 1.0,
-      polygon: function polygon(d) {
-        return d;
-      },
+      polygon: util.identityFunction,
       position: function position(d) {
         return Array.isArray(d) ? {
           x: d[0],
@@ -26014,9 +25997,7 @@ var quadFeature = function quadFeature(arg) {
       video: function video(d) {
         return d.video;
       },
-      position: function position(d) {
-        return d;
-      }
+      position: util.identityFunction
     }, arg.style === undefined ? {} : arg.style);
 
     if (arg.position !== undefined) {
@@ -27053,7 +27034,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "493ff30a20fb5c5febb2c3521372398121e0cdee";
+module.exports = "e4988e06092d4bee858b11f2d0109a6bfe77dfbb";
 
 /***/ }),
 
@@ -32927,12 +32908,8 @@ var trackFeature = function trackFeature(arg) {
     arg = arg || {};
     s_init.call(m_this, arg);
     var style = $.extend(true, {}, {
-      track: function track(d) {
-        return d;
-      },
-      position: function position(d) {
-        return d;
-      },
+      track: util.identityFunction,
+      position: util.identityFunction,
       time: function time(d, i) {
         return d.t !== undefined ? d.t : i;
       }
@@ -33007,7 +32984,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/;
 /**
  * This purpose of this class is to provide a generic interface for computing
@@ -38579,6 +38556,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 identityFunction(d) {
+    return d;
+  },
   ///////////////////////////////////////////////////////////////////////////
 
   /*
@@ -39408,6 +39396,8 @@ module.exports = {
 var inherit = __webpack_require__(5699);
 
 var feature = __webpack_require__(6837);
+
+var util = __webpack_require__(4634);
 /**
  * Object specification for a graph feature.
  *
@@ -39534,9 +39524,7 @@ var vectorFeature = function vectorFeature(arg) {
         y: 0,
         z: 0
       },
-      delta: function delta(d) {
-        return d;
-      },
+      delta: util.identityFunction,
       scale: null // size scaling factor (null -> renderer decides)
 
     }, arg.style === undefined ? {} : arg.style);
@@ -39568,7 +39556,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.8.7";
+module.exports = "1.8.8";
 
 /***/ }),
 
@@ -40865,6 +40853,7 @@ var webgl_lineFeature = function webgl_lineFeature(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);
 
@@ -40880,7 +40869,7 @@ var webgl_lineFeature = function webgl_lineFeature(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(simpleInverse ? -pos.y : pos.y);
           position.push(pos.z || 0.0);
@@ -43459,10 +43448,12 @@ var webgl_polygonFeature = function webgl_polygonFeature(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;
@@ -43481,7 +43472,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
         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] = simpleInverse ? -c.y : c.y; // ignore the z values until we support them
 
@@ -43505,7 +43496,7 @@ var webgl_polygonFeature = function webgl_polygonFeature(arg) {
             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] = simpleInverse ? -c.y : c.y; // ignore the z values until we support them