map_features.xml:
authorSteve Bennett <stevagewp@gmail.com>
Wed, 6 Oct 2010 13:43:41 +0000 (13:43 +0000)
committerSteve Bennett <stevagewp@gmail.com>
Wed, 6 Oct 2010 13:43:41 +0000 (13:43 +0000)
- add the various _link roads.
- make 'oneway' an 'always' attribute.

potlatch.css:
- highway=tertiary_link
- service=alley
- highway=road
- text on paths, schools, sports centres
- tweak waterway tunnels, powerlines
- barrier=fence
- power=generator
- landuse=*
- leisure=garden
- embankment=yes (looks poo)
- boundary=administrative (TODO other boundaries?)
- sports centre, school

Possibly controversial: change rendering of unmatched ways to be high vis.

resources/map_features.xml
resources/potlatch.css

index 2af4583..f9e15a6 100644 (file)
@@ -5,7 +5,7 @@ Quick documentation:
 <category> the categories that features belong to. This includes both nodes (icons on left) and ways/areas (drop-down list that appears when a way/area is selected)
   name: Shown in GUI
   id: internal reference (a feature refers to this with category=xxx)
 <category> the categories that features belong to. This includes both nodes (icons on left) and ways/areas (drop-down list that appears when a way/area is selected)
   name: Shown in GUI
   id: internal reference (a feature refers to this with category=xxx)
-  
+
 <feature> a pre-defined group of tags that make up a feature
   category: [ctext] corresponding to category id
   icon
 <feature> a pre-defined group of tags that make up a feature
   category: [ctext] corresponding to category id
   icon
@@ -19,12 +19,12 @@ Quick documentation:
   tag - one or more of these required, defines the tags that make up the feature.
     @k - key
     @v - value
   tag - one or more of these required, defines the tags that make up the feature.
     @k - key
     @v - value
-  input 
+  input
     @ref=xxx
   inputSet
     @ref=xxx
     @ref=xxx
   inputSet
     @ref=xxx
-</feature>  
-  
+</feature>
+
 <inputSet>: a reusable group of properties for a feature.
   @id="internal id"
   input...
 <inputSet>: a reusable group of properties for a feature.
   @id="internal id"
   input...
@@ -77,7 +77,7 @@ Quick documentation:
 
   <category name="Natural" id="natural">
   </category>
 
   <category name="Natural" id="natural">
   </category>
-  
+
   <category name="Barrier" id="barrier">
   </category>
 
   <category name="Barrier" id="barrier">
   </category>
 
@@ -86,7 +86,7 @@ Quick documentation:
 
   <category name="Admin" id="admin">
   </category>
 
   <category name="Admin" id="admin">
   </category>
-  
+
   <category name="Buildings" id="buildings">
   </category>
 
   <category name="Buildings" id="buildings">
   </category>
 
@@ -104,7 +104,7 @@ Quick documentation:
   </category>
 
   <!-- Common input sets -->
   </category>
 
   <!-- Common input sets -->
-  
+
   <inputSet id="simpleName">
     <input type="freetext" presence="always" name="Name" key="name" description="The name" priority="highest" />
   </inputSet>
   <inputSet id="simpleName">
     <input type="freetext" presence="always" name="Name" key="name" description="The name" priority="highest" />
   </inputSet>
@@ -128,14 +128,14 @@ Quick documentation:
       <choice value="no" text="No"/>
     </input>
   </inputSet>
       <choice value="no" text="No"/>
     </input>
   </inputSet>
-  
+
   <inputSet id="buildingAddress">
     <input type="freetext" presence="onTagMatch" category="Address" description="The number of the house, e.g. 156 or 10-12" name="House Number" key="addr:housenumber"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The name of the house, e.g. Riverbank Cottage" name="Building Name" key="addr:housename"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The Street Name (optional)" name="Street Name" key="addr:street"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The postcode" name="Postcode" key="addr:postcode"/>
   </inputSet>
   <inputSet id="buildingAddress">
     <input type="freetext" presence="onTagMatch" category="Address" description="The number of the house, e.g. 156 or 10-12" name="House Number" key="addr:housenumber"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The name of the house, e.g. Riverbank Cottage" name="Building Name" key="addr:housename"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The Street Name (optional)" name="Street Name" key="addr:street"/>
     <input type="freetext" presence="onTagMatch" category="Address" description="The postcode" name="Postcode" key="addr:postcode"/>
   </inputSet>
-  
+
   <inputSet id="web">
     <input type="freetext" presence="onTagMatch" category="Web" description="The URL of the website" name="Website" key="website" />
   </inputSet>
   <inputSet id="web">
     <input type="freetext" presence="onTagMatch" category="Web" description="The URL of the website" name="Website" key="website" />
   </inputSet>
@@ -155,7 +155,7 @@ Quick documentation:
   </inputSet>
 
   <!-- Roads -->
   </inputSet>
 
   <!-- Roads -->
-  
+
   <inputSet id="majorRoad">
     <inputSet ref="names"/>
     <inputSet ref="roadRefs"/>
   <inputSet id="majorRoad">
     <inputSet ref="names"/>
     <inputSet ref="roadRefs"/>
@@ -191,7 +191,7 @@ Quick documentation:
     <inputSet ref="pedestrians"/>
     <inputSet ref="permissions"/>
   </inputSet>
     <inputSet ref="pedestrians"/>
     <inputSet ref="permissions"/>
   </inputSet>
-  
+
   <inputSet id="junctionNode">
     <inputSet ref="turnRestrictions"/>
   </inputSet>
   <inputSet id="junctionNode">
     <inputSet ref="turnRestrictions"/>
   </inputSet>
@@ -205,9 +205,9 @@ Quick documentation:
         key="int_ref" description="The official international reference number"/>
     <input type="freetext" presence="onTagMatch"
         name="Old Reference" category="Naming" priority="low"
         key="int_ref" description="The official international reference number"/>
     <input type="freetext" presence="onTagMatch"
         name="Old Reference" category="Naming" priority="low"
-        key="old_ref" description="The historic or previous reference number"/>  
+        key="old_ref" description="The historic or previous reference number"/>
   </inputSet>
   </inputSet>
