Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7359)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7360)
@@ -22,10 +22,8 @@
     object-z-index: 20;
     icon-image: "misc/fixme-annotation.png";
-/*    priority="10000"*/
 }
 node[note]::core_note {
     object-z-index: 10;
     icon-image: "misc/note-annotation.png";
-/*    priority="-100000"*/
 }
 
@@ -114,9 +112,7 @@
     icon-image: "misc/housenumber.png";
     text: auto;
-/*    priority="-50000"*/
 }
 way["addr:interpolation"=odd] {
     width: 1;
-    realwidth: 1;
     color: address#1C86EE;
     dashes: 15,4;
@@ -124,5 +120,4 @@
 way["addr:interpolation"=even] {
     width: 1;
-    realwidth: 1;
     color: address#1C86EE;
     dashes: 4,4;
@@ -131,5 +126,4 @@
 way["addr:interpolation"=alphabetic] {
     width: 1;
-    realwidth: 1;
     color: address#1C86EE;
     dashes: 2,2;
@@ -137,10 +131,8 @@
 area[building][!building?!] {
     fill-color: building#cb9999;
-/*    priority="-10000"*/
 }
 node[building][!building?!] {
     icon-image: "misc/landmark/building.png";
     text: auto;
-/*    priority="-10000"*/
 }
 node[building=garage] {
@@ -155,5 +147,4 @@
     icon-image: "misc/entrance-yes.png";
     text: auto;
-/*    priority="100"*/
 }
 node[entrance=yes] {
@@ -208,5 +199,4 @@
 node[access?!] {
     icon-image: "vehicle/restriction/access.png";
-/*    priority="-100"*/
 }
 node[access=permissive],
@@ -215,23 +205,18 @@
     icon-image: "misc/no_icon.png";
     text: auto;
-/*    priority="-100"*/
 }
 node[bicycle?!] {
     icon-image: "vehicle/restriction/bicycle.png";
-/*    priority="-100"*/
 }
 node[bicycle=designated] {
     icon-image: "vehicle/restriction/bicycle-designated.png";
     text: auto;
-/*    priority="-100"*/
 }
 node[foot?!] {
     icon-image: "vehicle/restriction/foot.png";
-/*    priority="-100"*/
 }
 node[foot=designated] {
     icon-image: "vehicle/restriction/foot-designated.png";
     text: auto;
-/*    priority="-100"*/
 }
 node[goods?!],
@@ -260,5 +245,4 @@
 node[noexit?] {
     icon-image: "vehicle/restriction/dead_end.png";
-/*    priority="-100"*/
 }
 node[maxweight] {
@@ -467,55 +451,44 @@
 way[highway=motorway] {
     width: 3;
-    realwidth: 8;
     color: motorway#809bc0;
 }
 way[highway=motorway_link] {
     width: 3;
-    realwidth: 5;
     color: motorway#809bc0;
 }
 way[highway=trunk] {
     width: 3;
-    realwidth: 8;
     color: trunk#7fc97f;
 }
 way[highway=trunk_link] {
     width: 3;
-    realwidth: 5;
     color: trunk#7fc97f;
 }
 way[highway=primary] {
     width: 3;
-    realwidth: 8;
     color: primary#fb805f;
 }
 way[highway=primary_link] {
     width: 3;
-    realwidth: 5;
     color: primary#fb805f;
 }
 way[highway=secondary] {
     width: 3;
-    realwidth: 6;
     color: secondary#fdbf6f;
 }
 way[highway=secondary_link] {
     width: 3;
-    realwidth: 5;
     color: secondary#fdbf6f;
 }
 way[highway=tertiary] {
     width: 2;
-    realwidth: 5;
     color: tertiary#f7f496;
 }
 way[highway=tertiary_link] {
     width: 2;
-    realwidth: 4;
     color: tertiary#f7f496;
 }
 way[highway=unclassified] {
     width: 2;
-    realwidth: 5;
     color: street#c0c0c0;
 }
@@ -524,10 +497,8 @@
     casing-width: 0.5;
     casing-color: #ff9696;
-    realwidth: 5;
     color: #770000;
 }
 way[highway=unsurfaced] {
     width: 1;
-    realwidth: 3;
     color: street#c0c0c0;
 }
@@ -537,16 +508,12 @@
 way[highway=track] {
     width: 1;
-    realwidth: 3;
     color: highway_track#006600;
-/*    priority="-10000"*/
 }
 way[highway=residential] {
     width: 2;
-    realwidth: 5;
     color: street#c0c0c0;
 }
 way[highway=living_street] {
     width: 2;
-    realwidth: 3;
     dashes: 9,9;
     dashes-background-color: livingdashed#00ff00;
@@ -558,15 +525,12 @@
 way[highway=service][!area?] {
     width: 1;
-    realwidth: 3;
     color: service#809bc0;
 }
 way[highway=bridleway] {
     width: 1;
-    realwidth: 2;
     color: horse#c08000;
 }
 way[highway=cycleway] {
     width: 1;
-    realwidth: 2;
     color: bicycle#b100ff;
 }
@@ -576,10 +540,8 @@
 way[highway=footway][!area?] {
     width: 1;
-    realwidth: 1;
     color: foot#00ff00;
 }
 way[highway=path][bicycle!=designated][bicycle!=official][foot!=designated][foot!=official] {
     width: 1;
-    realwidth: 1;
     dashes: 9,9;
     color: foot#00ff00;
@@ -589,23 +551,17 @@
 way[highway=path][bicycle=official] {
     width: 1;
-    realwidth: 2;
     color: bicycle#b100ff;
-/*    priority="100"*/
 }
 way[highway=path][foot=designated],
 way[highway=path][foot=official] {
     width: 1;
-    realwidth: 1;
     color: foot#00ff00;
-/*    priority="100"*/
 }
 way[highway=path][bicycle=designated][foot=designated],
 way[highway=path][bicycle=official][foot=official] {
     width: 1;
-    realwidth: 2;
     color: bicycle#b100ff;
     dashes: 14,14;
     dashes-background-color: foot#00ff00;
-/*    priority="200"*/
 }
 way[highway=cycleway][foot=yes],
@@ -613,5 +569,4 @@
 way[highway=path][bicycle=official][foot=yes] {
     width: 1;
-    realwidth: 2;
     color: bicycle#b100ff;
     dashes: 21,7;
@@ -622,5 +577,4 @@
 way[highway=path][bicycle=yes][foot=official] {
     width: 1;
-    realwidth: 2;
     color: foot#00ff00;
     dashes: 21,7;
@@ -629,5 +583,4 @@
 way[highway=pedestrian][area?], relation[type=multipolygon][highway=pedestrian] {
     width: 3;
-    realwidth: 5;
     color: foot#00ff00;
     fill-color: foot#00ff00;
@@ -635,10 +588,8 @@
 way[highway=pedestrian] {
     width: 3;
-    realwidth: 5;
     color: foot#00ff00;
 }
 way[highway=steps] {
     width: 1;
-    realwidth: 1;
     color: foot#00ff00;
     dashes: 2,2;
@@ -660,5 +611,4 @@
     icon-image: "vehicle/restriction/roundabout_left.png";
     text: auto;
-/*    priority="10000"*/
 }
 node[highway=mini_roundabout] {
@@ -726,5 +676,4 @@
     z-index: 1;
     width: 2;
-    realwidth: 5;
     color: water#0000ff;
     dashes: 9,9;
@@ -755,13 +704,10 @@
 way[highway=construction] {
     width: 2;
-    realwidth: 5;
     color: construction#ffff00;
     dashes: 9,9;
-/*    priority="10"*/
 }
 node[highway=construction] {
     icon-image: "misc/construction.png";
     text: auto;
-/*    priority="10"*/
 }
 area[highway=emergency_access_point] {
@@ -802,5 +748,4 @@
     icon-image: "vehicle/traffic_calming.png";
     text: auto;
-/*    priority="-5"*/
 }
 node[traffic_calming=chicane] {
@@ -1102,5 +1047,4 @@
     icon-image: "misc/landmark/power.png";
     text: auto;
-/*    priority="-10000"*/
 }
 
@@ -1815,5 +1759,4 @@
     icon-image: "vehicle/parking.png";
     text: auto;
-/*    priority="-500"*/
 }node[amenity=parking] {
     icon-image: vehicle/parking.png;
@@ -1823,15 +1766,12 @@
     icon-image: "vehicle/parking/multi-storey.png";
     text: auto;
-/*    priority="10000"*/
 }
 node[amenity=motorcycle_parking] {
     icon-image: "vehicle/parking/motorbike.png";
     text: auto;
-/*     priority="20000";*/
 }
 node[amenity=bicycle_parking] {
     icon-image: "vehicle/parking/bicycle.png";
     text: auto;
-/*    priority="20000"*/
 }
 node[parking=park_and_ride] {
@@ -1874,10 +1814,8 @@
     icon-image: "vehicle/fuel.png";
     text: auto;
-/*    priority="10000"*/
 }
 node[amenity=charging_station] {
     icon-image: "vehicle/fuel/charging_station.png";
     text: auto;
-/*    priority="1000"*/
 }
 node[amenity=grit_bin] {
@@ -1986,5 +1924,4 @@
     icon-image: "religion.png";
     text: auto;
-/*    priority="-10000"*/
 }
 node[amenity=place_of_worship][religion=bahai] {
@@ -2228,5 +2165,4 @@
 node[amenity=vending_machine] {
     icon-image: "transport/ticket-machine.png";
-/*    priority="-10"*/
 }
 node[vending=excrement_bags] {
@@ -2374,5 +2310,4 @@
     icon-image: "misc/information/guidepost.png";
     text: auto;
-/*    priority="10"*/
 }
 area[information=office] {
@@ -2382,15 +2317,12 @@
     icon-image: "misc/information/informationoffice.png";
     text: auto;
-/*    priority="10"*/
 }
 node[information=map] {
     icon-image: "misc/information/map.png";
     text: auto;
-/*    priority="10"*/
 }
 node[information=board] {
     icon-image: "misc/information/board.png";
     text: auto;
-/*    priority="10"*/
 }
 
@@ -2672,5 +2604,4 @@
     icon-image: "transport/railway_small.png";
     text: auto;
-/*    priority="-10"*/
 }
 node[highway=bus_stop] {
@@ -2681,25 +2612,20 @@
     icon-image: "transport/bus_small.png";
     text: auto;
-/*    priority="4"*/
 }
 node[public_transport=stop_position][aerial=yes] {
     icon-image: "transport/aerialway.png";
     text: auto;
-/*    priority="6"*/
 }
 node[public_transport=stop_position][ferry=yes] {
     icon-image: "transport/ferry.png";
     text: auto;
-/*    priority="7"*/
 }
 node[public_transport=stop_position][tram=yes] {
     icon-image: "transport/tram.png";
     text: auto;
-/*    priority="8"*/
 }
 node[public_transport=stop_position][train=yes] {
     icon-image: "transport/railway_small.png";
     text: auto;
-/*    priority="10"*/
 }
 area[public_transport=platform]:closed {
@@ -2708,5 +2634,4 @@
 way[public_transport=platform]!:closed {
     width: 3;
-    realwidth: 1;
     color: service#809bc0;
     dashes: 12,3;
@@ -2715,20 +2640,16 @@
     icon-image: "transport/bus_small.png";
     text: auto;
-/*    priority="-10"*/
 }
 node[public_transport=platform][bus=yes] {
     icon-image: "transport/bus_small.png";
     text: auto;
-/*    priority="4"*/
 }
 node[public_transport=platform][aerial=yes] {
     icon-image: "transport/aerialway/station.png";
     text: auto;
-/*    priority="6"*/
 }
 node[public_transport=platform][ferry=yes] {
     icon-image: "transport/ferry.png";
     text: auto;
-/*    priority="7"*/
 }
 node[public_transport=platform][tram=yes],
@@ -2736,5 +2657,4 @@
     icon-image: "transport/railway_station.png";
     text: auto;
-/*    priority="10"*/
 }
 
@@ -2780,5 +2700,4 @@
 way[railway=rail][service=siding] {
     width: 1;
-/*    priority="2"*/
 }
 way[railway=rail][service=yard],
@@ -2786,5 +2705,4 @@
     width: 1;
     color: railyard#552200
-/*    priority="2"*/
 }
 /* draw tram on top of other way (highway=*) or
@@ -2827,5 +2745,4 @@
     color: oldrail#404040;
     dashes: 9,9;
-/*    priority="-10000"*/
 }
 way[railway=narrow_gauge],
@@ -2901,5 +2818,4 @@
 way[aeroway=runway] {
     width: 3;
-    realwidth: 10;
     color: aeroway_dark#330000;
 }
@@ -2910,5 +2826,4 @@
 way[aeroway=taxiway] {
     width: 2;
-    realwidth: 10;
     color: aeroway#660000;
 }
@@ -3162,5 +3077,4 @@
     icon-image: "misc/landmark/trees_conifer.png";
     text: auto;
-/*    priority="10"*/
 }
 node[natural=tree][type=broad_leaved],
@@ -3168,10 +3082,8 @@
     icon-image: "misc/landmark/trees_broad_leaved.png";
     text: auto;
-/*    priority="10"*/
 }
 node[natural=tree][type=palm] {
     icon-image: "misc/landmark/trees_palm.png";
     text: auto;
-/*    priority="10"*/
 }
 
@@ -3182,27 +3094,21 @@
 way[waterway=river] {
     width: 2;
-    realwidth: 5;
     color: water#0000ff;
 }
 area[waterway=riverbank] {
     fill-color: riverbank#0000cf;
-/*    priority="10000"*/
-    width: 1;
-    realwidth: 5;
+    width: 1;
     color: riverbank#0000cf;
 }
 way[waterway=canal], way[waterway=wadi] {
     width: 2;
-    realwidth: 2;
     color: water#0000ff;
 }
 way[waterway=stream] {
     width: 1;
-    realwidth: 1;
     color: stream#6600cc;
 }
 way[waterway=ditch], way[waterway=drain] {
     width: 1;
-    realwidth: 1;
     color: water#0000ff;
 }
@@ -3617,5 +3523,4 @@
     color: boundary#FF6600;
     dashes: 9,9;
-/*    priority="-10"*/
 }
 way[admin_level=9]::core_boundary,