X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2Fhttp%2FWfsHttpHandler.java;h=c12a77b9da24cc0226629d270188b5ee816d0194;hb=12b80cad8670765da2cc8316c2c5d537cfbcbcd2;hp=8c143dbf01510d7eb10a56b588ec50b82ac819ea;hpb=e9978679e86dcd297270432e4ed953b782f1e7c6;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 8c143db..c12a77b 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
@@ -29,6 +29,7 @@ import org.argeo.app.api.EntityName;
 import org.argeo.app.api.EntityType;
 import org.argeo.app.api.WGS84PosName;
 import org.argeo.app.api.geo.FeatureAdapter;
+import org.argeo.app.api.geo.WfsKvp;
 import org.argeo.app.geo.CqlUtils;
 import org.argeo.app.geo.GeoJson;
 import org.argeo.app.geo.GeoUtils;
@@ -73,47 +74,52 @@ public class WfsHttpHandler implements HttpHandler {
 	private final static CmsLog log = CmsLog.getLog(WfsHttpHandler.class);
 	private ProvidedRepository contentRepository;
 
-	// HTTP parameters
-	final static String OUTPUT_FORMAT = "outputFormat";
-	final static String TYPE_NAMES = "typeNames";
-	final static String CQL_FILTER = "cql_filter";
-	final static String BBOX = "bbox";
-
 	private final Map<QName, FeatureAdapter> featureAdapters = new HashMap<>();
 
 	@Override
 	public void handle(HttpExchange exchange) throws IOException {
+		ContentSession session = HttpServerUtils.getContentSession(contentRepository, exchange);
+
 		String path = HttpServerUtils.subPath(exchange);
 
 		// content path
-		final String pathToUse;
-		int lastSlash = path.lastIndexOf('/');
+		final String pathToUse = path;
 		String fileName = null;
-		if (lastSlash > 0) {
-			fileName = path.substring(lastSlash + 1);
-		}
 		boolean zipped = false;
-		if (fileName != null) {
-			pathToUse = path.substring(0, lastSlash);
-			if (path.endsWith(".zip")) {
-				zipped = true;
-			}
-		} else {
-			pathToUse = path;
-		}
+//		int lastSlash = path.lastIndexOf('/');
+//		if (lastSlash > 0) {
+//			fileName = path.substring(lastSlash + 1);
+//		}
+//		if (fileName != null) {
+//			pathToUse = path.substring(0, lastSlash);
+//			if (path.endsWith(".zip")) {
+//				zipped = true;
+//			}
+//		} else {
+//			pathToUse = path;
+//		}
 
-		ContentSession session = HttpServerUtils.getContentSession(contentRepository, exchange);
-		// Content content = session.get(path);
+		Map<String, List<String>> parameters = HttpServerUtils.parseParameters(exchange);
 
 		// PARAMETERS
-		Map<String, List<String>> parameters = HttpServerUtils.parseParameters(exchange);
-		String cql = getKvpParameter(parameters, CQL_FILTER);
-		String typeNamesStr = getKvpParameter(parameters, TYPE_NAMES);
-		String outputFormat = getKvpParameter(parameters, OUTPUT_FORMAT);
+		String cql = getKvpParameter(parameters, WfsKvp.CQL_FILTER);
+		String typeNamesStr = getKvpParameter(parameters, WfsKvp.TYPE_NAMES);
+		String outputFormat = getKvpParameter(parameters, WfsKvp.OUTPUT_FORMAT);
 		if (outputFormat == null) {
 			outputFormat = "application/json";
 		}
-		String bboxStr = getKvpParameter(parameters, BBOX);
+
+		// TODO deal with multiple
+		String formatOption = getKvpParameter(parameters, WfsKvp.FORMAT_OPTIONS);
+		if (formatOption != null) {
+			if (formatOption.startsWith(WfsKvp.FILENAME_))
+				fileName = formatOption.substring(WfsKvp.FILENAME_.length());
+		}
+		if (fileName != null && fileName.endsWith(".zip"))
+			zipped = true;
+
+		// bbox
+		String bboxStr = getKvpParameter(parameters, WfsKvp.BBOX);
 		if (log.isTraceEnabled())
 			log.trace(bboxStr);
 		final Envelope bbox;
@@ -210,11 +216,14 @@ public class WfsHttpHandler implements HttpHandler {
 
 			if (bbox != null) {
 				search.getWhere().any((or) -> {
+					// box overlap, see https://stackoverflow.com/questions/20925818/algorithm-to-check-if-two-boxes-overlap
+					// isOverlapping = (x1min < x2max AND x2min < x1max AND y1min < y2max AND y2min < y1max)
+					// x1 = entity, x2 = bbox
 					or.all((and) -> {
-						and.gte(EntityName.minLat, bbox.getMinX());
-						and.gte(EntityName.minLon, bbox.getMinY());
-						and.lte(EntityName.maxLat, bbox.getMaxX());
-						and.lte(EntityName.maxLon, bbox.getMaxY());
+						and.lte(EntityName.minLat, bbox.getMaxX());
+						and.gte(EntityName.maxLat, bbox.getMinX());
+						and.lte(EntityName.minLon, bbox.getMaxY());
+						and.gte(EntityName.maxLon, bbox.getMinY());
 					});
 					or.all((and) -> {
 						and.gte(WGS84PosName.lat, bbox.getMinX());
@@ -250,14 +259,14 @@ public class WfsHttpHandler implements HttpHandler {
 	 * 
 	 * @see https://docs.ogc.org/is/09-025r2/09-025r2.html#19
 	 */
-	protected String getKvpParameter(Map<String, List<String>> parameters, String key) {
+	protected String getKvpParameter(Map<String, List<String>> parameters, WfsKvp key) {
 		Objects.requireNonNull(key, "KVP key cannot be null");
 		// let's first try the default (CAML case) which should be more efficient
-		List<String> values = parameters.get(key);
+		List<String> values = parameters.get(key.getKey());
 		if (values == null) {
 			// then let's do an ignore case comparison of the key
 			keys: for (String k : parameters.keySet()) {
-				if (key.equalsIgnoreCase(k)) {
+				if (key.getKey().equalsIgnoreCase(k)) {
 					values = parameters.get(k);
 					break keys;
 				}
@@ -468,7 +477,7 @@ public class WfsHttpHandler implements HttpHandler {
 	 */
 
 	public void addFeatureAdapter(FeatureAdapter featureAdapter, Map<String, Object> properties) {
-		List<String> typeNames = LangUtils.toStringList(properties.get(TYPE_NAMES));
+		List<String> typeNames = LangUtils.toStringList(properties.get(WfsKvp.TYPE_NAMES.getKey()));
 		if (typeNames.isEmpty()) {
 			log.warn("FeatureAdapter " + featureAdapter.getClass() + " does not declare type names. Ignoring it...");
 			return;
@@ -481,7 +490,7 @@ public class WfsHttpHandler implements HttpHandler {
 	}
 
 	public void removeFeatureAdapter(FeatureAdapter featureAdapter, Map<String, Object> properties) {
-		List<String> typeNames = LangUtils.toStringList(properties.get(TYPE_NAMES));
+		List<String> typeNames = LangUtils.toStringList(properties.get(WfsKvp.TYPE_NAMES.getKey()));
 		if (!typeNames.isEmpty()) {
 			// ignore if noe type name declared
 			return;