-  
+
   <inputSet id="roadPhysical">
     <input type="freetext" presence="onTagMatch"
         name="Width" category="Physical"
   <inputSet id="roadPhysical">
     <input type="freetext" presence="onTagMatch"
         name="Width" category="Physical"
@@ -235,7 +235,7 @@ Quick documentation:
     <input presence="onTagMatch" type="number" name="Lanes" category="Physical" description="Total number of lanes, counting both directions"
            key="lanes" minimum="1" maximum="10" layout="horizontal"/>
   </inputSet>
     <input presence="onTagMatch" type="number" name="Lanes" category="Physical" description="Total number of lanes, counting both directions"
            key="lanes" minimum="1" maximum="10" layout="horizontal"/>
   </inputSet>
-  
+
   <inputSet id="bridge">
     <input type="choice" presence="onTagMatch"
         name="Bridge" category="Physical" description="Road goes over a bridge"
   <inputSet id="bridge">
     <input type="choice" presence="onTagMatch"
         name="Bridge" category="Physical" description="Road goes over a bridge"
@@ -256,7 +256,7 @@ Quick documentation:
       <choice value="yes" text="Tunnel" description="Generic tunnel"/>
     </input>
   </inputSet>
       <choice value="yes" text="Tunnel" description="Generic tunnel"/>
     </input>
   </inputSet>
-  
+
   <inputSet id="embankment-cutting">
     <input type="choice"
            name="Embankment" category="Physical" description="Road supported on a raised bed of earth and rock."
   <inputSet id="embankment-cutting">
     <input type="choice"
            name="Embankment" category="Physical" description="Road supported on a raised bed of earth and rock."
@@ -306,13 +306,13 @@ Quick documentation:
       <choice value="military" text="Military" />
     </input>
   </inputSet>
       <choice value="military" text="Military" />
     </input>
   </inputSet>
-  
+
   <inputSet id="fee">
     <input type="freetext" presence="onTagMatch" category="Restrictions" description="The charge/cost of using this amenity" name="Fee" key="fee"/>
   </inputSet>
 
   <inputSet id="roadRestrictions">
   <inputSet id="fee">
     <input type="freetext" presence="onTagMatch" category="Restrictions" description="The charge/cost of using this amenity" name="Fee" key="fee"/>
   </inputSet>
 
   <inputSet id="roadRestrictions">
-    <input type="choice" presence="onTagMatch"
+    <input type="choice" presence="always"
         name="Oneway" category="Restrictions" description="Oneway roads"
         key="oneway">
       <choice value="yes" match="yes|true|1" text="One way"
         name="Oneway" category="Restrictions" description="Oneway roads"
         key="oneway">
       <choice value="yes" match="yes|true|1" text="One way"
@@ -329,12 +329,12 @@ Quick documentation:
 
   <inputSet id="roadRoundabout">
     <!-- review the choice of category -->
 
   <inputSet id="roadRoundabout">
     <!-- review the choice of category -->
-    <input type="choice" presence="onTagMatch" name="Roundabout" category="Restrictions" description="Whether this road is a roundabout. Make the way face the direction appropriate for the country." 
+    <input type="choice" presence="onTagMatch" name="Roundabout" category="Restrictions" description="Whether this road is a roundabout. Make the way face the direction appropriate for the country."
            key="junction">
       <choice value="roundabout" text="Yes" />
     </input>
   </inputSet>
            key="junction">
       <choice value="roundabout" text="Yes" />
     </input>
   </inputSet>
-  
+
   <inputSet id="turnRestrictions">
     <input type="turn" name="Turn restriction" description="Turn restriction" category="Restrictions" priority="normal" presence="onTagMatch">
        <match k="type" v="restriction"/>
   <inputSet id="turnRestrictions">
     <input type="turn" name="Turn restriction" description="Turn restriction" category="Restrictions" priority="normal" presence="onTagMatch">
        <match k="type" v="restriction"/>
@@ -367,13 +367,13 @@ Quick documentation:
     <input type="freetext" presence="onTagMatch" category="Naptan" description="" name="Naptan Street (read-only)" key="naptan:Street" />
     <input type="freetext" presence="onTagMatch" category="Naptan" description="Delete this when the details have been verified on-the-ground" name="Naptan Verified?" key="naptan:verified" />
   </inputSet>
     <input type="freetext" presence="onTagMatch" category="Naptan" description="" name="Naptan Street (read-only)" key="naptan:Street" />
     <input type="freetext" presence="onTagMatch" category="Naptan" description="Delete this when the details have been verified on-the-ground" name="Naptan Verified?" key="naptan:verified" />
   </inputSet>
-  
+
   <inputSet id="buses">
     <input type="freetext" presence="always" category="Bus Stop" name="Stop Name" key="name" description="The name of the bus stop" />
     <input type="freetext" presence="always" category="Bus Stop" name="Local Ref" key="local_ref" description="The local reference of the stop, usually one or two letters above the main flag, used at bus interchanges, e.g. L, BX" />
     <inputSet ref="naptan" />
   </inputSet>
   <inputSet id="buses">
     <input type="freetext" presence="always" category="Bus Stop" name="Stop Name" key="name" description="The name of the bus stop" />
     <input type="freetext" presence="always" category="Bus Stop" name="Local Ref" key="local_ref" description="The local reference of the stop, usually one or two letters above the main flag, used at bus interchanges, e.g. L, BX" />
     <inputSet ref="naptan" />
   </inputSet>
-  
+
   <inputSet id="bus-route">
     <input type="route" name="Bus Route" description="Bus route" category="Transport" priority="low" presence="onTagMatch">
       <match k="type" v="route"/>
   <inputSet id="bus-route">
     <input type="route" name="Bus Route" description="Bus route" category="Transport" priority="low" presence="onTagMatch">
       <match k="type" v="route"/>
@@ -383,7 +383,7 @@ Quick documentation:
       </icon>
     </input>
   </inputSet>
       </icon>
     </input>
   </inputSet>
-  
+
   <inputSet id="tram-route">
     <input type="route" name="Tram Route" description="Tram route" category="Transport" priority="low" presence="onTagMatch">
       <match k="type" v="route"/>
   <inputSet id="tram-route">
     <input type="route" name="Tram Route" description="Tram route" category="Transport" priority="low" presence="onTagMatch">
       <match k="type" v="route"/>
