diff --git a/documentation/manual/filters.md b/documentation/manual/filters.md index 3470d67e1..90a7b0d0d 100644 --- a/documentation/manual/filters.md +++ b/documentation/manual/filters.md @@ -47,11 +47,11 @@ It is possible to [define custom filtering functions](https://docs.ohsome.org/ja _ohsome_ filter --------------- -An easy way to provide complex [`filter`s](https://docs.ohsome.org/java/oshdb/0.6.0-SNAPSHOT/aggregated/org/heigit/bigspatialdata/oshdb/api/mapreducer/MapReducer.html#filter-org.heigit.bigspatialdata.oshdb.api.generic.function.String-) (available in the upcoming version 0.6 of the OSHDB) is through the functionality of [ohsome filters](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/libs/ohsome-filter#readme), which allow one to define osm data filter in a human readable syntax. With these one can combine several tag, type and geoemtry filters with arbitrary boolean operators. +An easy way to provide complex [`filter`s](https://docs.ohsome.org/java/oshdb/0.6.0-SNAPSHOT/aggregated/org/heigit/bigspatialdata/oshdb/api/mapreducer/MapReducer.html#filter-org.heigit.bigspatialdata.oshdb.api.generic.function.String-) (available in the upcoming version 0.6 of the OSHDB) is through the functionality of [ohsome filters](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/libs/ohsome-filter#readme), which allow one to define osm data filter in a human readable syntax. With these one can combine several tag, type and geometry filters with arbitrary boolean operators. _lambda_ filter --------------- -It is possible to define [`filter` functions](https://docs.ohsome.org/java/oshdb/0.5.10/aggregated/org/heigit/bigspatialdata/oshdb/api/mapreducer/MapReducer.html#filter-org.heigit.bigspatialdata.oshdb.api.generic.function.SerializablePredicate-) that can sort out values after they already have been transformed in a [map](map.md#map) step. +It is possible to define [`filter` functions](https://docs.ohsome.org/java/oshdb/0.5.10/aggregated/org/heigit/bigspatialdata/oshdb/api/mapreducer/MapReducer.html#filter-org.heigit.bigspatialdata.oshdb.api.generic.function.SerializablePredicate-) that can sort out values after they already have been transformed in a [map](map-reduce.md#map) step. -Note that it is ususally best to use the less flexible, but more performant OSM data filters described above wherever possible, as they can reduce the amount of data to be iterated over right from the start of the query. This is because while the basic filters are applied at the beginning of each query on the full OSM history data directly, the filter lambda functions are only executed after the data has already been computed and transformed. \ No newline at end of file +Note that it is usually best to use the less flexible, but more performant OSM data filters described above wherever possible, as they can reduce the amount of data to be iterated over right from the start of the query. This is because while the basic filters are applied at the beginning of each query on the full OSM history data directly, the filter lambda functions are only executed after the data has already been computed and transformed. diff --git a/oshdb-api/src/main/java/org/heigit/bigspatialdata/oshdb/api/mapreducer/MapReducer.java b/oshdb-api/src/main/java/org/heigit/bigspatialdata/oshdb/api/mapreducer/MapReducer.java index 45c3fb90e..22f9870be 100644 --- a/oshdb-api/src/main/java/org/heigit/bigspatialdata/oshdb/api/mapreducer/MapReducer.java +++ b/oshdb-api/src/main/java/org/heigit/bigspatialdata/oshdb/api/mapreducer/MapReducer.java @@ -719,8 +719,8 @@ public MapReducer filter(SerializablePredicate f) { /** * Apply a custom "ohsome" filter expression to this query. * - *

See https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/libs/ohsome-filter#readme - * and https://docs.ohsome.org/java/ohsome-filter/1.3.0 for further information about how + *

See https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/libs/ohsome-filter#ohsome-filter + * and https://docs.ohsome.org/java/ohsome-filter for further information about how * to create such a filter expression object.

* * @param f the filter expression to apply to the mapReducer