Extend Filters, extract Ids #509
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package org.heigit.ohsome.oshdb.filter; | ||
|
|
||
| import org.heigit.ohsome.oshdb.OSHDBTag; | ||
| import org.heigit.ohsome.oshdb.osm.OSMType; | ||
|
|
||
| import java.util.*; | ||
| import java.util.function.Function; | ||
| import java.util.function.Predicate; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static java.util.Collections.*; | ||
| import static java.util.Comparator.comparingLong; | ||
|
|
||
| public class FilterUtil { | ||
|
|
||
| private FilterUtil() { | ||
| throw new IllegalStateException("utility class"); | ||
| } | ||
|
|
||
| public static Map<EnumSet<OSMType>, Set<OSHDBTag>> tags(FilterExpression expression, Predicate<OSHDBTag> test) { | ||
| return tags(expression.normalize(), test); | ||
| } | ||
|
|
||
| public static Map<EnumSet<OSMType>, Set<OSHDBTag>> tags(List<List<Filter>> normalized, Predicate<OSHDBTag> test) { | ||
| return extract(normalized, filter -> { | ||
| if (filter instanceof TagFilterEquals tagFilter) { | ||
| return Stream.of(tagFilter.getTag()).filter(test); | ||
| } else if (filter instanceof TagFilterEqualsAny tagFilter) { | ||
| return Stream.of(tagFilter.getTag()).map(key -> new OSHDBTag(key.toInt(), -1)).filter(test); | ||
| } else if (filter instanceof TagFilterEqualsAnyOf tagFilter) { | ||
| return tagFilter.tags.stream().filter(test); | ||
| } | ||
| return Stream.empty(); | ||
| }); | ||
| } | ||
|
|
||
| private static <T> Map<EnumSet<OSMType>, Set<T>> extract(List<List<Filter>> normalized, Function<Filter, Stream<T>> extractor) { | ||
| var result = new HashMap<EnumSet<OSMType>, Set<T>>(); | ||
| for(var group: normalized){ | ||
| var type = EnumSet.allOf(OSMType.class); | ||
| var groupResult = new HashSet<T>(); | ||
| for (var filter : group) { | ||
| if (filter instanceof TypeFilter typeFilter) { | ||
| type = EnumSet.of(typeFilter.getType()); | ||
| } else { | ||
| extractor.apply(filter).forEach(groupResult::add); | ||
| } | ||
| } | ||
| if (groupResult.isEmpty()) { | ||
| return emptyMap(); | ||
| } | ||
| result.computeIfAbsent(type, x -> new HashSet<>()).addAll(groupResult); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| public static Map<EnumSet<OSMType>, Set<IdRange>> extractIds(FilterExpression expression) { | ||
| return extractIds(expression.normalize()); | ||
| } | ||
|
|
||
| public static Map<EnumSet<OSMType>, Set<IdRange>> extractIds(List<List<Filter>> normalized) { | ||
| var result = extract(normalized, filter -> { | ||
| if (filter instanceof IdFilterEquals idFilter){ | ||
| return Stream.of(new IdRange(idFilter.getId())); | ||
| } else if (filter instanceof IdFilterEqualsAnyOf idFilter) { | ||
| return idFilter.getIds().stream().map(IdRange::new); | ||
| } else if (filter instanceof IdFilterRange idFilter) { | ||
| return Stream.of(idFilter.getRange()); | ||
| } | ||
| return Stream.empty(); | ||
| }); | ||
| compactRanges(result); | ||
| return result; | ||
| } | ||
|
|
||
| private static void compactRanges(Map<EnumSet<OSMType>, Set<IdRange>> result) { | ||
| for (var entry : result.entrySet()) { | ||
| var ranges = new ArrayList<>(entry.getValue()); | ||
| var compact = new HashSet<IdRange>(ranges.size()); | ||
| ranges.sort(comparingLong(IdRange::getFromId)); | ||
| var itr = ranges.iterator(); | ||
| var range = itr.next(); | ||
| while (itr.hasNext()) { | ||
| var next = itr.next(); | ||
| if (next.getFromId() <= range.getToId() + 1) { | ||
| range = new IdRange(range.getFromId(), next.getToId()); | ||
| } else { | ||
| compact.add(range); | ||
| range = next; | ||
| } | ||
| } | ||
| compact.add(range); | ||
| entry.setValue(compact); | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. We could move the code from public static Set<OSMType> extractTypes(FilterExpression expression) {
return extractTypes(expression.normalize());
}
public static Set<OSMType> extractTypes(List<List<Filter>> normalized) {
var allTypes = EnumSet.noneOf(OSMType.class);
extract(normalized, ignored -> Stream.of(true)).keySet()
.forEach(allTypes::addAll);
return allTypes;
}and in mapRed = mapRed.osmTypeInternal(FilterUtil.extractTypes(filter)); |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is missing a case:
GeometryTypeFilters do implicitly also filter by type (e.g.geometry: polygonis equivalent to something like(type:way or (type:relation and type=multipolygon)) and <actual geometry check>.Something like this should work:
Another question is if there are cases where we want the
extractorto be called withGeometryTypeFilters. 🤔