X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2Fhttp%2FWfsHttpHandler.java;h=6eb12796572279509400b7ee3a537ee25f842015;hb=352297dc44811090e8acb3131ca29e4fc9421741;hp=d60d51d788249af5d334f4b632d7095da2e606a3;hpb=57f3528fda509d840818a72ebcd38b6ab3afa435;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 d60d51d..6eb1279 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 @@ -6,8 +6,11 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.UncheckedIOException; import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; @@ -15,21 +18,24 @@ import javax.xml.namespace.QName; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentSession; -import org.argeo.api.acr.DName; import org.argeo.api.acr.NamespaceUtils; -import org.argeo.api.acr.QNamed; import org.argeo.api.acr.ldap.LdapAttr; +import org.argeo.api.acr.search.AndFilter; import org.argeo.api.acr.spi.ProvidedRepository; import org.argeo.api.cms.CmsLog; 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.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; import org.argeo.cms.http.HttpHeader; import org.argeo.cms.http.server.HttpServerUtils; +import org.argeo.cms.util.LangUtils; +import org.argeo.cms.util.StreamUtils; import org.geotools.data.DataUtilities; import org.geotools.data.geojson.GeoJSONWriter; import org.geotools.feature.DefaultFeatureCollection; @@ -67,6 +73,8 @@ public class WfsHttpHandler implements HttpHandler { final static String TYPE_NAMES = "typeNames"; final static String CQL_FILTER = "cql_filter"; + private final Map featureAdapters = new HashMap<>(); + @Override public void handle(HttpExchange exchange) throws IOException { String path = HttpServerUtils.subPath(exchange); @@ -74,9 +82,9 @@ public class WfsHttpHandler implements HttpHandler { // Content content = session.get(path); Map> parameters = HttpServerUtils.parseParameters(exchange); - String cql = parameters.containsKey(CQL_FILTER) ? parameters.get(CQL_FILTER).get(0) : null; - String typeNamesStr = parameters.containsKey(TYPE_NAMES) ? parameters.get(TYPE_NAMES).get(0) : null; - String outputFormat = parameters.containsKey(OUTPUT_FORMAT) ? parameters.get(OUTPUT_FORMAT).get(0) : null; + String cql = getKvpParameter(parameters, CQL_FILTER); + String typeNamesStr = getKvpParameter(parameters, TYPE_NAMES); + String outputFormat = getKvpParameter(parameters, OUTPUT_FORMAT); if (outputFormat == null) { outputFormat = "application/json"; } @@ -93,28 +101,34 @@ public class WfsHttpHandler implements HttpHandler { default -> throw new IllegalArgumentException("Unexpected value: " + outputFormat); } - QName[] typeNames; + List typeNames = new ArrayList<>(); if (typeNamesStr != null) { String[] arr = typeNamesStr.split(","); - typeNames = new QName[arr.length]; for (int i = 0; i < arr.length; i++) { - typeNames[i] = NamespaceUtils.parsePrefixedName(arr[i]); + typeNames.add(NamespaceUtils.parsePrefixedName(arr[i])); } } else { - typeNames = new QName[] { EntityType.local.qName() }; + typeNames.add(EntityType.local.qName()); } + if (typeNames.size() > 1) + throw new UnsupportedOperationException("Only one type name is currently supported"); + Stream res = session.search((search) -> { 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) - f.isContentClass(typeName); - }); +// search.getWhere().any((f) -> { + for (QName typeName : typeNames) { + FeatureAdapter featureAdapter = featureAdapters.get(typeName); + if (featureAdapter == null) + throw new IllegalStateException("No feature adapter found for " + typeName); + // f.isContentClass(typeName); + featureAdapter.addConstraintsForFeature((AndFilter) search.getWhere(), typeName); + } +// }); }); exchange.sendResponseHeaders(200, 0); @@ -124,12 +138,46 @@ public class WfsHttpHandler implements HttpHandler { if ("GML3".equals(outputFormat)) { encodeCollectionAsGML(res, out); } else if ("application/json".equals(outputFormat)) { - encodeCollectionAsGeoJSon(res, out); + encodeCollectionAsGeoJSon(res, out, typeNames); + } + } + } + + /** + * Retrieve KVP (keyword-value pairs) parameters, which are lower case, as per + * specifications. + * + * @see https://docs.ogc.org/is/09-025r2/09-025r2.html#19 + */ + protected String getKvpParameter(Map> parameters, String key) { + Objects.requireNonNull(key, "KVP key cannot be null"); + // let's first try the default (CAML case) which should be more efficient + List values = parameters.get(key); + if (values == null) { + // then let's do an ignore case comparison of the key + keys: for (String k : parameters.keySet()) { + if (key.equalsIgnoreCase(k)) { + values = parameters.get(k); + break keys; + } } } + if (values == null) // nothing was found + return null; + if (values.size() != 1) { + // although not completely clear from the standard, we assume keys must be + // unique + // since lists are defined here + // https://docs.ogc.org/is/09-026r2/09-026r2.html#10 + throw new IllegalArgumentException("Key " + key + " as multiple values"); + } + String value = values.get(0); + assert value != null; + return value; } - protected void encodeCollectionAsGeoJSon(Stream features, OutputStream out) throws IOException { + protected void encodeCollectionAsGeoJSon(Stream features, OutputStream out, List typeNames) + throws IOException { long begin = System.currentTimeMillis(); AtomicLong count = new AtomicLong(0); JsonGenerator generator = Json.createGenerator(out); @@ -137,20 +185,62 @@ public class WfsHttpHandler implements HttpHandler { generator.write("type", "FeatureCollection"); generator.writeStartArray("features"); features.forEach((c) -> { - Geometry defaultGeometry = getDefaultGeometry(c); - if (defaultGeometry == null) - return; - generator.writeStartObject(); - generator.write("type", "Feature"); - String featureId = getFeatureId(c); - if (featureId != null) - generator.write("id", featureId); - GeoJSon.writeBBox(generator, defaultGeometry); - GeoJSon.writeGeometry(generator, defaultGeometry); - - generator.writeStartObject("properties"); - writeTimeProperties(generator, c); - writeProperties(generator, c); + // TODO deal with multiple type names + FeatureAdapter featureAdapter = null; + QName typeName = null; + if (!typeNames.isEmpty()) { + typeName = typeNames.get(0); + featureAdapter = featureAdapters.get(typeName); + } + + boolean geometryWritten = false; +// if (typeName.getLocalPart().equals("fieldSimpleFeature")) { +// Content area = c.getContent("place.geom.json").orElse(null); +// if (area != null) { +// generator.writeStartObject(); +// generator.write("type", "Feature"); +// String featureId = getFeatureId(c); +// if (featureId != null) +// generator.write("id", featureId); +// +// generator.flush(); +// try (InputStream in = area.open(InputStream.class)) { +// out.write(",\"geometry\":".getBytes()); +// StreamUtils.copy(in, out); +// //out.flush(); +// } catch (Exception e) { +// log.error(c.getPath() + " : " + e.getMessage()); +// } finally { +// } +// geometryWritten = true; +// }else { +// return; +// } +// } + + if (!geometryWritten) { + + Geometry defaultGeometry = featureAdapter != null ? featureAdapter.getDefaultGeometry(c, typeName) + : getDefaultGeometry(c); + if (defaultGeometry == null) + return; + generator.writeStartObject(); + generator.write("type", "Feature"); + String featureId = getFeatureId(c); + 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(GeoJson.PROPERTIES); + AcrJsonUtils.writeTimeProperties(generator, c); + if (featureAdapter != null) + featureAdapter.writeProperties(generator, c, typeName); + else + writeProperties(generator, c); generator.writeEnd();// properties object generator.writeEnd();// feature object @@ -171,7 +261,7 @@ public class WfsHttpHandler implements HttpHandler { protected Geometry getDefaultGeometry(Content content) { if (content.hasContentClass(EntityType.geopoint)) { double latitude = content.get(WGS84PosName.lat, Double.class).get(); - double longitude = content.get(WGS84PosName.lng, Double.class).get(); + double longitude = content.get(WGS84PosName.lon, Double.class).get(); Coordinate coordinate = new Coordinate(longitude, latitude); Point the_geom = JTS.GEOMETRY_FACTORY.createPoint(coordinate); @@ -185,24 +275,7 @@ public class WfsHttpHandler implements HttpHandler { return uuid; } - private final QName JCR_CREATED = NamespaceUtils.parsePrefixedName("jcr:created"); - - private final QName JCR_LAST_MODIFIED = NamespaceUtils.parsePrefixedName("jcr:lastModified"); - - protected void writeTimeProperties(JsonGenerator g, Content content) { - String creationDate = content.attr(DName.creationdate); - if (creationDate == null) - creationDate = content.attr(JCR_CREATED); - if (creationDate != null) - g.write(DName.creationdate.get(), creationDate); - String lastModified = content.attr(DName.getlastmodified); - if (lastModified == null) - lastModified = content.attr(JCR_LAST_MODIFIED); - if (lastModified != null) - g.write(DName.getlastmodified.get(), lastModified); - } - - protected void writeProperties(JsonGenerator generator, Content content) { + public void writeProperties(JsonGenerator generator, Content content) { String path = content.getPath(); generator.write("path", path); if (content.hasContentClass(EntityType.local)) { @@ -217,33 +290,6 @@ public class WfsHttpHandler implements HttpHandler { } - protected void writeAttr(JsonGenerator g, Content content, String attr) { - writeAttr(g, content, NamespaceUtils.parsePrefixedName(attr)); - } - - protected void writeAttr(JsonGenerator g, Content content, QNamed attr) { - writeAttr(g, content, attr.qName()); - } - - protected void writeAttr(JsonGenerator g, Content content, QName attr) { - // String value = content.attr(attr); - Object value = content.get(attr); - if (value != null) { - // TODO specify NamespaceContext - String key = NamespaceUtils.toPrefixedName(attr); - if (value instanceof Double v) - g.write(key, v); - else if (value instanceof Long v) - g.write(key, v); - else if (value instanceof Integer v) - g.write(key, v); - else if (value instanceof Boolean v) - g.write(key, v); - else - g.write(key, value.toString()); - } - } - protected void encodeCollectionAsGeoJSonOld(Stream features, OutputStream out) throws IOException { // BODY PROCESSING @@ -283,7 +329,7 @@ public class WfsHttpHandler implements HttpHandler { return; double latitude = c.get(WGS84PosName.lat, Double.class).get(); - double longitude = c.get(WGS84PosName.lng, Double.class).get(); + double longitude = c.get(WGS84PosName.lon, Double.class).get(); Coordinate coordinate = new Coordinate(longitude, latitude); the_geom = geometryFactory.createPoint(coordinate); @@ -355,7 +401,7 @@ public class WfsHttpHandler implements HttpHandler { // } else { if (c.hasContentClass(EntityType.geopoint)) { double latitude = c.get(WGS84PosName.lat, Double.class).get(); - double longitude = c.get(WGS84PosName.lng, Double.class).get(); + double longitude = c.get(WGS84PosName.lon, Double.class).get(); Coordinate coordinate = new Coordinate(longitude, latitude); the_geom = JTS.GEOMETRY_FACTORY.createPoint(coordinate); @@ -393,6 +439,36 @@ public class WfsHttpHandler implements HttpHandler { } + /* + * DEPENDENCY INJECTION + */ + + public void addFeatureAdapter(FeatureAdapter featureAdapter, Map properties) { + List typeNames = LangUtils.toStringList(properties.get(TYPE_NAMES)); + if (typeNames.isEmpty()) { + log.warn("FeatureAdapter " + featureAdapter.getClass() + " does not declare type names. Ignoring it..."); + return; + } + + for (String tn : typeNames) { + QName typeName = NamespaceUtils.parsePrefixedName(tn); + featureAdapters.put(typeName, featureAdapter); + } + } + + public void removeFeatureAdapter(FeatureAdapter featureAdapter, Map properties) { + List typeNames = LangUtils.toStringList(properties.get(TYPE_NAMES)); + if (!typeNames.isEmpty()) { + // ignore if noe type name declared + return; + } + + for (String tn : typeNames) { + QName typeName = NamespaceUtils.parsePrefixedName(tn); + featureAdapters.remove(typeName); + } + } + public void setContentRepository(ProvidedRepository contentRepository) { this.contentRepository = contentRepository; }