sort out a whole bunch of the horrible mess that is our icon set, including new railw...
authorRichard Fairhurst <richard@systemed.net>
Sun, 13 Feb 2011 17:02:38 +0000 (17:02 +0000)
committerRichard Fairhurst <richard@systemed.net>
Sun, 13 Feb 2011 17:02:38 +0000 (17:02 +0000)
39 files changed:
resources/features/aeroway__runway.png [new file with mode: 0644]
resources/features/aeroway__taxiway.png [new file with mode: 0644]
resources/features/paths__unofficial.png [new file with mode: 0644]
resources/features/pois/barrier_generic.svg [deleted file]
resources/features/railway__abandoned.png [new file with mode: 0644]
resources/features/railway__disused.png [new file with mode: 0644]
resources/features/railway__light.png [new file with mode: 0644]
resources/features/railway__platform.png [new file with mode: 0644]
resources/features/railway__preserved.png [new file with mode: 0644]
resources/features/railway__rail.png [new file with mode: 0644]
resources/features/railway__siding.png [new file with mode: 0644]
resources/features/railway__spur.png [new file with mode: 0644]
resources/features/railway__subway.png [new file with mode: 0644]
resources/features/railway__tram.png [new file with mode: 0644]
resources/features/waterway__basin.png [new file with mode: 0644]
resources/features/waterway__coastline.png [new file with mode: 0644]
resources/features/waterway__dock.png [new file with mode: 0644]
resources/features/waterway__lake.png [new file with mode: 0644]
resources/features/waterway__marina.png [new file with mode: 0644]
resources/features/waterway__reservoir.png [new file with mode: 0644]
resources/features/waterway__riverbank.png [new file with mode: 0644]
resources/icons/health_pharmacy.n.16.png
resources/map_features/paths.xml
resources/map_features/transport.xml
resources/map_features/water.xml
resources_src/amenity_vendingmachine.svg [moved from resources/features/pois/amenity_vendingmachine.svg with 100% similarity]
resources_src/barrier_generic.svg [moved from resources/features/barrier_generic.svg with 100% similarity]
resources_src/manmade_lighthouse.svg [moved from resources/features/manmade_lighthouse.svg with 100% similarity]
resources_src/manmade_silo.svg [moved from resources/features/manmade_silo.svg with 100% similarity]
resources_src/manmade_tower.svg [moved from resources/features/manmade_tower.svg with 100% similarity]
resources_src/miniroundabout.svg [moved from resources/features/pois/miniroundabout.svg with 100% similarity]
resources_src/power_high.svg [moved from resources/features/power_high.svg with 100% similarity]
resources_src/power_low.svg [moved from resources/features/power_low.svg with 100% similarity]
resources_src/power_station.svg [moved from resources/features/pois/power_station.svg with 100% similarity]
resources_src/transport__railway.svg [moved from resources/features/transport__railway.svg with 100% similarity]
resources_src/transport__subway.svg [moved from resources/features/transport__subway.svg with 100% similarity]
resources_src/transport__tram.svg [moved from resources/features/transport__tram.svg with 100% similarity]
resources_src/water_generic.svg [moved from resources/features/pois/water_generic.svg with 100% similarity]
resources_src/way_icons.ai [new file with mode: 0644]