@@ -393,7 +393,7 @@ Quick documentation:
       </icon>
     </input>
   </inputSet>
       </icon>
     </input>
   </inputSet>
-  
+
   <inputSet id="cycle">
     <inputSet ref="bicycle-permission" />
     <input type="route" name="National Cycle Routes" description="A signposted route in a National Cycle Network, or nearest equivalent." category="Cycle" priority="low">
   <inputSet id="cycle">
     <inputSet ref="bicycle-permission" />
     <input type="route" name="National Cycle Routes" description="A signposted route in a National Cycle Network, or nearest equivalent." category="Cycle" priority="low">
@@ -436,7 +436,7 @@ Quick documentation:
       <help>http://wiki.openstreetmap.org/wiki/Key:access</help>
     </input>
   </inputSet>
       <help>http://wiki.openstreetmap.org/wiki/Key:access</help>
     </input>
   </inputSet>
-  
+
   <inputSet id="bicycle-lane">
     <input type="choice"
         name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface"
   <inputSet id="bicycle-lane">
     <input type="choice"
         name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface"
@@ -477,18 +477,18 @@ Quick documentation:
        </icon>
     </input>
   </inputSet>
        </icon>
     </input>
   </inputSet>
-  
+
   <inputSet id="route">
     <inputSet ref="names"/>
     <inputSet ref="roadRefs"/>
   </inputSet>
   <inputSet id="route">
     <inputSet ref="names"/>
     <inputSet ref="roadRefs"/>
   </inputSet>
-  
+
   <inputSet id="waterways">
     <input type="freetext" presence="always" name="Name" category="Naming" key="name" description="The name" />
     <input type="freetext" presence="always" name="Width" category="Properties" key="width" description="The width in metres" />
     <inputSet ref="boatPermissions" />
   <inputSet id="waterways">
     <input type="freetext" presence="always" name="Name" category="Naming" key="name" description="The name" />
     <input type="freetext" presence="always" name="Width" category="Properties" key="width" description="The width in metres" />
     <inputSet ref="boatPermissions" />
-         
-           
+
+
     </inputSet>
 <!-- Would be good to have a dedicated 'access' type of input -->
   <!-- all the description fields are identical at the moment for ease of maintenance, should be tailored in future. -->
     </inputSet>
 <!-- Would be good to have a dedicated 'access' type of input -->
   <!-- all the description fields are identical at the moment for ease of maintenance, should be tailored in future. -->
@@ -528,7 +528,7 @@ Quick documentation:
     </input>
 
   </inputSet>
     </input>
 
   </inputSet>
-  
+
   <!-- ************************************************************************
        Roads
        ************************************************************************ -->
   <!-- ************************************************************************
        Roads
        ************************************************************************ -->
@@ -565,7 +565,7 @@ Quick documentation:
 
     <line/>
     <tag k="highway" v="trunk"/>
 
     <line/>
     <tag k="highway" v="trunk"/>
-    
+
     <inputSet ref="majorRoad"/>
   </feature>
 
     <inputSet ref="majorRoad"/>
   </feature>
 
@@ -592,6 +592,21 @@ Quick documentation:
     <inputSet ref="majorRoad"/>
   </feature>
 
     <inputSet ref="majorRoad"/>
   </feature>
 
+  <feature name="Primary road link">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary_link</help>
+
+    <line/>
+    <tag k="highway" v="primary_link"/>
+
+    <inputSet ref="majorRoad"/>
+  </feature>
+
+
   <feature name="Secondary road">
     <category>roads</category>
     <icon image="features/highway__unclassified.png">
   <feature name="Secondary road">
     <category>roads</category>
     <icon image="features/highway__unclassified.png">
@@ -606,6 +621,22 @@ Quick documentation:
     <inputSet ref="majorRoad"/>
   </feature>
 
     <inputSet ref="majorRoad"/>
   </feature>
 
+  <feature name="Secondary road link">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary_link</help>
+
+    <line/>
+    <tag k="highway" v="secondary_link"/>
+
+    <inputSet ref="majorRoad"/>
+  </feature>
+
+
+
   <feature name="Tertiary road">
     <category>roads</category>
     <icon image="features/highway__unclassified.png">
   <feature name="Tertiary road">
     <category>roads</category>
     <icon image="features/highway__unclassified.png">
@@ -620,6 +651,21 @@ Quick documentation:
     <inputSet ref="majorRoad"/>
   </feature>
 
     <inputSet ref="majorRoad"/>
   </feature>
 
+  <feature name="Tertiary road link">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="14pt"><b>${name}</b></font><br/>
+      <font size="10pt">${ref}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary_link</help>
+
+    <line/>
+    <tag k="highway" v="tertiary_link"/>
+
+    <inputSet ref="majorRoad"/>
+  </feature>
+
+
   <feature name="Minor road">
     <category>roads</category>
     <icon image="features/highway__unclassified.png">
   <feature name="Minor road">
     <category>roads</category>
     <icon image="features/highway__unclassified.png">
@@ -694,7 +740,7 @@ Quick documentation:
 
     <inputSet ref="minorRoad"/>
   </feature>
 
     <inputSet ref="minorRoad"/>
   </feature>
-  
+
   <feature name="Track">
     <category>roads</category>
     <icon image="features/highway__unclassified.png">
   <feature name="Track">
     <category>roads</category>
     <icon image="features/highway__unclassified.png">
@@ -733,7 +779,7 @@ Quick documentation:
     <tag k="highway" v="cycleway"/>
     <inputSet ref="path"/>
   </feature>
     <tag k="highway" v="cycleway"/>
     <inputSet ref="path"/>
   </feature>
-  
+
   <feature name="Pedestrian Street">
     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
   <feature name="Pedestrian Street">
     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
@@ -788,7 +834,7 @@ Quick documentation:
     <area/>
     <tag k="leisure" v="park"/>
   </feature>
     <area/>
     <tag k="leisure" v="park"/>
   </feature>
