Added support for custom point geometry to GeoJSONLayer

dist/vizicities.js

@@ -15034,6 +15034,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      topojson: false,
 	      filter: null,
 	      onEachFeature: null,
+	      pointGeometry: null,
 	      style: _utilGeoJSON2['default'].defaultStyle
 	    };
 	
@@ -15378,6 +15379,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	      }
 	
 	      if (geometry.type === 'Point' || geometry.type === 'MultiPoint') {
+	        // Get geometry object to use for point, if provided
+	        if (typeof this._options.pointGeometry === 'function') {
+	          options.geometry = this._options.pointGeometry(feature);
+	        }
+	
 	        return new _geometryPointLayer2['default'](coordinates, options);
 	      }
 	    }
@@ -16823,6 +16829,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	// TODO: Look at ways to drop unneeded references to array buffers, etc to
 	// reduce memory footprint
 	
+	// TODO: Provide alternative output using tubes and splines / curves
+	
 	var _Layer2 = __webpack_require__(37);
 	
 	var _Layer3 = _interopRequireDefault(_Layer2);
@@ -17402,7 +17410,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        // Debug geometry for points is a thin bar
 	        //
 	        // TODO: Allow point geometry to be customised / overridden
-	        var geometryWidth = this._world.metresToWorld(5, this._pointScale);
+	        var geometryWidth = this._world.metresToWorld(25, this._pointScale);
 	        var geometryHeight = this._world.metresToWorld(200, this._pointScale);
 	        var _geometry = new _three2['default'].BoxGeometry(geometryWidth, geometryHeight, geometryWidth);
 	
@@ -17412,7 +17420,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	        // Pull attributes out of debug geometry
 	        geometry = new _three2['default'].BufferGeometry().fromGeometry(_geometry);
 	      } else {
-	        geometry = this._options.geometry;
+	        if (this._options.geometry instanceof _three2['default'].BufferGeometry) {
+	          geometry = this._options.geometry;
+	        } else {
+	          geometry = new _three2['default'].BufferGeometry().fromGeometry(this._options.geometry);
+	        }
 	      }
 	
 	      // For each point

examples/basic/main.js

@@ -29,9 +29,13 @@ var layer = VIZI.geoJSONLayer('http://vector.mapzen.com/osm/roads,pois,buildings
   interactive: true,
   style: {
     color: '#ff0000',
-    lineColor: '#ff0000',
+    lineColor: '#0000ff',
     lineRenderOrder: 1,
-    pointColor: '#ff0000'
+    pointColor: '#00cc00'
+  },
+  pointGeometry: function(feature) {
+    var geometry = new THREE.SphereGeometry(2, 16, 16);
+    return geometry;
   },
   onEachFeature: function(feature, layer) {
     layer.on('click', function(layer, point2d, point3d, intersects) {

src/layer/GeoJSONLayer.js

@@ -16,6 +16,7 @@ class GeoJSONLayer extends LayerGroup {
       topojson: false,
       filter: null,
       onEachFeature: null,
+      pointGeometry: null,
       style: GeoJSON.defaultStyle
     };
 
@@ -345,6 +346,11 @@ class GeoJSONLayer extends LayerGroup {
     }
 
     if (geometry.type === 'Point' || geometry.type === 'MultiPoint') {
+      // Get geometry object to use for point, if provided
+      if (typeof this._options.pointGeometry === 'function') {
+        options.geometry = this._options.pointGeometry(feature);
+      }
+
       return new PointLayer(coordinates, options);
     }
   }

src/layer/geometry/PointLayer.js

@@ -130,7 +130,7 @@ class PointLayer extends Layer {
       // Debug geometry for points is a thin bar
       //
       // TODO: Allow point geometry to be customised / overridden
-      var geometryWidth = this._world.metresToWorld(5, this._pointScale);
+      var geometryWidth = this._world.metresToWorld(25, this._pointScale);
       var geometryHeight = this._world.metresToWorld(200, this._pointScale);
       var _geometry = new THREE.BoxGeometry(geometryWidth, geometryHeight, geometryWidth);
 
@@ -140,7 +140,11 @@ class PointLayer extends Layer {
       // Pull attributes out of debug geometry
       geometry = new THREE.BufferGeometry().fromGeometry(_geometry);
     } else {
-      geometry = this._options.geometry;
+      if (this._options.geometry instanceof THREE.BufferGeometry) {
+        geometry = this._options.geometry;
+      } else {
+        geometry = new THREE.BufferGeometry().fromGeometry(this._options.geometry);
+      }
     }
 
     // For each point

src/layer/geometry/PolylineLayer.js

@@ -3,6 +3,8 @@
 // TODO: Look at ways to drop unneeded references to array buffers, etc to
 // reduce memory footprint
 
+// TODO: Provide alternative output using tubes and splines / curves
+
 import Layer from '../Layer';
 import extend from 'lodash.assign';
 import THREE from 'three';