diff --git a/resources/features/aeroway__runway.png b/resources/features/aeroway__runway.png
new file mode 100644 (file)
index 0000000..bbac49e
Binary files /dev/null and b/resources/features/aeroway__runway.png differ
diff --git a/resources/features/aeroway__taxiway.png b/resources/features/aeroway__taxiway.png
new file mode 100644 (file)
index 0000000..a5eda4d
Binary files /dev/null and b/resources/features/aeroway__taxiway.png differ
diff --git a/resources/features/paths__unofficial.png b/resources/features/paths__unofficial.png
new file mode 100644 (file)
index 0000000..fa428df
Binary files /dev/null and b/resources/features/paths__unofficial.png differ
diff --git a/resources/features/pois/barrier_generic.svg b/resources/features/pois/barrier_generic.svg
deleted file mode 100644 (file)
index 2473955..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg3646"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="barrier_generic.svg"
-   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/pois/barrier_generic.24.png"
-   inkscape:export-xdpi="33.75"
-   inkscape:export-ydpi="33.75">
-  <defs
-     id="defs3648">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective3654" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="-0.27272727"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#666666;fill-opacity:1;stroke:none"
-       id="rect3656"
-       width="64.363632"
-       height="64"
-       x="0"
-       y="0"
-       ry="8.0227919"
-       rx="6.6013985" />
-  </g>
-</svg>
diff --git a/resources/features/railway__abandoned.png b/resources/features/railway__abandoned.png
new file mode 100644 (file)
index 0000000..3b7a02e
Binary files /dev/null and b/resources/features/railway__abandoned.png differ
diff --git a/resources/features/railway__disused.png b/resources/features/railway__disused.png
new file mode 100644 (file)
index 0000000..2b24f69
Binary files /dev/null and b/resources/features/railway__disused.png differ
diff --git a/resources/features/railway__light.png b/resources/features/railway__light.png
new file mode 100644 (file)
index 0000000..0e2eca7
Binary files /dev/null and b/resources/features/railway__light.png differ
diff --git a/resources/features/railway__platform.png b/resources/features/railway__platform.png
new file mode 100644 (file)
index 0000000..e6d5919
Binary files /dev/null and b/resources/features/railway__platform.png differ
diff --git a/resources/features/railway__preserved.png b/resources/features/railway__preserved.png
new file mode 100644 (file)
index 0000000..28d4f5c
Binary files /dev/null and b/resources/features/railway__preserved.png differ
diff --git a/resources/features/railway__rail.png b/resources/features/railway__rail.png
new file mode 100644 (file)
index 0000000..0aa4e66
Binary files /dev/null and b/resources/features/railway__rail.png differ
diff --git a/resources/features/railway__siding.png b/resources/features/railway__siding.png
new file mode 100644 (file)
index 0000000..9519ee0
Binary files /dev/null and b/resources/features/railway__siding.png differ
diff --git a/resources/features/railway__spur.png b/resources/features/railway__spur.png
new file mode 100644 (file)
index 0000000..4cde3d8
Binary files /dev/null and b/resources/features/railway__spur.png differ
diff --git a/resources/features/railway__subway.png b/resources/features/railway__subway.png
new file mode 100644 (file)
index 0000000..7e13bd0
Binary files /dev/null and b/resources/features/railway__subway.png differ
diff --git a/resources/features/railway__tram.png b/resources/features/railway__tram.png
new file mode 100644 (file)
index 0000000..2940c7a
Binary files /dev/null and b/resources/features/railway__tram.png differ
diff --git a/resources/features/waterway__basin.png b/resources/features/waterway__basin.png
new file mode 100644 (file)
index 0000000..29798db
Binary files /dev/null and b/resources/features/waterway__basin.png differ
diff --git a/resources/features/waterway__coastline.png b/resources/features/waterway__coastline.png
new file mode 100644 (file)
index 0000000..2239eb0
Binary files /dev/null and b/resources/features/waterway__coastline.png differ
diff --git a/resources/features/waterway__dock.png b/resources/features/waterway__dock.png
new file mode 100644 (file)
index 0000000..e6e40d1
Binary files /dev/null and b/resources/features/waterway__dock.png differ
diff --git a/resources/features/waterway__lake.png b/resources/features/waterway__lake.png
new file mode 100644 (file)
index 0000000..275bb57
Binary files /dev/null and b/resources/features/waterway__lake.png differ
diff --git a/resources/features/waterway__marina.png b/resources/features/waterway__marina.png
new file mode 100644 (file)
index 0000000..3704b00
Binary files /dev/null and b/resources/features/waterway__marina.png differ
diff --git a/resources/features/waterway__reservoir.png b/resources/features/waterway__reservoir.png
new file mode 100644 (file)
index 0000000..bd118e6
Binary files /dev/null and b/resources/features/waterway__reservoir.png differ
diff --git a/resources/features/waterway__riverbank.png b/resources/features/waterway__riverbank.png
new file mode 100644 (file)
index 0000000..7152808
Binary files /dev/null and b/resources/features/waterway__riverbank.png differ
index ffc1256..1827b0a 100644 (file)
Binary files a/resources/icons/health_pharmacy.n.16.png and b/resources/icons/health_pharmacy.n.16.png differ
index 3305765..c182cdf 100644 (file)
-<featureGroup>\r
-  <feature name="Footpath">\r
-    <category>paths</category>\r
-    <icon image="features/paths__footway.png">\r
-      ${name} <i>${ref}</i>\r
-    </icon>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway</help>\r
-    <line/>\r
-    <tag k="highway" v="footway"/>\r
-    <inputSet ref="path"/>\r
-    <inputSet ref="common"/>\r
-    <inputset ref="naming"/>\r
-  </feature>\r
-\r
-  <feature name="Cycle path">\r
-    <category>paths</category>\r
-    <icon image="features/paths__bike.png">\r
-      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>\r
-    </icon>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway</help>\r
-    <line/>\r
-    <tag k="highway" v="cycleway"/>\r
-    <inputSet ref="path"/>\r
-    <inputSet ref="common"/>\r
-    <inputset ref="naming"/>\r
-  </feature>\r
-\r
-  <feature name="Generic path">\r
-    <category>paths</category>\r
-    <icon >\r
-      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>\r
-    </icon>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath</help>\r
-\r
-    <line/>\r
-    <tag k="highway" v="path"/>\r
-    <inputSet ref="path"/>\r
-    <inputSet ref="common"/>\r
-    <inputset ref="naming"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Pedestrian street">\r
-    <category>paths</category>\r
-    <icon image="features/paths__pedestrian.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <tag k="highway" v="pedestrian"/>\r
-    <!-- pedestrian roads can be lines or areas, with different tags -->\r
-    <!-- TODO - implement this! -->\r
-    <line>\r
-      <tag k="highway" v="pedestrian"/>\r
-    </line>\r
-    <area>\r
-      <tag k="highway" v="pedestrian"/>\r
-      <tag k="area" v="yes"/>\r
-    </area>\r
-    <inputSet ref="minorRoad"/>\r
-    <inputSet ref="common"/>\r
-    <inputset ref="naming"/>\r
-  </feature>\r
-\r
-  <feature name="Bridleway">\r
-    <category>paths</category>\r
-    <icon image="features/paths__bridleway.png">\r
-    </icon>\r
-\r
-    <line/>\r
-    <tag k="highway" v="bridleway"/>\r
-    <inputSet ref="path"/>\r
-    <inputSet ref="common"/>\r
-    <inputset ref="naming"/>\r
-  </feature>\r
-\r
-  <feature name="Steps">\r
-    <category>paths</category>\r
-    <icon image="features/paths__steps.png">\r
-    </icon>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps</help>\r
-\r
-    <line/>\r
-    <tag k="highway" v="steps"/>\r
-    <inputSet ref="path"/>\r
-    <input type="freetext" presence="always" category="Naming" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-  \r
-  \r
-  <!-- Bicycle routes -->\r
-  <feature name="National Cycle Network">\r
-    <category>paths</category>\r
-    <icon image="features/cycle__ncn.png" background="red" foreground="white">\r
-      <font size="14pt">\r
-        <b>${ref}</b>\r
-      </font>\r
-      <br/>\r
-      <font size="12pt">${name}</font>\r
-    </icon>\r
-\r
-    <relation/>\r
-    <tag k="type" v="route"/>\r
-    <tag k="network" v="ncn"/>\r
-\r
-    <inputSet ref="route"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Regional Cycle Network">\r
-    <category>paths</category>\r
-    <icon image="features/cycle__rcn.png" background="cyan" foreground="white">\r
-      <font size="14pt"><b>${ref}</b></font><br/>\r
-      <font size="12pt">${name}</font>\r
-    </icon>\r
-\r
-    <relation/>\r
-    <tag k="type" v="route"/>\r
-    <tag k="network" v="rcn"/>\r
-\r
-    <inputSet ref="route"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Local Cycle Network">\r
-    <category>paths</category>\r
-    <icon image="features/cycle__lcn.png" background="blue" foreground="white">\r
-      <font size="14pt">\r
-        <b>${ref}</b>\r
-      </font>\r
-      <br/>\r
-      <font size="12pt">${name}</font>\r
-    </icon>\r
-\r
-    <relation/>\r
-    <tag k="type" v="route"/>\r
-    <tag k="network" v="lcn"/>\r
-\r
-    <inputSet ref="route"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-  \r
-  <!-- hiking -->\r
-  \r
-  <feature name="Long Distance Path">\r
-    <category>paths</category>\r
-    <icon image="features/paths__footway.png" background="green" foreground="white">\r
-      <font size="14pt">\r
-        <b>${ref}</b>\r
-      </font>\r
-      <br/>\r
-      <font size="12pt">${name}</font>\r
-    </icon>\r
-\r
-    <relation/>\r
-    <tag k="type" v="route"/>\r
-    <tag k="route" v="foot"/>\r
-\r
-    <inputSet ref="route"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-  \r
+<featureGroup>
+  <feature name="Footpath">
+    <category>paths</category>
+    <icon image="features/paths__footway.png">
+      ${name} <i>${ref}</i>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway</help>
+    <line/>
+    <tag k="highway" v="footway"/>
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+    <inputset ref="naming"/>
+  </feature>
+
+  <feature name="Cycle path">
+    <category>paths</category>
+    <icon image="features/paths__bike.png">
+      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway</help>
+    <line/>
+    <tag k="highway" v="cycleway"/>
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+    <inputset ref="naming"/>
+  </feature>
+
+  <feature name="Pedestrian street">
+    <category>paths</category>
+    <icon image="features/paths__pedestrian.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <tag k="highway" v="pedestrian"/>
+    <!-- pedestrian roads can be lines or areas, with different tags -->
+    <!-- TODO - implement this! -->
+    <line>
+      <tag k="highway" v="pedestrian"/>
+    </line>
+    <area>
+      <tag k="highway" v="pedestrian"/>
+      <tag k="area" v="yes"/>
+    </area>
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+    <inputset ref="naming"/>
+  </feature>
+
+  <feature name="Bridleway">
+    <category>paths</category>
+    <icon image="features/paths__bridleway.png">
+    </icon>
+
+    <line/>
+    <tag k="highway" v="bridleway"/>
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+    <inputset ref="naming"/>
+  </feature>
+
+  <feature name="Steps">
+    <category>paths</category>
+    <icon image="features/paths__steps.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps</help>
+
+    <line/>
+    <tag k="highway" v="steps"/>
+    <inputSet ref="path"/>
+    <input type="freetext" presence="always" category="Naming" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+  
+  <feature name="Generic path">
+    <category>paths</category>
+    <icon image="features/paths__unofficial.png">
+      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath</help>
+
+    <line/>
+    <tag k="highway" v="path"/>
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+    <inputset ref="naming"/>
+  </feature>
+
+  
+  <!-- Bicycle routes -->
+  <feature name="National Cycle Network">
+    <category>paths</category>
+    <icon image="features/cycle__ncn.png" background="red" foreground="white">
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br/>
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="network" v="ncn"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Regional Cycle Network">
+    <category>paths</category>
+    <icon image="features/cycle__rcn.png" background="cyan" foreground="white">
+      <font size="14pt"><b>${ref}</b></font><br/>
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="network" v="rcn"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Local Cycle Network">
+    <category>paths</category>
+    <icon image="features/cycle__lcn.png" background="blue" foreground="white">
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br/>
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="network" v="lcn"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+  
+  <!-- hiking -->
+  
+  <feature name="Long Distance Path">
+    <category>paths</category>
+    <icon image="features/paths__footway.png" background="green" foreground="white">
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br/>
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="route" v="foot"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+  
 </featureGroup>