-  
+
   <feature name="Forest">
     <category>natural</category>
     <icon image="icons/natural_blank.png" />
   <feature name="Forest">
     <category>natural</category>
     <icon image="icons/natural_blank.png" />
@@ -827,29 +873,29 @@ Quick documentation:
     <icon>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
     <icon>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
-    
+
     <line/>
     <tag k="barrier" v="ditch"/>
   </feature>
     <line/>
     <tag k="barrier" v="ditch"/>
   </feature>
-  
+
   <feature name="Retaining wall">
     <category>barrier</category>
     <icon image="features/barrier_generic.png" />
     <icon>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help>
   <feature name="Retaining wall">
     <category>barrier</category>
     <icon image="features/barrier_generic.png" />
     <icon>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help>
-    
+
     <line/>
     <tag k="barrier" v="retaining_wall"/>
   </feature>
     <line/>
     <tag k="barrier" v="retaining_wall"/>
   </feature>
-  
+
   <feature name="City wall">
     <category>barrier</category>
     <icon image="features/barrier_generic.png" />
     <icon>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help>
   <feature name="City wall">
     <category>barrier</category>
     <icon image="features/barrier_generic.png" />
     <icon>
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help>
-    
+
     <line/>
     <tag k="barrier" v="city_wall"/>
   </feature>
     <line/>
     <tag k="barrier" v="city_wall"/>
   </feature>
@@ -913,7 +959,7 @@ Quick documentation:
     <line/>
     <tag k="waterway" v="canal"/>
     <inputSet ref="waterways" />
     <line/>
     <tag k="waterway" v="canal"/>
     <inputSet ref="waterways" />
-    
+
   </feature>
 
   <feature name="Drain">
   </feature>
 
   <feature name="Drain">
@@ -1017,7 +1063,7 @@ Quick documentation:
     <area/>
     <point/>
     <tag k="leisure" v="marina"/>
     <area/>
     <point/>
     <tag k="leisure" v="marina"/>
-    <inputSet ref="names"/>    
+    <inputSet ref="names"/>
   </feature>
 
   <feature name="Slipway">
   </feature>
 
   <feature name="Slipway">
@@ -1207,7 +1253,7 @@ Quick documentation:
     <input type="freetext" presence="always" category="Naming" name="Runway number (01-36)" key="ref"/>
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
   </feature>
     <input type="freetext" presence="always" category="Naming" name="Runway number (01-36)" key="ref"/>
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
   </feature>
-  
+
   <feature name="Airport taxiway">
     <category>transport</category>
     <icon image="icons/transport_blank.png"/>
   <feature name="Airport taxiway">
     <category>transport</category>
     <icon image="icons/transport_blank.png"/>
@@ -1217,7 +1263,7 @@ Quick documentation:
     <input type="freetext" presence="always" category="Naming" name="Taxiway number" key="ref"  />
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
   </feature>
     <input type="freetext" presence="always" category="Naming" name="Taxiway number" key="ref"  />
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
   </feature>
-  
+
   <feature name="Airport apron">
     <category>transport</category>
     <icon image="icons/transport_blank.png"/>
   <feature name="Airport apron">
     <category>transport</category>
     <icon image="icons/transport_blank.png"/>
@@ -1235,7 +1281,7 @@ Quick documentation:
     <input type="freetext" presence="always" category="Naming" name="Gate number" key="ref" />
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
   </feature>
     <input type="freetext" presence="always" category="Naming" name="Gate number" key="ref" />
     <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
   </feature>
-  
+
   <!-- ************************************************************************
        Buildings
        ************************************************************************ -->
   <!-- ************************************************************************
        Buildings
        ************************************************************************ -->
@@ -1410,6 +1456,22 @@ Quick documentation:
     <inputSet ref="buildingAddress" />
   </feature>
 
     <inputSet ref="buildingAddress" />
   </feature>
 
+  <feature name="Sports centre">
+    <category>buildings</category>
+    <icon >
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <point />
+    <tag k="leisure" v="sports_centre"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress" />
+    <inputSet ref="pitchSport"/>
+  </feature>
+
+
   <!-- ************************************************************************
        Landuse
        ************************************************************************ -->
   <!-- ************************************************************************
        Landuse
        ************************************************************************ -->
@@ -1479,7 +1541,7 @@ Quick documentation:
     <tag k="landuse" v="military"/>
     <inputSet ref="simpleName"/>
   </feature>
     <tag k="landuse" v="military"/>
     <inputSet ref="simpleName"/>
   </feature>
-  
+
   <feature name="Conservation">
     <category>natural</category>
     <icon image="icons/natural_blank.png"/>
   <feature name="Conservation">
     <category>natural</category>
     <icon image="icons/natural_blank.png"/>
@@ -1569,7 +1631,7 @@ Quick documentation:
       <choice value="volleyball" text="Volleyball"/>
     </input>
   </inputSet>
       <choice value="volleyball" text="Volleyball"/>
     </input>
   </inputSet>
-  
+
   <feature name="Sports track">
     <category>landuse</category>
     <area/>
   <feature name="Sports track">
     <category>landuse</category>
     <area/>
@@ -1704,8 +1766,8 @@ Quick documentation:
       <choice value="islet" text="Islet"/>
     </input>
   </feature>
       <choice value="islet" text="Islet"/>
     </input>
   </feature>
-  
-  
+
+
 
   <!-- ************************************************************************
        POIs
 
   <!-- ************************************************************************
        POIs
@@ -1756,7 +1818,7 @@ Quick documentation:
       <choice value="sikh" text="Sikhism (gurdwara)" />
       <choice value="shinto" text="Shinto (shrine)" />
     </input>
       <choice value="sikh" text="Sikhism (gurdwara)" />
       <choice value="shinto" text="Shinto (shrine)" />
     </input>
-   
+
     <input type="freetext" presence="always" category="" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>
   </feature>
 
     <input type="freetext" presence="always" category="" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>
   </feature>
 
@@ -1769,7 +1831,7 @@ Quick documentation:
     <input type="freetext" presence="always" category="Banking" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>
     <input type="freetext" presence="always" category="Banking" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/>
   </feature>
     <input type="freetext" presence="always" category="Banking" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>
     <input type="freetext" presence="always" category="Banking" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/>
   </feature>
