Skip to content

Commit 5084f1a

Browse files
ThuhaaThuhaa
authored
Merge pull request #104 from UNDP-Data/feat/use-un-labels
feat: replace admin labels in voyager to use un labels
2 parents ca4bfdd + bdc4ff7 commit 5084f1a

5 files changed

Lines changed: 201 additions & 19 deletions

File tree

‎.changeset/curly-bars-burn.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@undp-data/style": minor
3+
---
4+
5+
feat: replaced admin labels in voyager style to use un labels
6+
7+
feat: replaced admin labels in dark style to use un labels
8+
9+
feat: replaced admin labels in aerial style to use un labels
10+
11+
feat: replaced admin labels in positron style to use un labels

‎assets/aerialstyle.yml‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,9 @@ layers:
123123
- !!inc/file layers/place_suburbs.yml
124124
- !!inc/file layers/place_villages.yml
125125
- !!inc/file layers/place_town.yml
126-
- !!inc/file layers/place_country_2.yml
127-
- !!inc/file layers/place_country_1.yml
126+
# carto country labels
127+
# - !!inc/file layers/place_country_2.yml
128+
# - !!inc/file layers/place_country_1.yml
128129
- !!inc/file layers/place_state.yml
129130
- !!inc/file layers/place_continent.yml
130131
- !!inc/file layers/place_city_r6.yml
@@ -141,5 +142,48 @@ layers:
141142
- !!inc/file layers/roadname_pri.yml
142143
- !!inc/file layers/roadname_major.yml
143144
- !!inc/file layers/housenumber.yml
145+
146+
147+
# UN admin labels
148+
- !!inc/file un_street_map/Labels/LAB_Water_S/label/Ocean.yml
149+
- !!inc/file un_street_map/Labels/LAB_Water_M/label/Ocean.yml
150+
- !!inc/file un_street_map/Labels/LAB_Admin4_MMR/label/Class 1.yml
151+
- !!inc/file un_street_map/Labels/LAB_Admin3_MMR/label/Class 1.yml
152+
- !!inc/file un_street_map/Labels/LAB_Admin3_VMC/label/Municipality.yml
153+
- !!inc/file un_street_map/Labels/LAB_Admin3_MIK/label/Municipality.yml
154+
- !!inc/file un_street_map/Labels/LAB_Admin2_NoHQ/label/Admin2.yml
155+
- !!inc/file un_street_map/Labels/LAB_Admin2_HQ/label/Admin2.yml
156+
- !!inc/file un_street_map/Labels/LAB_Admin1_NoHQ/label/Admin1.yml
157+
- !!inc/file un_street_map/Labels/LAB_Admin1_HQ/label/Admin1.yml
158+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/Territory_NSG.yml
159+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/Territory_SG.yml
160+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_S.yml
161+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_M.yml
162+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_L.yml
163+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/Territory_NSG.yml
164+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/Territory_SG.yml
165+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_S.yml
166+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_M.yml
167+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_L.yml
168+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/Territory_NSG.yml
169+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/Territory_SG.yml
170+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/China.yml
171+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/MiddleEast.yml
172+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_S.yml
173+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_M.yml
174+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_L.yml
175+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Autonomies.yml
176+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Territory_SG.yml
177+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/China.yml
178+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/MiddleEast.yml
179+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Territory_NSG.yml
180+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_S.yml
181+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_M.yml
182+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_L.yml
183+
- !!inc/file un_street_map/Labels/LAB_Autonomous_L.yml
184+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/Territory.yml
185+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/MiddleEast.yml
186+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/State.yml
187+
144188
id: aerial
145189
owner: UNDP

‎assets/dark.yml‎

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,11 @@ layers:
112112
- !!inc/file dark/building.yml
113113
- !!inc/file dark/building-top.yml
114114

