Work on GeoJSon ans JTS support

[gpl/argeo-suite.git] / org.argeo.app.geo / src / org / argeo / app / geo / http / WfsHttpHandler.java

diff --git a/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java b/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java
index 2a637575d04844a29a35a11f297507966bea30c3..4ab3654f456ffd1f9cd53703b22f618ff4d12244 100644 (file)
--- a/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java
+++ b/org.argeo.app.geo/src/org/argeo/app/geo/http/WfsHttpHandler.java
@@ -117,8 +117,7 @@ public class WfsHttpHandler implements HttpHandler {
                        if (cql != null) {
                                CqlUtils.filter(search.from(path), cql);
                        } else {
-                               search.from(path).where((and) -> {
-                               });
+                               search.from(path);
                        }
 //                     search.getWhere().any((f) -> {
                        for (QName typeName : typeNames) {
@@ -203,9 +202,11 @@ public class WfsHttpHandler implements HttpHandler {
                        if (featureId != null)
                                generator.write("id", featureId);
                        GeoJSon.writeBBox(generator, defaultGeometry);
+                       generator.writeStartObject(GeoJSon.GEOMETRY);
                        GeoJSon.writeGeometry(generator, defaultGeometry);
+                       generator.writeEnd();// geometry object
 
-                       generator.writeStartObject("properties");
+                       generator.writeStartObject(GeoJSon.PROPERTIES);
                        AcrJsonUtils.writeTimeProperties(generator, c);
                        if (featureAdapter != null)
                                featureAdapter.writeProperties(generator, c, typeName);