-  
+
   <feature name="Bank">
     <category>amenity</category>
     <icon image="features/pois/money_bank2.n.24.png">
   <feature name="Bank">
     <category>amenity</category>
     <icon image="features/pois/money_bank2.n.24.png">
@@ -1783,9 +1845,9 @@ Quick documentation:
     <input type="choice" presence="always" category="Bank" name="Public ATM available" key="atm" description="Is there a public ATM available?">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     <input type="choice" presence="always" category="Bank" name="Public ATM available" key="atm" description="Is there a public ATM available?">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
-    </input>    
+    </input>
   </feature>
   </feature>
-  
+
   <feature name="Recycling">
     <category>amenity</category>
     <icon image="features/pois/amenity_recycling.n.24.png"/>
   <feature name="Recycling">
     <category>amenity</category>
     <icon image="features/pois/amenity_recycling.n.24.png"/>
@@ -1793,7 +1855,7 @@ Quick documentation:
     <point />
     <tag k="amenity" v="recycling"/>
   </feature>
     <point />
     <tag k="amenity" v="recycling"/>
   </feature>
-  
+
   <feature name="School">
     <category>amenity</category>
     <icon image="features/pois/education_school.n.24.png">
   <feature name="School">
     <category>amenity</category>
     <icon image="features/pois/education_school.n.24.png">
@@ -1805,7 +1867,7 @@ Quick documentation:
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
   </feature>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
   </feature>
-  
+
   <feature name="Post Box">
     <category>amenity</category>
     <icon image="features/pois/amenity_post_box.n.24.png">
   <feature name="Post Box">
     <category>amenity</category>
     <icon image="features/pois/amenity_post_box.n.24.png">
@@ -2059,7 +2121,7 @@ Quick documentation:
     <tag k="highway" v="bus_stop"/>
     <inputSet ref="buses" />
   </feature>
     <tag k="highway" v="bus_stop"/>
     <inputSet ref="buses" />
   </feature>
-  
+
   <feature name="Car Parking">
     <category>transport</category>
     <icon image="features/pois/transport_parking_car.n.24.png">
   <feature name="Car Parking">
     <category>transport</category>
     <icon image="features/pois/transport_parking_car.n.24.png">
@@ -2074,7 +2136,7 @@ Quick documentation:
     <input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
     <inputSet ref="fee"/>
   </feature>
     <input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
     <inputSet ref="fee"/>
   </feature>
-  
+
   <feature name="Bicycle Parking">
     <category>transport</category>
     <icon image="features/pois/transport_parking_bicycle.n.24.png">
   <feature name="Bicycle Parking">
     <category>transport</category>
     <icon image="features/pois/transport_parking_bicycle.n.24.png">
@@ -2085,7 +2147,7 @@ Quick documentation:
     <tag k="amenity" v="bicycle_parking"/>
     <inputSet ref="names"/>
     <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
     <tag k="amenity" v="bicycle_parking"/>
     <inputSet ref="names"/>
     <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
-    <input type="number" minimum="0" maximum="99999" stepSize="1" 
+    <input type="number" minimum="0" maximum="99999" stepSize="1"
         presence="always" category="Cycle" name="Capacity" key="capacity"
         description="The number of bicycles that can be parked in the group of bicycle parking racks"/>
     <inputSet ref="fee"/>
         presence="always" category="Cycle" name="Capacity" key="capacity"
         description="The number of bicycles that can be parked in the group of bicycle parking racks"/>
     <inputSet ref="fee"/>
@@ -2094,13 +2156,13 @@ Quick documentation:
       <choice value="no" text="No"/>
     </input>
   </feature>
       <choice value="no" text="No"/>
     </input>
   </feature>
-  
+
   <feature name="Railway station">
     <category>transport</category>
     <icon image="features/pois/transport_train_station.n.24.png">
       <font size="14pt"><b>${name}</b></font>
     </icon>
   <feature name="Railway station">
     <category>transport</category>
     <icon image="features/pois/transport_train_station.n.24.png">
       <font size="14pt"><b>${name}</b></font>
     </icon>
-    
+
     <point/>
     <tag k="railway" v="station"/>
     <inputSet ref="names"/>
     <point/>
     <tag k="railway" v="station"/>
     <inputSet ref="names"/>
@@ -2152,13 +2214,13 @@ Quick documentation:
 
 
   </feature>
 
 
   </feature>
-  
+
   <feature name="Bus station">
     <category>transport</category><point /><inputSet ref="simpleName" />
        <icon image="features/pois/transport_bus_station.n.24.png"/>
     <tag k="amenity" v="bus_station"/>
   </feature>
   <feature name="Bus station">
     <category>transport</category><point /><inputSet ref="simpleName" />
        <icon image="features/pois/transport_bus_station.n.24.png"/>
     <tag k="amenity" v="bus_station"/>
   </feature>
-  
+
   <feature name="Taxi rank">
     <category>transport</category><point /><inputSet ref="simpleName" />
        <icon image="features/pois/transport_taxi_rank.n.24.png"/>
   <feature name="Taxi rank">
     <category>transport</category><point /><inputSet ref="simpleName" />
        <icon image="features/pois/transport_taxi_rank.n.24.png"/>
@@ -2170,7 +2232,7 @@ Quick documentation:
        <icon image="features/pois/transport_tram_stop.n.24.png"/>
     <tag k="railway" v="tram_stop"/>
   </feature>
        <icon image="features/pois/transport_tram_stop.n.24.png"/>
     <tag k="railway" v="tram_stop"/>
   </feature>
-  
+
   <feature name="Bicycle rental">
     <category>transport</category><point /><inputSet ref="simpleName" />
        <icon image="features/pois/transport_rental_bicycle.n.24.png"/>
   <feature name="Bicycle rental">
     <category>transport</category><point /><inputSet ref="simpleName" />
        <icon image="features/pois/transport_rental_bicycle.n.24.png"/>
@@ -2182,7 +2244,7 @@ Quick documentation:
        <icon image="features/pois/transport_rental_car.n.24.png"/>
     <tag k="amenity" v="car_rental"/>
   </feature>
        <icon image="features/pois/transport_rental_car.n.24.png"/>
     <tag k="amenity" v="car_rental"/>
   </feature>
