From 8b5923202eeafa26daa6163df3da07e828348809 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Mon, 8 Oct 2018 09:59:08 -0400 Subject: [PATCH] Add a featureType to all features. We had this on some features, but not all. --- src/choroplethFeature.js | 2 ++ src/graphFeature.js | 2 ++ src/heatmapFeature.js | 2 ++ src/isolineFeature.js | 2 ++ src/meshFeature.js | 2 ++ src/pathFeature.js | 2 ++ src/pixelmapFeature.js | 2 ++ src/quadFeature.js | 2 ++ src/vectorFeature.js | 2 ++ 9 files changed, 18 insertions(+) diff --git a/src/choroplethFeature.js b/src/choroplethFeature.js index 502179f798..015eedc535 100644 --- a/src/choroplethFeature.js +++ b/src/choroplethFeature.js @@ -74,6 +74,8 @@ var choroplethFeature = function (arg) { }, arg); + this.featureType = 'choropleth'; + /** * Get/Set choropleth scalar data. * diff --git a/src/graphFeature.js b/src/graphFeature.js index 4012b1f443..687ce9a02a 100644 --- a/src/graphFeature.js +++ b/src/graphFeature.js @@ -35,6 +35,8 @@ var graphFeature = function (arg) { s_init = this._init, s_exit = this._exit; + this.featureType = 'graph'; + /** * Initialize */ diff --git a/src/heatmapFeature.js b/src/heatmapFeature.js index 55bec6becf..131ac03e81 100644 --- a/src/heatmapFeature.js +++ b/src/heatmapFeature.js @@ -68,6 +68,8 @@ var heatmapFeature = function (arg) { m_gcsPosition, s_init = this._init; + this.featureType = 'heatmap'; + m_position = arg.position || function (d) { return d; }; m_intensity = arg.intensity || function (d) { return 1; }; m_maxIntensity = arg.maxIntensity !== undefined ? arg.maxIntensity : null; diff --git a/src/isolineFeature.js b/src/isolineFeature.js index c4efd5c9de..cb7f5d6c26 100644 --- a/src/isolineFeature.js +++ b/src/isolineFeature.js @@ -211,6 +211,8 @@ var isolineFeature = function (arg) { s_modified = this.modified, s_update = this._update; + this.featureType = 'isoline'; + this.contour = m_this.mesh; this.isoline = m_this.mesh; diff --git a/src/meshFeature.js b/src/meshFeature.js index 3751a6406b..b61ccaf664 100644 --- a/src/meshFeature.js +++ b/src/meshFeature.js @@ -117,6 +117,8 @@ var meshFeature = function (arg) { s_init = this._init, m_mesh = {}; + this.featureType = 'mesh'; + /** * Get/Set mesh accessor. * diff --git a/src/pathFeature.js b/src/pathFeature.js index 03c6b11e81..c007cbfc20 100644 --- a/src/pathFeature.js +++ b/src/pathFeature.js @@ -25,6 +25,8 @@ var pathFeature = function (arg) { m_position = arg.position === undefined ? [] : arg.position, s_init = this._init; + this.featureType = 'path'; + /** * Get/Set positions * diff --git a/src/pixelmapFeature.js b/src/pixelmapFeature.js index fc53405c9f..9ef7da33eb 100644 --- a/src/pixelmapFeature.js +++ b/src/pixelmapFeature.js @@ -78,6 +78,8 @@ var pixelmapFeature = function (arg) { s_init = this._init, s_exit = this._exit; + this.featureType = 'pixelmap'; + /** * Get/Set position accessor. * diff --git a/src/quadFeature.js b/src/quadFeature.js index ea976f1d04..a50a64cf14 100644 --- a/src/quadFeature.js +++ b/src/quadFeature.js @@ -80,6 +80,8 @@ var quadFeature = function (arg) { m_videos = [], m_quads; + this.featureType = 'quad'; + /** * Track a list of object->object mappings. The mappings are kept in a list. * This marks all known mappings as unused. If they are not marked as used diff --git a/src/vectorFeature.js b/src/vectorFeature.js index 4183812afc..4abbf9d180 100644 --- a/src/vectorFeature.js +++ b/src/vectorFeature.js @@ -27,6 +27,8 @@ var vectorFeature = function (arg) { s_init = this._init, s_style = this.style; + this.featureType = 'vector'; + /** * Get or set the accessor for the origin of the vector. This is the point * that the vector base resides at. Defaults to (0, 0, 0).