diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index f87d9f0c3..85d49721a 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -304,7 +304,8 @@ waterway|dam;200; amenity|charging_station|motorcar;[amenity=charging_station][motorcar?];;name;int_name;201; leisure|golf_course;202; highway|service|bridge;[highway=service][bridge?];;name;int_name;203; -highway|pedestrian|square;[highway=pedestrian][place=square];;name;int_name;204; +# ~250K usages. +power|portal;204; # Marsh 500K usages, wet_meadow 160K natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=wetland][wetland=wet_meadow],[natural=wetland][wetland=dambo];;;;205; leisure|stadium;206; @@ -996,7 +997,7 @@ deprecated|deprecated;871;x deprecated|deprecated;872;x area:highway|pedestrian;873; area:highway|unclassified;874; -deprecated|deprecated;875;x +highway|pedestrian|square;[highway=pedestrian][place=square];;;;875; deprecated|deprecated;876;x area:highway|cycleway;877; entrance|exit;878; diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 4589bbd74..f4e756bd1 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1216,6 +1216,7 @@ node|z14-[man_made=communications_tower], node|z17-[man_made=communications_tower], {font-size: 11;} +node|z19-[power=portal], 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 2c2526500..9955b07ca 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1200,6 +1200,7 @@ man_made-mast # icon z16- man_made-silo # icon z16- (also has caption(optional) z18-) man_made-storage_tank # icon z16- (also has caption(optional) z18-) man_made-water_tower # icon z16- (also has caption(optional) z18-) +power-portal # icon z19- power-tower # icon z19- === 450 diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index 9e63ee350..aeab4dbee 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -290,8 +290,10 @@ node|z14-[highway=ford], node|z16-[highway=ladder], {icon-image: ladder-m.svg;} +node|z13-[power=portal], node|z13[power=tower], {icon-image: mast-m.svg;} +node|z14-[power=portal], node|z14-[power=tower], {icon-image: power-tower-m.svg;} node|z15-[power=pole], diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 02462b5df..0e359e795 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1201,6 +1201,7 @@ man_made-mast # icon z13- (also has captio man_made-silo # icon z13- (also has caption(optional) z14-) man_made-storage_tank # icon z13- (also has caption(optional) z14-) man_made-water_tower # icon z13- (also has caption(optional) z14-) +power-portal # icon z13- power-tower # icon z13- === 450