-  
+
   <feature name="Ferry Terminal">
     <category>transport</category>
     <icon image="features/pois/transport_port.n.24.png"/>
   <feature name="Ferry Terminal">
     <category>transport</category>
     <icon image="features/pois/transport_port.n.24.png"/>
@@ -2201,17 +2263,17 @@ Quick documentation:
     <icon image="features/pois/barrier_bollard.n.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>
     <icon image="features/pois/barrier_bollard.n.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>
-    
+
     <point />
     <tag k="barrier" v="bollard"/>
   </feature>
     <point />
     <tag k="barrier" v="bollard"/>
   </feature>
-  
+
   <feature name="Gate">
     <category>barrier</category>
     <icon image="features/pois/barrier_gate.n.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help>
   <feature name="Gate">
     <category>barrier</category>
     <icon image="features/pois/barrier_gate.n.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help>
-    
+
     <point />
     <tag k="barrier" v="gate"/>
   </feature>
     <point />
     <tag k="barrier" v="gate"/>
   </feature>
@@ -2238,37 +2300,37 @@ Quick documentation:
     <icon image="features/pois/barrier_cycle_barrier.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help>
     <icon image="features/pois/barrier_cycle_barrier.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help>
-    
+
     <point />
     <tag k="barrier" v="cycle_barrier"/>
   </feature>
     <point />
     <tag k="barrier" v="cycle_barrier"/>
   </feature>
-  
+
   <feature name="Big Concrete Blocks">
     <category>barrier</category>
     <icon image="features/pois/barrier_blocks.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help>
   <feature name="Big Concrete Blocks">
     <category>barrier</category>
     <icon image="features/pois/barrier_blocks.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help>
-    
+
     <point />
     <tag k="barrier" v="block"/>
   </feature>
     <point />
     <tag k="barrier" v="block"/>
   </feature>
-  
+
   <feature name="Cattle Grid">
     <category>barrier</category>
     <icon image="features/pois/barrier_cattle_grid.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help>
   <feature name="Cattle Grid">
     <category>barrier</category>
     <icon image="features/pois/barrier_cattle_grid.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help>
-    
+
     <point />
     <tag k="barrier" v="cattle_grid"/>
   </feature>
     <point />
     <tag k="barrier" v="cattle_grid"/>
   </feature>
-  
+
   <feature name="Toll Booth">
     <category>barrier</category>
     <icon image="features/pois/barrier_toll_booth.n.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth</help>
   <feature name="Toll Booth">
     <category>barrier</category>
     <icon image="features/pois/barrier_toll_booth.n.24.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth</help>
-    
+
     <point />
     <tag k="barrier" v="toll_booth"/>
     <tagSet ref="fee"/>
     <point />
     <tag k="barrier" v="toll_booth"/>
     <tagSet ref="fee"/>
@@ -2293,7 +2355,7 @@ Quick documentation:
   </feature>
 
   <feature name="Traffic calming">
   </feature>
 
   <feature name="Traffic calming">
-    
+
     <category>transport</category>
     <icon image="icons/speed_hump_16.png"/>
     <help>
     <category>transport</category>
     <icon image="icons/speed_hump_16.png"/>
     <help>
@@ -2312,12 +2374,12 @@ Quick documentation:
       <choice value="rumble_strip" text="Rumble strip" description="A series of very small bumps causing vibration or noise."/>
       <choice value="choker" text="Choker" description="An artificial narrowing of the road."/>
     </input>
       <choice value="rumble_strip" text="Rumble strip" description="A series of very small bumps causing vibration or noise."/>
       <choice value="choker" text="Choker" description="An artificial narrowing of the road."/>
     </input>
-    
+
   </feature>
 
 
   <!-- ========= Entertainment ========= -->
   </feature>
 
 
   <!-- ========= Entertainment ========= -->
-  
+
   <feature name="Pub">
     <category>foodanddrink</category>
     <icon image="features/pois/food_pub.n.24.png">
   <feature name="Pub">
     <category>foodanddrink</category>
     <icon image="features/pois/food_pub.n.24.png">
@@ -2357,7 +2419,7 @@ Quick documentation:
     <inputSet ref="buildingAddress"/>
     <inputSet ref="cuisine"/>
   </feature>
     <inputSet ref="buildingAddress"/>
     <inputSet ref="cuisine"/>
   </feature>
-  
+
   <feature name="Cafe">
     <category>foodanddrink</category>
     <icon image="features/pois/food_cafe.n.24.png">
   <feature name="Cafe">
     <category>foodanddrink</category>
     <icon image="features/pois/food_cafe.n.24.png">
@@ -2372,7 +2434,7 @@ Quick documentation:
     <inputSet ref="cuisine"/>
     <inputSet ref="wifi" />
   </feature>
     <inputSet ref="cuisine"/>
     <inputSet ref="wifi" />
   </feature>
-  
+
   <feature name="Fast Food">
     <category>foodanddrink</category>
     <icon image="features/pois/food_fastfood.n.24.png">
   <feature name="Fast Food">
     <category>foodanddrink</category>
     <icon image="features/pois/food_fastfood.n.24.png">
@@ -2401,7 +2463,7 @@ Quick documentation:
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
   </feature>
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
   </feature>
-  
+
   <feature name="Supermarket">
     <category>shopping</category>
     <icon image="features/pois/shopping_supermarket.n.24.png">
   <feature name="Supermarket">
     <category>shopping</category>
     <icon image="features/pois/shopping_supermarket.n.24.png">
@@ -2414,7 +2476,7 @@ Quick documentation:
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
   </feature>
     <inputSet ref="web" />
     <inputSet ref="buildingAddress"/>
   </feature>
+
   <feature name="Alcohol shop">
     <category>shopping</category><point />
     <inputSet ref="simpleName" />
   <feature name="Alcohol shop">
     <category>shopping</category><point />
     <inputSet ref="simpleName" />
@@ -2632,7 +2694,7 @@ Quick documentation:
     <tag k="landuse" v="meadow"/>
     <inputSet ref="simpleName"/>
   </feature>
     <tag k="landuse" v="meadow"/>
     <inputSet ref="simpleName"/>
   </feature>
