Skip to content

fix: drop legacy-only place names #582

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

Open
tijptjik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: drop legacy-only place names #582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 32 additions & 1 deletion tiles/src/main/java/com/protomaps/basemap/layers/Places.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,39 @@ private Map<String, Object> makeTagMap(String kind, String kindDetail, Integer p
return computedTags;
}

private static boolean isCurrentNameKey(String key) {
return key.equals("name") || key.startsWith("name:");
}

private static boolean isOldNameKey(String key) {
return key.equals("old_name") ||
key.equals("old:name") ||
key.startsWith("old_name:") ||
key.startsWith("old:name:");
}

private static boolean hasAnyCurrentName(SourceFeature sf) {
return sf.tags().keySet().stream().anyMatch(Places::isCurrentNameKey);
}

private static boolean hasAnyOldName(SourceFeature sf) {
return sf.tags().keySet().stream().anyMatch(Places::isOldNameKey);
}

private static boolean isLegacyOnlyPlace(SourceFeature sf) {
return hasAnyOldName(sf) && !hasAnyCurrentName(sf);
}

public void processOsm(SourceFeature sf, FeatureCollector features) {
if (!sf.isPoint() || !sf.hasTag("name") || !sf.hasTag("place")) {
if (!sf.isPoint() || !sf.hasTag("place")) {
return;
}

if (isLegacyOnlyPlace(sf)) {
return;
}

if (!hasAnyCurrentName(sf)) {
return;
}

Expand Down