Make OpenBuildings instantiator work

Author: inigo-cobian

klab.engine/src/main/java/org/integratedmodelling/klab/components/processing/openbuildings/OpenBuildingsInstantiator.java

@@ -75,7 +75,7 @@ public Object eval(IContextualizationScope scope, Object... parameters) {
     @Override
     public List<IObjectArtifact> instantiate(IObservable semantics, IContextualizationScope scope) throws KlabException {
         List<IObjectArtifact> ret = new ArrayList<>();
-        String tilesfile = "klab.engine/src/main/resources/components/org.integratedmodelling.geospace/openbuildings/tiles.geojson";
+        String tilesfile = "../../klab.engine/src/main/resources/components/org.integratedmodelling.geospace/openbuildings/tiles.geojson";
 
         Geometry contextGeometry = ((Shape) contextSubject.getScale().getSpace().getShape()).getJTSGeometry();
 
@@ -105,8 +105,8 @@ public List<IObjectArtifact> instantiate(IObservable semantics, IContextualizati
                 // Get properties (attributes)
                 System.out.println("Properties:");
                 for (Property property : feature.getProperties()) {
-                    if (property.getName().equals("tile_url")) {
-                        downloadableFiles.add(tilesfile);
+                    if (property.getName().toString().equals("tile_url")) {
+                        downloadableFiles.add(property.getValue().toString());
                     }
                 }
             }
@@ -133,15 +133,16 @@ public List<IObjectArtifact> instantiate(IObservable semantics, IContextualizati
                     double lat = Double.parseDouble(record.get(0));
                     double lon = Double.parseDouble(record.get(1));
 
-                    if (!contextGeometry.contains(Shape.makePoint(lat, lon))) { // TODO check coordinates
+                    if (!contextGeometry.contains(Shape.makePoint(lon, lat))) { // TODO check coordinates
                         continue;
                     }
                     IMetadata metadata = new Metadata();
                     metadata.put("confidence", Double.parseDouble(record.get(3)));
                     metadata.put("area_in_meters", Double.parseDouble(record.get(2)));
                     String geometryWkt = record.get(4);
 
-                    Shape buildingShape = Shape.create(geometryWkt, Projection.create("EPSG:3857"));
+                    Shape buildingShape = Shape.create(geometryWkt, Projection.create(Projection.DEFAULT_PROJECTION_CODE));
+                    //buildingShape = buildingShape.transform(Projection.create(Projection.DEFAULT_PROJECTION_CODE));
                     String id = CamelCase.toLowerCase(Observables.INSTANCE.getDisplayName(semantics), '-') + "_" + n++;
                     ISubject subject = (ISubject) scope.newObservation(semantics, id, getScale(buildingShape, contextSubject), metadata);
 

klab.engine/src/main/resources/components/org.integratedmodelling.geospace/services/openbuildings.kdl

@@ -0,0 +1,15 @@
+@klab 0.10.0
+@version 0.10.0
+@namespace gis.openbuildings
+
+const export object query
+	""
+     label 'Query OpenBuildings'
+{
+	
+	optional number threshold
+		""
+		 default 90
+
+	class org.integratedmodelling.klab.components.processing.openbuildings.OpenBuildingsInstantiator
+}