-  
+
   <feature name="Orchard">
     <category>agriculture</category>
     <icon image="features/pois/landuse_grass.n.24.png" />
   <feature name="Orchard">
     <category>agriculture</category>
     <icon image="features/pois/landuse_grass.n.24.png" />
@@ -2696,10 +2758,10 @@ Quick documentation:
     <relation/>
     <tag k="type" v="route"/>
     <tag k="network" v="ncn"/>
     <relation/>
     <tag k="type" v="route"/>
     <tag k="network" v="ncn"/>
-      
+
     <inputSet ref="route"/>
   </feature>
     <inputSet ref="route"/>
   </feature>
-  
+
   <feature name="Regional Cycle Network">
     <category>paths</category>
     <icon image="features/cycle__rcn.png" background="cyan" foreground="white">
   <feature name="Regional Cycle Network">
     <category>paths</category>
     <icon image="features/cycle__rcn.png" background="cyan" foreground="white">
@@ -2710,7 +2772,7 @@ Quick documentation:
     <relation/>
     <tag k="type" v="route"/>
     <tag k="network" v="rcn"/>
     <relation/>
     <tag k="type" v="route"/>
     <tag k="network" v="rcn"/>
-      
+
     <inputSet ref="route"/>
   </feature>
 
     <inputSet ref="route"/>
   </feature>
 
@@ -2724,7 +2786,7 @@ Quick documentation:
     <relation/>
     <tag k="type" v="route"/>
     <tag k="network" v="lcn"/>
     <relation/>
     <tag k="type" v="route"/>
     <tag k="network" v="lcn"/>
-      
+
     <inputSet ref="route"/>
   </feature>
 
     <inputSet ref="route"/>
   </feature>
 
@@ -2740,7 +2802,7 @@ Quick documentation:
     <relation/>
     <tag k="type" v="route"/>
     <tag k="route" v="foot"/>
     <relation/>
     <tag k="type" v="route"/>
     <tag k="route" v="foot"/>
-      
+
     <inputSet ref="route"/>
   </feature>
 
     <inputSet ref="route"/>
   </feature>
 
@@ -2755,27 +2817,27 @@ Quick documentation:
     <relation/>
     <tag k="type" v="route"/>
     <tag k="route" v="bus"/>
     <relation/>
     <tag k="type" v="route"/>
     <tag k="route" v="bus"/>
-      
+
     <inputSet ref="route"/>
     <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the bus service" priority="low"/>
     <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the bus service" priority="low"/>
   </feature>
     <inputSet ref="route"/>
     <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the bus service" priority="low"/>
     <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the bus service" priority="low"/>
   </feature>
-  
+
   <feature name="Tram Route">
     <category>transport</category>
     <icon image="features/transport__tram.png">
       <font size="12pt">${operator} <b>${reg}</b></font>
     </icon>
   <feature name="Tram Route">
     <category>transport</category>
     <icon image="features/transport__tram.png">
       <font size="12pt">${operator} <b>${reg}</b></font>
     </icon>
-    
+
     <relation/>
     <tag k="type" v="route"/>
     <tag k="route" v="tram"/>
     <relation/>
     <tag k="type" v="route"/>
     <tag k="route" v="tram"/>
-    
+
     <inputSet ref="route"/>
     <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the tram service" priority="low"/>
     <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the tram service" priority="low"/>
   </feature>
     <inputSet ref="route"/>
     <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the tram service" priority="low"/>
     <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the tram service" priority="low"/>
   </feature>
-  
+
 
     <!-- Junction nodes (for turn restrictions) -->
 
 
     <!-- Junction nodes (for turn restrictions) -->
 
index 4b86d2e..59ca4b6 100644 (file)
@@ -1,12 +1,14 @@
 /*
 
        Stylesheet that mimicks, to a certain extent, potlatch 1.x
 /*
 
        Stylesheet that mimicks, to a certain extent, potlatch 1.x
-        Andy Allan, November 2009
+        Started by Andy Allan, November 2009
 
        Based heavily on:
        MapCSS demonstration stylesheet
        Richard Fairhurst, October 2009
 
        Based heavily on:
        MapCSS demonstration stylesheet
        Richard Fairhurst, October 2009
-       
+
+Todo: define some reusable classes like "centred text".
+
 */
 
 /* This rule applies to all areas (closed ways). Note that rules are applied in the order
 */
 
 /* This rule applies to all areas (closed ways). Note that rules are applied in the order
@@ -32,33 +34,40 @@ way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F
 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],way[highway=unclassified]     { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; }
 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],way[highway=unclassified]     { z-index: 6; color: #FEFECB; 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=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: #aaaaaa; casing-width: 2; }
+way[highway=road]                                   { color: gray; width: 5; casing-color: white; casing-width: 7; }
 
 /* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit
 area=yes tag should be filled. The below doesn't yet work as intended. */
 way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
 way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
 
 
 /* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit
 area=yes tag should be filled. The below doesn't yet work as intended. */
 way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
 way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
 
-way[highway=steps]     { color: #FF6644; width: 2; dashes: 4, 2; }
-way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; }
+way[highway=steps]     { color: #FF6644; width: 6; dashes: 2, 2; }
+way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; set .path;}
 way[highway=footway][bicycle=yes]   { z-index: 4; color: Blue; width: 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; }
