[oshdb-filter] allow filtering by changeset id and (optionally) contributor id

CHANGELOG.md

@@ -12,6 +12,10 @@ Changelog
 
 > See the _upgrading from 0.6_ section below for instructions how to update your code according to these breaking changes.
 
+### new features
+
+* enhance functionality of oshdb-filter: add new `changeset: <id|(ids)>` and (optional) `contributor: <id|(ids)>` filters ([#380])
+
 ### performance improvements
 
 * replace an unnecessarily used Map with a more lightweight implementation using a List. ([#352])
@@ -60,6 +64,7 @@ Changelog
 [#369]: https://github.com/GIScience/oshdb/pull/369
 [#374]: https://github.com/GIScience/oshdb/pull/374
 [#375]: https://github.com/GIScience/oshdb/pull/375
+[#384]: https://github.com/GIScience/oshdb/pull/380
 [#384]: https://github.com/GIScience/oshdb/pull/384
 
 

oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/db/OSHDBDatabase.java

@@ -3,8 +3,8 @@
 import java.util.OptionalLong;
 import org.heigit.ohsome.oshdb.OSHDB;
 import org.heigit.ohsome.oshdb.api.mapreducer.MapReducer;
-import org.heigit.ohsome.oshdb.api.object.OSHDBMapReducible;
 import org.heigit.ohsome.oshdb.util.exceptions.OSHDBTimeoutException;
+import org.heigit.ohsome.oshdb.util.mappable.OSHDBMapReducible;
 
 /**
  * OSHDB database backend connector.

oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/db/OSHDBIgnite.java

@@ -13,10 +13,10 @@
 import org.heigit.ohsome.oshdb.api.mapreducer.backend.MapReducerIgniteAffinityCall;
 import org.heigit.ohsome.oshdb.api.mapreducer.backend.MapReducerIgniteLocalPeek;
 import org.heigit.ohsome.oshdb.api.mapreducer.backend.MapReducerIgniteScanQuery;
-import org.heigit.ohsome.oshdb.api.object.OSHDBMapReducible;
 import org.heigit.ohsome.oshdb.osm.OSMType;
 import org.heigit.ohsome.oshdb.util.TableNames;
 import org.heigit.ohsome.oshdb.util.exceptions.OSHDBTableNotFoundException;
+import org.heigit.ohsome.oshdb.util.mappable.OSHDBMapReducible;
 
 /**
  * OSHDB database backend connector to a Ignite system.

oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/db/OSHDBJdbc.java

@@ -15,10 +15,10 @@
 import org.heigit.ohsome.oshdb.api.mapreducer.MapReducer;
 import org.heigit.ohsome.oshdb.api.mapreducer.backend.MapReducerJdbcMultithread;
 import org.heigit.ohsome.oshdb.api.mapreducer.backend.MapReducerJdbcSinglethread;
-import org.heigit.ohsome.oshdb.api.object.OSHDBMapReducible;
 import org.heigit.ohsome.oshdb.osm.OSMType;
 import org.heigit.ohsome.oshdb.util.TableNames;
 import org.heigit.ohsome.oshdb.util.exceptions.OSHDBTableNotFoundException;
+import org.heigit.ohsome.oshdb.util.mappable.OSHDBMapReducible;
 
 /**
  * OSHDB database backend connector to a JDBC database file.

oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/GeometrySplitter.java

@@ -14,15 +14,16 @@
 import java.util.stream.Stream;
 import org.heigit.ohsome.oshdb.OSHDBBoundable;
 import org.heigit.ohsome.oshdb.OSHDBBoundingBox;
-import org.heigit.ohsome.oshdb.api.object.OSMContribution;
-import org.heigit.ohsome.oshdb.api.object.OSMEntitySnapshot;
+import org.heigit.ohsome.oshdb.api.object.OSMContributionImpl;
+import org.heigit.ohsome.oshdb.api.object.OSMEntitySnapshotImpl;
 import org.heigit.ohsome.oshdb.util.celliterator.ContributionType;
 import org.heigit.ohsome.oshdb.util.celliterator.LazyEvaluatedObject;
 import org.heigit.ohsome.oshdb.util.geometry.OSHDBGeometryBuilder;
 import org.heigit.ohsome.oshdb.util.geometry.fip.FastBboxInPolygon;
 import org.heigit.ohsome.oshdb.util.geometry.fip.FastBboxOutsidePolygon;
 import org.heigit.ohsome.oshdb.util.geometry.fip.FastPolygonOperations;
-import org.locationtech.jts.geom.Envelope;
+import org.heigit.ohsome.oshdb.util.mappable.OSMContribution;
+import org.heigit.ohsome.oshdb.util.mappable.OSMEntitySnapshot;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Polygonal;
@@ -102,7 +103,7 @@ public Map<U, OSMEntitySnapshot> splitOSMEntitySnapshot(OSMEntitySnapshot data)
           }
 
           // now we can check against the actual contribution geometry
-          Geometry snapshotGeometry = data.getGeometry();
+          var snapshotGeometry = data.getGeometry();
           OSHDBBoundingBox snapshotBbox = OSHDBGeometryBuilder.boundingBoxOf(
               snapshotGeometry.getEnvelopeInternal()
           );
@@ -124,7 +125,7 @@ public Map<U, OSMEntitySnapshot> splitOSMEntitySnapshot(OSMEntitySnapshot data)
               // not actually intersecting -> skip
               return Stream.empty();
             } else {
-              return Stream.of(new IndexData<>(index, new OSMEntitySnapshot(data,
+              return Stream.of(new IndexData<>(index, new OSMEntitySnapshotImpl(data,
                   new LazyEvaluatedObject<>(() ->
                       faultTolerantIntersection(snapshotGeometry, poop))
               )));
@@ -166,8 +167,8 @@ public Map<U, OSMContribution> splitOSMContribution(OSMContribution data) {
           }
 
           // now we can check against the actual contribution geometry
-          Geometry contributionGeometryBefore = data.getGeometryBefore();
-          Geometry contributionGeometryAfter = data.getGeometryAfter();
+          var contributionGeometryBefore = data.getGeometryBefore();
+          var contributionGeometryAfter = data.getGeometryAfter();
           OSHDBBoundingBox contributionGeometryBbox;
           if (data.is(ContributionType.CREATION)) {
             contributionGeometryBbox = OSHDBGeometryBuilder.boundingBoxOf(
@@ -178,7 +179,7 @@ public Map<U, OSMContribution> splitOSMContribution(OSMContribution data) {
                 contributionGeometryBefore.getEnvelopeInternal()
             );
           } else {
-            Envelope env = contributionGeometryBefore.getEnvelopeInternal();
+            var env = contributionGeometryBefore.getEnvelopeInternal();
             env.expandToInclude(contributionGeometryAfter.getEnvelopeInternal());
             contributionGeometryBbox = OSHDBGeometryBuilder.boundingBoxOf(env);
           }
@@ -203,7 +204,7 @@ public Map<U, OSMContribution> splitOSMContribution(OSMContribution data) {
               // not actually intersecting -> skip
               return Stream.empty();
             } else {
-              return Stream.of(new IndexData<>(index, new OSMContribution(data,
+              return Stream.of(new IndexData<>(index, new OSMContributionImpl(data,
                   new LazyEvaluatedObject<>(() ->
                       faultTolerantIntersection(contributionGeometryBefore, poop)),
                   new LazyEvaluatedObject<>(() ->

oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/mapreducer/MapAggregator.java

@@ -29,9 +29,6 @@
 import org.heigit.ohsome.oshdb.api.generic.OSHDBCombinedIndex;
 import org.heigit.ohsome.oshdb.api.generic.WeightedValue;
 import org.heigit.ohsome.oshdb.api.mapreducer.MapReducer.Grouping;
-import org.heigit.ohsome.oshdb.api.object.OSHDBMapReducible;
-import org.heigit.ohsome.oshdb.api.object.OSMContribution;
-import org.heigit.ohsome.oshdb.api.object.OSMEntitySnapshot;
 import org.heigit.ohsome.oshdb.filter.FilterExpression;
 import org.heigit.ohsome.oshdb.osm.OSMType;
 import org.heigit.ohsome.oshdb.util.exceptions.OSHDBInvalidTimestampException;
@@ -42,12 +39,14 @@
 import org.heigit.ohsome.oshdb.util.function.SerializableFunction;
 import org.heigit.ohsome.oshdb.util.function.SerializablePredicate;
 import org.heigit.ohsome.oshdb.util.function.SerializableSupplier;
+import org.heigit.ohsome.oshdb.util.mappable.OSHDBMapReducible;
+import org.heigit.ohsome.oshdb.util.mappable.OSMContribution;
+import org.heigit.ohsome.oshdb.util.mappable.OSMEntitySnapshot;
 import org.heigit.ohsome.oshdb.util.tagtranslator.OSMTagInterface;
 import org.jetbrains.annotations.Contract;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.Polygonal;
 
-
 /**
  * A MapReducer with built-in aggregation by an arbitrary index.
  *
@@ -220,17 +219,15 @@ MapAggregator<OSHDBCombinedIndex<U, V>, X> aggregateByGeometry(Map<V, P> geometr
       );
     } else {
       MapAggregator<OSHDBCombinedIndex<U, V>, ? extends OSHDBMapReducible> ret;
-      if (this.mapReducer.forClass.equals(OSMContribution.class)) {
+      if (mapReducer.isOSMContributionViewQuery()) {
         ret = this.flatMap(x -> gs.splitOSMContribution((OSMContribution) x).entrySet())
             .aggregateBy(Entry::getKey, geometries.keySet()).map(Entry::getValue);
-      } else if (this.mapReducer.forClass.equals(OSMEntitySnapshot.class)) {
+      } else if (mapReducer.isOSMEntitySnapshotViewQuery()) {
         ret = this.flatMap(x -> gs.splitOSMEntitySnapshot((OSMEntitySnapshot) x).entrySet())
             .aggregateBy(Entry::getKey, geometries.keySet()).map(Entry::getValue);
       } else {
-        throw new UnsupportedOperationException(
-            "aggregateByGeometry not implemented for objects of type: "
-                + this.mapReducer.forClass.toString()
-        );
+        throw new UnsupportedOperationException(String.format(
+            MapReducer.UNIMPLEMENTED_DATA_VIEW, this.mapReducer.viewClass));
       }
       @SuppressWarnings("unchecked") // no mapper functions have been applied -> the type is still X
       MapAggregator<OSHDBCombinedIndex<U, V>, X> result =