make byOSHEntity filters a bit sharper

GIScience · Jun 1, 2021 · c8af432 · c8af432
1 parent 2027b72
commit c8af432
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/oshdb-filter/src/main/java/org/heigit/ohsome/oshdb/filter/Filter.java b/oshdb-filter/src/main/java/org/heigit/ohsome/oshdb/filter/Filter.java
@@ -26,7 +26,22 @@ public interface Filter extends FilterExpression {
    * @return a filter object which filters using the given predicate
    */
   static Filter byOSHEntity(OSHEntityFilter oshCallback) {
-    return by(oshCallback, ignored -> true);
+    return new NegatableFilter(new FilterInternal() {
+      @Override
+      public boolean applyOSM(OSMEntity entity) {
+        return true;
+      }
+
+      @Override
+      public boolean applyOSH(OSHEntity entity) {
+        return oshCallback.test(entity);
+      }
+
+      @Override
+      boolean applyOSHNegated(OSHEntity entity) {
+        return !oshCallback.test(entity);
+      }
+    });
   }
 
   /**