Add feature picking for both Cesium and Leaflet as well as licence for pbf and vector-tile

Author: tephenavies

LICENSE.md

@@ -253,6 +253,66 @@ https://github.com/hammerjs/hammer.js
 >
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+### pbf
+
+> Copyright (c) 2015, Mapbox
+> All rights reserved.
+>
+> Redistribution and use in source and binary forms, with or without
+> modification, are permitted provided that the following conditions are met:
+>
+> * Redistributions of source code must retain the above copyright notice, this
+>   list of conditions and the following disclaimer.
+>
+> * Redistributions in binary form must reproduce the above copyright notice,
+>   this list of conditions and the following disclaimer in the documentation
+>   and/or other materials provided with the distribution.
+>
+> * Neither the name of pbf nor the names of its
+>   contributors may be used to endorse or promote products derived from
+>   this software without specific prior written permission.
+>
+> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+> IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+> DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+> FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+> DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+> SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+> OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+
+### vector-tile
+
+> Copyright (c) 2014, Mapbox
+>
+
+> All rights reserved.
+>
+> Redistribution and use in source and binary forms, with or without modification,
+> are permitted provided that the following conditions are met:
+>
+>     * Redistributions of source code must retain the above copyright notice,
+>       this list of conditions and the following disclaimer.
+>     * Redistributions in binary form must reproduce the above copyright notice,
+>       this list of conditions and the following disclaimer in the documentation
+>       and/or other materials provided with the distribution.
+>     * Neither the name of llmr nor the names of its contributors
+>       may be used to endorse or promote products derived from this software
+>       without specific prior written permission.
+>
+> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+> "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+> A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+> EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+> LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+> NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Tests
 =====
 
@@ -270,6 +330,3 @@ http://pivotal.github.com/jasmine/
 > The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 >
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-

lib/MapboxVectorCanvasTileLayer.js

@@ -4,8 +4,9 @@
 var L = require('leaflet');
 var defined = require('terriajs-cesium/Source/Core/defined');
 
-//var CesiumTileLayer = require('../Map/CesiumTileLayer');
 var CesiumEvent = require('terriajs-cesium/Source/Core/Event');
+var Cartographic = require('terriajs-cesium/Source/Core/Cartographic');
+var pollToPromise = require('./Core/pollToPromise');
 
 var MapboxVectorCanvasTileLayer = L.TileLayer.Canvas.extend({
     initialize: function(imageryProvider, options) {
@@ -30,6 +31,25 @@ var MapboxVectorCanvasTileLayer = L.TileLayer.Canvas.extend({
         });
 
 
+    },
+
+    pickFeatures: function(map, longitudeRadians, latitudeRadians) {
+        var ll = new Cartographic(longitudeRadians, latitudeRadians, 0.0);
+
+        var level = map.getZoom();
+
+        var that = this;
+        return pollToPromise(function() {
+            return that.imageryProvider.ready;
+        }).then(function() {
+            var tilingScheme = that.imageryProvider.tilingScheme;
+            var tileCoordinates = tilingScheme.positionToTileXY(ll, level);
+            if (!defined(tileCoordinates)) {
+                return undefined;
+            }
+
+            return that.imageryProvider.pickFeatures(tileCoordinates.x, tileCoordinates.y, level, longitudeRadians, latitudeRadians);
+        });
     }
 
 

lib/MapboxVectorTileImageryProvider.js

@@ -9,12 +9,15 @@ var Event = require('terriajs-cesium/Source/Core/Event');
 var defined = require('terriajs-cesium/Source/Core/defined');
 var VectorTile = require('vector-tile').VectorTile;
 var Protobuf = require('pbf');
+var inside = require('point-in-polygon');
 var loadArrayBuffer = require('terriajs-cesium/Source/Core/loadArrayBuffer');
 
+var ImageryLayerFeatureInfo = require('terriajs-cesium/Source/Scene/ImageryLayerFeatureInfo');
+
 var defineProperties = require('terriajs-cesium/Source/Core/defineProperties');
 
 
-var MapboxVectorTileImageryProvider = function (colorFunc) {
+var MapboxVectorTileImageryProvider = function (csvItem, colorFunc) {
     this._url = 'https://b.tiles.mapbox.com/v4/steve9164.1rjjq17t/';
     this._layerName = '1270055001_sa4_2011_aust_shape';
     this._fileExtension = 'vector.pbf';
@@ -33,6 +36,8 @@ var MapboxVectorTileImageryProvider = function (colorFunc) {
         }
     }
 
+    this._csvItem = csvItem;
+
     this._tilingScheme = new WebMercatorTilingScheme();
 
     this._tileWidth = 256;
@@ -186,21 +191,59 @@ MapboxVectorTileImageryProvider.prototype._requestImage = function(x, y, level,
                         context.lineTo(pos.x, pos.y);
                     }
                     context.closePath();
-                    context.fillStyle = that._colorFunc(json.id);
+                    context.strokeStyle = "black";
+                    context.lineWidth = 1;
+                    context.stroke();
+                    context.fillStyle = that._colorFunc(json.id - 1);
                     context.fill();
                 }
             }
 
         }
 
         return canvas;
