X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2Fhttp%2FWfsHttpHandler.java;h=84b9893082f3f324c9e2952fd8afaf82ef81cdcd;hb=b96d17f3eb275a97109cc160db1cfd3731a01d31;hp=2a637575d04844a29a35a11f297507966bea30c3;hpb=b4ffcdbc144ccb0633f033bb0be498988374ae68;p=gpl%2Fargeo-suite.git

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 2a63757..84b9893 100644
--- 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
@@ -28,7 +28,7 @@ import org.argeo.app.api.EntityType;
 import org.argeo.app.api.WGS84PosName;
 import org.argeo.app.api.geo.FeatureAdapter;
 import org.argeo.app.geo.CqlUtils;
-import org.argeo.app.geo.GeoJSon;
+import org.argeo.app.geo.GeoJson;
 import org.argeo.app.geo.GpxUtils;
 import org.argeo.app.geo.JTS;
 import org.argeo.cms.acr.json.AcrJsonUtils;
@@ -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) {
@@ -202,10 +201,12 @@ public class WfsHttpHandler implements HttpHandler {
 			String featureId = getFeatureId(c);
 			if (featureId != null)
 				generator.write("id", featureId);
-			GeoJSon.writeBBox(generator, defaultGeometry);
-			GeoJSon.writeGeometry(generator, defaultGeometry);
+//			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);