diff --git a/data/categories.txt b/data/categories.txt index 234945319..e80f6162c 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -14121,6 +14121,10 @@ el:Καμινάδα εργοστασίου sk:Komín mr:कारखाना चिमणी +man_made-crane +en:Crane +ru:Кран + man_made-tower|man_made-flare en:Tower ru:Башня diff --git a/data/editor.config b/data/editor.config index a74041062..77d127d39 100644 --- a/data/editor.config +++ b/data/editor.config @@ -731,7 +731,7 @@ --> - + @@ -1241,6 +1241,8 @@ + + @@ -1253,6 +1255,7 @@ + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index ca1ab41db..44d364d76 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1016,7 +1016,7 @@ historic|memorial|cross;[historic=memorial][memorial=cross];;name;int_name;895; historic|gallows;[historic=gallows];;name;int_name;896; historic|pillory;[historic=pillory];;name;int_name;897; amenity|money_transfer;898; -deprecated|deprecated;899;x +man_made|crane;899; railway|subway|darkgreen;[railway=subway][colour=darkgreen];x;name;int_name;900;railway|subway|tunnel deprecated|deprecated;901;x railway|subway|gray;[railway=subway][colour=gray];x;name;int_name;902;railway|subway|tunnel diff --git a/data/styles/default/dark/symbols/crane-m.svg b/data/styles/default/dark/symbols/crane-m.svg new file mode 100644 index 000000000..26fc374c5 --- /dev/null +++ b/data/styles/default/dark/symbols/crane-m.svg @@ -0,0 +1,12 @@ + + + + + + image/svg+xml + + + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index e0977ad47..b9c39bcda 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1076,6 +1076,8 @@ node|z18-[shop=lottery], node|z18-[shop=hearing_aids], node|z18-[man_made=chimney], area|z18-[man_made=chimney], +node|z18-[man_made=crane], +area|z18-[man_made=crane], node|z18-[man_made=silo], area|z18-[man_made=silo], node|z18-[man_made=storage_tank], @@ -1841,6 +1843,10 @@ node|z16-[man_made=chimney], area|z16-[man_made=chimney], {icon-image: chimney-m.svg;font-size: 11;} +node|z16-[man_made=crane], +area|z16-[man_made=crane], +{icon-image: crane-m.svg;font-size: 11;} + node|z16-[man_made=works], area|z16-[man_made=works] {icon-image: factory-m.svg;font-size: 11;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index b8440b975..c500d0b29 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1094,6 +1094,7 @@ landuse-vineyard # caption z15- (also has are leisure-ice_rink # icon z17- (also has caption(optional) z17-) leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) man_made-chimney # icon z16- (also has caption(optional) z18-) +man_made-crane # icon z16- (also has caption(optional) z18-) man_made-flagpole # icon z15- man_made-flare # icon z16- (also has caption(optional) z18-) man_made-tower # icon z16- (also has caption(optional) z18-) @@ -2034,6 +2035,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-ice_rink # caption(optional) z17- (also has icon z17-) # leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) # man_made-chimney # caption(optional) z18- (also has icon z16-) +# man_made-crane # caption(optional) z18- (also has icon z16-) # man_made-flare # caption(optional) z18- (also has icon z16-) # man_made-tower # caption(optional) z18- (also has icon z16-) # man_made-tower-communication # caption(optional) z18- (also has icon z16-) diff --git a/data/styles/default/light/symbols/crane-m.svg b/data/styles/default/light/symbols/crane-m.svg new file mode 100644 index 000000000..af5cd5ff2 --- /dev/null +++ b/data/styles/default/light/symbols/crane-m.svg @@ -0,0 +1,12 @@ + + + + + + image/svg+xml + + + + + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 040cef7ad..5afcd21fd 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1095,6 +1095,7 @@ landuse-vineyard # caption z15- (also has are leisure-ice_rink # icon z17- (also has caption(optional) z17-) leisure-pitch # icon z17- (also has caption(optional) z17-, area z15-) man_made-chimney # icon z16- (also has caption(optional) z18-) +man_made-crane # icon z16- (also has caption(optional) z18-) man_made-flagpole # icon z12- (also has caption(optional) z14-) man_made-flare # icon z13- (also has caption(optional) z18-) man_made-tower # icon z13- (also has caption(optional) z14-) @@ -2037,6 +2038,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # leisure-ice_rink # caption(optional) z17- (also has icon z17-) # leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) # man_made-chimney # caption(optional) z18- (also has icon z16-) +# man_made-crane # caption(optional) z18- (also has icon z16-) # man_made-flagpole # caption(optional) z14- (also has icon z12-) # man_made-flare # caption(optional) z18- (also has icon z13-) # man_made-tower # caption(optional) z14- (also has icon z13-)