-    });
+    }).otherwise(function(err) { });
 
 };
 
 
-MapboxVectorTileImageryProvider.prototype.pickFeatures = function() {
-    return undefined;
+MapboxVectorTileImageryProvider.prototype.pickFeatures = function(x, y, level, longitude, latitude) {
+    var that = this;
+    var url = buildImageUrl(this, x, y, level);
+
+    return loadArrayBuffer(url).then(function(data) {
+        var layer = new VectorTile(new Protobuf(data)).layers[that._layerName];
+
+        var to_deg = function (rad) {
+            return 180 * rad / Math.PI;
+        }
+
+        var point = [to_deg(longitude), to_deg(latitude)];
+
+        var features = [];
+
+        for (var i = 0; i < layer.length; i++) {
+            var json = layer.feature(i).toGeoJSON(x, y, level);
+            if (json.geometry.type == 'Polygon') {
+                for (var i2 = 0; i2 < json.geometry.coordinates.length; i2++) {
+                    // Check whether point is in this polygon
+                    if (inside(point, json.geometry.coordinates[i2])) {
+                        var feature = new ImageryLayerFeatureInfo();
+                        /*feature.properties = Object.assign({}, json.properties);
+                        feature.properties.FID = json.id - 1;*/
+                        feature.configureDescriptionFromProperties(that._csvItem.rowProperties(json.id - 1));
+                        feature.name = json.properties["SA4_NAME11"];
+                        //feature.data = json.geometry;
+                        features.push(feature);
+                        break; // No need to check other polygons with the same id
+                    }
+                }
+            }
+
+        }
+
+        return features;
+    });
 };
 
 module.exports = MapboxVectorTileImageryProvider;

lib/Models/CsvCatalogItem.js

@@ -440,7 +440,7 @@ CsvCatalogItem.prototype._hide = function() {
  * For region-mapped files, enable the WMS imagery layer, with recoloring and feature picking.
 */
 CsvCatalogItem.prototype._createImageryProvider = function(time) {
-    var imageryProvider = new MapboxVectorTileImageryProvider(this._colorFunc);
+    var imageryProvider = new MapboxVectorTileImageryProvider(this, this._colorFunc);
 
     //  new WebMapServiceImageryProvider({
     //     url: proxyCatalogItemUrl( this, this._regionProvider.server),

package.json

@@ -27,7 +27,8 @@
     "urijs": "^1.16.0",
     "urthecast": "^1.0.0",
     "pbf": "^1.3.2",
-    "vector-tile": "1.2.0"
+    "vector-tile": "1.2.0",
+    "point-in-polygon": "1.0.0"
   },
   "devDependencies": {
     "browserify": "^9.0.8",