diff --git a/data/categories.txt b/data/categories.txt index 1626e27f5d..2d85821248 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -7149,6 +7149,17 @@ el:Φάρος sk:Maják fa:فانوس دریایی +man_made-survey_point +en:4Survey Point|survey marker|survey benchmark|4geodetic mark|geodetic vertex|4triangulation station|4trigonometrical point|trig point|trig pillar|4trig station|trig beacon|trig +be:4Геадэзічны пункт +de:4Vermessungspunkt +el:4Γεωδαιτικό σημείο +fr:4Borne géodésique +ja:測量標 +pl:4Znak geodezyjny +ru:4Геодезический пункт|Геодезический знак|4тригонометрический пункт|пункт триангуляции|тригопункт|4триангулятор +uk:4Геодезичний пункт + organic-only|organic-yes en:4organic|bio|biological|eco|ecological|healthy ar:بيولوجي|بيولوجي|صحي|بيولوجي|بيئي|طبيعي|عضوي diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 3147014512..147df3b1f9 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -53,7 +53,7 @@ waterway|riverbank;52; highway|path|bicycle;[highway=path][bicycle?];;name;int_name;53; landuse|meadow;54; highway|living_street;55; -deprecated|deprecated;56;x +man_made|survey_point;56; natural|peak;57; highway|motorway;58; highway|steps;59; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 7f910815d3..9fbde77828 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -11051,6 +11051,17 @@ uk = Просіка zh-Hans = 树林分界线 + [type.man_made.survey_point] + en = Survey Point + be = Геадэзічны пункт + de = Vermessungspunkt + el = Γεωδαιτικό σημείο + fr = Borne géodésique + ja = 測量標 + pl = Znak geodezyjny + ru = Геодезический пункт + uk = Геодезичний пункт + [type.man_made.flagpole] en = Flagpole be = Флагшток diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 6f881daf32..8b7525c3b5 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -1248,8 +1248,6 @@ area|z15-[tourism=camp_site] node|z16-[tourism=picnic_site], area|z16-[tourism=picnic_site], -node|z16-[amenity=shelter], -area|z16-[amenity=shelter], node|z16-[highway=rest_area], area|z16-[highway=rest_area] {icon-image: picnic-m.svg;icon-min-distance: 10;} @@ -1257,6 +1255,10 @@ node|z16-[leisure=picnic_table], area|z16-[leisure=picnic_table] {icon-image: picnic_table-m.svg;icon-min-distance: 10;} +node|z16-[amenity=shelter], +area|z16-[amenity=shelter] +{icon-image: shelter-m.svg;icon-min-distance: 10;} + node|z16[tourism=caravan_site], area|z16[tourism=caravan_site] {icon-image: caravan_site-m.svg;font-size: 11;icon-min-distance: 30;} @@ -1382,6 +1384,7 @@ node|z16-[leisure=dog_park], area|z16-[leisure=dog_park], node|z16-[man_made=windmill], area|z16-[man_made=windmill], +node|z16-[man_made=survey_point], node|z17-[amenity=pharmacy], area|z17-[amenity=pharmacy], node|z17-[amenity=clinic], @@ -2005,7 +2008,7 @@ area|z17-[aeroway=gate] {icon-image: gate-m.svg;font-size: 11;} node|z18-[aeroway=gate], area|z18-[aeroway=gate] -{icon-image: gate-m.svg;tfont-size: 11;z-index: 24200;}/*check*/ +{icon-image: gate-m.svg;font-size: 11;z-index: 24200;}/*check*/ node|z17-[amenity=bureau_de_change] {icon-image: banknote-m.svg;font-size: 11;text-optional: true;} @@ -2055,8 +2058,8 @@ node|z18-[amenity=bbq], area|z18-[amenity=bbq] {icon-image: bbq-m.svg;font-size: 11;-x-me-text-priority:16000;text-optional: true;} -node|z19-[man_made=survey_point] -{icon-image: survey_point-m.svg;} +node|z16-[man_made=survey_point] +{icon-image: survey_point-m.svg;font-size: 11;text-optional: true;} /* 6. SHOP */ diff --git a/data/styles/clear/style-clear/symbols/shelter-m.svg b/data/styles/clear/style-clear/symbols/shelter-m.svg new file mode 100644 index 0000000000..37d8323529 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/shelter-m.svg @@ -0,0 +1,11 @@ + + + shelter-m + + + + + + + + diff --git a/data/styles/clear/style-clear/symbols/survey_point-m.svg b/data/styles/clear/style-clear/symbols/survey_point-m.svg new file mode 100644 index 0000000000..8bdd083d9e --- /dev/null +++ b/data/styles/clear/style-clear/symbols/survey_point-m.svg @@ -0,0 +1,15 @@ + + + survey_point-m + + + + + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/shelter-m.svg b/data/styles/clear/style-night/symbols/shelter-m.svg new file mode 100644 index 0000000000..a3a61da082 --- /dev/null +++ b/data/styles/clear/style-night/symbols/shelter-m.svg @@ -0,0 +1,11 @@ + + + shelter-m + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/survey_point-m.svg b/data/styles/clear/style-night/symbols/survey_point-m.svg new file mode 100644 index 0000000000..ccad3148de --- /dev/null +++ b/data/styles/clear/style-night/symbols/survey_point-m.svg @@ -0,0 +1,15 @@ + + + survey_point-m + + + + + + + + + + + + diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 276a7befa3..5eb20b47c4 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1800,6 +1800,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"man_made", "chimney"}, {"man_made", "cutline"}, {"man_made", "lighthouse"}, + {"man_made", "survey_point"}, {"man_made", "pier"}, {"man_made", "silo"}, {"man_made", "storage_tank"},