115-
# UN addmin boundaries
115+
# UN admin boundaries
116116
# ADM_Boundaries_L_HQ: z 5-
117117
# ADM_Boundaries_M: z 4
118118
# ADM_Boundaries_S: z 0-3
119+
119120
- !!inc/file un_street_map/Admin/ADM_Boundaries_L_HQ/Sovereign/halo.yml
120121
- !!inc/file un_street_map/Admin/ADM_Boundaries_L_HQ/International/halo.yml
121122
- !!inc/file un_street_map/Admin/ADM_Boundaries_L_HQ/Armistice/halo.yml
@@ -170,8 +171,11 @@ layers:
170171
- !!inc/file dark/place_suburbs.yml
171172
- !!inc/file dark/place_villages.yml
172173
- !!inc/file dark/place_town.yml
173-
- !!inc/file dark/place_country_2.yml
174-
- !!inc/file dark/place_country_1.yml
174+
175+
# carto style label layers
176+
# - !!inc/file dark/place_country_2.yml
177+
# - !!inc/file dark/place_country_1.yml
178+
175179
- !!inc/file dark/place_state.yml
176180
- !!inc/file dark/place_continent.yml
177181
- !!inc/file dark/place_city_r6.yml
@@ -188,5 +192,48 @@ layers:
188192
- !!inc/file dark/roadname_pri.yml
189193
- !!inc/file dark/roadname_major.yml
190194
- !!inc/file dark/housenumber.yml
191-
id: voyager
195+
196+
197+
# UN admin labels
198+
- !!inc/file un_street_map/Labels/LAB_Water_S/label/Ocean.yml
199+
- !!inc/file un_street_map/Labels/LAB_Water_M/label/Ocean.yml
200+
- !!inc/file un_street_map/Labels/LAB_Admin4_MMR/label/Class 1.yml
201+
- !!inc/file un_street_map/Labels/LAB_Admin3_MMR/label/Class 1.yml
202+
- !!inc/file un_street_map/Labels/LAB_Admin3_VMC/label/Municipality.yml
203+
- !!inc/file un_street_map/Labels/LAB_Admin3_MIK/label/Municipality.yml
204+
- !!inc/file un_street_map/Labels/LAB_Admin2_NoHQ/label/Admin2.yml
205+
- !!inc/file un_street_map/Labels/LAB_Admin2_HQ/label/Admin2.yml
206+
- !!inc/file un_street_map/Labels/LAB_Admin1_NoHQ/label/Admin1.yml
207+
- !!inc/file un_street_map/Labels/LAB_Admin1_HQ/label/Admin1.yml
208+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/Territory_NSG.yml
209+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/Territory_SG.yml
210+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_S.yml
211+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_M.yml
212+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_L.yml
213+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/Territory_NSG.yml
214+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/Territory_SG.yml
215+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_S.yml
216+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_M.yml
217+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_L.yml
218+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/Territory_NSG.yml
219+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/Territory_SG.yml
220+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/China.yml
221+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/MiddleEast.yml
222+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_S.yml
223+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_M.yml
224+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_L.yml
225+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Autonomies.yml
226+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Territory_SG.yml
227+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/China.yml
228+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/MiddleEast.yml
229+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Territory_NSG.yml
230+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_S.yml
231+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_M.yml
232+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_L.yml
233+
- !!inc/file un_street_map/Labels/LAB_Autonomous_L.yml
234+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/Territory.yml
235+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/MiddleEast.yml
236+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/State.yml
237+
238+
id: dark
192239
owner: Carto

‎assets/positron.yml‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ layers:
113113
- !!inc/file positron/building.yml
114114
- !!inc/file positron/building-top.yml
115115

116-
# UN addmin boundaries
116+
# UN admin boundaries
117117
# ADM_Boundaries_L_HQ: z 5-
118118
# ADM_Boundaries_M: z 4
119119
# ADM_Boundaries_S: z 0-3
@@ -158,9 +158,9 @@ layers:
158158
- !!inc/file un_street_map/Admin/ADM_Boundaries_S/Special.yml
159159
- !!inc/file un_street_map/Admin/ADM_Boundaries_S/International.yml
160160

