Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add OAPIF Core filtering capabilities to OskariWFS3Client #816

Merged
merged 11 commits into from
Mar 21, 2022
Merged

Add OAPIF Core filtering capabilities to OskariWFS3Client #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2c63666
Add OAPIF Core filtering capabilities to OskariWFS3Client
jampukka Mar 2, 2022
5887db6
Allow Filter to be passed to GeoJSONReader2.toFeatureCollection variant
jampukka Mar 16, 2022
6c71401
Pass the Filter to OskariWFS3Client, pass post-Filter to GeoJSONReade…
jampukka Mar 16, 2022
135b50b
Fix logger name
jampukka Mar 16, 2022
5936fd4
Fix ignored unittests
jampukka Mar 16, 2022
6c4248b
Fix error with nested ANDs
jampukka Mar 18, 2022
9e7df7a
Allow user to specify queryables in layer attributes
jampukka Mar 18, 2022
35b6985
Add test for using queryables, add flattening of simple ANDs
jampukka Mar 21, 2022
d2e4bcd
Revert "Fix error with nested ANDs"
jampukka Mar 21, 2022
e6d1fb8
Make clamp easier to read
jampukka Mar 21, 2022
b2951d8
Refactor flattening nested AND expressions from FilterVisitor pattern…
jampukka Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions geotools-ext/gt-geojson/src/main/java/org/oskari/geojson/GeoJSONReader2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package org.oskari.geojson;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;

import org.geotools.data.simple.SimpleFeatureCollection;
import org.geotools.data.store.EmptyFeatureCollection;
import org.geotools.feature.simple.SimpleFeatureBuilder;
import org.geotools.geometry.jts.JTS;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
import org.opengis.feature.type.AttributeDescriptor;
import org.opengis.filter.Filter;
import org.opengis.geometry.MismatchedDimensionException;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
Expand Down Expand Up @@ -49,22 +50,37 @@ public static SimpleFeatureCollection toFeatureCollection(Map<String, Object> js
public static SimpleFeatureCollection toFeatureCollection(Map<String, Object> json,
SimpleFeatureType schema, MathTransform transform)
throws MismatchedDimensionException, TransformException {
return toFeatureCollection(json, schema, null, Filter.INCLUDE);
}

public static SimpleFeatureCollection toFeatureCollection(
Map<String, Object> json,
SimpleFeatureType schema,
MathTransform transform,
Filter filter) throws MismatchedDimensionException, TransformException {
if (filter == null) {
filter = Filter.INCLUDE;
}

String type = GeoJSONUtil.getString(json, GeoJSON.TYPE);
if (!GeoJSON.FEATURE_COLLECTION.equals(type)) {
throw new IllegalArgumentException("type was not " + GeoJSON.FEATURE_COLLECTION);
}

List<Object> features = GeoJSONUtil.getList(json, GeoJSON.FEATURES);
if (features.isEmpty()) {
return new GeoJSONFeatureCollection(Collections.emptyList(), null);
return new EmptyFeatureCollection(schema);
}

SimpleFeatureBuilder builder = new SimpleFeatureBuilder(schema);
List<SimpleFeature> fc = new ArrayList<>();
for (Object f : features) {
@SuppressWarnings("unchecked")
Map<String, Object> _f = (Map<String, Object>) f;
fc.add(toFeature(_f, builder, transform));
SimpleFeature feature = toFeature(_f, builder, transform);
if (filter.evaluate(feature)) {
fc.add(feature);
}
}

return new GeoJSONFeatureCollection(fc, schema);
Expand Down
2 changes: 1 addition & 1 deletion service-wfs-client/src/main/java/org/oskari/service/wfs/client/OskariWFSClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

public class OskariWFSClient {

private static final Logger LOG = LogFactory.getLogger(OskariWFS110Client.class);
private static final Logger LOG = LogFactory.getLogger(OskariWFSClient.class);
private static final String EXC_HANDLING_OUTPUTFORMAT = "outputformat";
private static final TypeReference<HashMap<String, Object>> TYPE_REF = new TypeReference<HashMap<String, Object>>() {};
private static final ObjectMapper OM = new ObjectMapper();
Expand Down
2 changes: 1 addition & 1 deletion service-wfs-client/src/main/java/org/oskari/service/wfs/client/OskariWFSLoadCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public OskariWFSLoadCommand(OskariLayer layer, ReferencedEnvelope bbox,
protected SimpleFeatureCollection run() throws Exception {
switch (layer.getVersion()) {
case WFS_3_VERSION:
return OskariWFS3Client.getFeatures(layer, bbox, crs);
return OskariWFS3Client.getFeatures(layer, bbox, crs, filter);
case WFS_2_VERSION:
return OskariWFS2Client.getFeatures(layer, bbox, crs, filter);
default:
Expand Down
Loading