Skip to content

Commit

Permalink
Merge branch 'master' into improve-map-typedefs
Browse files Browse the repository at this point in the history
  • Loading branch information
manthey authored Oct 9, 2018
2 parents be9a617 + e1c8871 commit 51948b9
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/choroplethFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ var choroplethFeature = function (arg) {
},
arg);

this.featureType = 'choropleth';

/**
* Get/Set choropleth scalar data.
*
Expand Down
2 changes: 2 additions & 0 deletions src/graphFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ var graphFeature = function (arg) {
s_init = this._init,
s_exit = this._exit;

this.featureType = 'graph';

/**
* Initialize
*/
Expand Down
2 changes: 2 additions & 0 deletions src/heatmapFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/isolineFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions src/meshFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ var meshFeature = function (arg) {
s_init = this._init,
m_mesh = {};

this.featureType = 'mesh';

/**
* Get/Set mesh accessor.
*
Expand Down
2 changes: 2 additions & 0 deletions src/pathFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
2 changes: 2 additions & 0 deletions src/pixelmapFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ var pixelmapFeature = function (arg) {
s_init = this._init,
s_exit = this._exit;

this.featureType = 'pixelmap';

/**
* Get/Set position accessor.
*
Expand Down
2 changes: 2 additions & 0 deletions src/quadFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/vectorFeature.js
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion website/themes/agency/layout/examples.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="col-md-12">
<section>
<h2>Examples</h2>
<p class="text-muted">GeoJS has many features, some of which are shown off in these examples. Some of the examples are intended to showcase all of the options of a feature, such as the <a href="tile">Tile Layer</a>. Other examples show how real data can be visualized, such as the <a href="hurricane">Hurricane Tracking Data</a>. Each example has commented source code.</p>
<p class="text-muted">GeoJS has many features, some of which are shown off in these examples. Some of the examples are intended to showcase all of the options of a feature, such as the <a href="tiles">Tile Layer</a>. Other examples show how real data can be visualized, such as the <a href="hurricane">Hurricane Tracking Data</a>. Each example has commented source code.</p>
</section>
<div class="row">
<% for (let example of site.data.examples) { %>
Expand Down

0 comments on commit 51948b9

Please sign in to comment.