161-
# carto style layers
162-
# - !!inc/file positron/boundary_country_outline.yml
163-
# - !!inc/file positron/boundary_country_inner.yml
161+
# carto style layers
162+
# - !!inc/file positron/boundary_country_outline.yml
163+
# - !!inc/file positron/boundary_country_inner.yml
164164
- !!inc/file positron/waterway_label.yml
165165
- !!inc/file positron/watername_ocean.yml
166166
- !!inc/file positron/watername_sea.yml
@@ -170,8 +170,9 @@ layers:
170170
- !!inc/file positron/place_suburbs.yml
171171
- !!inc/file positron/place_villages.yml
172172
- !!inc/file positron/place_town.yml
173-
- !!inc/file positron/place_country_2.yml
174-
- !!inc/file positron/place_country_1.yml
173+
# carto style label layers
174+
# - !!inc/file positron/place_country_2.yml
175+
# - !!inc/file positron/place_country_1.yml
175176
- !!inc/file positron/place_state.yml
176177
- !!inc/file positron/place_continent.yml
177178
- !!inc/file positron/place_city_r6.yml
@@ -188,5 +189,46 @@ layers:
188189
- !!inc/file positron/roadname_pri.yml
189190
- !!inc/file positron/roadname_major.yml
190191
- !!inc/file positron/housenumber.yml
191-
id: voyager
192+
193+
# UN admin labels
194+
- !!inc/file un_street_map/Labels/LAB_Water_S/label/Ocean.yml
195+
- !!inc/file un_street_map/Labels/LAB_Water_M/label/Ocean.yml
196+
- !!inc/file un_street_map/Labels/LAB_Admin4_MMR/label/Class 1.yml
197+
- !!inc/file un_street_map/Labels/LAB_Admin3_MMR/label/Class 1.yml
198+
- !!inc/file un_street_map/Labels/LAB_Admin3_VMC/label/Municipality.yml
199+
- !!inc/file un_street_map/Labels/LAB_Admin3_MIK/label/Municipality.yml
200+
- !!inc/file un_street_map/Labels/LAB_Admin2_NoHQ/label/Admin2.yml
201+
- !!inc/file un_street_map/Labels/LAB_Admin2_HQ/label/Admin2.yml
202+
- !!inc/file un_street_map/Labels/LAB_Admin1_NoHQ/label/Admin1.yml
203+
- !!inc/file un_street_map/Labels/LAB_Admin1_HQ/label/Admin1.yml
204+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/Territory_NSG.yml
205+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/Territory_SG.yml
206+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_S.yml
207+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_M.yml
208+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_L.yml
209+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/Territory_NSG.yml
210+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/Territory_SG.yml
211+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_S.yml
212+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_M.yml
213+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_L.yml
214+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/Territory_NSG.yml
215+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/Territory_SG.yml
216+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/China.yml
217+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/MiddleEast.yml
218+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_S.yml
219+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_M.yml
220+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_L.yml
221+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Autonomies.yml
222+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Territory_SG.yml
223+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/China.yml
224+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/MiddleEast.yml
225+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Territory_NSG.yml
226+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_S.yml
227+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_M.yml
228+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_L.yml
229+
- !!inc/file un_street_map/Labels/LAB_Autonomous_L.yml
230+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/Territory.yml
231+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/MiddleEast.yml
232+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/State.yml
233+
id: positron
192234
owner: Carto

‎assets/style.yml‎

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ layers:
5555
- !!inc/file layers/landuse_residential.yml
5656
- !!inc/file layers/landuse.yml
5757
- !!inc/file layers/waterway.yml
58-
# - !!inc/file layers/boundary_county.yml
59-
# - !!inc/file layers/boundary_state.yml
6058
- !!inc/file layers/water.yml
6159
- !!inc/file layers/water_shadow.yml
6260
- !!inc/file layers/aeroway-runway.yml
@@ -113,7 +111,7 @@ layers:
113111
- !!inc/file layers/building.yml
114112
- !!inc/file layers/building-top.yml
115113