\ No newline at end of file
index 91df3df..29ddc16 100644 (file)
-<featureGroup>\r
-    <feature name="Railway line">\r
-        <category>transport</category>\r
-        <icon image="features/transport__railway.png">\r
-          <font size="14pt">\r
-            <b>${name}</b>\r
-          </font>\r
-        </icon>\r
-    \r
-        <line/>\r
-        <tag k="railway" v="rail"/>\r
-        <inputSet ref="bridge"/>\r
-        <inputSet ref="tunnel"/>\r
-        <inputSet ref="embankment-cutting"/>\r
-        <inputSet ref="rail-electrification"/>\r
-        <inputSet ref="rail-usage"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Railway spur">\r
-        <category>transport</category>\r
-        <icon image="features/transport__railway.png">\r
-          <font size="14pt">\r
-            <b>${name}</b>\r
-          </font>\r
-        </icon>\r
-    \r
-        <line/>\r
-        <tag k="railway" v="rail"/>\r
-        <tag k="service" v="spur"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Railway siding">\r
-        <category>transport</category>\r
-        <icon image="features/transport__railway.png">\r
-          <font size="14pt">\r
-            <b>${name}</b>\r
-          </font>\r
-        </icon>\r
-    \r
-        <line/>\r
-        <tag k="railway" v="rail"/>\r
-        <tag k="service" v="siding"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Preserved line">\r
-        <category>transport</category>\r
-        <icon image="features/transport__railway.png">\r
-          <font size="14pt"><b>${name}</b></font>\r
-        </icon>\r
-    \r
-        <line/>\r
-        <tag k="railway" v="preserved"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Disused tracks">\r
-        <category>transport</category>\r
-        <icon image="features/transport__railway_disused.png">\r
-          <font size="14pt">\r
-            <b>${name}</b>\r
-          </font>\r
-        </icon>\r
-    \r
-        <line/>\r
-        <tag k="railway" v="disused"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Old trackbed">\r
-        <category>transport</category>\r
-        <icon image="features/transport__railway_abandoned.png">\r
-          <font size="14pt"><b>${name}</b></font>\r
-        </icon>\r
-    \r
-        <line/>\r
-        <tag k="railway" v="abandoned"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Light rail line">\r
-        <category>transport</category>\r
-        <icon image="features/transport__tram.png">\r
-          <font size="14pt">\r
-            <b>${name}</b>\r
-          </font>\r
-        </icon>\r
-    \r
-        <line/>\r
-        <tag k="railway" v="light_rail"/>\r
-        <inputSet ref="bridge"/>\r
-        <inputSet ref="tunnel"/>\r
-        <inputset ref="embankment-cutting"/>\r
-        <inputSet ref="rail-electrification"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Tram line">\r
-        <category>transport</category>\r
-        <icon image="features/transport__tram.png">\r
-          <font size="14pt"><b>${name}</b></font>\r
-        </icon>\r
-    \r
-        <line/>\r
-        <tag k="railway" v="tram"/>\r
-        <input ref="tram-route"/>\r
-        <inputSet ref="bridge"/>\r
-        <inputSet ref="tunnel"/>\r
-        <inputset ref="embankment-cutting"/>\r
-        <inputSet ref="rail-electrification"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Subway line">\r
-        <category>transport</category>\r
-        <icon image="features/transport__subway.png">\r
-          <font size="14pt">\r
-            <b>${name}</b>\r
-          </font>\r
-        </icon>\r
-    \r
-        <line/>\r
-        <tag k="railway" v="subway"/>\r
-        <inputSet ref="bridge"/>\r
-        <inputSet ref="tunnel"/>\r
-        <inputset ref="embankment-cutting"/>\r
-        <inputSet ref="rail-electrification"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Railway platform">\r
-        <category>transport</category>\r
-        <icon image="features/transport__railway_platform.png"/>\r
-        <line/>\r
-        <area/>\r
-        <tag k="railway" v="platform"/>\r
-        <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The number of the platform" priority="low"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Bus station">\r
-        <category>transport</category>\r
-        <icon image="/features/pois/transport_bus_station.n.24.png">\r
-          <b>${name} ${addr:housename}</b><br/>\r
-          ${addr:housenumber} ${addr:street} ${addr:postcode}\r
-        </icon>\r
-    \r
-        <area/>\r
-        <tag k="amenity" v="bus_station"/>\r
-        <inputSet ref="names"/>\r
-        <inputSet ref="isBuilding"/>\r
-        <inputSet ref="buildingAddress"/>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Airport">\r
-        <category>transport</category>\r
-        <icon image="icons/transport_airport_48.png"/>\r
-        <tag k="aeroway" v="aerodrome"/>\r
-        <area/>\r
-        <point/>\r
-        <inputSet ref="names"/>\r
-        <input type="freetext" presence="always" category="Naming" name="International Air Transport Association (IATA) airport code" key="ref"/>\r
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Airport terminal">\r
-        <category>transport</category>\r
-        <icon image="features/pois/transport_airport_terminal.n.24.png"/>\r
-        <tag k="aeroway" v="terminal"/>\r
-        <area/>\r
-        <point/>\r
-        <inputSet ref="names"/>\r
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Helipad">\r
-        <category>transport</category>\r
-        <icon image="icons/transport_helipad_48.png"/>\r
-        <tag k="aeroway" v="helipad"/>\r
-        <area/>\r
-        <point/>\r
-        <inputSet ref="names"/>\r
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Airport runway">\r
-        <category>transport</category>\r
-        <icon image="icons/transport_blank.png"/>\r
-        <tag k="aeroway" v="runway"/>\r
-        <line/>\r
-        <inputSet ref="names"/>\r
-        <input type="freetext" presence="always" category="Naming" name="Runway number (01-36)" key="ref"/>\r
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Airport taxiway">\r
-        <category>transport</category>\r
-        <icon image="icons/transport_blank.png"/>\r
-        <tag k="aeroway" v="taxiway"/>\r
-        <line/>\r
-        <inputSet ref="names"/>\r
-        <input type="freetext" presence="always" category="Naming" name="Taxiway number" key="ref" />\r
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Airport apron">\r
-        <category>transport</category>\r
-        <icon image="icons/transport_blank.png"/>\r
-        <tag k="aeroway" v="apron"/>\r
-        <area/>\r
-        <inputSet ref="names"/>\r
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-    \r
-    \r
-      <feature name="Airport gate">\r
-        <category>transport</category>\r
-        <icon image="features/pois/transport_airport_gate.n.24.png"/>\r
-        <tag k="aeroway" v="gate"/>\r
-        <point/>\r
-        <input type="freetext" presence="always" category="Naming" name="Gate number" key="ref"/>\r
-        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>\r
-        <inputSet ref="common"/>\r
-      </feature>\r
-      \r
-      \r
-<feature name="Aerodrome">\r
-    <category>aeroway</category>\r
-    <icon image="features/pois/transport_aerodrome.n.24.png"/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome</help>\r
-    <point/>\r
-    <tag k="aeroway" v="aerodrome"/>\r
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the aerodrome/airport" priority="low"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Bus Stop">\r
-    <category>transport</category>\r
-    <icon image="features/pois/transport_bus_stop2.n.24.png">\r
-      ${name} ${local_ref}\r
-    </icon>\r
-    <point/>\r
-    <tag k="highway" v="bus_stop"/>\r
-    <inputSet ref="buses"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Car Parking">\r
-    <category>transport</category>\r
-    <icon image="features/pois/transport_parking_car.n.24.png">\r
-      ${name}\r
-    </icon>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dparking</help>\r
-    <point/>\r
-    <area/>\r
-    <tag k="amenity" v="parking"/>\r
-    <inputSet ref="names"/>\r
-    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>\r
-    <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"/>\r
-    <inputSet ref="fee"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Bicycle Parking">\r
-    <category>transport</category>\r
-    <icon image="features/pois/transport_parking_bicycle.n.24.png">\r
-      ${name} ${capacity}\r
-    </icon>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_parking</help>\r
-    <point/>\r
-    <tag k="amenity" v="bicycle_parking"/>\r
-    <inputSet ref="names"/>\r
-    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>\r
-    <input type="number" minimum="0" maximum="99999" stepSize="1"\r
-        presence="always" category="Cycle" name="Capacity" key="capacity"\r
-        description="The number of bicycles that can be parked in the group of bicycle parking racks"/>\r
-    <inputSet ref="fee"/>\r
-    <input type="choice" presence="always" category="Cycle" name="Covered" key="covered" description="Is the cycle parking covered, so that the bikes are kept dry?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Railway station">\r
-    <category>transport</category>\r
-    <icon image="features/pois/transport_train_station.n.24.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <point/>\r
-    <tag k="railway" v="station"/>\r
-    <inputSet ref="names"/>\r
-    <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/>\r
-    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the service" priority="low"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Fuel">\r
-    <category>transport</category>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/transport_fuel.n.24.png"/>\r
-    <tag k="amenity" v="fuel"/>\r
-    <input type="freetext" category="Naming" name="Operator" key="operator" description="The provider of the service"/>\r
-    <input type="choice" category="Fuels" name="Diesel" key="diesel" description="Is diesel fuel sold here?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-    <input type="choice" category="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-    <input type="choice" category="Fuels" name="Octane 95" key="octane_95" description="Is octane 95 unleaded fuel sold here?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-    <input type="choice" category="Fuels" name="Octane 98" key="octane_98" description="Is octane 98 unleaded fuel sold here?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-    <input type="choice" category="Fuels" name="Octane 100" key="octane_100" description="Is octane 100 unleaded fuel sold here?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-    <input type="choice" category="Fuels" name="Ethanol" key="ethanol" description="Is ethanol sold here?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-    <input type="choice" category="Fuels" name="LPG" key="lpg" description="Is LPG (liquid petroleum gas) sold here?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-    <input type="choice" category="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-    <input type="choice" category="Fuels" name="Bio-diesel" key="biodiesel" description="Is biodiesel unleaded fuel sold here?">\r
-      <choice value="yes" text="Yes"/>\r
-      <choice value="no" text="No"/>\r
-    </input>\r
-\r
-\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Bus station">\r
-    <category>transport</category>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/transport_bus_station.n.24.png"/>\r
-    <tag k="amenity" v="bus_station"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Taxi rank">\r
-    <category>transport</category>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/transport_taxi_rank.n.24.png"/>\r
-    <tag k="amenity" v="taxi"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Tram stop">\r
-    <category>transport</category><point/><inputSet ref="simpleName" />\r
-    <icon image="features/pois/transport_tram_stop.n.24.png"/>\r
-    <tag k="railway" v="tram_stop"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Bicycle rental">\r
-    <category>transport</category>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/transport_rental_bicycle.n.24.png"/>\r
-    <tag k="amenity" v="bicycle_rental"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Car rental">\r
-    <category>transport</category>\r
-    <point/>\r
-    <inputSet ref="simpleName"/>\r
-    <icon image="features/pois/transport_rental_car.n.24.png"/>\r
-    <tag k="amenity" v="car_rental"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Ferry Terminal">\r
-    <category>transport</category>\r
-    <icon image="features/pois/transport_port.n.24.png"/>\r
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal</help>\r
-    <point/>\r
-    <tag k="amenity" v="ferry_terminal"/>\r
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the ferry terminal."/>\r
-    <input type="freetext" presence="always" category="" name="Operator" key="operator" description="The operator of the ferry terminal." priority="low"/>\r
-    <input type="freetext" presence="onTagMatch" category="Cargo" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <!-- public transit routes -->\r
-  <feature name="Bus Route">\r
-    <category>transport</category>\r
-    <icon image="features/transport__bus.png">\r
-      <font size="12pt">\r
-        ${operator} <b>${ref}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <relation/>\r
-    <tag k="type" v="route"/>\r
-    <tag k="route" v="bus"/>\r
-\r
-    <inputSet ref="route"/>\r
-    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the bus service" priority="low"/>\r
-    <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the bus service" priority="low"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Tram Route">\r
-    <category>transport</category>\r
-    <icon image="features/transport__tram.png">\r
-      <font size="12pt">\r
-        ${operator} <b>${reg}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <relation/>\r
-    <tag k="type" v="route"/>\r
-    <tag k="route" v="tram"/>\r
-\r
-    <inputSet ref="route"/>\r
-    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the tram service" priority="low"/>\r
-    <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the tram service" priority="low"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-      \r
+<featureGroup>
+    <feature name="Railway line">
+        <category>transport</category>
+        <icon image="features/railway__rail.png">
+          <font size="14pt">
+            <b>${name}</b>
+          </font>
+        </icon>
+    
+        <line/>
+        <tag k="railway" v="rail"/>
+        <inputSet ref="bridge"/>
+        <inputSet ref="tunnel"/>
+        <inputSet ref="embankment-cutting"/>
+        <inputSet ref="rail-electrification"/>
+        <inputSet ref="rail-usage"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Railway spur">
+        <category>transport</category>
+        <icon image="features/railway__spur.png">
+          <font size="14pt">
+            <b>${name}</b>
+          </font>
+        </icon>
+    
+        <line/>
+        <tag k="railway" v="rail"/>
+        <tag k="service" v="spur"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Railway siding">
+        <category>transport</category>
+        <icon image="features/railway__siding.png">
+          <font size="14pt">
+            <b>${name}</b>
+          </font>
+        </icon>
+    
+        <line/>
+        <tag k="railway" v="rail"/>
+        <tag k="service" v="siding"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Preserved line">
+        <category>transport</category>
+        <icon image="features/railway__preserved.png">
+          <font size="14pt"><b>${name}</b></font>
+        </icon>
+    
+        <line/>
+        <tag k="railway" v="preserved"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Disused tracks">
+        <category>transport</category>
+        <icon image="features/railway__disused.png">
+          <font size="14pt">
+            <b>${name}</b>
+          </font>
+        </icon>
+    
+        <line/>
+        <tag k="railway" v="disused"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Old trackbed">
+        <category>transport</category>
+        <icon image="features/railway__abandoned.png">
+          <font size="14pt"><b>${name}</b></font>
+        </icon>
+    
+        <line/>
+        <tag k="railway" v="abandoned"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Light rail line">
+        <category>transport</category>
+        <icon image="features/railway__light.png">
+          <font size="14pt">
+            <b>${name}</b>
+          </font>
+        </icon>
+    
+        <line/>
+        <tag k="railway" v="light_rail"/>
+        <inputSet ref="bridge"/>
+        <inputSet ref="tunnel"/>
+        <inputset ref="embankment-cutting"/>
+        <inputSet ref="rail-electrification"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Tram line">
+        <category>transport</category>
+        <icon image="features/railway__tram.png">
+          <font size="14pt"><b>${name}</b></font>
+        </icon>
+    
+        <line/>
+        <tag k="railway" v="tram"/>
+        <input ref="tram-route"/>
+        <inputSet ref="bridge"/>
+        <inputSet ref="tunnel"/>
+        <inputset ref="embankment-cutting"/>
+        <inputSet ref="rail-electrification"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Subway line">
+        <category>transport</category>
+        <icon image="features/railway__subway.png">
+          <font size="14pt">
+            <b>${name}</b>
+          </font>
+        </icon>
+    
+        <line/>
+        <tag k="railway" v="subway"/>
+        <inputSet ref="bridge"/>
+        <inputSet ref="tunnel"/>
+        <inputset ref="embankment-cutting"/>
+        <inputSet ref="rail-electrification"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Railway platform">
+        <category>transport</category>
+        <icon image="features/railway__platform.png"/>
+        <line/>
+        <area/>
+        <tag k="railway" v="platform"/>
+        <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The number of the platform" priority="low"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Bus station">
+        <category>transport</category>
+        <icon image="/features/pois/transport_bus_station.n.24.png">
+          <b>${name} ${addr:housename}</b><br/>
+          ${addr:housenumber} ${addr:street} ${addr:postcode}
+        </icon>
+    
+        <area/>
+        <tag k="amenity" v="bus_station"/>
+        <inputSet ref="names"/>
+        <inputSet ref="isBuilding"/>
+        <inputSet ref="buildingAddress"/>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Airport">
+        <category>transport</category>
+        <icon image="icons/transport_airport_48.png"/>
+        <tag k="aeroway" v="aerodrome"/>
+        <area/>
+        <point/>
+        <inputSet ref="names"/>
+        <input type="freetext" presence="always" category="Naming" name="International Air Transport Association (IATA) airport code" key="ref"/>
+        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Airport terminal">
+        <category>transport</category>
+        <icon image="features/pois/transport_airport_terminal.n.24.png"/>
+        <tag k="aeroway" v="terminal"/>
+        <area/>
+        <point/>
+        <inputSet ref="names"/>
+        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Helipad">
+        <category>transport</category>
+        <icon image="icons/transport_helipad_48.png"/>
+        <tag k="aeroway" v="helipad"/>
+        <area/>
+        <point/>
+        <inputSet ref="names"/>
+        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Airport runway">
+        <category>transport</category>
+        <icon image="features/aeroway__runway.png"/>
+        <tag k="aeroway" v="runway"/>
+        <line/>
+        <inputSet ref="names"/>
+        <input type="freetext" presence="always" category="Naming" name="Runway number (01-36)" key="ref"/>
+        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Airport taxiway">
+        <category>transport</category>
+        <icon image="features/aeroway__taxiway.png"/>
+        <tag k="aeroway" v="taxiway"/>
+        <line/>
+        <inputSet ref="names"/>
+        <input type="freetext" presence="always" category="Naming" name="Taxiway number" key="ref" />
+        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Airport apron">
+        <category>transport</category>
+        <icon image="icons/transport_blank.png"/>
+        <tag k="aeroway" v="apron"/>
+        <area/>
+        <inputSet ref="names"/>
+        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+        <inputSet ref="common"/>
+      </feature>
+    
+    
+      <feature name="Airport gate">
+        <category>transport</category>
+        <icon image="features/pois/transport_airport_gate.n.24.png"/>
+        <tag k="aeroway" v="gate"/>
+        <point/>
+        <input type="freetext" presence="always" category="Naming" name="Gate number" key="ref"/>
+        <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+        <inputSet ref="common"/>
+      </feature>
+      
+      
+<feature name="Aerodrome">
+    <category>aeroway</category>
+    <icon image="features/pois/transport_aerodrome.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome</help>
+    <point/>
+    <tag k="aeroway" v="aerodrome"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the aerodrome/airport" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bus Stop">
+    <category>transport</category>
+    <icon image="features/pois/transport_bus_stop2.n.24.png">
+      ${name} ${local_ref}
+    </icon>
+    <point/>
+    <tag k="highway" v="bus_stop"/>
+    <inputSet ref="buses"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Car Parking">
+    <category>transport</category>
+    <icon image="features/pois/transport_parking_car.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dparking</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="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" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
+    <inputSet ref="fee"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bicycle Parking">
+    <category>transport</category>
+    <icon image="features/pois/transport_parking_bicycle.n.24.png">
+      ${name} ${capacity}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_parking</help>
+    <point/>
+    <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"
+        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"/>
+    <input type="choice" presence="always" category="Cycle" name="Covered" key="covered" description="Is the cycle parking covered, so that the bikes are kept dry?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <inputSet ref="common"/>
+  </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>
+
+    <point/>
+    <tag k="railway" v="station"/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the service" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Fuel">
+    <category>transport</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/transport_fuel.n.24.png"/>
+    <tag k="amenity" v="fuel"/>
+    <input type="freetext" category="Naming" name="Operator" key="operator" description="The provider of the service"/>
+    <input type="choice" category="Fuels" name="Diesel" key="diesel" description="Is diesel fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 95" key="octane_95" description="Is octane 95 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 98" key="octane_98" description="Is octane 98 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 100" key="octane_100" description="Is octane 100 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Ethanol" key="ethanol" description="Is ethanol sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="LPG" key="lpg" description="Is LPG (liquid petroleum gas) sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Bio-diesel" key="biodiesel" description="Is biodiesel unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+
+
+    <inputSet ref="common"/>
+  </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"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Taxi rank">
+    <category>transport</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/transport_taxi_rank.n.24.png"/>
+    <tag k="amenity" v="taxi"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Tram stop">
+    <category>transport</category><point/><inputSet ref="simpleName" />
+    <icon image="features/pois/transport_tram_stop.n.24.png"/>
+    <tag k="railway" v="tram_stop"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bicycle rental">
+    <category>transport</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/transport_rental_bicycle.n.24.png"/>
+    <tag k="amenity" v="bicycle_rental"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Car rental">
+    <category>transport</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/transport_rental_car.n.24.png"/>
+    <tag k="amenity" v="car_rental"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Ferry Terminal">
+    <category>transport</category>
+    <icon image="features/pois/transport_port.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal</help>
+    <point/>
+    <tag k="amenity" v="ferry_terminal"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the ferry terminal."/>
+    <input type="freetext" presence="always" category="" name="Operator" key="operator" description="The operator of the ferry terminal." priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Cargo" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- public transit routes -->
+  <feature name="Bus Route">
+    <category>transport</category>
+    <icon image="features/transport__bus.png">
+      <font size="12pt">
+        ${operator} <b>${ref}</b>
+      </font>
+    </icon>
+
+    <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"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <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"/>
+
+    <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"/>
+    <inputSet ref="common"/>
+  </feature>
+
+      
 </featureGroup>
