From 76aec4d394eb789bfdf6a04a1896fd8a2d2f489f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20M=C4=99drek?= Date: Tue, 7 May 2024 01:31:45 +0200 Subject: [PATCH 1/7] Added preset for boundary-marker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kuba Mędrek --- data/categories.txt | 5 +++++ data/editor.config | 4 ++++ data/mapcss-mapping.csv | 1 + data/strings/types_strings.txt | 5 +++++ data/styles/clear/include/Icons.mapcss | 2 ++ data/styles/clear/include/priorities_4_overlays.prio.txt | 2 ++ data/styles/outdoors/include/priorities_4_overlays.prio.txt | 2 ++ data/styles/vehicle/include/Icons.mapcss | 3 +++ data/styles/vehicle/include/priorities_4_overlays.prio.txt | 2 ++ generator/generator_tests/osm_type_test.cpp | 1 + 10 files changed, 27 insertions(+) diff --git a/data/categories.txt b/data/categories.txt index b8e9747b92..a3cbc66469 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -3527,6 +3527,11 @@ vi:Đá ranh giới zh-Hans:界碑 zh-Hant:界碑 +boundary-marker +en:Boundary Marker +de:4Grenzstein|4Markstein +pl:Znak graniczny + historic-castle|@category_tourism en:4Castle|4Palace|4Fortress|U+1F3EF|U+1F3F0|U+1F451|U+1F478|Hillfort|Kremlin|Manor house ar:قلعة|سياحة|أماكن جذابة|مناظر|كاسترا|الكنيسة المحصنة|حصون التلال|كرملين|قصر مالك العزبة|قصر|شاتو diff --git a/data/editor.config b/data/editor.config index bd63d58877..a4b2d377d5 100644 --- a/data/editor.config +++ b/data/editor.config @@ -410,6 +410,10 @@ + + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 90097a683c..27ab4e44c1 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1692,3 +1692,4 @@ railway|subway_entrance|singapore;[railway=subway_entrance][city=singapore];;nam railway|station|subway|boston;[railway=station][transport=subway][city=boston],[railway=station][station=subway][city=boston];;name;int_name;1596; railway|subway_entrance|boston;[railway=subway_entrance][city=boston];;name;int_name;1597; leisure|miniature_golf;1598; +boundary|marker;1599; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index f27ab937c2..16b0ca6fc7 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -6520,6 +6520,11 @@ [type.boundary.administrative.4] ref = type.boundary.administrative.3 + [type.boundary.marker] + en = Boundary Marker + de = Grenzstein + pl = Znak graniczny + [type.boundary.national_park] en = National Park af = Nasionale park diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index d45a26c55b..4d4efe20df 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -448,6 +448,7 @@ node|z16-[historic=wreck], node|z16-[historic=locomotive], node|z16-[historic=boundary_stone], area|z16-[historic=boundary_stone], +node|z16-[boundary=marker], node|z16-[historic=wayside_cross], area|z16-[historic=wayside_cross], node|z16-[historic=tomb], @@ -639,6 +640,7 @@ node|z16-[tourism=information][information=map] node|z16-[historic=boundary_stone], area|z16-[historic=boundary_stone], +node|z16-[boundary=marker], node|z16-[historic=gallows], area|z16-[historic=gallows], node|z16-[historic=pillory], diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 9f40193307..37b8e343e7 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -966,6 +966,7 @@ amenity-kindergarten # icon z17- (also has captio amenity-school # icon z17- (also has caption(optional) z17-, area z15-) historic-archaeological_site # icon z17- (also has caption(optional) z17-) historic-boundary_stone # icon z16- (also has caption(optional) z16-) +boundary-marker # icon z16- (also has caption(optional) z16-) historic-gallows # icon z16- (also has caption(optional) z17-) historic-memorial-cross # icon z17- (also has caption(optional) z17-) historic-pillory # icon z16- (also has caption(optional) z17-) @@ -1873,6 +1874,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-school # caption(optional) z17- (also has icon z17-, area z15-) # historic-archaeological_site # caption(optional) z17- (also has icon z17-) # historic-boundary_stone # caption(optional) z16- (also has icon z16-) +# boundary-marker # caption(optional) z16- (also has icon z16-) # historic-gallows # caption(optional) z17- (also has icon z16-) # historic-memorial-cross # caption(optional) z17- (also has icon z17-) # historic-pillory # caption(optional) z17- (also has icon z16-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 77d069d863..17d0eabc78 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -966,6 +966,7 @@ amenity-kindergarten # icon z17- (also has captio amenity-school # icon z17- (also has caption(optional) z17-, area z15-) historic-archaeological_site # icon z17- (also has caption(optional) z17-) historic-boundary_stone # icon z16- (also has caption(optional) z16-) +boundary-marker # icon z16- (also has caption(optional) z16-) historic-gallows # icon z16- (also has caption(optional) z17-) historic-memorial-cross # icon z17- (also has caption(optional) z17-) historic-pillory # icon z16- (also has caption(optional) z17-) @@ -1873,6 +1874,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-school # caption(optional) z17- (also has icon z17-, area z15-) # historic-archaeological_site # caption(optional) z17- (also has icon z17-) # historic-boundary_stone # caption(optional) z16- (also has icon z16-) +# boundary-marker # caption(optional) z16- (also has icon z16-) # historic-gallows # caption(optional) z17- (also has icon z16-) # historic-memorial-cross # caption(optional) z17- (also has icon z17-) # historic-pillory # caption(optional) z17- (also has icon z16-) diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 53c16e437e..1cc7acff70 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -242,6 +242,7 @@ node|z16-[amenity=community_centre], area|z16-[amenity=community_centre], node|z16-[historic=boundary_stone], area|z16-[historic=boundary_stone], +node|z16-[boundary=marker], node|z16-[historic=wayside_cross], area|z16-[historic=wayside_cross], node|z16-[historic=gallows], @@ -368,6 +369,7 @@ node|z15-[tourism=viewpoint] node|z16[historic=boundary_stone], area|z16[historic=boundary_stone], +node|z16[boundary=marker], node|z16[historic=wayside_cross], area|z16[historic=wayside_cross], node|z16[historic=gallows], @@ -387,6 +389,7 @@ area|z16[historic=wayside_shrine] node|z17-[historic=boundary_stone], area|z17-[historic=boundary_stone], +node|z17-[boundary=marker], node|z17-[historic=wayside_cross], area|z17-[historic=wayside_cross], node|z17-[historic=gallows], diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index ca2e47dc68..737658afd4 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -516,6 +516,7 @@ amenity-charging_station-bicycle # icon z16- (also has captio === 850 historic-boundary_stone # icon z16- (also has caption(optional) z16-) +boundary=marker # icon z16- (also has caption(optional) z16-) historic-gallows # icon z16- (also has caption(optional) z16-) historic-pillory # icon z16- (also has caption(optional) z16-) historic-ship # icon z16- (also has caption(optional) z16-) @@ -1003,6 +1004,7 @@ entrance-main # icon z18- (also has captio # === -9150 # historic-boundary_stone # caption(optional) z16- (also has icon z16-) +# boundary-marker # caption(optional) z16- (also has icon z16-) # historic-gallows # caption(optional) z16- (also has icon z16-) # historic-pillory # caption(optional) z16- (also has icon z16-) # historic-ship # caption(optional) z16- (also has icon z16-) diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 5400f0ac05..5bcd38f4cc 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2283,6 +2283,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"barrier", "toll_booth"}, {"barrier", "wall"}, {"boundary", "national_park"}, + {"boundary", "marker"}, {"boundary", "protected_area"}, {"building", "has_parts"}, {"building", "train_station"}, -- 2.45.3 From 65d8a82a6f887434a4519319635ddaf238c2435a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20M=C4=99drek?= Date: Tue, 7 May 2024 22:29:28 +0200 Subject: [PATCH 2/7] Changes from review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kuba Mędrek --- data/editor.config | 1 - data/styles/clear/include/Icons.mapcss | 5 +++-- data/styles/clear/include/priorities_4_overlays.prio.txt | 3 +-- data/styles/outdoors/include/Icons.mapcss | 3 +++ data/styles/vehicle/include/Icons.mapcss | 3 --- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/data/editor.config b/data/editor.config index a4b2d377d5..edd40da90c 100644 --- a/data/editor.config +++ b/data/editor.config @@ -412,7 +412,6 @@ - diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 4d4efe20df..2a4cbc12cf 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -448,7 +448,6 @@ node|z16-[historic=wreck], node|z16-[historic=locomotive], node|z16-[historic=boundary_stone], area|z16-[historic=boundary_stone], -node|z16-[boundary=marker], node|z16-[historic=wayside_cross], area|z16-[historic=wayside_cross], node|z16-[historic=tomb], @@ -640,7 +639,6 @@ node|z16-[tourism=information][information=map] node|z16-[historic=boundary_stone], area|z16-[historic=boundary_stone], -node|z16-[boundary=marker], node|z16-[historic=gallows], area|z16-[historic=gallows], node|z16-[historic=pillory], @@ -1773,6 +1771,9 @@ node|z17-[amenity=public_bath], area|z17-[amenity=public_bath], {icon-image: public_bath-m.svg;font-size: 11;} +node|z18-[boundary=marker], +{icon-image: dot-m.svg;} + /* 6. SHOP */ node|z16-[amenity=marketplace], diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 37b8e343e7..ad77a69934 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -966,7 +966,6 @@ amenity-kindergarten # icon z17- (also has captio amenity-school # icon z17- (also has caption(optional) z17-, area z15-) historic-archaeological_site # icon z17- (also has caption(optional) z17-) historic-boundary_stone # icon z16- (also has caption(optional) z16-) -boundary-marker # icon z16- (also has caption(optional) z16-) historic-gallows # icon z16- (also has caption(optional) z17-) historic-memorial-cross # icon z17- (also has caption(optional) z17-) historic-pillory # icon z16- (also has caption(optional) z17-) @@ -1174,6 +1173,7 @@ power-station # icon z17- (also has captio barrier-entrance # icon z16- (also has caption(optional) z16-) entrance-main # icon z18- (also has caption(optional) z18-) +boundary-marker # icon z16- (also has caption(optional) z18-) === 220 historic-anchor # icon z18- (also has caption(optional) z18-) @@ -1874,7 +1874,6 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-school # caption(optional) z17- (also has icon z17-, area z15-) # historic-archaeological_site # caption(optional) z17- (also has icon z17-) # historic-boundary_stone # caption(optional) z16- (also has icon z16-) -# boundary-marker # caption(optional) z16- (also has icon z16-) # historic-gallows # caption(optional) z17- (also has icon z16-) # historic-memorial-cross # caption(optional) z17- (also has icon z17-) # historic-pillory # caption(optional) z17- (also has icon z16-) diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index 86415ce822..43e77d1f53 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -359,3 +359,6 @@ node|z14-[man_made=mast], node|z18-[man_made=cairn], {icon-image: cairn-m.svg;text: name;text-color: @poi_label;font-size: 12;text-offset: 1;} + +node|z16-[boundary=marker], +{icon-image: dot-m.svg;} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 1cc7acff70..53c16e437e 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -242,7 +242,6 @@ node|z16-[amenity=community_centre], area|z16-[amenity=community_centre], node|z16-[historic=boundary_stone], area|z16-[historic=boundary_stone], -node|z16-[boundary=marker], node|z16-[historic=wayside_cross], area|z16-[historic=wayside_cross], node|z16-[historic=gallows], @@ -369,7 +368,6 @@ node|z15-[tourism=viewpoint] node|z16[historic=boundary_stone], area|z16[historic=boundary_stone], -node|z16[boundary=marker], node|z16[historic=wayside_cross], area|z16[historic=wayside_cross], node|z16[historic=gallows], @@ -389,7 +387,6 @@ area|z16[historic=wayside_shrine] node|z17-[historic=boundary_stone], area|z17-[historic=boundary_stone], -node|z17-[boundary=marker], node|z17-[historic=wayside_cross], area|z17-[historic=wayside_cross], node|z17-[historic=gallows], -- 2.45.3 From 47e3e7e1bcbf08058542719b94fc74d38a4570c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20M=C4=99drek?= Date: Thu, 9 May 2024 23:04:07 +0200 Subject: [PATCH 3/7] Removed from search MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kuba Mędrek --- data/categories.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/categories.txt b/data/categories.txt index a3cbc66469..b8e9747b92 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -3527,11 +3527,6 @@ vi:Đá ranh giới zh-Hans:界碑 zh-Hant:界碑 -boundary-marker -en:Boundary Marker -de:4Grenzstein|4Markstein -pl:Znak graniczny - historic-castle|@category_tourism en:4Castle|4Palace|4Fortress|U+1F3EF|U+1F3F0|U+1F451|U+1F478|Hillfort|Kremlin|Manor house ar:قلعة|سياحة|أماكن جذابة|مناظر|كاسترا|الكنيسة المحصنة|حصون التلال|كرملين|قصر مالك العزبة|قصر|شاتو -- 2.45.3 From e833f77c6e635d596c73a7d98b7c357718820a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20M=C4=99drek?= Date: Thu, 9 May 2024 23:07:22 +0200 Subject: [PATCH 4/7] Updated translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kuba Mędrek --- data/strings/types_strings.txt | 41 +++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 16b0ca6fc7..97bb3b5c60 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -6522,8 +6522,47 @@ [type.boundary.marker] en = Boundary Marker - de = Grenzstein + af = Grensmerker + ar = علامة الحدود + az = Sərhəd işarəsi + be = Межавы знак + bg = Граничен маркер + ca = Marcador de límit + cs = Hraniční značka + da = Grænsemarkør + de = Grenzmarkierung + el = Οριακός δείκτης + es = Hito fronterizo + et = Piirimärk + eu = Muga-markatzailea + fa = نشانگر مرز + fi = Rajamerkki + fr = Marqueur de frontière + he = סמן גבול + hi = सीमा चिन्हक + hu = Határjelző + id = Penanda batas + it = Marcatore di confine + ja = バウンダリーマーカー + ko = 경계 마커 + lt = Ribų žymeklis + mr = सीमा चिन्हक + nb = Grensemarkør + nl = Grensmarkering pl = Znak graniczny + pt = Marcador de fronteira + pt-BR = Marcador de limite + ro = Marcaj de delimitare + ru = Пограничный знак + sk = Hraničná značka + sv = Gränsmarkör + sw = Alama ya mpaka + th = เครื่องหมายเขตแดน + tr = Sınır işaretleyici + uk = Прикордонний знак + vi = Điểm đánh dấu ranh giới + zh-Hans = 界标 + zh-Hant = 界碑 [type.boundary.national_park] en = National Park -- 2.45.3 From 7f8094acadf924d7c867eaa96f8c48263b025721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20M=C4=99drek?= Date: Thu, 9 May 2024 23:24:30 +0200 Subject: [PATCH 5/7] More review changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kuba Mędrek --- data/styles/clear/include/priorities_4_overlays.prio.txt | 2 +- data/styles/outdoors/include/priorities_4_overlays.prio.txt | 3 +-- data/styles/vehicle/include/priorities_4_overlays.prio.txt | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index ad77a69934..27915b6a47 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -1172,8 +1172,8 @@ power-station # icon z17- (also has captio === 230 barrier-entrance # icon z16- (also has caption(optional) z16-) +boundary-marker # icon z18- entrance-main # icon z18- (also has caption(optional) z18-) -boundary-marker # icon z16- (also has caption(optional) z18-) === 220 historic-anchor # icon z18- (also has caption(optional) z18-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 17d0eabc78..979f5d81d9 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -966,7 +966,6 @@ amenity-kindergarten # icon z17- (also has captio amenity-school # icon z17- (also has caption(optional) z17-, area z15-) historic-archaeological_site # icon z17- (also has caption(optional) z17-) historic-boundary_stone # icon z16- (also has caption(optional) z16-) -boundary-marker # icon z16- (also has caption(optional) z16-) historic-gallows # icon z16- (also has caption(optional) z17-) historic-memorial-cross # icon z17- (also has caption(optional) z17-) historic-pillory # icon z16- (also has caption(optional) z17-) @@ -1174,6 +1173,7 @@ power-station # icon z17- (also has captio barrier-entrance # icon z16- (also has caption(optional) z16-) entrance-main # icon z18- (also has caption(optional) z18-) +boundary-marker # icon z16- === 220 historic-anchor # icon z18- (also has caption(optional) z18-) @@ -1874,7 +1874,6 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-school # caption(optional) z17- (also has icon z17-, area z15-) # historic-archaeological_site # caption(optional) z17- (also has icon z17-) # historic-boundary_stone # caption(optional) z16- (also has icon z16-) -# boundary-marker # caption(optional) z16- (also has icon z16-) # historic-gallows # caption(optional) z17- (also has icon z16-) # historic-memorial-cross # caption(optional) z17- (also has icon z17-) # historic-pillory # caption(optional) z17- (also has icon z16-) diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 737658afd4..ca2e47dc68 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -516,7 +516,6 @@ amenity-charging_station-bicycle # icon z16- (also has captio === 850 historic-boundary_stone # icon z16- (also has caption(optional) z16-) -boundary=marker # icon z16- (also has caption(optional) z16-) historic-gallows # icon z16- (also has caption(optional) z16-) historic-pillory # icon z16- (also has caption(optional) z16-) historic-ship # icon z16- (also has caption(optional) z16-) @@ -1004,7 +1003,6 @@ entrance-main # icon z18- (also has captio # === -9150 # historic-boundary_stone # caption(optional) z16- (also has icon z16-) -# boundary-marker # caption(optional) z16- (also has icon z16-) # historic-gallows # caption(optional) z16- (also has icon z16-) # historic-pillory # caption(optional) z16- (also has icon z16-) # historic-ship # caption(optional) z16- (also has icon z16-) -- 2.45.3 From 91b154f15ca2055bd8ca25e167b708a0b612a075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20M=C4=99drek?= Date: Thu, 9 May 2024 23:54:11 +0200 Subject: [PATCH 6/7] [styles] Regenerate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kuba Mędrek --- data/classificator.txt | 1 + data/drules_proto.bin | Bin 420656 -> 420755 bytes data/drules_proto.txt | 38 ++++++++++++++++++ data/drules_proto_clear.bin | Bin 407559 -> 407626 bytes data/drules_proto_clear.txt | 24 +++++++++++ data/drules_proto_dark.bin | Bin 406151 -> 406218 bytes data/drules_proto_dark.txt | 24 +++++++++++ data/drules_proto_outdoors_clear.bin | Bin 423739 -> 423838 bytes data/drules_proto_outdoors_clear.txt | 38 ++++++++++++++++++ data/drules_proto_outdoors_dark.bin | Bin 422212 -> 422311 bytes data/drules_proto_outdoors_dark.txt | 38 ++++++++++++++++++ .../include/priorities_4_overlays.prio.txt | 2 +- data/types.txt | 1 + data/visibility.txt | 1 + 14 files changed, 166 insertions(+), 1 deletion(-) diff --git a/data/classificator.txt b/data/classificator.txt index ae2eae1738..88581ef2bb 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -231,6 +231,7 @@ world + 3 - 4 - {} + marker - national_park - protected_area + 1 - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index a6f2cc784f9049fdf5dfd378e731b6a20ccfe45b..cf8bb9e870d7d359048b6c0acd8b7348acd560ba 100644 GIT binary patch delta 127 zcmdmRO>**e$qkIRlM=c3lk!XRQWA?Qb#oJovQvwM_&5ZVxVTtT@=J7cCGIc+`GRPC hAvC@)8easN-*mg}He=gurncM6ZMRvr-DWkI0028yB~}0c delta 34 mcmbPyU2?-U$qkIRn^SJLr`%=)VkRJF24a@&DYsemCjbB|We`mO diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 2b41441433..932cf3fc7a 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -16877,6 +16877,44 @@ cont { } } } +cont { + name: "boundary-marker" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 17 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 18 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 19 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 20 + symbol { + name: "dot-m" + priority: 220 + } + } +} cont { name: "boundary-national_park" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 79b12dbae1fbc93d6fda76bb1c9159e858549d69..2f11297e67ad2fa7d3e8031b40fc101a4899b14c 100644 GIT binary patch delta 101 zcmZqwAaUx0#D=QNPL5psN%^IDDTzguy19u(*{MZBd>lebTwJUv`6ar!5_cGZd|@=c c2r|F9@^X9SWkw)o0%B$$X4zhOnYAwk0H3QO5dZ)H delta 34 mcmX^0L8ASG#D=QN&3iAm@4d_j#7scU48$zk_g-f0O#uL0pc54U diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 2f9eef40da..646f3dc512 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -16279,6 +16279,30 @@ cont { } } } +cont { + name: "boundary-marker" + element { + scale: 18 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 19 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 20 + symbol { + name: "dot-m" + priority: 220 + } + } +} cont { name: "boundary-national_park" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 86009ac3c3ceb5ae0d44afef6315729ced612a53..4e5626752ecd63692545bb3266ea6b12142f0433 100644 GIT binary patch delta 101 zcmZpFDsk$m#0I&`PL5psN%^IDDTzguy19u(*{MZBd>lebTwJUv`6ar!5_cGZd|@=c c2r|D}_Hw)IWkw)o0%B$$X4x)#nKdgO097L&P5=M^ delta 34 lcmX^0RHFT<#0I&`&54)W6E8CYF%u9o12N0?#LKLi@c=LG5K;gD diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 0485a75aa8..4c90ba80b4 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -16279,6 +16279,30 @@ cont { } } } +cont { + name: "boundary-marker" + element { + scale: 18 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 19 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 20 + symbol { + name: "dot-m" + priority: 220 + } + } +} cont { name: "boundary-national_park" element { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index 30d1f2c7bdff584581fb9a8e9f755b46df1d7c3d..6269703079b425566f9b01fba974239ec4564cf4 100644 GIT binary patch delta 133 zcmdn}PIBIR$qn~!Bqeh3C*_ysr6d+r>gFaEWv3Pi@o@+!adEMxJz#6lk!XRQWA?Qb#oJovQvwM_&5ZVxVTtT@=J7cCGIc+`GRPC zAvC@)8easN&$WVuOAKyDUSdgReqLfud;!ohA?4=zH`?dlU<6_&AZ7+)mhJOzur8ee E0CHwDTmS$7 delta 34 mcmZ4fSn|jt$qmgnnxEZhe|Ccrh?#(x8Hic7KfA$ta0UQwIuxJ) diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index a481300782..28e9926a37 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -16724,6 +16724,44 @@ cont { } } } +cont { + name: "boundary-marker" + element { + scale: 16 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 17 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 18 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 19 + symbol { + name: "dot-m" + priority: 220 + } + } + element { + scale: 20 + symbol { + name: "dot-m" + priority: 220 + } + } +} cont { name: "boundary-national_park" element { diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 979f5d81d9..f019f45b3f 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1172,8 +1172,8 @@ power-station # icon z17- (also has captio === 230 barrier-entrance # icon z16- (also has caption(optional) z16-) -entrance-main # icon z18- (also has caption(optional) z18-) boundary-marker # icon z16- +entrance-main # icon z18- (also has caption(optional) z18-) === 220 historic-anchor # icon z18- (also has caption(optional) z18-) diff --git a/data/types.txt b/data/types.txt index 656f961166..5d73072b53 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1596,3 +1596,4 @@ amenity|recycling|container *railway|station|subway|boston *railway|subway_entrance|boston *leisure|miniature_golf +*boundary|marker diff --git a/data/visibility.txt b/data/visibility.txt index 821058f10d..67663b43e8 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -231,6 +231,7 @@ world 000000000000000000000 + 3 000010000000000000000 - 4 000001111111111111111 - {} + marker 000000000000000000000 - national_park 000000000011111111111 - protected_area 000000000000111111111 + 1 000000000011111111111 - -- 2.45.3 From 7525d7616297cdb99e6e2a14690452f3fd1d2905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20M=C4=99drek?= Date: Thu, 23 May 2024 01:20:23 +0200 Subject: [PATCH 7/7] Update translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kuba Mędrek --- data/strings/types_strings.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 97bb3b5c60..01253f8aed 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -6522,19 +6522,19 @@ [type.boundary.marker] en = Boundary Marker - af = Grensmerker ar = علامة الحدود az = Sərhəd işarəsi be = Межавы знак bg = Граничен маркер ca = Marcador de límit - cs = Hraniční značka + cs = Hraniční kámen da = Grænsemarkør - de = Grenzmarkierung + de = Grenzstein + en = Boundary Marker el = Οριακός δείκτης es = Hito fronterizo et = Piirimärk - eu = Muga-markatzailea + eu = Mugarria fa = نشانگر مرز fi = Rajamerkki fr = Marqueur de frontière @@ -6550,9 +6550,8 @@ nb = Grensemarkør nl = Grensmarkering pl = Znak graniczny - pt = Marcador de fronteira - pt-BR = Marcador de limite - ro = Marcaj de delimitare + pt = Marco de fronteira + ro = Piatră de hotar ru = Пограничный знак sk = Hraničná značka sv = Gränsmarkör -- 2.45.3