X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2Fhttp%2FWfsHttpHandler.java;h=59cb97a2d4eb02331f423b3b7ef302501c6f64d7;hb=ee54891e28ea7af2623bfaa28bc4a1103bfc7c22;hp=6eb12796572279509400b7ee3a537ee25f842015;hpb=352297dc44811090e8acb3131ca29e4fc9421741;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 6eb1279..59cb97a 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 @@ -13,6 +13,8 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; import javax.xml.namespace.QName; @@ -27,35 +29,39 @@ 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; import org.argeo.app.geo.GpxUtils; import org.argeo.app.geo.JTS; +import org.argeo.app.geo.acr.GeoEntityUtils; import org.argeo.cms.acr.json.AcrJsonUtils; +import org.argeo.cms.auth.RemoteAuthUtils; import org.argeo.cms.http.HttpHeader; +import org.argeo.cms.http.RemoteAuthHttpExchange; 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.api.feature.GeometryAttribute; +import org.geotools.api.feature.simple.SimpleFeature; +import org.geotools.api.feature.simple.SimpleFeatureType; +import org.geotools.api.feature.type.AttributeDescriptor; +import org.geotools.api.feature.type.Name; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.referencing.operation.MathTransform; +import org.geotools.api.referencing.operation.TransformException; import org.geotools.feature.DefaultFeatureCollection; import org.geotools.feature.NameImpl; -import org.geotools.feature.SchemaException; import org.geotools.feature.simple.SimpleFeatureBuilder; -import org.geotools.geometry.jts.JTSFactoryFinder; +import org.geotools.referencing.CRS; import org.geotools.referencing.crs.DefaultGeographicCRS; import org.geotools.wfs.GML; import org.geotools.wfs.GML.Version; import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.GeometryFactory; -import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; -import org.opengis.feature.GeometryAttribute; -import org.opengis.feature.simple.SimpleFeature; -import org.opengis.feature.simple.SimpleFeatureType; -import org.opengis.feature.type.AttributeDescriptor; -import org.opengis.feature.type.Name; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; @@ -68,37 +74,113 @@ 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"; - private final Map featureAdapters = new HashMap<>(); @Override public void handle(HttpExchange exchange) throws IOException { - String path = HttpServerUtils.subPath(exchange); ContentSession session = HttpServerUtils.getContentSession(contentRepository, exchange); - // Content content = session.get(path); + + String path = HttpServerUtils.subPath(exchange); + + // content path + final String pathToUse = path; + String fileName = null; + boolean zipped = false; +// 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; +// } Map> parameters = HttpServerUtils.parseParameters(exchange); - String cql = getKvpParameter(parameters, CQL_FILTER); - String typeNamesStr = getKvpParameter(parameters, TYPE_NAMES); - String outputFormat = getKvpParameter(parameters, OUTPUT_FORMAT); + + // PARAMETERS + 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"; } - switch (outputFormat) { - case "application/json" -> { - exchange.getResponseHeaders().set(HttpHeader.CONTENT_TYPE.getHeaderName(), "application/json"); + // 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()); } - case "GML3" -> { -// exchange.getResponseHeaders().set(HttpHeader.CONTENT_TYPE.getHeaderName(), "application/gml+xml"); - exchange.getResponseHeaders().set(HttpHeader.CONTENT_TYPE.getHeaderName(), "application/xml"); + if (fileName != null && fileName.endsWith(".zip")) + zipped = true; + + // bbox + String bboxStr = getKvpParameter(parameters, WfsKvp.BBOX); + if (log.isTraceEnabled()) + log.trace(bboxStr); + final Envelope bbox; + if (bboxStr != null) { + String srs; + String[] arr = bboxStr.split(","); + // TODO check SRS and convert to WGS84 + double minLat = Double.parseDouble(arr[0]); + double minLon = Double.parseDouble(arr[1]); + double maxLat = Double.parseDouble(arr[2]); + double maxLon = Double.parseDouble(arr[3]); + if (arr.length == 5) { + srs = arr[4]; + } else { + srs = null; + } + + if (srs != null && !srs.equals(GeoUtils.EPSG_4326)) { + try { + // TODO optimise + CoordinateReferenceSystem sourceCRS = CRS.decode(srs); + CoordinateReferenceSystem targetCRS = CRS.decode(GeoUtils.EPSG_4326); + MathTransform transform = CRS.findMathTransform(sourceCRS, targetCRS, true); + bbox = org.geotools.geometry.jts.JTS.transform( + new Envelope(new Coordinate(minLat, minLon), new Coordinate(maxLat, maxLon)), transform); + } catch (FactoryException | TransformException e) { + throw new IllegalArgumentException("Cannot convert bounding box", e); + // bbox = null; + } + } else { + bbox = new Envelope(new Coordinate(minLat, minLon), new Coordinate(maxLat, maxLon)); + } + } else { + bbox = null; } - default -> throw new IllegalArgumentException("Unexpected value: " + outputFormat); + // response headers + exchange.getResponseHeaders().set(HttpHeader.DATE.getHeaderName(), Long.toString(System.currentTimeMillis())); + + if (fileName != null) { + exchange.getResponseHeaders().set(HttpHeader.CONTENT_DISPOSITION.getHeaderName(), + HttpHeader.ATTACHMENT + ";" + HttpHeader.FILENAME + "=\"" + fileName + "\""); + + } + + // content type + if (zipped) { + exchange.getResponseHeaders().set(HttpHeader.CONTENT_TYPE.getHeaderName(), "application/zip"); + + } else { + switch (outputFormat) { + case "application/json" -> { + exchange.getResponseHeaders().set(HttpHeader.CONTENT_TYPE.getHeaderName(), "application/json"); + } + case "GML3" -> { +// exchange.getResponseHeaders().set(HttpHeader.CONTENT_TYPE.getHeaderName(), "application/gml+xml"); + exchange.getResponseHeaders().set(HttpHeader.CONTENT_TYPE.getHeaderName(), "application/xml"); + } + + default -> throw new IllegalArgumentException("Unexpected value: " + outputFormat); + } } List typeNames = new ArrayList<>(); @@ -114,27 +196,52 @@ public class WfsHttpHandler implements HttpHandler { if (typeNames.size() > 1) throw new UnsupportedOperationException("Only one type name is currently supported"); + // QUERY Stream res = session.search((search) -> { if (cql != null) { - CqlUtils.filter(search.from(path), cql); + CqlUtils.filter(search.from(pathToUse), cql); } else { - search.from(path); + search.from(pathToUse); } -// 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); + RemoteAuthUtils.doAs(() -> { + featureAdapter.addConstraintsForFeature((AndFilter) search.getWhere(), typeName); + return null; + }, new RemoteAuthHttpExchange(exchange)); + } + + if (bbox != null) { + search.getWhere().any((or) -> { + 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()); + }); + or.all((and) -> { + and.gte(WGS84PosName.lat, bbox.getMinX()); + and.gte(WGS84PosName.lon, bbox.getMinY()); + and.lte(WGS84PosName.lat, bbox.getMaxX()); + and.lte(WGS84PosName.lon, bbox.getMaxY()); + }); + }); } -// }); }); exchange.sendResponseHeaders(200, 0); final int BUFFER_SIZE = 100 * 1024; - try (BufferedOutputStream out = new BufferedOutputStream(exchange.getResponseBody(), BUFFER_SIZE)) { + try (OutputStream out = zipped ? new ZipOutputStream(exchange.getResponseBody()) + : new BufferedOutputStream(exchange.getResponseBody(), BUFFER_SIZE)) { + if (out instanceof ZipOutputStream zipOut) { + String unzippedFileName = fileName.substring(0, fileName.length() - ".zip".length()); + zipOut.putNextEntry(new ZipEntry(unzippedFileName)); + } + if ("GML3".equals(outputFormat)) { encodeCollectionAsGML(res, out); } else if ("application/json".equals(outputFormat)) { @@ -149,14 +256,14 @@ public class WfsHttpHandler implements HttpHandler { * * @see https://docs.ogc.org/is/09-025r2/09-025r2.html#19 */ - protected String getKvpParameter(Map> parameters, String key) { + protected String getKvpParameter(Map> 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 values = parameters.get(key); + List 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; } @@ -230,7 +337,7 @@ public class WfsHttpHandler implements HttpHandler { if (featureId != null) generator.write("id", featureId); -// GeoJson.writeBBox(generator, defaultGeometry); + GeoJson.writeBBox(generator, defaultGeometry); generator.writeStartObject(GeoJson.GEOMETRY); GeoJson.writeGeometry(generator, defaultGeometry); generator.writeEnd();// geometry object @@ -260,12 +367,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.lon, Double.class).get(); - - Coordinate coordinate = new Coordinate(longitude, latitude); - Point the_geom = JTS.GEOMETRY_FACTORY.createPoint(coordinate); - return the_geom; + return GeoEntityUtils.toPoint(content); } return null; } @@ -290,78 +392,6 @@ public class WfsHttpHandler implements HttpHandler { } - protected void encodeCollectionAsGeoJSonOld(Stream features, OutputStream out) throws IOException { - - // BODY PROCESSING - try (GeoJSONWriter geoJSONWriter = new GeoJSONWriter(out)) { - geoJSONWriter.setPrettyPrinting(true); - geoJSONWriter.setEncodeFeatureBounds(true); - - boolean gpx = true; - SimpleFeatureType TYPE; - try { - if (gpx) - TYPE = DataUtilities.createType("Content", - "the_geom:Polygon:srid=4326,path:String,type:String,name:String"); - else - TYPE = DataUtilities.createType("Content", - "the_geom:Point:srid=4326,path:String,type:String,name:String"); - } catch (SchemaException e) { - throw new RuntimeException(e); - } - SimpleFeatureBuilder featureBuilder = new SimpleFeatureBuilder(TYPE); - GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory(); - - features.forEach((c) -> { - Geometry the_geom; - if (gpx) {// experimental - Content area = c.getContent("gpx/area.gpx").orElse(null); - if (area == null) - return; - try (InputStream in = area.open(InputStream.class)) { - SimpleFeature feature = GpxUtils.parseGpxToPolygon(in); - the_geom = (Geometry) feature.getDefaultGeometry(); - } catch (IOException e) { - throw new UncheckedIOException("Cannot parse " + c, e); - } - } else { - if (!c.hasContentClass(EntityType.geopoint)) - return; - - double latitude = c.get(WGS84PosName.lat, Double.class).get(); - double longitude = c.get(WGS84PosName.lon, Double.class).get(); - - Coordinate coordinate = new Coordinate(longitude, latitude); - the_geom = geometryFactory.createPoint(coordinate); - - } - - featureBuilder.add(the_geom); - String pth = c.getPath(); - featureBuilder.add(pth); - if (c.hasContentClass(EntityType.local)) { - String type = c.attr(EntityName.type); - featureBuilder.add(type); - } else { - List contentClasses = c.getContentClasses(); - if (!contentClasses.isEmpty()) { - featureBuilder.add(NamespaceUtils.toPrefixedName(contentClasses.get(0))); - } - } - featureBuilder.add(NamespaceUtils.toPrefixedName(c.getName())); - - String uuid = c.attr(LdapAttr.entryUUID); - - SimpleFeature feature = featureBuilder.buildFeature(uuid); - try { - geoJSONWriter.write(feature); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - }); - } - } - protected void encodeCollectionAsGML(Stream features, OutputStream out) throws IOException { String entityType = "entity"; URL schemaLocation = getClass().getResource("/org/argeo/app/api/entity.xsd"); @@ -444,7 +474,7 @@ public class WfsHttpHandler implements HttpHandler { */ public void addFeatureAdapter(FeatureAdapter featureAdapter, Map properties) { - List typeNames = LangUtils.toStringList(properties.get(TYPE_NAMES)); + List 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; @@ -457,7 +487,7 @@ public class WfsHttpHandler implements HttpHandler { } public void removeFeatureAdapter(FeatureAdapter featureAdapter, Map properties) { - List typeNames = LangUtils.toStringList(properties.get(TYPE_NAMES)); + List typeNames = LangUtils.toStringList(properties.get(WfsKvp.TYPE_NAMES.getKey())); if (!typeNames.isEmpty()) { // ignore if noe type name declared return;