From e49e836f423082f88d80653fff1e55b233788728 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 30 Jan 2025 19:03:53 +0300 Subject: [PATCH] [classif] Add man_made=utility_pole Signed-off-by: Konstantin Pastbin --- data/mapcss-mapping.csv | 3 ++- data/strings/types_strings.txt | 4 ++++ data/styles/outdoors/include/Icons.mapcss | 1 + data/styles/outdoors/include/priorities_4_overlays.prio.txt | 1 + generator/generator_tests/osm_type_test.cpp | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index adfdd56cc5..35b77b7cbc 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -636,7 +636,8 @@ deprecated|deprecated;517;x deprecated|deprecated;518;x deprecated|deprecated;519;x sport|diving;520; -deprecated|deprecated;521;x +#~270k uses. +man_made|utility_pole;521; deprecated:boundary|administrative|suburb:04.2024;[boundary=administrative][border_type=suburb];x;name;int_name;522; deprecated|deprecated;523;x railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 8fc3cf1da5..ebd517fefc 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -23148,6 +23148,10 @@ comment = A single pole supporting minor power lines. en = Power Pole + [type.man_made.utility_pole] + comment = A single pole supporting various public utilities, such as lighting or telephony. + en = Utility Pole + [type.psurface] en = psurface af = Padoppervlak diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index 250854b61d..751d733066 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -367,6 +367,7 @@ node|z13[power=tower], node|z14-[power=tower], {icon-image: power-tower-m.svg;} node|z15-[power=pole], +node|z15-[man_made=utility_pole], {icon-image: mast-m.svg;} node|z13-[power=generator][generator:source=wind], diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index bf55d7836f..e12f147911 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1200,6 +1200,7 @@ emergency-emergency_ward_entrance # icon z18- (also has captio building # caption z16- (also has area z14-) building-garage # caption z16- (also has area z14-) building-has_parts # caption z16- (also has area z14-) +man_made-utility_pole power-plant # icon z17- power-plant-coal # icon z17- power-plant-gas # icon z17- diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 9b158ee839..bfda0cda04 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2509,6 +2509,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"man_made", "silo"}, {"man_made", "storage_tank"}, {"man_made", "tower"}, + // {"man_made", "utility_pole"}, // In the outdoor style only. {"man_made", "water_tap"}, {"man_made", "water_tower"}, {"man_made", "water_well"},