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 a6f2cc784f..cf8bb9e870 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ 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 79b12dbae1..2f11297e67 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ 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 86009ac3c3..4e5626752e 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ 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 30d1f2c7bd..6269703079 100644 Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index 5573cc8ce1..ae6c5dc8db 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.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/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 6c15855106..4be4ad73bb 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ 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/editor.config b/data/editor.config index bd63d58877..edd40da90c 100644 --- a/data/editor.config +++ b/data/editor.config @@ -410,6 +410,9 @@ + + + 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..01253f8aed 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -6520,6 +6520,49 @@ [type.boundary.administrative.4] ref = type.boundary.administrative.3 + [type.boundary.marker] + en = Boundary Marker + ar = علامة الحدود + az = Sərhəd işarəsi + be = Межавы знак + bg = Граничен маркер + ca = Marcador de límit + cs = Hraniční kámen + da = Grænsemarkør + de = Grenzstein + en = Boundary Marker + el = Οριακός δείκτης + es = Hito fronterizo + et = Piirimärk + eu = Mugarria + 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 = Marco de fronteira + ro = Piatră de hotar + 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 af = Nasionale park diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index d45a26c55b..2a4cbc12cf 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -1771,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 9f40193307..27915b6a47 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -1172,6 +1172,7 @@ 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-) === 220 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/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 77d069d863..f019f45b3f 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1172,6 +1172,7 @@ power-station # icon z17- (also has captio === 230 barrier-entrance # icon z16- (also has caption(optional) z16-) +boundary-marker # icon z16- entrance-main # icon z18- (also has caption(optional) z18-) === 220 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 - 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"},