diff --git a/data/categories.txt b/data/categories.txt index 2dc9067038..5c4b8ee29e 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -12379,8 +12379,8 @@ sk:Stožiar tr:Direk uk:Щогла|вишка -man_made-tower-communication -en:Communications Tower|cell tower|cellular tower +man_made-communications_tower|man_made-tower-communication +en:Communications Tower|cell tower|cellular tower|mast ar:برج الاتصالات be:Вежа сувязі|вышка сувязі|сотавая вышка bg:Комуникационна кула @@ -12409,7 +12409,7 @@ pl:Wieża komunikacyjna pt:Torre de Comunicações pt-BR:Torre de Comunicações ro:Turnul de comunicații -ru:Вышка связи|cотовая вышка|башня связи +ru:Вышка связи|cотовая вышка|телекоммуникационная башня sk:Komunikačná veža sr:Комуникациони торањ|Komunikacioni toranj sv:Kommunikationstorn diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 463036aaae..5c99906bf3 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -582,7 +582,7 @@ railway|monorail|bridge;[railway=monorail][bridge?];;name;int_name;469; area:highway|steps;470; # ~90k usages. amenity|telephone;471; -deprecated|deprecated;472;x +man_made|communications_tower;472; deprecated|deprecated;473;x natural|grassland;474; deprecated|deprecated;475;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 6fe4b0a0a0..88dac7e087 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -18891,7 +18891,8 @@ zh-Hans = 高塔 zh-Hant = 塔 - [type.man_made.tower.communication] + [type.man_made.communications_tower] + comment = A huge telecommunications tower. Often a local monument or a landmark. en = Communications Tower af = Kommunikasietoring ar = برج اتصالات @@ -18922,7 +18923,7 @@ pt = Torre de comunicação pt-BR = Torre de comunicação ro = Turnul de comunicații - ru = Вышка связи + ru = Телекоммуникационная башня sk = Komunikačná veža sr = Телекомуникациони торањ sv = Kommunikationstorn @@ -18934,6 +18935,11 @@ zh-Hans = 通讯塔 zh-Hant = 通訊塔 + [type.man_made.tower.communication] + comment = A regular telecommunications tower / mast. + ref = type.man_made.communications_tower + ru = Вышка связи + [type.man_made.wastewater_plant] en = Wastewater Treatment Plant af = Watersuiweringsaanleg diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 553bc3e175..a7187e66ff 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -904,6 +904,7 @@ node|z14-[amenity=place_of_worship], area|z14-[amenity=place_of_worship], node|z14-[man_made=lighthouse], area|z14-[man_made=lighthouse], +node|z15-[man_made=communications_tower], node|z15-[amenity=hospital], node|z15-[landuse=landfill], area|z15-[landuse=landfill], @@ -1554,6 +1555,12 @@ node|z16-[barrier=cycle_barrier], node|z16-[highway=ford], {icon-image: ford-m.svg;} +/* TODO: needs a better icon */ +node|z14-[man_made=communications_tower], +{icon-image: mast-m.svg;} +node|z17-[man_made=communications_tower], +{font-size: 11;} + node|z19-[power=tower], node|z15-[man_made=flagpole], node|z16-[man_made=mast], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index fca79e1211..de8ae47173 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -303,6 +303,7 @@ highway-secondary-bridge # pathtext z10- (also has sh highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-) === 5600 +man_made-communications_tower man_made-lighthouse # icon z14- (also has caption(optional) z14-) natural-peak # icon z13- (also has caption(optional) z13-) natural-volcano # icon z12- (also has caption(optional) z13-) diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index 67bd456dd0..663f98e1b7 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -11,6 +11,7 @@ area|z11-[waterway=waterfall], node|z11-[natural=peak][name], node|z15-[natural=saddle], node|z12-[mountain_pass], +node|z13-[man_made=communications_tower], node|z14-[natural=spring], area|z14-[natural=spring], node|z14-[amenity=water_point], @@ -379,6 +380,20 @@ node|z13-[man_made=mast], {icon-image: dot-m.svg;} node|z14-[man_made=flagpole], node|z14-[man_made=mast], +{icon-image: mast-m.svg;} + +/* TODO: needs a better icon */ +node|z12-[man_made=communications_tower], +{icon-image: mast-m.svg;} +node|z13-[man_made=communications_tower], +{font-size: 11;} +node|z14-[man_made=communications_tower], +{icon-image: power-tower-m.svg;} +node|z16-[man_made=communications_tower], +{font-size: 12;} + +node|z14-[man_made=tower], +node|z14-[man_made=tower][tower:type=communication], {icon-image: mast-m.svg; font-size: 11;} node|z13-[man_made=tower], diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 2725429a21..14e276c94d 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -303,6 +303,7 @@ highway-secondary-bridge # pathtext z10- (also has sh highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-) === 5600 +man_made-communications_tower man_made-lighthouse # icon z11- (also has caption(optional) z14-) natural-peak # icon z10- (also has caption(optional) z11-) natural-volcano # icon z10- (also has caption(optional) z13-) diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index f83a8e2cba..4ccd75cb7c 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -519,6 +519,7 @@ area|z14-[barrier=toll_booth], node|z14-[barrier=border_control], node|z16-[barrier=lift_gate], area|z16-[barrier=lift_gate], +node|z16-[man_made=communications_tower], node|z17-[amenity=bank], area|z17-[amenity=bank], node|z17-[amenity=vending_machine][vending=fuel], @@ -649,6 +650,10 @@ area|z13-[barrier=toll_booth], node|z14-[barrier=border_control], {icon-image: bcontrol-m.svg;} +/* TODO: needs a better icon */ +node|z15-[man_made=communications_tower], +{icon-image: mast-m.svg;} + node|z16-[barrier=lift_gate], area|z16-[barrier=lift_gate] {icon-image: lift_gate-m.svg;icon-min-distance: 30;} diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index bb6b63850a..c3b200aa62 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -429,6 +429,7 @@ railway-station-subway-yokohama # icon z13- (also has captio barrier-border_control # icon z14- (also has caption(optional) z14-) historic-city_gate # icon z13- (also has caption(optional) z15-) historic-monument # icon z13- (also has caption(optional) z15-) +man_made-communications_tower === 1950 place-hamlet # caption z13- diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 061501c10f..9f394b2648 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2152,13 +2152,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) // {"landuse", "greenfield"}, // {"landuse", "greenhouse_horticulture"}, // {"landuse", "retail"}, - {"man_made", "cairn"}, // {"man_made", "pipeline"}, // {"man_made", "surveillance"}, - {"man_made", "tower"}, // {"man_made", "wastewater_plant"}, - {"man_made", "water_tower"}, - {"man_made", "water_well"}, // {"mapswithme", "grid"}, // {"military", "bunker"}, // {"natural", "cliff"}, @@ -2499,7 +2495,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"leisure", "track"}, {"leisure", "water_park"}, {"man_made", "breakwater"}, + {"man_made", "cairn"}, {"man_made", "chimney"}, + {"man_made", "communications_tower"}, {"man_made", "cross"}, {"man_made", "cutline"}, {"man_made", "embankment"}, @@ -2508,7 +2506,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"man_made", "pier"}, {"man_made", "silo"}, {"man_made", "storage_tank"}, + {"man_made", "tower"}, {"man_made", "water_tap"}, + {"man_made", "water_tower"}, + {"man_made", "water_well"}, {"man_made", "windmill"}, {"man_made", "works"}, {"natural", "bare_rock"},