From d666629e84c7aa23c5e9e6ed7af7c7a874911f71 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Wed, 20 Oct 2021 22:42:06 +0100 Subject: [PATCH] [classifier] Added man_made=silo/storage_tank. Signed-off-by: Viktor Govako --- data/mapcss-mapping.csv | 4 ++-- data/strings/types_strings.txt | 12 ++++++++++++ data/styles/clear/include/Icons.mapcss | 10 ++++++++++ .../clear/style-clear/symbols/storage-tank.svg | 17 +++++++++++++++++ .../clear/style-night/symbols/storage-tank.svg | 17 +++++++++++++++++ generator/generator_tests/osm_type_test.cpp | 2 ++ 6 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 data/styles/clear/style-clear/symbols/storage-tank.svg create mode 100644 data/styles/clear/style-night/symbols/storage-tank.svg diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index c51f0d8f50..c98628eec6 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -298,8 +298,8 @@ highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297; railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298; man_made|lighthouse;299; highway|path|demanding_mountain_hiking;[highway=path][sac_scale=demanding_mountain_hiking];;name;int_name;300; -deprecated|deprecated;301;x -deprecated|deprecated;302;x +man_made|storage_tank;301; +man_made|silo;302; power|generator;303; highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304; man_made|pipeline|overground;[man_made=pipeline][location=overground];;name;int_name;305; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 2c1e36b7fa..2d92d48c00 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -12626,6 +12626,18 @@ pt-BR = Pipeline subterrâneo zh-Hans = 地面管道 + [type.man_made.silo] + en = Silo + be = Сілас + ru = Элеватор + uk = Силос + + [type.man_made.storage_tank] + en = Storage Tank + be = Рэзервуар + ru = Резервуар + uk = Резервуар + [type.man_made.surveillance] en = Surveillance Camera ar = كاميرا مراقبة diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index b57b59e6dd..73898794cc 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -1694,6 +1694,10 @@ node|z18-[man_made=chimney], area|z18-[man_made=chimney], node|z18-[man_made=works], area|z18-[man_made=works], +node|z18-[man_made=silo], +area|z18-[man_made=silo], +node|z18-[man_made=storage_tank], +area|z18-[man_made=storage_tank], node|z18-[amenity=bbq], area|z18-[amenity=bbq], node|z19-[power=substation], @@ -2253,6 +2257,12 @@ node|z16-[man_made=works], area|z16-[man_made=works] {icon-image: chimney-m.svg;font-size: 11;} +node|z16-[man_made=silo], +area|z16-[man_made=silo], +node|z16-[man_made=storage_tank], +area|z16-[man_made=storage_tank], +{icon-image: storage-tank.svg;font-size: 11;} + node|z18-[amenity=bbq], area|z18-[amenity=bbq] {icon-image: bbq-m.svg;font-size: 11;-x-me-text-priority:16000;text-optional: true;} diff --git a/data/styles/clear/style-clear/symbols/storage-tank.svg b/data/styles/clear/style-clear/symbols/storage-tank.svg new file mode 100644 index 0000000000..7016a5551b --- /dev/null +++ b/data/styles/clear/style-clear/symbols/storage-tank.svg @@ -0,0 +1,17 @@ + + + storage-tank + + + + diff --git a/data/styles/clear/style-night/symbols/storage-tank.svg b/data/styles/clear/style-night/symbols/storage-tank.svg new file mode 100644 index 0000000000..83f3e62c1e --- /dev/null +++ b/data/styles/clear/style-night/symbols/storage-tank.svg @@ -0,0 +1,17 @@ + + + storage-tank + + + + diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 3ece8633b5..4e4865a586 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1664,6 +1664,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"man_made", "cutline"}, {"man_made", "lighthouse"}, {"man_made", "pier"}, + {"man_made", "silo"}, + {"man_made", "storage_tank"}, {"man_made", "water_tap"}, {"man_made", "windmill"}, {"man_made", "works"},