\ No newline at end of file
index 1787c9e..86e3888 100644 (file)
-<featureGroup>\r
-  <feature name="Stream">\r
-    <category>water</category>\r
-    <description>A very narrow river.</description>\r
-    <icon image="features/waterway__stream.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <line/>\r
-    <tag k="waterway" v="stream"/>\r
-    <inputSet ref="waterways"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="River">\r
-    <category>water</category>\r
-    <icon image="features/waterway__river.png">\r
-      <font size="14pt"><b>${name}</b></font>\r
-    </icon>\r
-\r
-    <line/>\r
-    <tag k="waterway" v="river"/>\r
-    <inputSet ref="waterways"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Canal">\r
-    <category>water</category>\r
-    <icon image="features/waterway__canal.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <line/>\r
-    <tag k="waterway" v="canal"/>\r
-    <inputSet ref="waterways"/>\r
-    <inputSet ref="tunnel"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Drain">\r
-    <category>water</category>\r
-    <icon image="features/waterway__drain.png">\r
-      <font size="14pt"><b>${name}</b></font>\r
-    </icon>\r
-\r
-    <line/>\r
-    <tag k="waterway" v="drain"/>\r
-    <inputSet ref="tunnel"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Dam">\r
-    <!-- Moved to "barrier" because this describes the dam wall, not the water. -->\r
-    <category>barrier</category>\r
-    <icon image="features/waterway__dam.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <line/>\r
-    <area/>\r
-    <tag k="waterway" v="dam"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Riverbank">\r
-    <category>water</category>\r
-    <icon image="features/pois/water_generic.24.png">\r
-      <font size="14pt"><b>${name}</b></font>\r
-    </icon>\r
-\r
-    <area/>\r
-    <tag k="waterway" v="riverbank"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Reservoir">\r
-    <category>water</category>\r
-    <icon image="features/pois/water_generic.24.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <area/>\r
-    <tag k="landuse" v="reservoir"/>\r
-    <inputSet ref="boatPermissions"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Lake">\r
-    <category>water</category>\r
-    <icon image="features/pois/water_generic.24.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-    <area/>\r
-    <tag k="natural" v="water"/>\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="boatPermissions"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Basin">\r
-    <category>water</category>\r
-    <icon image="features/pois/water_generic.24.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <area/>\r
-    <tag k="landuse" v="basin"/>\r
-    <inputSet ref="boatPermissions"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Weir">\r
-    <category>water</category>\r
-    <icon image="features/waterway__weir.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <line/>\r
-    <point/>\r
-    <tag k="waterway" v="weir"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-\r
-\r
-  <feature name="Dock">\r
-    <category>water</category>\r
-    <icon image="features/pois/water_generic.24.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <area/>\r
-    <tag k="waterway" v="dock"/>\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Marina">\r
-    <category>water</category>\r
-    <icon image="features/pois/transport_marina.n.24.png">\r
-      <font size="14pt">\r
-        <b>${name}</b>\r
-      </font>\r
-    </icon>\r
-\r
-    <area/>\r
-    <point/>\r
-    <tag k="leisure" v="marina"/>\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-\r
-  <feature name="Slipway">\r
-    <category>water</category>\r
-    <icon image="features/waterway__slipway.png" />\r
-    <line/>\r
-    <tag k="leisure" v="slipway"/>\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="Slipway">\r
-    <category>water</category>\r
-    <!-- icon from http://www.clker.com/clipart-map-symbols-boat-launch-white.html, feel free to (re)move this notice -->\r
-    <icon image="features/pois/boat-launch-24.png"/>\r
-    <point />\r
-    <tag k="leisure" v="slipway"/>\r
-    <inputSet ref="names"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
-\r
-  <feature name="Coastline">\r
-    <category>water</category>\r
-    <line/>\r
-    <tag k="natural" v="coastline"/>\r
-    <inputSet ref="common"/>\r
-  </feature>\r
+<featureGroup>
+  <feature name="Stream">
+    <category>water</category>
+    <description>A very narrow river.</description>
+    <icon image="features/waterway__stream.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="waterway" v="stream"/>
+    <inputSet ref="waterways"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="River">
+    <category>water</category>
+    <icon image="features/waterway__river.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="waterway" v="river"/>
+    <inputSet ref="waterways"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Canal">
+    <category>water</category>
+    <icon image="features/waterway__canal.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="waterway" v="canal"/>
+    <inputSet ref="waterways"/>
+    <inputSet ref="tunnel"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Drain">
+    <category>water</category>
+    <icon image="features/waterway__drain.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="waterway" v="drain"/>
+    <inputSet ref="tunnel"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Dam">
+    <!-- Moved to "barrier" because this describes the dam wall, not the water. -->
+    <category>barrier</category>
+    <icon image="features/waterway__dam.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <area/>
+    <tag k="waterway" v="dam"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Riverbank">
+    <category>water</category>
+    <icon image="features/waterway__riverbank.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <area/>
+    <tag k="waterway" v="riverbank"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Reservoir">
+    <category>water</category>
+    <icon image="features/waterway__reservoir.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <area/>
+    <tag k="landuse" v="reservoir"/>
+    <inputSet ref="boatPermissions"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Lake">
+    <category>water</category>
+    <icon image="features/waterway__lake.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+    <area/>
+    <tag k="natural" v="water"/>
+    <inputSet ref="names"/>
+    <inputSet ref="boatPermissions"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Basin">
+    <category>water</category>
+    <icon image="features/waterway__basin.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <area/>
+    <tag k="landuse" v="basin"/>
+    <inputSet ref="boatPermissions"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Weir">
+    <category>water</category>
+    <icon image="features/waterway__weir.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <point/>
+    <tag k="waterway" v="weir"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+
+  <feature name="Dock">
+    <category>water</category>
+    <icon image="features/waterway__dock.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <area/>
+    <tag k="waterway" v="dock"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Marina">
+    <category>water</category>
+    <icon image="features/waterway__marina.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <area/>
+    <point/>
+    <tag k="leisure" v="marina"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Slipway">
+    <category>water</category>
+    <icon image="features/waterway__slipway.png" />
+    <line/>
+    <tag k="leisure" v="slipway"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Slipway">
+    <category>water</category>
+    <!-- icon from http://www.clker.com/clipart-map-symbols-boat-launch-white.html, feel free to (re)move this notice -->
+    <icon image="features/pois/boat-launch-24.png"/>
+    <point />
+    <tag k="leisure" v="slipway"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Coastline">
+    <category>water</category>
+    <icon image="features/waterway__coastline.png" />
+    <line/>
+    <tag k="natural" v="coastline"/>
+    <inputSet ref="common"/>
+  </feature>
 </featureGroup>
\ No newline at end of file
diff --git a/resources_src/way_icons.ai b/resources_src/way_icons.ai
new file mode 100644 (file)
index 0000000..a9abe43
Binary files /dev/null and b/resources_src/way_icons.ai differ