Skip to content
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

Jump to bottom

Gloss city names in the local language #592

Merged
merged 10 commits into from
Dec 5, 2022
+701 −77
Merged

Gloss city names in the local language #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b0e0f6e
Dynamically adapt text-field expressions to language
1ec5 Nov 28, 2022
7cec299
Gloss city names in local language
1ec5 Nov 28, 2022
68eb253
Isolate glossed name from parentheses
1ec5 Nov 29, 2022
98e9a41
Fold diacritics in English to determine gloss visibility
1ec5 Nov 30, 2022
64e6131
Simplified label expression generation
1ec5 Nov 30, 2022
dfa0bf5
Conflate local and preferred language names more aggressively
1ec5 Nov 30, 2022
d62da7e
Refactored layer localization
1ec5 Dec 3, 2022
cc8b28d
Install style specification
1ec5 Dec 3, 2022
c32b11a
Test place label with gloss
1ec5 Dec 3, 2022
8025a7d
Refactored glossy city label expression
1ec5 Dec 3, 2022
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
128 changes: 128 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"open": "^8.4.0"
},
"devDependencies": {
"@maplibre/maplibre-gl-style-spec": "^17.0.1",
"chai": "^4.3.7",
"create-serve": "^1.0.1",
"esbuild": "^0.15.15",
Expand Down
18 changes: 2 additions & 16 deletions src/americana.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,22 +255,7 @@ function buildLayers() {
lyrPlace.continent
);

// Resolve localized name placeholders.
let localizedNameExpression = Label.getLocalizedNameExpression(false);
let legacyLocalizedNameExpression = Label.getLocalizedNameExpression(true);
for (let layer of layers) {
if (
"metadata" in layer &&
"layout" in layer &&
layer.metadata["americana:text-field-localized"] === true
) {
// https://github.com/openmaptiles/openmaptiles/issues/769
layer.layout["text-field"] =
layer["source-layer"] === "transportation_name"
? legacyLocalizedNameExpression
: localizedNameExpression;
}
}
Label.localizeLayers(layers, Label.getLocales());

return layers;
}
Expand Down Expand Up @@ -316,6 +301,7 @@ maplibregl.setRTLTextPlugin(
true
);

window.maplibregl = maplibregl;
export const map = (window.map = new maplibregl.Map({
container: "map", // container id
hash: "map",
Expand Down
Loading