Index: trunk/styles/standard/potlatch2.mapcss
===================================================================
--- trunk/styles/standard/potlatch2.mapcss	(revision 3898)
+++ trunk/styles/standard/potlatch2.mapcss	(revision 3898)
@@ -0,0 +1,314 @@
+/*
+
+	Potlatch 2 core stylesheet
+	
+	This stylesheet should contain commonly used features and only the most essential extra attributes
+	(e.g. oneway). It needs to remain simple (not too many nested styles or dash-type decorations) in
+	order not to kill performance on slower systems and those with a less effective Flash Player (i.e. 
+	Linux).
+	
+	It is expected that experienced mappers will switch between this and other stylesheets as required.
+
+*/
+
+meta {
+    title: "Potlatch 2";
+    icon: "dialogs/mappaint/pl2_small.png";
+}
+
+canvas {
+    background-color: white;
+}
+
+/****************
+ * core_ways.css
+ ****************/
+
+/* Roads */
+
+way[highway=motorway],way[highway=motorway_link],
+way[highway=trunk],way[highway=trunk_link],
+way[highway=primary],way[highway=primary_link],
+way[highway=secondary],way[highway=secondary_link],
+way[highway=tertiary],way[highway=tertiary_link],
+way[highway=residential],way[highway=unclassified]  { text: auto; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; }
+way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; }
+way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; }
+way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; }
+way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; }
+way[highway=tertiary]                               { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; }
+way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 7; }
+way[highway=tertiary_link]                          { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; }
+way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; }
+way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 5; }
+way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; }
+way[highway=service][service=alley]                 { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; }
+way[highway=road]                                   { color: gray; width: 5; casing-color: white; casing-width: 7; }
+way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; }
+
+/* Road areas */
+
+way[highway=pedestrian]!:closed { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
+way[highway=pedestrian]:closed  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */
+
+/* Paths */
+
+way[highway=steps]     { color: #FF6644; width: 6; dashes: 2, 2; }
+way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; prop_path : 1;}
+way[highway=footway][bicycle=yes]   { z-index: 4; color: blue; width: 1; }
+way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; prop_path : 1;}
+way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; prop_path : 1;}
+way[highway=path]      { color: brown; width: 2; dashes: 2, 2; prop_path : 1;}
+way[highway=cycleway]  { color: blue; width: 2; dashes: 4, 2; prop_path : 1;}
+way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
+way[is_prop_set("prop_path")]              { text:auto; text-color: black; text-position: line; text-offset: 5;}
+
+/* Under construction */
+
+way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }
+way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;}
+way[construction=rail]
+	{ z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
+way[construction=rail]::rail_over
+	{ z-index: 7; color: white; width: 3; dashes: 6,18; }
+
+/* Railways */
+
+way[railway=rail]
+	{ z-index: 6; color: black; width: 5; }
+way[railway=rail]::rail_over
+	{ z-index: 7; color: white; width: 3; dashes: 12,12; }
+way[railway=platform] { color:black; width: 2; }
+way[railway=subway]
+    { z-index: 6; color: #444444; width: 5; }
+way[railway=subway]::railway_over
+    { z-index: 7; color: white; width: 3; dashes: 8,8; }
+way[railway=disused],way[railway=abandoned]
+    { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
+way[railway=disused]::railway_over, way[railway=abandoned]::railway_over
+    { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
+
+/* Waterways */
+
+way[waterway=river],
+way[waterway=canal],
+way[waterway=stream]   { color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
+way[waterway=drain] 			 {color: blue; width: 1; text:auto; text-color: blue; text-position: offset; text-offset: 3;}
+way[waterway][tunnel=yes]                {dashes: 8,4;}
+
+/* Aeroways */
+
+way[aeroway=aerodrome]:closed
+    { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 4;  }
+way|z-15[aeroway=aerodrome]:closed
+    { z-index: 3; fill-color: #bb99bb;  fill-opacity: 0.5;}
+way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; }
+way[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
+way|z17-[aeroway=runway]!:closed
+    { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; }
+way|z17-[aeroway=runway]!:closed::aeroway2
+    { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
+way|z17-[aeroway=runway]!:closed::aeroway3
+    { z-index: 11; color: black; width: 7; }
+way|z17-[aeroway=runway]!:closed::aeroway4
+    { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
+way|z17-[aeroway=runway]!:closed::aeroway5
+    { z-index: 13; color: black; width: 3; }
+way|z17-[aeroway=runway]!:closed::aeroway6
+    { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
+
+way|z15-16[aeroway=runway]!:closed
+    { z-index: 9; color: black; width: 5;  }
+way|z15-16[aeroway=runway]!:closed::aeroway2
+    { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
+way|z15-16[aeroway=runway]!:closed::aeroway3
+    { z-index: 13; color: black; width: 3; }
+way|z15-16[aeroway=runway]!:closed::aeroway4
+    { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
+    
+way|z-14[aeroway=runway]!:closed
+    { z-index: 9; color: #444444; width: 3;  }
+way[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
+way[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
+
+/* Barriers */
+
+way[barrier] {color: #000000; width: 1}
+way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; }
+
+/* Power */
+
+way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;}
+way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;}
+way[power=station]:closed { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;}
+way[power=generator]:closed { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;}
+
+/* Leisure */
+
+way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
+way[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; }
+
+
+/* Physical decoration */
+
+way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1
+    { z-index: 4; color: white; width: +3; }
+way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2
+    { z-index: 3; color: black; width: +6; }
+way[tunnel=yes][!waterway]::tunnel1
+    { z-index: 4; color: white; width: +2; }
+way[tunnel=yes][!waterway]::tunnel2
+    { z-index: 3; color: black; width: +6; dashes: 4,4; }
+
+/* Attribute decoration */
+
+/*way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }*/
+/*way[oneway="-1"] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; }*/
+
+/****************
+ * core_pois.css
+ ****************/
+
+node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; }
+node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
+node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
+node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
+node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; }
+node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
+node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
+node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
+node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
+node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
+node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
+node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; }
+node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; }
+node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; }
+node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; }
+node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; }
+node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; }
+node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; }
+node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; }
+node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; }
+node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
+node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
+node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; }
+way[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
+node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
+node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
+node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
+node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
+node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
+node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
+node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
+node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; }
+node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
+node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; }
+node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; }
+node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
+node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
+node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
+node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
+node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
+node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
+node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; }
+node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; }
+node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; }
+node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; }
+node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; }
+node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; }
+node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; }
+node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; }
+node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
+node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
+node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
+node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
+node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
+node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
+node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
+node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
+node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
+node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
+node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; }
+node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
+node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
+node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
+node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; }
+node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
+node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
+node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; }
+node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
+node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
+node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
+node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
+
+/* Addressing */
+
+node["addr:housenumber"],
+node["addr:housename"] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
+way["addr:interpolation"] { color: #B0E0E6; width: 3; dashes: 3,3;}
+
+/****************
+ * core_landuse.css
+ ****************/
+
+/* Landuse */
+
+way[natural]:closed                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
+way[natural=beach]:closed                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[natural=coastline]						{ color: black; width: 3; }
+way[landuse]:closed                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; }
+way[landuse=residential]:closed              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; }
+way[landuse=retail]:closed                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; }
+way[landuse=commercial]:closed               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; }
+way[landuse=military]:closed                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; prop_area_small_name : 1; }
+way[amenity],way[shop]:closed                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
+/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */
+way[leisure]:closed                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
+way[tourism]:closed                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[historic],way[ruins]:closed              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[military]:closed                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[building]:closed                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
+way[natural=water],
+way[waterway][waterway!=dam]:closed          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;}
+way[waterway=dam]							{ color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;}
+way[man_made]:closed							{ color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
+way[man_made=reservoir_covered]:closed       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
+way[landuse=reservoir]:closed                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;}
+way[landuse=forest],way[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;}
+way[leisure=park]:closed                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;}
+way[leisure=garden]:closed                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[leisure=pitch]:closed					{ z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[landuse=recreation_ground]:closed        { color: green; fill-color: green; prop_area_small_name : 1;}
+way[amenity=parking]:closed                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
+way[public_transport=pay_scale_area]:closed  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
+way[man_made=pier]							{ z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;}
+way[man_made=pier][floating=yes]			{ dashes: 4,2; casing-color: #444;}
+way[leisure=marina]:closed					{ color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;}
+way[leisure=slipway]						{ color: grey; width: 3; casing-color: blue; casing-width: 7; }
+way[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
+/* Perhaps should be filled, on lower zooms. */
+way[boundary=national_park]                 { color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
+way[boundary=protected_area]                { color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;}
+way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
+way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
+way[landuse=cemetery]						{ color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;}
+/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
+
+/*@import("stylesheets/core_ways.css");*/
+/*@import("stylesheets/core_pois.css");*/
+/*@import("stylesheets/core_landuse.css");*/
+/*@import("stylesheets/core_relations.css");*/
+way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
+/*@import("stylesheets/core_interactive.css");*/
+
Index: trunk/styles_nodist/potlatch2/build.xml
===================================================================
--- trunk/styles_nodist/potlatch2/build.xml	(revision 3898)
+++ trunk/styles_nodist/potlatch2/build.xml	(revision 3898)
@@ -0,0 +1,61 @@
+<project name="potlatch2styles_mod" basedir=".">
+<!--
+
+    The potlatch 2 styles need to be patched in order to work with the JOSM MapCSS implementation.
+    When updating from the potlatch2 repository, the workflow can be like this:
+     * copy files from 'patched' to 'source'
+     * cd source && svn up
+     * solve possible conflicts
+     * modify the new sections, such that they work with josm
+     * create potlatch2.mapcss (ant assemble)
+     * copy files from 'source' to 'patched'
+     * update externals definition to the current revision (ant update-externals)
+     * commit everything (style, patches and externals definition)
+     
+-->
+
+    <!--    concatinate the files to one mapcss style file     -->
+    <target name="assemble">
+        <concat destfile="../../styles/standard/potlatch2.mapcss">
+            <filelist dir="." files="prelude.css"/>        
+            <filelist dir="patched" files="core_ways.css,core_pois.css,core_landuse.css,potlatch.css"/>        
+        </concat>
+    </target>
+    
+    
+    <target name="copy-patched-to-source">
+        <copy todir="source" overwrite="true"> 
+            <fileset dir="patched"/>
+        </copy>
+    </target>
+    
+    <target name="copy-source-to-patched">
+        <copy todir="patched" overwrite="true"> 
+            <filelist dir="source" files="core_ways.css,core_pois.css,core_landuse.css,potlatch.css"/>        
+        </copy>
+    </target>
+
+    <!--    Update the explicit revision number in the externals definition to the current revision. -->
+    <target name="update-externals" depends="source-revision">
+        <exec executable="svn">
+            <arg value="propset"/>
+            <arg value="svn:externals"/>
+            <arg value="source -r ${version.entry.commit.revision} http://svn.openstreetmap.org/applications/editors/potlatch2/resources/stylesheets"/>
+            <arg value="."/>
+        </exec>
+    </target>
+    
+    <!--    Determine revision and save in  ${version.entry.commit.revision}-->
+    <target name="source-revision" depends="init">
+        <exec append="false" output="REVISION.XML" executable="svn" dir="source" failifexecutionfails="true">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="."/>
+        </exec>
+        <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
+        <delete file="REVISION.XML" />
+    </target>
+    
+</project>
+
Index: trunk/styles_nodist/potlatch2/patched/core_landuse.css
===================================================================
--- trunk/styles_nodist/potlatch2/patched/core_landuse.css	(revision 3898)
+++ trunk/styles_nodist/potlatch2/patched/core_landuse.css	(revision 3898)
@@ -0,0 +1,48 @@
+
+/****************
+ * core_landuse.css
+ ****************/
+
+/* Landuse */
+
+way[natural]:closed                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
+way[natural=beach]:closed                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[natural=coastline]						{ color: black; width: 3; }
+way[landuse]:closed                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; }
+way[landuse=residential]:closed              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; }
+way[landuse=retail]:closed                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; }
+way[landuse=commercial]:closed               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; }
+way[landuse=military]:closed                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; prop_area_small_name : 1; }
+way[amenity],way[shop]:closed                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
+/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */
+way[leisure]:closed                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
+way[tourism]:closed                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[historic],way[ruins]:closed              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[military]:closed                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[building]:closed                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
+way[natural=water],
+way[waterway][waterway!=dam]:closed          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;}
+way[waterway=dam]							{ color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;}
+way[man_made]:closed							{ color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
+way[man_made=reservoir_covered]:closed       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
+way[landuse=reservoir]:closed                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; prop_area_small_name : 1;}
+way[landuse=forest],way[natural=wood]:closed { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; prop_area_small_name : 1;}
+way[leisure=park]:closed                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;}
+way[leisure=garden]:closed                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[leisure=pitch]:closed					{ z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[landuse=recreation_ground]:closed        { color: green; fill-color: green; prop_area_small_name : 1;}
+way[amenity=parking]:closed                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
+way[public_transport=pay_scale_area]:closed  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
+way[man_made=pier]							{ z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;}
+way[man_made=pier][floating=yes]			{ dashes: 4,2; casing-color: #444;}
+way[leisure=marina]:closed					{ color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;}
+way[leisure=slipway]						{ color: grey; width: 3; casing-color: blue; casing-width: 7; }
+way[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;}
+way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
+/* Perhaps should be filled, on lower zooms. */
+way[boundary=national_park]                 { color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
+way[boundary=protected_area]                { color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;}
+way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
+way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
+way[landuse=cemetery]						{ color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; prop_area_small_name : 1;}
+/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
Index: trunk/styles_nodist/potlatch2/patched/core_pois.css
===================================================================
--- trunk/styles_nodist/potlatch2/patched/core_pois.css	(revision 3898)
+++ trunk/styles_nodist/potlatch2/patched/core_pois.css	(revision 3898)
@@ -0,0 +1,92 @@
+
+/****************
+ * core_pois.css
+ ****************/
+
+node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; }
+node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
+node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
+node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
+node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; }
+node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
+node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
+node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
+node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
+node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
+node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
+node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; }
+node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; }
+node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; }
+node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; }
+node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; }
+node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; }
+node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; }
+node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; }
+node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; }
+node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
+node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
+node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; }
+way[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
+node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
+node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
+node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
+node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
+node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
+node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
+node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
+node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; }
+node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
+node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; }
+node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; }
+node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
+node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
+node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
+node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
+node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
+node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
+node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; }
+node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; }
+node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; }
+node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; }
+node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; }
+node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; }
+node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; }
+node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; }
+node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
+node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
+node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
+node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
+node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
+node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
+node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
+node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
+node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
+node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
+node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; }
+node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
+node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
+node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
+node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; }
+node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
+node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
+node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; }
+node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
+node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
+node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
+node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
+
+/* Addressing */
+
+node["addr:housenumber"],
+node["addr:housename"] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
+way["addr:interpolation"] { color: #B0E0E6; width: 3; dashes: 3,3;}
Index: trunk/styles_nodist/potlatch2/patched/core_ways.css
===================================================================
--- trunk/styles_nodist/potlatch2/patched/core_ways.css	(revision 3898)
+++ trunk/styles_nodist/potlatch2/patched/core_ways.css	(revision 3898)
@@ -0,0 +1,145 @@
+
+/****************
+ * core_ways.css
+ ****************/
+
+/* Roads */
+
+way[highway=motorway],way[highway=motorway_link],
+way[highway=trunk],way[highway=trunk_link],
+way[highway=primary],way[highway=primary_link],
+way[highway=secondary],way[highway=secondary_link],
+way[highway=tertiary],way[highway=tertiary_link],
+way[highway=residential],way[highway=unclassified]  { text: auto; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; }
+way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; }
+way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; }
+way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; }
+way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; }
+way[highway=tertiary]                               { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; }
+way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 7; }
+way[highway=tertiary_link]                          { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; }
+way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; }
+way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 5; }
+way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; }
+way[highway=service][service=alley]                 { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; }
+way[highway=road]                                   { color: gray; width: 5; casing-color: white; casing-width: 7; }
+way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; }
+
+/* Road areas */
+
+way[highway=pedestrian]!:closed { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
+way[highway=pedestrian]:closed  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */
+
+/* Paths */
+
+way[highway=steps]     { color: #FF6644; width: 6; dashes: 2, 2; }
+way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; prop_path : 1;}
+way[highway=footway][bicycle=yes]   { z-index: 4; color: blue; width: 1; }
+way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; prop_path : 1;}
+way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; prop_path : 1;}
+way[highway=path]      { color: brown; width: 2; dashes: 2, 2; prop_path : 1;}
+way[highway=cycleway]  { color: blue; width: 2; dashes: 4, 2; prop_path : 1;}
+way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
+way[is_prop_set("prop_path")]              { text:auto; text-color: black; text-position: line; text-offset: 5;}
+
+/* Under construction */
+
+way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }
+way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;}
+way[construction=rail]
+	{ z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
+way[construction=rail]::rail_over
+	{ z-index: 7; color: white; width: 3; dashes: 6,18; }
+
+/* Railways */
+
+way[railway=rail]
+	{ z-index: 6; color: black; width: 5; }
+way[railway=rail]::rail_over
+	{ z-index: 7; color: white; width: 3; dashes: 12,12; }
+way[railway=platform] { color:black; width: 2; }
+way[railway=subway]
+    { z-index: 6; color: #444444; width: 5; }
+way[railway=subway]::railway_over
+    { z-index: 7; color: white; width: 3; dashes: 8,8; }
+way[railway=disused],way[railway=abandoned]
+    { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
+way[railway=disused]::railway_over, way[railway=abandoned]::railway_over
+    { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
+
+/* Waterways */
+
+way[waterway=river],
+way[waterway=canal],
+way[waterway=stream]   { color: blue; width: 2; text:auto; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
+way[waterway=drain] 			 {color: blue; width: 1; text:auto; text-color: blue; text-position: offset; text-offset: 3;}
+way[waterway][tunnel=yes]                {dashes: 8,4;}
+
+/* Aeroways */
+
+way[aeroway=aerodrome]:closed
+    { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 4;  }
+way|z-15[aeroway=aerodrome]:closed
+    { z-index: 3; fill-color: #bb99bb;  fill-opacity: 0.5;}
+way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; }
+way[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
+way|z17-[aeroway=runway]!:closed
+    { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; }
+way|z17-[aeroway=runway]!:closed::aeroway2
+    { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; }
+way|z17-[aeroway=runway]!:closed::aeroway3
+    { z-index: 11; color: black; width: 7; }
+way|z17-[aeroway=runway]!:closed::aeroway4
+    { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
+way|z17-[aeroway=runway]!:closed::aeroway5
+    { z-index: 13; color: black; width: 3; }
+way|z17-[aeroway=runway]!:closed::aeroway6
+    { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
+
+way|z15-16[aeroway=runway]!:closed
+    { z-index: 9; color: black; width: 5;  }
+way|z15-16[aeroway=runway]!:closed::aeroway2
+    { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; }
+way|z15-16[aeroway=runway]!:closed::aeroway3
+    { z-index: 13; color: black; width: 3; }
+way|z15-16[aeroway=runway]!:closed::aeroway4
+    { z-index: 14; color: white; width: 1;  dashes: 4, 16; }
+    
+way|z-14[aeroway=runway]!:closed
+    { z-index: 9; color: #444444; width: 3;  }
+way[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
+way[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
+
+/* Barriers */
+
+way[barrier] {color: #000000; width: 1}
+way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; }
+
+/* Power */
+
+way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;}
+way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;}
+way[power=station]:closed { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;}
+way[power=generator]:closed { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;}
+
+/* Leisure */
+
+way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
+way[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; }
+
+
+/* Physical decoration */
+
+way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1
+    { z-index: 4; color: white; width: +3; }
+way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2
+    { z-index: 3; color: black; width: +6; }
+way[tunnel=yes][!waterway]::tunnel1
+    { z-index: 4; color: white; width: +2; }
+way[tunnel=yes][!waterway]::tunnel2
+    { z-index: 3; color: black; width: +6; dashes: 4,4; }
+
+/* Attribute decoration */
+
+/*way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }*/
+/*way[oneway="-1"] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; }*/
Index: trunk/styles_nodist/potlatch2/patched/potlatch.css
===================================================================
--- trunk/styles_nodist/potlatch2/patched/potlatch.css	(revision 3898)
+++ trunk/styles_nodist/potlatch2/patched/potlatch.css	(revision 3898)
@@ -0,0 +1,8 @@
+
+/*@import("stylesheets/core_ways.css");*/
+/*@import("stylesheets/core_pois.css");*/
+/*@import("stylesheets/core_landuse.css");*/
+/*@import("stylesheets/core_relations.css");*/
+way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
+/*@import("stylesheets/core_interactive.css");*/
+
Index: trunk/styles_nodist/potlatch2/prelude.css
===================================================================
--- trunk/styles_nodist/potlatch2/prelude.css	(revision 3898)
+++ trunk/styles_nodist/potlatch2/prelude.css	(revision 3898)
@@ -0,0 +1,21 @@
+/*
+
+	Potlatch 2 core stylesheet
+	
+	This stylesheet should contain commonly used features and only the most essential extra attributes
+	(e.g. oneway). It needs to remain simple (not too many nested styles or dash-type decorations) in
+	order not to kill performance on slower systems and those with a less effective Flash Player (i.e. 
+	Linux).
+	
+	It is expected that experienced mappers will switch between this and other stylesheets as required.
+
+*/
+
+meta {
+    title: "Potlatch 2";
+    icon: "dialogs/mappaint/pl2_small.png";
+}
+
+canvas {
+    background-color: white;
+}
