Skip to content

Commit

Permalink
prefer the local language
Browse files Browse the repository at this point in the history
  • Loading branch information
@kylerchin
kylerchin committed Nov 30, 2024
1 parent d7f4787 commit f20c244
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
30 changes: 15 additions & 15 deletions static/dark-style.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2196,7 +2196,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-letter-spacing": 0.2,
Expand Down Expand Up @@ -2226,7 +2226,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-letter-spacing": 0.2,
Expand Down Expand Up @@ -2258,7 +2258,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-letter-spacing": 0.2,
Expand Down Expand Up @@ -2290,7 +2290,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-max-width": 9,
Expand Down Expand Up @@ -2364,7 +2364,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-max-width": 9,
Expand Down Expand Up @@ -2490,7 +2490,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-max-width": 9,
Expand All @@ -2517,7 +2517,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-rotation-alignment": "map",
Expand Down Expand Up @@ -2552,7 +2552,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-rotation-alignment": "map",
Expand Down Expand Up @@ -2584,7 +2584,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Medium"],
"text-rotation-alignment": "map",
Expand Down Expand Up @@ -2722,7 +2722,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-max-width": 9,
Expand Down Expand Up @@ -2756,7 +2756,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-letter-spacing": 0.1,
Expand Down Expand Up @@ -2788,7 +2788,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-max-width": 8,
Expand Down Expand Up @@ -2826,7 +2826,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-max-width": 8,
Expand Down Expand Up @@ -2860,7 +2860,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-letter-spacing": 0.2,
Expand Down Expand Up @@ -2896,7 +2896,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-max-width": 8,
Expand Down
34 changes: 17 additions & 17 deletions static/light-style.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2369,7 +2369,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-letter-spacing": 0.2,
Expand Down Expand Up @@ -2426,7 +2426,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-letter-spacing": 0.2,
Expand Down Expand Up @@ -2479,7 +2479,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-max-width": 9,
Expand Down Expand Up @@ -2534,7 +2534,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-max-width": 9,
Expand Down Expand Up @@ -2592,7 +2592,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-max-width": 9,
Expand Down Expand Up @@ -2636,7 +2636,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-max-width": 9,
Expand All @@ -2663,7 +2663,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-rotation-alignment": "map",
Expand Down Expand Up @@ -2698,7 +2698,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-rotation-alignment": "map",
Expand Down Expand Up @@ -2729,7 +2729,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-rotation-alignment": "map",
Expand Down Expand Up @@ -2866,7 +2866,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-max-width": 9,
Expand Down Expand Up @@ -2900,7 +2900,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-letter-spacing": 0.1,
Expand Down Expand Up @@ -2932,7 +2932,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-max-width": 8,
Expand Down Expand Up @@ -2970,7 +2970,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-max-width": 8,
Expand Down Expand Up @@ -3004,7 +3004,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Italic"],
"text-letter-spacing": 0.2,
Expand Down Expand Up @@ -3040,7 +3040,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Regular"],
"text-max-width": 8,
Expand Down Expand Up @@ -3085,7 +3085,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Bold"],
"text-max-width": 8,
Expand Down Expand Up @@ -3126,7 +3126,7 @@
"case",
["has", "name:nonlatin"],
["concat", ["get", "name:latin"], "\n", ["get", "name:nonlatin"]],
["coalesce", ["get", "name_en"], ["get", "name"]]
["coalesce", ["get", "name"], ["get", "name_en"]]
],
"text-font": ["Noto Sans Bold"],
"text-max-width": 6.25,
Expand Down

0 comments on commit f20c244

Please sign in to comment.