116-
# UN addmin boundaries
114+
# UN admin boundaries
117115
# ADM_Boundaries_L_HQ: z 5-
118116
# ADM_Boundaries_M: z 4
119117
# ADM_Boundaries_S: z 0-3
@@ -161,7 +159,6 @@ layers:
161159
# carto style layers
162160
# - !!inc/file layers/boundary_country_outline.yml
163161
# - !!inc/file layers/boundary_country_inner.yml
164-
165162
- !!inc/file layers/waterway_label.yml
166163
- !!inc/file layers/watername_ocean.yml
167164
- !!inc/file layers/watername_sea.yml
@@ -171,8 +168,10 @@ layers:
171168
- !!inc/file layers/place_suburbs.yml
172169
- !!inc/file layers/place_villages.yml
173170
- !!inc/file layers/place_town.yml
174-
- !!inc/file layers/place_country_2.yml
175-
- !!inc/file layers/place_country_1.yml
171+
172+
# carto country labels
173+
# - !!inc/file layers/place_country_2.yml
174+
# - !!inc/file layers/place_country_1.yml
176175
- !!inc/file layers/place_state.yml
177176
- !!inc/file layers/place_continent.yml
178177
- !!inc/file layers/place_city_r6.yml
@@ -189,5 +188,44 @@ layers:
189188
- !!inc/file layers/roadname_pri.yml
190189
- !!inc/file layers/roadname_major.yml
191190
- !!inc/file layers/housenumber.yml
191+
- !!inc/file un_street_map/Labels/LAB_Water_S/label/Ocean.yml
192+
- !!inc/file un_street_map/Labels/LAB_Water_M/label/Ocean.yml
193+
- !!inc/file un_street_map/Labels/LAB_Admin4_MMR/label/Class 1.yml
194+
- !!inc/file un_street_map/Labels/LAB_Admin3_MMR/label/Class 1.yml
195+
- !!inc/file un_street_map/Labels/LAB_Admin3_VMC/label/Municipality.yml
196+
- !!inc/file un_street_map/Labels/LAB_Admin3_MIK/label/Municipality.yml
197+
- !!inc/file un_street_map/Labels/LAB_Admin2_NoHQ/label/Admin2.yml
198+
- !!inc/file un_street_map/Labels/LAB_Admin2_HQ/label/Admin2.yml
199+
- !!inc/file un_street_map/Labels/LAB_Admin1_NoHQ/label/Admin1.yml
200+
- !!inc/file un_street_map/Labels/LAB_Admin1_HQ/label/Admin1.yml
201+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/Territory_NSG.yml
202+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/Territory_SG.yml
203+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_S.yml
204+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_M.yml
205+
- !!inc/file un_street_map/Labels/LAB_Country_L03_P/label/State_L.yml
206+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/Territory_NSG.yml
207+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/Territory_SG.yml
208+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_S.yml
209+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_M.yml
210+
- !!inc/file un_street_map/Labels/LAB_Country_L04_P/label/State_L.yml
211+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/Territory_NSG.yml
212+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/Territory_SG.yml
213+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/China.yml
214+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/MiddleEast.yml
215+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_S.yml
216+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_M.yml
217+
- !!inc/file un_street_map/Labels/LAB_Country_L05_P/label/State_L.yml
218+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Autonomies.yml
219+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Territory_SG.yml
220+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/China.yml
221+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/MiddleEast.yml
222+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/Territory_NSG.yml
223+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_S.yml
224+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_M.yml
225+
- !!inc/file un_street_map/Labels/LAB_Country_L06_P/label/State_L.yml
226+
- !!inc/file un_street_map/Labels/LAB_Autonomous_L.yml
227+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/Territory.yml
228+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/MiddleEast.yml
229+
- !!inc/file un_street_map/Labels/LAB_Country_L/label/State.yml
192230
id: voyager
193231
owner: Carto

0 commit comments

Comments
 (0)