-way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; }
-way[highway=path]      { color: brown; width: 2; dashes: 2, 2; }
-way[highway=cycleway]  { color: Blue; width: 2; dashes: 4, 2; text:name; text-color: black; text-position: offset; text-offset: 3;}
+way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; set .path;}
+way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; .path;}
+way[highway=path]      { color: brown; width: 2; dashes: 2, 2; set .path;}
+way[highway=cycleway]  { color: Blue; width: 2; dashes: 4, 2; set .path;}
 way[railway=tram]      {z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
 way[railway=tram]      {z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
+way .path              {text:name; text-color: black; text-position: offset; text-offset: 3;}
 
 way[waterway=river], way[waterway=canal] { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
 
 way[waterway=river], way[waterway=canal] { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
-way[waterway=drain][tunnel!=yes] {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;}
+way[waterway=drain]                     {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;}
+way[waterway][tunnel=yes]                {dashes: 8,4;}
 
 way[barrier] {color: #000000; width: 1}
 
 way[barrier] {color: #000000; width: 1}
+way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; }
 
 /*add node[power=pylon] etc when there's an icon */
 
 /*add node[power=pylon] etc when there's an icon */
-way[power=line] {color: darkgrey; width: 1; dashes: 12,2; }
-way[power=minor_line] {color: grey; width: 1; dashes: 2,4; }
-way[power=station] :area { color: black; fill-color: grey; fill-opacity: 0.6;} /* fill-color not used? */
+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] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6;}
+way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6;}
 
 way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
 
 
 way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
 
@@ -66,8 +75,12 @@ way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 1
 
 
 way[natural] :area                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
 
 
 way[natural] :area                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
-way[natural=beach] :area                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.4; }
+way[natural=beach] :area                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; }
 way[landuse] :area                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; }
 way[landuse] :area                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; }
+way[landuse=residential] :area              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; }
+way[landuse=retail] :area                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; }
+way[landuse=commercial] :area               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; }
+way[landuse=military] :area                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; }
 way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
 way[leisure],way[sport] :area               { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
 way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; }
 way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
 way[leisure],way[sport] :area               { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
 way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; }
@@ -77,8 +90,9 @@ way[building] :area                         { color: #ff6ec7; width: 1; fill-col
 way[natural=water],
 way[waterway] :area               { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; }
 way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; }
 way[natural=water],
 way[waterway] :area               { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; }
 way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; }
-way[leisure=park]  :area                    { color: #44ff44; width: 1; fill-color: #44ff44; fill-opacity: 0.2; }
-way[leisure=pitch] :area                                       { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.6; }
+way[leisure=park]  :area                    { color: #44ff44; width: 1; fill-color: #44ff44; fill-opacity: 0.15; }
+way[leisure=garden]  :area                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; }
+way[leisure=pitch] :area                                       { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.4; }
 way[landuse=recreation_ground] :area        { color: green; fill-color: green; }
 way[amenity=parking] :area                  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.2; }
 way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
 way[landuse=recreation_ground] :area        { color: green; fill-color: green; }
 way[amenity=parking] :area                  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.2; }
 way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
@@ -88,8 +102,13 @@ way[man_made=pier][floating=yes]                    { dashes: 4,2; casing-color: #444;}
 way[leisure=marina] :area                                      { color: pink; fill-color: pink; fill-opacity: 0.4;}
 way[leisure=slipway]                                           { color: grey; width: 3; casing-color: blue; casing-width: 7; }
 
 way[leisure=marina] :area                                      { color: pink; fill-color: pink; fill-opacity: 0.4;}
 way[leisure=slipway]                                           { color: grey; width: 3; casing-color: blue; casing-width: 7; }
 
+way[embankment=yes]                        { z-index: 6; opacity: 0.5; color: brown; width: eval('_width+16'); dashes: 2, 14; }
+                                           { z-index: 5; opacity: 0.5; color: brown; width: eval('_width+24'); dashes: 2, 30; } /* meh, improve this */
+
+way[boundary=administrative]                { color: purple; width: 10; opacity: 0.2; dashes: 12,24; }
+
 
 
-/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 
+/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
 
 node[addr:housenumber],
 node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
 
 node[addr:housenumber],
 node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
@@ -121,7 +140,7 @@ node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-
 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; }
 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] :area { color: yellow; fill-color: yellow;}
+way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; text-color: black; font-size: 10; text: name; text-halo: white; text-halo-radius: 2; text-position: center; }
 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=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; }
@@ -179,13 +198,13 @@ node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text
 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; }
 
 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; }
 
-way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; }
+way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; text: name; text-color: black; font-size: 10; text-halo: white; text-halo-radius: 2; text-position: center; }
 
 
 /* We can stack styles at different z-index (depth) */
 
 way[railway=rail]
 
 
 /* We can stack styles at different z-index (depth) */
 
 way[railway=rail]
-       { z-index: 6; color: black; width: 5; } 
+       { z-index: 6; color: black; width: 5; }
        { z-index: 7; color: white; width: 3; dashes: 12,12; }
 way[railway=platform] { color:black; width: 2; }
 way[railway=subway]
        { z-index: 7; color: white; width: 3; dashes: 12,12; }
 way[railway=platform] { color:black; width: 2; }
 way[railway=subway]
@@ -196,9 +215,9 @@ way[railway=subway]
 way[bridge=yes], way[bridge=viaduct], way[bridge=suspension]
     { z-index: 4; color: white; width: eval('_width+3'); }
     { z-index: 3; color: black; width: eval('_width+6'); }
 way[bridge=yes], way[bridge=viaduct], way[bridge=suspension]
     { z-index: 4; color: white; width: eval('_width+3'); }
     { z-index: 3; color: black; width: eval('_width+6'); }
-    
+
 /* Tunnel */
 /* Tunnel */
-way[tunnel=yes]
+way[tunnel=yes][!waterway]
     { z-index: 4; color: white; width: eval('_width+2'); }
     { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
 
     { z-index: 4; color: white; width: eval('_width+2'); }
     { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
 
@@ -220,7 +239,11 @@ way :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; }
 way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
 way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
 way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
 way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
 way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
 way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
-way !:drawn { z-index:10; width: 0.5; color: gray; } 
+/*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/
+way !:drawn { z-index:9; width: 2; color: black; dashes: 4,0;} { z-index:10; width: 2; color: #ffff00; dashes: 0, 4, 4, 0;}
+ /*IMHO (Steve Bennett), in early testing we want to highlight ways that aren't triggering rules */
+/* way !:drawn { z-index:10; width: 0.5; color: gray; } was like this */
+
 
 relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; }
 
 
 relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; }
 
@@ -232,7 +255,7 @@ node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; colo
 node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1;}
 node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; }
 node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; }
 node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1;}
 node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; }
 node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; }
-       
+
 /* Descendant selectors provide an easy way to style relations: this example means "any way
    which is part of a relation whose type=route". */
 
 /* Descendant selectors provide an easy way to style relations: this example means "any way
    which is part of a relation whose type=route". */