mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[classif] Add man_made=communications_tower

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2025-01-29 19:14:40 +03:00
parent 042e8ce025
commit 8f8a4449a7
10 changed files with 47 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/categories.txt
View file

@ -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

2
data/mapcss-mapping.csv
View file

@ -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

Can't render this file because it contains an unexpected character in line 7 and column 16.

10
data/strings/types_strings.txt
View file

@ -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

7
data/styles/default/include/Icons.mapcss
View file

@ -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],

1
data/styles/default/include/priorities_4_overlays.prio.txt
View file

@ -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-)

15
data/styles/outdoors/include/Icons.mapcss
View file

@ -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],

1
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View file

@ -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-)

5
data/styles/vehicle/include/Icons.mapcss
View file

@ -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;}

1
data/styles/vehicle/include/priorities_4_overlays.prio.txt
View file

@ -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-

9
generator/generator_tests/osm_type_test.cpp
View file

@ -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"},