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.

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

Render shared paths with an underline, change cycleways color #7925

Merged
merged 4 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions android/app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1232,6 +1232,7 @@
<string name="type.highway.path">مسار</string>
<string name="type.highway.path.alpine_hiking">مسار</string>
<string name="type.highway.path.bicycle">مسار للمشاة والدراجات معاً</string>
<string name="type.highway.footway.bicycle">مسار للمشاة والدراجات معاً</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">جسر</string>
<string name="type.highway.path.demanding_alpine_hiking">مسار</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-az/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,7 @@
<string name="type.highway.path">Yol</string>
<string name="type.highway.path.alpine_hiking">Yol</string>
<string name="type.highway.path.bicycle">Velosiped və Gəzinti Yolu</string>
<string name="type.highway.footway.bicycle">Velosiped və Gəzinti Yolu</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Körpü</string>
<string name="type.highway.path.demanding_alpine_hiking">Yol</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1130,6 +1130,7 @@
<string name="type.highway.path">Cesta</string>
<string name="type.highway.path.alpine_hiking">Cesta</string>
<string name="type.highway.path.bicycle">Cesta</string>
<string name="type.highway.footway.bicycle">Cesta</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Most</string>
<string name="type.highway.path.demanding_alpine_hiking">Cesta</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1110,6 +1110,7 @@
<string name="type.highway.path">Sti</string>
<string name="type.highway.path.alpine_hiking">Sti</string>
<string name="type.highway.path.bicycle">Sti</string>
<string name="type.highway.footway.bicycle">Sti</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Bro</string>
<string name="type.highway.path.demanding_alpine_hiking">Sti</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1209,6 +1209,7 @@
<string name="type.highway.path">Weg</string>
<string name="type.highway.path.alpine_hiking">Alpinwanderweg</string>
<string name="type.highway.path.bicycle">Radweg</string>
<string name="type.highway.footway.bicycle">Radweg</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Brücke</string>
<string name="type.highway.path.demanding_alpine_hiking">Anspruchsvoller Alpinwanderweg</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1171,6 +1171,7 @@
<string name="type.highway.path">Διαδρομή</string>
<string name="type.highway.path.alpine_hiking">Διαδρομή</string>
<string name="type.highway.path.bicycle">Διαδρομή</string>
<string name="type.highway.footway.bicycle">Διαδρομή</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Γέφυρα</string>
<string name="type.highway.path.demanding_alpine_hiking">Διαδρομή</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,7 @@
<string name="type.highway.path">Camino</string>
<string name="type.highway.path.alpine_hiking">Camino de senderismo alpino</string>
<string name="type.highway.path.bicycle">Camino para bicicletas</string>
<string name="type.highway.footway.bicycle">Camino para bicicletas</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Puente</string>
<string name="type.highway.path.demanding_alpine_hiking">Camino de senderismo alpino exigente</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,7 @@
<string name="type.highway.path">Rada</string>
<string name="type.highway.path.alpine_hiking">Alpi matkarada</string>
<string name="type.highway.path.bicycle">Jalgratta- ja jalgtee</string>
<string name="type.highway.footway.bicycle">Jalgratta- ja jalgtee</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Sild</string>
<string name="type.highway.path.demanding_alpine_hiking">Nõudlik alpi matkarada</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,7 @@
<string name="type.highway.path">Bidea</string>
<string name="type.highway.path.alpine_hiking">Bidea</string>
<string name="type.highway.path.bicycle">Bidea</string>
<string name="type.highway.footway.bicycle">Bidea</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Zubia</string>
<string name="type.highway.path.demanding_alpine_hiking">Bidea</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,7 @@
<string name="type.highway.path">مسیر</string>
<string name="type.highway.path.alpine_hiking">مسیر</string>
<string name="type.highway.path.bicycle">مسیر</string>
<string name="type.highway.footway.bicycle">مسیر</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">پل</string>
<string name="type.highway.path.demanding_alpine_hiking">مسیر</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,7 @@
<string name="type.highway.path">Polku</string>
<string name="type.highway.path.alpine_hiking">Alppivaellus</string>
<string name="type.highway.path.bicycle">Pyörä- ja jalkatie</string>
<string name="type.highway.footway.bicycle">Pyörä- ja jalkatie</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Silta</string>
<string name="type.highway.path.demanding_alpine_hiking">Vaativa alppivaellus</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,7 @@
<string name="type.highway.path">Chemin</string>
<string name="type.highway.path.alpine_hiking">Chemin</string>
<string name="type.highway.path.bicycle">Chemin</string>
<string name="type.highway.footway.bicycle">Chemin</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Pont</string>
<string name="type.highway.path.demanding_alpine_hiking">Chemin</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,7 @@
<string name="type.highway.path">पथ</string>
<string name="type.highway.path.alpine_hiking">पथ</string>
<string name="type.highway.path.bicycle">पथ</string>
<string name="type.highway.footway.bicycle">पथ</string>
<string name="type.highway.path.demanding_alpine_hiking">पथ</string>
<string name="type.highway.path.demanding_mountain_hiking">पथ</string>
<string name="type.highway.path.difficult_alpine_hiking">पथ</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1140,6 +1140,7 @@
<string name="type.highway.path">Ösvény</string>
<string name="type.highway.path.alpine_hiking">Ösvény</string>
<string name="type.highway.path.bicycle">Ösvény</string>
<string name="type.highway.footway.bicycle">Ösvény</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Híd</string>
<string name="type.highway.path.demanding_alpine_hiking">Ösvény</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,7 @@
<string name="type.highway.path">Jalur</string>
<string name="type.highway.path.alpine_hiking">Jalur</string>
<string name="type.highway.path.bicycle">Jalur</string>
<string name="type.highway.footway.bicycle">Jalur</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Menjembatani</string>
<string name="type.highway.path.demanding_alpine_hiking">Jalur</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,7 @@
<string name="type.highway.path">Sentiero</string>
<string name="type.highway.path.alpine_hiking">Sentiero</string>
<string name="type.highway.path.bicycle">Sentiero</string>
<string name="type.highway.footway.bicycle">Sentiero</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Ponte</string>
<string name="type.highway.path.demanding_alpine_hiking">Sentiero</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,7 @@
<string name="type.highway.path">歩道</string>
<string name="type.highway.path.alpine_hiking">歩道</string>
<string name="type.highway.path.bicycle">歩道</string>
<string name="type.highway.footway.bicycle">歩道</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">橋</string>
<string name="type.highway.path.demanding_alpine_hiking">歩道</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1119,6 +1119,7 @@
<string name="type.highway.path">길</string>
<string name="type.highway.path.alpine_hiking">길</string>
<string name="type.highway.path.bicycle">길</string>
<string name="type.highway.footway.bicycle">길</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">다리</string>
<string name="type.highway.path.demanding_alpine_hiking">길</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-mr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@
<string name="type.highway.path">पथ</string>
<string name="type.highway.path.alpine_hiking">पथ</string>
<string name="type.highway.path.bicycle">सायकल आणि पाऊलवाट</string>
<string name="type.highway.footway.bicycle">सायकल आणि पाऊलवाट</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">पूल</string>
<string name="type.highway.path.demanding_alpine_hiking">पथ</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-nb/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,7 @@
<string name="type.highway.path">Sti</string>
<string name="type.highway.path.alpine_hiking">Sti</string>
<string name="type.highway.path.bicycle">Sti</string>
<string name="type.highway.footway.bicycle">Sti</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Bru</string>
<string name="type.highway.path.demanding_alpine_hiking">Sti</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1217,6 +1217,7 @@
<string name="type.highway.path">Pad</string>
<string name="type.highway.path.alpine_hiking">Alpine wandelpad</string>
<string name="type.highway.path.bicycle">Fietspad</string>
<string name="type.highway.footway.bicycle">Fietspad</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Brug</string>
<string name="type.highway.path.demanding_alpine_hiking">Pad</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1223,6 +1223,7 @@
<string name="type.highway.path">Ścieżka</string>
<string name="type.highway.path.alpine_hiking">Ścieżka wspinaczkowa</string>
<string name="type.highway.path.bicycle">Ścieżka dla rowerów</string>
<string name="type.highway.footway.bicycle">Ścieżka dla rowerów</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Most</string>
<string name="type.highway.path.demanding_alpine_hiking">Ścieżka</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,7 @@
<string name="type.highway.path">Caminho</string>
<string name="type.highway.path.alpine_hiking">Caminho pedonal</string>
<string name="type.highway.path.bicycle">Caminho para ciclistas</string>
<string name="type.highway.footway.bicycle">Caminho para ciclistas</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Ponte</string>
<string name="type.highway.path.demanding_alpine_hiking">Caminho pedonal difícil</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,7 @@
<string name="type.highway.path">Caminho</string>
<string name="type.highway.path.alpine_hiking">Caminho</string>
<string name="type.highway.path.bicycle">Caminho</string>
<string name="type.highway.footway.bicycle">Caminho</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Ponte</string>
<string name="type.highway.path.demanding_alpine_hiking">Caminho</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1140,6 +1140,7 @@
<string name="type.highway.path">Cale</string>
<string name="type.highway.path.alpine_hiking">Cale</string>
<string name="type.highway.path.bicycle">Cale</string>
<string name="type.highway.footway.bicycle">Cale</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Pod</string>
<string name="type.highway.path.demanding_alpine_hiking">Cale</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,7 @@
<string name="type.highway.path">Тропа</string>
<string name="type.highway.path.alpine_hiking">Тропа</string>
<string name="type.highway.path.bicycle">Велопешеходная дорожка</string>
<string name="type.highway.footway.bicycle">Велопешеходная дорожка</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Мост</string>
<string name="type.highway.path.demanding_alpine_hiking">Тропа</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-sk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1209,6 +1209,7 @@
<string name="type.highway.path">Cesta</string>
<string name="type.highway.path.alpine_hiking">Turistický chodník</string>
<string name="type.highway.path.bicycle">Cesta pre cyklistov a chodcov</string>
<string name="type.highway.footway.bicycle">Cesta pre cyklistov a chodcov</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Most</string>
<string name="type.highway.path.demanding_alpine_hiking">Náročný turistický chodník</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,7 @@
<string name="type.highway.path">Gångväg</string>
<string name="type.highway.path.alpine_hiking">Gångväg</string>
<string name="type.highway.path.bicycle">Gångväg</string>
<string name="type.highway.footway.bicycle">Gångväg</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Bro</string>
<string name="type.highway.path.demanding_alpine_hiking">Gångväg</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-th/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1121,6 +1121,7 @@
<string name="type.highway.path">เส้นทาง</string>
<string name="type.highway.path.alpine_hiking">เส้นทาง</string>
<string name="type.highway.path.bicycle">เส้นทาง</string>
<string name="type.highway.footway.bicycle">เส้นทาง</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">สะพาน</string>
<string name="type.highway.path.demanding_alpine_hiking">เส้นทาง</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1221,6 +1221,7 @@
<string name="type.highway.path">Yol</string>
<string name="type.highway.path.alpine_hiking">Yol</string>
<string name="type.highway.path.bicycle">Bisiklet ve Yürüyüş Yolu</string>
<string name="type.highway.footway.bicycle">Bisiklet ve Yürüyüş Yolu</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Köprü</string>
<string name="type.highway.path.demanding_alpine_hiking">Yol</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1226,6 +1226,7 @@
<string name="type.highway.path">Стежка</string>
<string name="type.highway.path.alpine_hiking">Стежка</string>
<string name="type.highway.path.bicycle">Велопішохідна доріжка</string>
<string name="type.highway.footway.bicycle">Велопішохідна доріжка</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Міст</string>
<string name="type.highway.path.demanding_alpine_hiking">Стежка</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-vi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,7 @@
<string name="type.highway.path">Đường</string>
<string name="type.highway.path.alpine_hiking">Đường</string>
<string name="type.highway.path.bicycle">Đường</string>
<string name="type.highway.footway.bicycle">Đường</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Cầu</string>
<string name="type.highway.path.demanding_alpine_hiking">Đường</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1160,6 +1160,7 @@
<string name="type.highway.path">人行步道</string>
<string name="type.highway.path.alpine_hiking">人行步道</string>
<string name="type.highway.path.bicycle">人行步道</string>
<string name="type.highway.footway.bicycle">人行步道</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">橋</string>
<string name="type.highway.path.demanding_alpine_hiking">人行步道</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,7 @@
<string name="type.highway.path">小道</string>
<string name="type.highway.path.alpine_hiking">小道</string>
<string name="type.highway.path.bicycle">小道</string>
<string name="type.highway.footway.bicycle">小道</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">桥</string>
<string name="type.highway.path.demanding_alpine_hiking">小道</string>
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1261,6 +1261,7 @@
<string name="type.highway.path">Path</string>
<string name="type.highway.path.alpine_hiking">Path</string>
<string name="type.highway.path.bicycle">Cycle &amp; Foot Path</string>
<string name="type.highway.footway.bicycle">Cycle &amp; Foot Path</string>
<!-- These translations are used for all type.highway.*.bridge. -->
<string name="type.highway.path.bridge">Bridge</string>
<string name="type.highway.path.demanding_alpine_hiking">Path</string>
Expand Down
1 change: 1 addition & 0 deletions data/classificator.txt
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ world +
elevator -
footway +
area -
bicycle -
bridge -
crossing -
sidewalk -
Expand Down
13 changes: 8 additions & 5 deletions data/colors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
5286655
5378955
5395026
5459435
5592405
5666134
5717555
Expand Down Expand Up @@ -291,7 +292,6 @@
16742950
16746278
16746306
16746413
16747109
16748864
16749632
Expand All @@ -314,10 +314,8 @@
441199131
441925171
442905727
443432263
451800027
452764770
452954029
452968274
452984831
609045837
Expand Down Expand Up @@ -350,13 +348,16 @@
860111940
860571203
860629531
861097451
861295871
861355571
861690961
861690972
861885229
862076287
862148400
862348902
862862663
863203947
863664762
863850275
Expand Down Expand Up @@ -419,6 +420,7 @@
1296977469
1297041991
1297109072
1297305067
1297438037
1297563187
1297691427
Expand Down Expand Up @@ -467,7 +469,6 @@
1308586790
1308588582
1308591910
1308592045
1308594496
1308595264
1308601687
Expand All @@ -494,6 +495,7 @@
1715771835
1716276300
1716868437
1716933887
1717328977
1717523245
1717714303
Expand All @@ -512,7 +514,6 @@
1724368575
1724500155
1724896680
1728022445
1728053247
1931024665
1943327690
Expand All @@ -538,10 +539,12 @@
2152483916
2152615485
2153076053
2153141503
2153536593
2153769774
2153921919
2153997148
2154708295
2154984050
2155510394
2155695907
Expand Down
Binary file modified data/drules_proto.bin
Binary file not shown.