Update Potlatch 2 to 0.5-288-g9cbfeb6 build
authorTom Hughes <tom@compton.nu>
Tue, 8 Mar 2011 20:26:25 +0000 (20:26 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 8 Mar 2011 20:36:49 +0000 (20:36 +0000)
111 files changed:
public/potlatch2/features/aeroway__aerodrome.png [new file with mode: 0644]
public/potlatch2/features/aeroway__apron.png [new file with mode: 0644]
public/potlatch2/features/aeroway__helipad.png [new file with mode: 0644]
public/potlatch2/features/aeroway__runway.png [new file with mode: 0644]
public/potlatch2/features/aeroway__taxiway.png [new file with mode: 0644]
public/potlatch2/features/aeroway__terminal.png [new file with mode: 0644]
public/potlatch2/features/amenity__bus_station.png [new file with mode: 0644]
public/potlatch2/features/amenity__parking.png [new file with mode: 0644]
public/potlatch2/features/barrier_generic.svg [deleted file]
public/potlatch2/features/cycle__lcn.png [deleted file]
public/potlatch2/features/cycle__ncn.png [deleted file]
public/potlatch2/features/cycle__rcn.png [deleted file]
public/potlatch2/features/manmade_lighthouse.png [new file with mode: 0644]
public/potlatch2/features/manmade_silo.png [new file with mode: 0644]
public/potlatch2/features/manmade_tower.png [new file with mode: 0644]
public/potlatch2/features/oneway__-1.png
public/potlatch2/features/oneway__no.png
public/potlatch2/features/oneway__yes.png
public/potlatch2/features/paths__bike.svg [deleted file]
public/potlatch2/features/paths__bridleway.svg [deleted file]
public/potlatch2/features/paths__footway.svg [deleted file]
public/potlatch2/features/paths__pedestrian.svg [deleted file]
public/potlatch2/features/paths__steps.svg [deleted file]
public/potlatch2/features/paths__unknown.png [deleted file]
public/potlatch2/features/paths__unknown.svg [deleted file]
public/potlatch2/features/paths__unofficial.png [new file with mode: 0644]
public/potlatch2/features/pois/accommodation_shelter2.n.24.png
public/potlatch2/features/pois/amenity_town_hall.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/amenity_vendingmachine.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_generic.svg [deleted file]
public/potlatch2/features/pois/flowers.png [deleted file]
public/potlatch2/features/pois/health_hospital.n.24.png
public/potlatch2/features/pois/health_pharmacy.n.24.png
public/potlatch2/features/pois/money_atm.n.24.png
public/potlatch2/features/pois/money_bank2.n.24.png
public/potlatch2/features/pois/place_of_worship_unknown.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/poi_place_city.p.24.png [new file with mode: 0644]
public/potlatch2/features/pois/poi_place_hamlet.p.24.png [new file with mode: 0644]
public/potlatch2/features/pois/poi_place_suburb.p.24.png [new file with mode: 0644]
public/potlatch2/features/pois/poi_place_town.p.24.png [new file with mode: 0644]
public/potlatch2/features/pois/poi_place_village.p.24.png [new file with mode: 0644]
public/potlatch2/features/pois/power_station.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_florist.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_garden_centre.n.24.png
public/potlatch2/features/pois/shopping_toy.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/sport_shooting.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_airport.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_helicopter_pad.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_mini_roundabout.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_slipway.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_traffic_calming.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_weir.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/water_generic.svg [deleted file]
public/potlatch2/features/power_high.svg [deleted file]
public/potlatch2/features/power_low.svg [deleted file]
public/potlatch2/features/railway__abandoned.png [new file with mode: 0644]
public/potlatch2/features/railway__disused.png [new file with mode: 0644]
public/potlatch2/features/railway__light.png [new file with mode: 0644]
public/potlatch2/features/railway__platform.png [new file with mode: 0644]
public/potlatch2/features/railway__preserved.png [new file with mode: 0644]
public/potlatch2/features/railway__rail.png [new file with mode: 0644]
public/potlatch2/features/railway__siding.png [new file with mode: 0644]
public/potlatch2/features/railway__spur.png [new file with mode: 0644]
public/potlatch2/features/railway__subway.png [new file with mode: 0644]
public/potlatch2/features/railway__tram.png [new file with mode: 0644]
public/potlatch2/features/route__bus.png [new file with mode: 0644]
public/potlatch2/features/route__lcn.png [new file with mode: 0644]
public/potlatch2/features/route__lwn.png [new file with mode: 0644]
public/potlatch2/features/route__ncn.png [new file with mode: 0644]
public/potlatch2/features/route__nwn.png [new file with mode: 0644]
public/potlatch2/features/route__rcn.png [new file with mode: 0644]
public/potlatch2/features/route__rwn.png [new file with mode: 0644]
public/potlatch2/features/transport__bus.png [deleted file]
public/potlatch2/features/transport__railway.svg [deleted file]
public/potlatch2/features/transport__subway.svg [deleted file]
public/potlatch2/features/transport__tram.svg [deleted file]
public/potlatch2/features/waterway__basin.png [new file with mode: 0644]
public/potlatch2/features/waterway__canal.svg [deleted file]
public/potlatch2/features/waterway__coastline.png [new file with mode: 0644]
public/potlatch2/features/waterway__dam.png
public/potlatch2/features/waterway__dam.svg [deleted file]
public/potlatch2/features/waterway__dock.png [new file with mode: 0644]
public/potlatch2/features/waterway__lake.png [new file with mode: 0644]
public/potlatch2/features/waterway__marina.png [new file with mode: 0644]
public/potlatch2/features/waterway__reservoir.png [new file with mode: 0644]
public/potlatch2/features/waterway__river.svg [deleted file]
public/potlatch2/features/waterway__riverbank.png [new file with mode: 0644]
public/potlatch2/features/waterway__stream.svg [deleted file]
public/potlatch2/help/introduction.jpg [new file with mode: 0644]
public/potlatch2/help/introduction.mp4 [new file with mode: 0644]
public/potlatch2/icons/health_pharmacy.n.16.png
public/potlatch2/locales/en_GB.swf [new file with mode: 0644]
public/potlatch2/locales/en_US.swf [new file with mode: 0644]
public/potlatch2/locales/fr_FR.swf [new file with mode: 0644]
public/potlatch2/map_features.xml
public/potlatch2/map_features/amenities.xml [new file with mode: 0644]
public/potlatch2/map_features/barriers.xml [new file with mode: 0644]
public/potlatch2/map_features/buildings.xml [new file with mode: 0644]
public/potlatch2/map_features/landuse.xml [new file with mode: 0644]
public/potlatch2/map_features/man_made.xml [new file with mode: 0644]
public/potlatch2/map_features/paths.xml [new file with mode: 0644]
public/potlatch2/map_features/places.xml [new file with mode: 0644]
public/potlatch2/map_features/power.xml [new file with mode: 0644]
public/potlatch2/map_features/roads.xml [new file with mode: 0644]
public/potlatch2/map_features/shopping.xml [new file with mode: 0644]
public/potlatch2/map_features/tourism.xml [new file with mode: 0644]
public/potlatch2/map_features/transport.xml [new file with mode: 0644]
public/potlatch2/map_features/water.xml [new file with mode: 0644]
public/potlatch2/potlatch2.swf
public/potlatch2/stylesheets/core_ways.css
public/potlatch2/stylesheets/wireframe.css

diff --git a/public/potlatch2/features/aeroway__aerodrome.png b/public/potlatch2/features/aeroway__aerodrome.png
new file mode 100644 (file)
index 0000000..1f3e088
Binary files /dev/null and b/public/potlatch2/features/aeroway__aerodrome.png differ
diff --git a/public/potlatch2/features/aeroway__apron.png b/public/potlatch2/features/aeroway__apron.png
new file mode 100644 (file)
index 0000000..57bca99
Binary files /dev/null and b/public/potlatch2/features/aeroway__apron.png differ
diff --git a/public/potlatch2/features/aeroway__helipad.png b/public/potlatch2/features/aeroway__helipad.png
new file mode 100644 (file)
index 0000000..2e575db
Binary files /dev/null and b/public/potlatch2/features/aeroway__helipad.png differ
diff --git a/public/potlatch2/features/aeroway__runway.png b/public/potlatch2/features/aeroway__runway.png
new file mode 100644 (file)
index 0000000..bbac49e
Binary files /dev/null and b/public/potlatch2/features/aeroway__runway.png differ
diff --git a/public/potlatch2/features/aeroway__taxiway.png b/public/potlatch2/features/aeroway__taxiway.png
new file mode 100644 (file)
index 0000000..a5eda4d
Binary files /dev/null and b/public/potlatch2/features/aeroway__taxiway.png differ
diff --git a/public/potlatch2/features/aeroway__terminal.png b/public/potlatch2/features/aeroway__terminal.png
new file mode 100644 (file)
index 0000000..1f58575
Binary files /dev/null and b/public/potlatch2/features/aeroway__terminal.png differ
diff --git a/public/potlatch2/features/amenity__bus_station.png b/public/potlatch2/features/amenity__bus_station.png
new file mode 100644 (file)
index 0000000..b39567e
Binary files /dev/null and b/public/potlatch2/features/amenity__bus_station.png differ
diff --git a/public/potlatch2/features/amenity__parking.png b/public/potlatch2/features/amenity__parking.png
new file mode 100644 (file)
index 0000000..0ea9051
Binary files /dev/null and b/public/potlatch2/features/amenity__parking.png differ
diff --git a/public/potlatch2/features/barrier_generic.svg b/public/potlatch2/features/barrier_generic.svg
deleted file mode 100644 (file)
index eaefcb1..0000000
+++ /dev/null
@@ -1,127 +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/power_high.png"
-   inkscape:export-xdpi="66.09375"
-   inkscape:export-ydpi="66.09375">
-  <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" />
-    <inkscape:perspective
-       id="perspective4207"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4277"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4327"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4327-8"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.375"
-     inkscape:cx="-31.684888"
-     inkscape:cy="-6.6968199"
-     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;stroke-width:0.50000000000000000;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3656"
-       width="64.363632"
-       height="64"
-       x="0"
-       y="0"
-       ry="8.0227919"
-       rx="6.6013985"
-       inkscape:export-xdpi="33.75"
-       inkscape:export-ydpi="33.75"
-       inkscape:export-filename="/home/andy/src/potlatch2/resources/features/pois/barrier_generic.24.png" />
-    <path
-       style="fill:#d0d0d0;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 22.299999,14.663637 57.306901,27.14564 57.699998,45.651763 22.845454,54.063636 22.299999,14.663637 z"
-       id="rect4392"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="fill:#d0d0d0;fill-opacity:1;stroke:#060502;stroke-width:2.97073364000000018;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect4395"
-       width="15.840281"
-       height="40.567558"
-       x="6.0798597"
-       y="14.26168"
-       rx="0" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/cycle__lcn.png b/public/potlatch2/features/cycle__lcn.png
deleted file mode 100644 (file)
index b46ab05..0000000
Binary files a/public/potlatch2/features/cycle__lcn.png and /dev/null differ
diff --git a/public/potlatch2/features/cycle__ncn.png b/public/potlatch2/features/cycle__ncn.png
deleted file mode 100644 (file)
index 49456c4..0000000
Binary files a/public/potlatch2/features/cycle__ncn.png and /dev/null differ
diff --git a/public/potlatch2/features/cycle__rcn.png b/public/potlatch2/features/cycle__rcn.png
deleted file mode 100644 (file)
index ed79223..0000000
Binary files a/public/potlatch2/features/cycle__rcn.png and /dev/null differ
diff --git a/public/potlatch2/features/manmade_lighthouse.png b/public/potlatch2/features/manmade_lighthouse.png
new file mode 100644 (file)
index 0000000..6aaf5f9
Binary files /dev/null and b/public/potlatch2/features/manmade_lighthouse.png differ
diff --git a/public/potlatch2/features/manmade_silo.png b/public/potlatch2/features/manmade_silo.png
new file mode 100644 (file)
index 0000000..be207ce
Binary files /dev/null and b/public/potlatch2/features/manmade_silo.png differ
diff --git a/public/potlatch2/features/manmade_tower.png b/public/potlatch2/features/manmade_tower.png
new file mode 100644 (file)
index 0000000..bcb4e3f
Binary files /dev/null and b/public/potlatch2/features/manmade_tower.png differ
index 2a80e9f..e8e6805 100644 (file)
Binary files a/public/potlatch2/features/oneway__-1.png and b/public/potlatch2/features/oneway__-1.png differ
index b768ab0..a50e12f 100644 (file)
Binary files a/public/potlatch2/features/oneway__no.png and b/public/potlatch2/features/oneway__no.png differ
index e62054c..4236836 100644 (file)
Binary files a/public/potlatch2/features/oneway__yes.png and b/public/potlatch2/features/oneway__yes.png differ
diff --git a/public/potlatch2/features/paths__bike.svg b/public/potlatch2/features/paths__bike.svg
deleted file mode 100644 (file)
index a222482..0000000
+++ /dev/null
@@ -1,217 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg2816"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="paths__footway.svg"
-   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/paths__footway.png"
-   inkscape:export-xdpi="8.3623695"
-   inkscape:export-ydpi="8.3623695">
-  <defs
-     id="defs2818">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective2825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="linearGradient3615"
-       x1="215"
-       y1="188.25"
-       x2="215"
-       y2="430.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
-    <inkscape:perspective
-       id="perspective2916"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.8"
-     inkscape:cx="-194.58464"
-     inkscape:cy="251.7971"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview2820"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2822">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="0"
-       y="188.75" />
-    <rect
-       style="fill:url(#linearGradient3625);fill-opacity:1"
-       id="rect3617"
-       width="428.125"
-       height="188.75"
-       x="0"
-       y="-6.5955419e-10" />
-    <g
-       id="g2319"
-       transform="translate(641.02874,-121.48949)"
-       style="fill:#000000;fill-opacity:1;stroke:#e6f708;stroke-opacity:1">
-      <path
-         id="path2323"
-         style="fill:#000000;stroke:#e6f708;fill-opacity:1;stroke-opacity:1"
-         d="" />
-    </g>
-    <g
-       id="g2325"
-       transform="translate(641.02874,-121.48949)"
-       style="fill:#000000;fill-opacity:1;stroke:#e6f708;stroke-opacity:1">
-      <path
-         id="path2329"
-         style="fill:#000000;stroke:#e6f708;fill-opacity:1;stroke-opacity:1"
-         d="" />
-    </g>
-    <g
-       id="g3757"
-       transform="matrix(0.81866272,0,0,0.81866272,168.38354,110.75723)">
-      <path
-         d="m 278.91286,461.96271 c 0,43.28842 -35.0922,78.38061 -78.38062,78.38061 -43.28842,0 -78.38061,-35.09219 -78.38061,-78.38061 0,-43.28842 35.09219,-78.38062 78.38061,-78.38062 43.28842,0 78.38062,35.0922 78.38062,78.38062 z"
-         id="path596"
-         sodipodi:cx="200.53224"
-         sodipodi:cy="461.96271"
-         sodipodi:rx="78.380615"
-         sodipodi:ry="78.380615"
-         sodipodi:type="arc"
-         style="font-size:12px;fill:none;stroke:#4a4a4a;stroke-width:26;stroke-opacity:1"
-         transform="matrix(-0.983459,0,0,0.983459,85.159738,-260.18659)" />
-      <path
-         d="m 278.91286,461.96271 c 0,43.28842 -35.0922,78.38061 -78.38062,78.38061 -43.28842,0 -78.38061,-35.09219 -78.38061,-78.38061 0,-43.28842 35.09219,-78.38062 78.38061,-78.38062 43.28842,0 78.38062,35.0922 78.38062,78.38062 z"
-         id="path595"
-         sodipodi:cx="200.53224"
-         sodipodi:cy="461.96271"
-         sodipodi:rx="78.380615"
-         sodipodi:ry="78.380615"
-         sodipodi:type="arc"
-         style="font-size:12px;fill:none;stroke:#4a4a4a;stroke-width:26;stroke-opacity:1"
-         transform="matrix(-0.983459,0,0,0.983459,415.52074,-261.68759)" />
-      <path
-         d="m 157.23838,61.490482 -198.216442,1.00111 -70.076498,130.142098 134.146488,0 140.153012,-95.103825"
-         id="path594"
-         sodipodi:nodetypes="ccccc"
-         style="font-size:12px;fill:none;stroke:#4a4a4a;stroke-width:20.52969933;stroke-linejoin:round;stroke-opacity:1" />
-      <path
-         d="m 149.62164,-16.503568 c 10.76679,0 18.90504,-0.24023 27.24667,12.5033196 2.40112,4.24812997 3.49891,9.43507 2.61231,14.5982204 -1.06358,5.87102 -4.53943,11.6392 -8.63703,15.05385 -5.4259,4.52159 -10.57524,4.17279 -9.74304,8.23745 1.06778,5.21545 4.32649,12.463 7.84807,24.23155 3.57467,11.94585 7.81937,26.566463 11.98592,40.967243 4.16655,14.400745 8.2566,28.589435 11.49416,39.645695 1.61883,5.5281 3.0326,10.27493 4.11828,13.8299 1.05776,3.46359 1.99166,6.15402 1.90542,5.96221 3.37308,5.93469 3.83222,9.80168 9.48991,14.85291 6.34352,5.55178 11.50835,9.65313 13.30083,10.90597 4.55283,3.30733 6.6694,10.28705 4.26519,13.73578 -3.0299,4.70007 -9.28742,5.42104 -13.86085,4.01492 -4.34258,-1.37853 -11.21684,-3.74643 -19.18802,-10.34857 l -0.0615,-0.0922 -0.0922,-0.0615 c -11.09146,-9.51363 -15.19483,-21.0602 -15.61239,-21.72827 l -0.58395,-0.89127 -0.39954,-0.98346 c -0.96107,-2.36581 -1.53677,-4.45189 -2.67376,-8.17502 -1.13702,-3.72312 -2.5784,-8.53309 -4.21046,-14.10649 -3.26407,-11.14676 -7.33336,-25.35702 -11.49416,-39.73789 -4.16083,-14.380855 -8.39513,-28.927018 -11.92445,-40.721368 -3.52934,-11.79434 -5.75905,-21.48095 -6.58328,-23.54157 -2.00615,-5.01532 -3.03104,-10.42981 -1.65961,-15.85829 1.37142,-5.42846 5.46959,-9.80971 9.14835,-10.82817 8.39707,-2.34923 6.16904,-8.3891804 1.873,-8.3979404 l -36.0005,-0.0733 -0.0887,-22.9932596 c 2.3e-4,-5e-4 23.36782,-5e-4 37.52535,-5e-4 z"
-         id="path593"
-         sodipodi:nodetypes="ccccscccccsscsccccccccccccssccc"
-         style="font-size:12px;fill:#4a4a4a;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-      <path
-         d="M 20.523428,188.5589 -47.433032,22.207192"
-         id="path599"
-         style="font-size:12px;fill:none;stroke:#4a4a4a;stroke-width:24.58650017;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         d="M 43.884728,146.0842 2.825168,241.65182"
-         id="path600"
-         style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#4a4a4a;stroke-width:8.9740696;stroke-linecap:round;stroke-opacity:1" />
-      <path
-         d="m 278.91286,461.96271 c 0,43.28842 -35.0922,78.38061 -78.38062,78.38061 -43.28842,0 -78.38061,-35.09219 -78.38061,-78.38061 0,-43.28842 35.09219,-78.38062 78.38061,-78.38062 43.28842,0 78.38062,35.0922 78.38062,78.38062 z"
-         id="path597"
-         sodipodi:cx="200.53224"
-         sodipodi:cy="461.96271"
-         sodipodi:rx="78.380615"
-         sodipodi:ry="78.380615"
-         sodipodi:type="arc"
-         style="font-size:12px;fill:#4a4a4a;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         transform="matrix(-0.277291,0,0,0.244915,77.946738,79.741412)" />
-      <path
-         d="m 62.163838,146.12777 -36.26994,0.33246"
-         id="path601"
-         sodipodi:nodetypes="cc"
-         style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#4a4a4a;stroke-width:12.53960037;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         d="m 21.314628,240.27904 -36.26994,0.33247"
-         id="path602"
-         sodipodi:nodetypes="cc"
-         style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#4a4a4a;stroke-width:12.53909969;stroke-linecap:round;stroke-opacity:1" />
-      <path
-         d="m -80.703712,7.3411716 85.29957,0 c 3.18547,0 7.29693,5.6348704 3.18547,9.3794104 -4.44674,4.23206 -44.4195,12.9188 -44.4195,12.9188 0,0 -10.97213,3.00849 -16.81217,2.30063 -5.84,-0.70788 -26.01458,-2.47758 -27.25337,-24.5988404 z"
-         id="path603"
-         sodipodi:nodetypes="cssccc"
-         style="font-size:12px;fill:#4a4a4a;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-    </g>
-  </g>
-</svg>
diff --git a/public/potlatch2/features/paths__bridleway.svg b/public/potlatch2/features/paths__bridleway.svg
deleted file mode 100644 (file)
index 8688699..0000000
+++ /dev/null
@@ -1,125 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg2816"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="New document 2">
-  <defs
-     id="defs2818">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective2825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="linearGradient3615"
-       x1="215"
-       y1="188.25"
-       x2="215"
-       y2="430.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.8"
-     inkscape:cx="256.88645"
-     inkscape:cy="210"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview2820"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2822">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="0"
-       y="188.75" />
-    <rect
-       style="fill:url(#linearGradient3625);fill-opacity:1"
-       id="rect3617"
-       width="427.5"
-       height="188.75"
-       x="1.25"
-       y="0" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#c9c9c9;fill-opacity:1;stroke:#252525;stroke-width:6.25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:AlArabiya;-inkscape-font-specification:AlArabiya;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 369.45207,213.25233 c 0.18987,-19.53568 -1.94101,-38.91836 -6.31128,-57.29252 C 351.48675,106.96205 324.81421,65.392665 287.92068,40.76116 214.13363,-8.501849 123.09905,20.805383 79.863235,114.45988 58.245333,161.28712 53.955156,217.54242 65.609196,266.54018 c 11.65404,48.99776 24.576584,60.56714 56.470114,90.19865 l 37.03982,-37.00768 c -27.16569,-18.13684 -44.05003,-46.51028 -51.06982,-76.02401 -7.0198,-29.51372 -5.10163,-60.34816 8.84437,-90.55705 27.892,-60.417779 98.40581,-86.654908 152.73718,-50.38125 27.16569,18.13684 44.05003,46.51028 51.06982,76.02401 7.01979,29.51372 5.10163,60.34816 -8.84437,90.55705 -9.90297,21.45116 -25.53118,40.09075 -45.23082,52.31899 l 30.94501,37.68589 c 28.05712,-17.89009 32.06564,-21.48829 51.31625,-51.31467 17.48058,-27.08394 20.24887,-62.22831 20.56532,-94.78778 z"
-       id="path3627"
-       sodipodi:nodetypes="cssssccsssssccsc" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/paths__footway.svg b/public/potlatch2/features/paths__footway.svg
deleted file mode 100644 (file)
index b218d1a..0000000
+++ /dev/null
@@ -1,133 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg2816"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="paths__footway.svg"
-   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/paths__footway.png"
-   inkscape:export-xdpi="8.3623695"
-   inkscape:export-ydpi="8.3623695">
-  <defs
-     id="defs2818">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective2825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="linearGradient3615"
-       x1="215"
-       y1="188.25"
-       x2="215"
-       y2="430.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.6"
-     inkscape:cx="132.44999"
-     inkscape:cy="194.75636"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview2820"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2822">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="0"
-       y="188.75" />
-    <rect
-       style="fill:url(#linearGradient3625);fill-opacity:1"
-       id="rect3617"
-       width="428.125"
-       height="188.75"
-       x="0"
-       y="-6.5955419e-10" />
-    <path
-       style="fill:#53dd51;fill-opacity:1;stroke:#4a4a4a;stroke-width:114.11499786;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 212.1875,104.1875 c -10.2939,0 -18.625,25.12042 -18.625,56.125 0,14.26614 1.77703,27.28377 4.6875,37.1875 l 27.875,0 c 2.91047,-9.90373 4.6875,-22.92136 4.6875,-37.1875 0,-31.00458 -8.3311,-56.125 -18.625,-56.125 z"
-       id="rect3858" />
-    <path
-       style="fill:#4a4a4a;fill-opacity:1;stroke:none"
-       d="m 161.25,276.875 c -12.11732,10.32046 -6.03125,26.63817 -6.03125,43.4375 0,31.10997 26.21316,56.34375 58.53125,56.34375 32.31809,0 58.53125,-25.23378 58.53125,-56.34375 0,-16.79933 6.71107,-31.86704 -5.40625,-42.1875 l -105.625,-1.25 z"
-       id="rect3861"
-       sodipodi:nodetypes="cssscc" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/paths__pedestrian.svg b/public/potlatch2/features/paths__pedestrian.svg
deleted file mode 100644 (file)
index 55ce9d6..0000000
+++ /dev/null
@@ -1,137 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg2816"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="paths__footway.svg"
-   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/paths__footway.png"
-   inkscape:export-xdpi="8.3623695"
-   inkscape:export-ydpi="8.3623695">
-  <defs
-     id="defs2818">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective2825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="linearGradient3615"
-       x1="215"
-       y1="188.25"
-       x2="215"
-       y2="430.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.1313709"
-     inkscape:cx="85.306552"
-     inkscape:cy="201.90418"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview2820"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2822">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="0"
-       y="188.75" />
-    <rect
-       style="fill:url(#linearGradient3625);fill-opacity:1"
-       id="rect3617"
-       width="428.125"
-       height="188.75"
-       x="0"
-       y="-6.5955419e-10" />
-    <path
-       style="fill:#b8b8b8;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="M 138.125,188.75 0.625,425 428.75,426.25 285,188.75 l -146.875,0 z"
-       id="path3886" />
-    <path
-       style="fill:#53dd51;fill-opacity:1;stroke:#4a4a4a;stroke-width:114.11499786;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 212.1875,104.1875 c -10.2939,0 -18.625,25.12042 -18.625,56.125 0,14.26614 1.77703,27.28377 4.6875,37.1875 l 27.875,0 c 2.91047,-9.90373 4.6875,-22.92136 4.6875,-37.1875 0,-31.00458 -8.3311,-56.125 -18.625,-56.125 z"
-       id="rect3858" />
-    <path
-       style="fill:#4a4a4a;fill-opacity:1;stroke:none"
-       d="m 161.25,276.875 c -12.11732,10.32046 -6.03125,26.63817 -6.03125,43.4375 0,31.10997 26.21316,56.34375 58.53125,56.34375 32.31809,0 58.53125,-25.23378 58.53125,-56.34375 0,-16.79933 6.71107,-31.86704 -5.40625,-42.1875 l -105.625,-1.25 z"
-       id="rect3861"
-       sodipodi:nodetypes="cssscc" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/paths__steps.svg b/public/potlatch2/features/paths__steps.svg
deleted file mode 100644 (file)
index ebbe956..0000000
+++ /dev/null
@@ -1,125 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg2816"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="paths__unknown.svg">
-  <defs
-     id="defs2818">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective2825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="linearGradient3615"
-       x1="215"
-       y1="188.25"
-       x2="215"
-       y2="430.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.6"
-     inkscape:cx="266.82499"
-     inkscape:cy="119.75636"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview2820"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="720"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2822">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="0"
-       y="188.75" />
-    <rect
-       style="fill:url(#linearGradient3625);fill-opacity:1"
-       id="rect3617"
-       width="428.125"
-       height="188.75"
-       x="0"
-       y="-6.5955419e-10" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:27.25000000000000000;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 66.875,383.125 0,-115 160,0 0,-126.875 148.125,0"
-       id="path3780" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/paths__unknown.png b/public/potlatch2/features/paths__unknown.png
deleted file mode 100644 (file)
index b050bc3..0000000
Binary files a/public/potlatch2/features/paths__unknown.png and /dev/null differ
diff --git a/public/potlatch2/features/paths__unknown.svg b/public/potlatch2/features/paths__unknown.svg
deleted file mode 100644 (file)
index 3283169..0000000
+++ /dev/null
@@ -1,135 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg2816"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="paths__bridleway.svg">
-  <defs
-     id="defs2818">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective2825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="linearGradient3615"
-       x1="215"
-       y1="188.25"
-       x2="215"
-       y2="430.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.6"
-     inkscape:cx="132.44999"
-     inkscape:cy="194.75636"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview2820"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2822">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="0"
-       y="188.75" />
-    <rect
-       style="fill:url(#linearGradient3625);fill-opacity:1"
-       id="rect3617"
-       width="428.125"
-       height="188.75"
-       x="0"
-       y="-6.5955419e-10" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:29.5175;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 158.47151,82.606455 c 181.33464,-72.601854 153.00069,81.768265 31.55906,116.334585 -21.23621,6.04453 0,148.80004 0,148.80004"
-       id="path3038"
-       sodipodi:nodetypes="csc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#999999;stroke:#010101;stroke-width:29.51749991999999878;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3812"
-       sodipodi:cx="200"
-       sodipodi:cy="392.5"
-       sodipodi:rx="8.75"
-       sodipodi:ry="7.5"
-       d="m 208.75,392.5 a 8.75,7.5 0 1 1 -17.5,0 8.75,7.5 0 1 1 17.5,0 z" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/paths__unofficial.png b/public/potlatch2/features/paths__unofficial.png
new file mode 100644 (file)
index 0000000..fa428df
Binary files /dev/null and b/public/potlatch2/features/paths__unofficial.png differ
index 71d79bd..68b8b04 100644 (file)
Binary files a/public/potlatch2/features/pois/accommodation_shelter2.n.24.png and b/public/potlatch2/features/pois/accommodation_shelter2.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_town_hall.n.24.png b/public/potlatch2/features/pois/amenity_town_hall.n.24.png
new file mode 100644 (file)
index 0000000..390289c
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_town_hall.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_vendingmachine.png b/public/potlatch2/features/pois/amenity_vendingmachine.png
new file mode 100644 (file)
index 0000000..58f0333
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_vendingmachine.png differ
diff --git a/public/potlatch2/features/pois/barrier_generic.svg b/public/potlatch2/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/public/potlatch2/features/pois/flowers.png b/public/potlatch2/features/pois/flowers.png
deleted file mode 100644 (file)
index ba6298d..0000000
Binary files a/public/potlatch2/features/pois/flowers.png and /dev/null differ
index e9b114a..62e68fb 100644 (file)
Binary files a/public/potlatch2/features/pois/health_hospital.n.24.png and b/public/potlatch2/features/pois/health_hospital.n.24.png differ
index 4fe2fc7..d2aa8c2 100644 (file)
Binary files a/public/potlatch2/features/pois/health_pharmacy.n.24.png and b/public/potlatch2/features/pois/health_pharmacy.n.24.png differ
index e081dd5..f1e55e8 100644 (file)
Binary files a/public/potlatch2/features/pois/money_atm.n.24.png and b/public/potlatch2/features/pois/money_atm.n.24.png differ
index 873adc7..74c5114 100644 (file)
Binary files a/public/potlatch2/features/pois/money_bank2.n.24.png and b/public/potlatch2/features/pois/money_bank2.n.24.png differ
diff --git a/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png b/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png
new file mode 100644 (file)
index 0000000..103a21b
Binary files /dev/null and b/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png differ
diff --git a/public/potlatch2/features/pois/poi_place_city.p.24.png b/public/potlatch2/features/pois/poi_place_city.p.24.png
new file mode 100644 (file)
index 0000000..d2f629c
Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_city.p.24.png differ
diff --git a/public/potlatch2/features/pois/poi_place_hamlet.p.24.png b/public/potlatch2/features/pois/poi_place_hamlet.p.24.png
new file mode 100644 (file)
index 0000000..1a938ce
Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_hamlet.p.24.png differ
diff --git a/public/potlatch2/features/pois/poi_place_suburb.p.24.png b/public/potlatch2/features/pois/poi_place_suburb.p.24.png
new file mode 100644 (file)
index 0000000..633e180
Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_suburb.p.24.png differ
diff --git a/public/potlatch2/features/pois/poi_place_town.p.24.png b/public/potlatch2/features/pois/poi_place_town.p.24.png
new file mode 100644 (file)
index 0000000..b456dc2
Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_town.p.24.png differ
diff --git a/public/potlatch2/features/pois/poi_place_village.p.24.png b/public/potlatch2/features/pois/poi_place_village.p.24.png
new file mode 100644 (file)
index 0000000..ee050b4
Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_village.p.24.png differ
diff --git a/public/potlatch2/features/pois/power_station.png b/public/potlatch2/features/pois/power_station.png
new file mode 100644 (file)
index 0000000..3417b4d
Binary files /dev/null and b/public/potlatch2/features/pois/power_station.png differ
diff --git a/public/potlatch2/features/pois/shopping_florist.n.24.png b/public/potlatch2/features/pois/shopping_florist.n.24.png
new file mode 100644 (file)
index 0000000..6dd9376
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_florist.n.24.png differ
index 416247f..a4f9b32 100644 (file)
Binary files a/public/potlatch2/features/pois/shopping_garden_centre.n.24.png and b/public/potlatch2/features/pois/shopping_garden_centre.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_toy.n.24.png b/public/potlatch2/features/pois/shopping_toy.n.24.png
new file mode 100644 (file)
index 0000000..08d7db0
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_toy.n.24.png differ
diff --git a/public/potlatch2/features/pois/sport_shooting.n.24.png b/public/potlatch2/features/pois/sport_shooting.n.24.png
new file mode 100644 (file)
index 0000000..9e50b00
Binary files /dev/null and b/public/potlatch2/features/pois/sport_shooting.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_airport.n.24.png b/public/potlatch2/features/pois/transport_airport.n.24.png
new file mode 100644 (file)
index 0000000..4e6bddb
Binary files /dev/null and b/public/potlatch2/features/pois/transport_airport.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png b/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png
new file mode 100644 (file)
index 0000000..e5e4e2f
Binary files /dev/null and b/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_mini_roundabout.n.24.png b/public/potlatch2/features/pois/transport_mini_roundabout.n.24.png
new file mode 100644 (file)
index 0000000..f52dc06
Binary files /dev/null and b/public/potlatch2/features/pois/transport_mini_roundabout.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_slipway.n.24.png b/public/potlatch2/features/pois/transport_slipway.n.24.png
new file mode 100644 (file)
index 0000000..f7d07a6
Binary files /dev/null and b/public/potlatch2/features/pois/transport_slipway.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_traffic_calming.n.24.png b/public/potlatch2/features/pois/transport_traffic_calming.n.24.png
new file mode 100644 (file)
index 0000000..5c50233
Binary files /dev/null and b/public/potlatch2/features/pois/transport_traffic_calming.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_weir.n.24.png b/public/potlatch2/features/pois/transport_weir.n.24.png
new file mode 100644 (file)
index 0000000..e699d3b
Binary files /dev/null and b/public/potlatch2/features/pois/transport_weir.n.24.png differ
diff --git a/public/potlatch2/features/pois/water_generic.svg b/public/potlatch2/features/pois/water_generic.svg
deleted file mode 100644 (file)
index fcfbc24..0000000
+++ /dev/null
@@ -1,100 +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="744.09448819"
-   height="1052.3622047"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective3602"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3602-1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="259.38208"
-     inkscape:cy="445.21264"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#6fc3ff;fill-opacity:1;stroke:none"
-       id="rect3590"
-       width="274.28571"
-       height="274.28571"
-       x="152.85715"
-       y="240.93361"
-       ry="32.857143" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:14.30000000000000071;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 191.42857,353.79075 c 0,0 27.14285,-52.85714 62.85714,-51.42857 42.85714,1.42857 50.00001,55.71429 85.71429,57.14286 34.28572,0 44.28571,-54.28571 44.28571,-54.28571"
-       id="path3592"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:14.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 196.42857,400.94783 c 0,0 27.14285,-52.85714 62.85714,-51.42857 42.85714,1.42857 50.00001,55.71429 85.71429,57.14286 34.28572,0 44.28571,-54.28571 44.28571,-54.28571"
-       id="path3592-8"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:14.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 200.71429,446.66212 c 0,0 27.14285,-52.85714 62.85714,-51.42857 42.85714,1.42857 50.00001,55.71429 85.71429,57.14286 34.28572,0 44.28571,-54.28571 44.28571,-54.28571"
-       id="path3592-9"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/power_high.svg b/public/potlatch2/features/power_high.svg
deleted file mode 100644 (file)
index 619562f..0000000
+++ /dev/null
@@ -1,162 +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="power_high.svg"
-   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/power_low.png"
-   inkscape:export-xdpi="66.09375"
-   inkscape:export-ydpi="66.09375">
-  <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" />
-    <inkscape:perspective
-       id="perspective4207"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4277"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4327"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4327-8"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </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="-9.928737"
-     inkscape:cy="27.153396"
-     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:#fecb00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3656"
-       width="64.363632"
-       height="64"
-       x="0"
-       y="0"
-       ry="8.0227919"
-       rx="6.6013985"
-       inkscape:export-xdpi="33.75"
-       inkscape:export-ydpi="33.75"
-       inkscape:export-filename="/home/andy/src/potlatch2/resources/features/pois/barrier_generic.24.png" />
-    <path
-       style="fill:none;stroke:#a3a3a3;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 4.2760698,18.390932 C 17.693215,29.541568 47.802016,24.335727 52.269385,22.230116"
-       id="path4197-3"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3.2727273,44.727273 5.6363636,-29.636364 3.0909091,0 6,29.454546"
-       id="path4263" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3.8181818,18.727273 13.7727272,-1e-6"
-       id="path4265"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3.0909091,23.363636 15.4999999,0"
-       id="path4267"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.40356085px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 51.843338,32.843675 2.274616,-11.960077 1.247369,0 2.421366,11.886703"
-       id="path4263-3" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.40356085px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 52.063462,22.351093 5.558134,-10e-7"
-       id="path4265-9"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.40356085px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 51.769963,24.222148 6.255194,0"
-       id="path4267-3"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#a3a3a3;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 4.0942516,23.730029 C 17.511397,34.880665 47.529289,26.311188 51.996658,24.205577"
-       id="path4197-3-9"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#a3a3a3;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 14.912433,18.548211 c 13.417145,11.150636 37.616855,5.853886 42.084224,3.748275"
-       id="path4197-3-9-2"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#a3a3a3;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 15.457888,23.63912 c 13.417145,11.150636 36.980491,2.672068 41.44786,0.566457"
-       id="path4197-3-9-6"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/power_low.svg b/public/potlatch2/features/power_low.svg
deleted file mode 100644 (file)
index 0cec276..0000000
+++ /dev/null
@@ -1,114 +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" />
-    <inkscape:perspective
-       id="perspective4207"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </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="1.1920149"
-     inkscape:cy="24.791019"
-     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:#fecb00;fill-opacity:1;stroke:none"
-       id="rect3656"
-       width="64.363632"
-       height="64"
-       x="0"
-       y="0"
-       ry="8.0227919"
-       rx="6.6013985"
-       inkscape:export-xdpi="33.75"
-       inkscape:export-ydpi="33.75"
-       inkscape:export-filename="/home/andy/src/potlatch2/resources/features/pois/barrier_generic.24.png" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 50.727273,26.181818 5.818182,0"
-       id="path4195" />
-    <path
-       style="fill:none;stroke:#453a1b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 53.454545,40.545455 10e-7,-15.909091"
-       id="path4193"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#a3a3a3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 13.818182,18.181818 c 13.469645,7.863274 29.696969,9.939394 41.454545,8"
-       id="path4197"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#a3a3a3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 4.1818185,18.296681 C 17.651463,26.159955 41.696969,30.145166 51.999999,25.933045"
-       id="path4197-3"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#453a1b;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 9.8181818,50.496516 1e-7,-37.138302"
-       id="path4189"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 0.72591841,19.144162 19.27543559,0"
-       id="path4191" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/railway__abandoned.png b/public/potlatch2/features/railway__abandoned.png
new file mode 100644 (file)
index 0000000..3b7a02e
Binary files /dev/null and b/public/potlatch2/features/railway__abandoned.png differ
diff --git a/public/potlatch2/features/railway__disused.png b/public/potlatch2/features/railway__disused.png
new file mode 100644 (file)
index 0000000..2b24f69
Binary files /dev/null and b/public/potlatch2/features/railway__disused.png differ
diff --git a/public/potlatch2/features/railway__light.png b/public/potlatch2/features/railway__light.png
new file mode 100644 (file)
index 0000000..0e2eca7
Binary files /dev/null and b/public/potlatch2/features/railway__light.png differ
diff --git a/public/potlatch2/features/railway__platform.png b/public/potlatch2/features/railway__platform.png
new file mode 100644 (file)
index 0000000..e6d5919
Binary files /dev/null and b/public/potlatch2/features/railway__platform.png differ
diff --git a/public/potlatch2/features/railway__preserved.png b/public/potlatch2/features/railway__preserved.png
new file mode 100644 (file)
index 0000000..28d4f5c
Binary files /dev/null and b/public/potlatch2/features/railway__preserved.png differ
diff --git a/public/potlatch2/features/railway__rail.png b/public/potlatch2/features/railway__rail.png
new file mode 100644 (file)
index 0000000..0aa4e66
Binary files /dev/null and b/public/potlatch2/features/railway__rail.png differ
diff --git a/public/potlatch2/features/railway__siding.png b/public/potlatch2/features/railway__siding.png
new file mode 100644 (file)
index 0000000..9519ee0
Binary files /dev/null and b/public/potlatch2/features/railway__siding.png differ
diff --git a/public/potlatch2/features/railway__spur.png b/public/potlatch2/features/railway__spur.png
new file mode 100644 (file)
index 0000000..4cde3d8
Binary files /dev/null and b/public/potlatch2/features/railway__spur.png differ
diff --git a/public/potlatch2/features/railway__subway.png b/public/potlatch2/features/railway__subway.png
new file mode 100644 (file)
index 0000000..7e13bd0
Binary files /dev/null and b/public/potlatch2/features/railway__subway.png differ
diff --git a/public/potlatch2/features/railway__tram.png b/public/potlatch2/features/railway__tram.png
new file mode 100644 (file)
index 0000000..2940c7a
Binary files /dev/null and b/public/potlatch2/features/railway__tram.png differ
diff --git a/public/potlatch2/features/route__bus.png b/public/potlatch2/features/route__bus.png
new file mode 100644 (file)
index 0000000..bb816ac
Binary files /dev/null and b/public/potlatch2/features/route__bus.png differ
diff --git a/public/potlatch2/features/route__lcn.png b/public/potlatch2/features/route__lcn.png
new file mode 100644 (file)
index 0000000..21d5916
Binary files /dev/null and b/public/potlatch2/features/route__lcn.png differ
diff --git a/public/potlatch2/features/route__lwn.png b/public/potlatch2/features/route__lwn.png
new file mode 100644 (file)
index 0000000..50ee446
Binary files /dev/null and b/public/potlatch2/features/route__lwn.png differ
diff --git a/public/potlatch2/features/route__ncn.png b/public/potlatch2/features/route__ncn.png
new file mode 100644 (file)
index 0000000..7cc7779
Binary files /dev/null and b/public/potlatch2/features/route__ncn.png differ
diff --git a/public/potlatch2/features/route__nwn.png b/public/potlatch2/features/route__nwn.png
new file mode 100644 (file)
index 0000000..92ac048
Binary files /dev/null and b/public/potlatch2/features/route__nwn.png differ
diff --git a/public/potlatch2/features/route__rcn.png b/public/potlatch2/features/route__rcn.png
new file mode 100644 (file)
index 0000000..614ac95
Binary files /dev/null and b/public/potlatch2/features/route__rcn.png differ
diff --git a/public/potlatch2/features/route__rwn.png b/public/potlatch2/features/route__rwn.png
new file mode 100644 (file)
index 0000000..fff9b23
Binary files /dev/null and b/public/potlatch2/features/route__rwn.png differ
diff --git a/public/potlatch2/features/transport__bus.png b/public/potlatch2/features/transport__bus.png
deleted file mode 100644 (file)
index b779706..0000000
Binary files a/public/potlatch2/features/transport__bus.png and /dev/null differ
diff --git a/public/potlatch2/features/transport__railway.svg b/public/potlatch2/features/transport__railway.svg
deleted file mode 100644 (file)
index efd37fe..0000000
+++ /dev/null
@@ -1,78 +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="svg2383"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="railway.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.75"
-     inkscape:cx="32"
-     inkscape:cy="37.16129"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="725"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
-  <defs
-     id="defs2385">
-    <inkscape:perspective
-       id="perspective2391"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 8 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="16 : 8 : 1"
-       inkscape:persp3d-origin="8 : 5.3333333 : 1"
-       id="perspective3435" />
-  </defs>
-  <metadata
-     id="metadata2388">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       id="rect3379"
-       d="M 23.571591,39.957736 C 23.571591,39.957736 22.991727,41.082003 22.991727,41.082003 C 22.991727,41.082003 18.939671,41.098329 18.939671,41.098329 C 18.939671,41.098329 18.472115,41.721646 18.472115,41.721646 C 18.472115,41.721646 22.670357,41.705088 22.670357,41.705088 C 22.670357,41.705088 21.97468,43.053896 21.97468,43.053896 C 21.97468,43.053896 17.460053,43.070868 17.460053,43.070868 C 17.460053,43.070868 16.877085,43.848045 16.877085,43.848045 C 16.877085,43.848045 21.573929,43.830888 21.573929,43.830888 C 21.573929,43.830888 20.694917,45.535159 20.694917,45.535159 C 20.694917,45.535159 15.598495,45.552586 15.598495,45.552586 C 15.598495,45.552586 14.851436,46.548521 14.851436,46.548521 C 14.851436,46.548521 20.181279,46.531023 20.181279,46.531023 C 20.181279,46.531023 19.035543,48.752427 19.035543,48.752427 C 19.035543,48.752427 13.185195,48.769855 13.185195,48.769855 C 13.185195,48.769855 12.193568,50.091833 12.193568,50.091833 C 12.193568,50.091833 18.353605,50.074599 18.353605,50.074599 C 18.353605,50.074599 16.798242,53.090207 16.798242,53.090207 C 16.798242,53.090207 9.9321837,53.10658 9.9321837,53.10658 C 9.9321837,53.10658 8.552778,54.945523 8.552778,54.945523 C 8.552778,54.945523 15.849349,54.929964 15.849349,54.929964 C 15.849349,54.929964 13.617428,59.257309 13.617428,59.257309 C 13.617428,59.257309 5.30888,59.270095 5.30888,59.270095 C 5.30888,59.270095 3.2601077,62.001395 3.2601077,62.001395 C 3.2601077,62.001395 12.207481,61.990982 12.207481,61.990982 C 12.207481,61.990982 8.736787,68.72012 8.736787,68.72012 C 8.736787,68.72012 -1.7815572,68.722644 -1.7815572,68.722644 C -1.7815572,68.722644 -5.138518,73.197946 -5.138518,73.197946 C -5.138518,73.197946 6.425013,73.202294 6.425013,73.202294 C 6.425013,73.202294 -0.25238634,86.148731 -0.25238634,86.148731 C -0.25238634,86.148731 6.816882,86.163981 6.816882,86.163981 C 6.816882,86.163981 12.02938,73.204401 12.02938,73.204401 C 12.02938,73.204401 51.374154,73.219196 51.374154,73.219196 C 51.374154,73.219196 56.526317,86.271215 56.526317,86.271215 C 56.526317,86.271215 63.706495,86.286704 63.706495,86.286704 C 63.706495,86.286704 57.048006,73.221329 57.048006,73.221329 C 57.048006,73.221329 67.063135,73.225095 67.063135,73.225095 C 67.063135,73.225095 63.844385,68.706901 63.844385,68.706901 C 63.844385,68.706901 54.748436,68.709083 54.748436,68.709083 C 54.748436,68.709083 51.30151,61.945483 51.30151,61.945483 C 51.30151,61.945483 59.021167,61.936499 59.021167,61.936499 C 59.021167,61.936499 57.064887,59.190447 57.064887,59.190447 C 57.064887,59.190447 49.903082,59.201469 49.903082,59.201469 C 49.903082,59.201469 47.691599,54.862065 47.691599,54.862065 C 47.691599,54.862065 53.971816,54.848673 53.971816,54.848673 C 53.971816,54.848673 52.658173,53.004697 52.658173,53.004697 C 52.658173,53.004697 46.752207,53.01878 46.752207,53.01878 C 46.752207,53.01878 45.21347,49.99945 45.21347,49.99945 C 45.21347,49.99945 50.506692,49.98464 50.506692,49.98464 C 50.506692,49.98464 49.56408,48.661485 49.56408,48.661485 C 49.56408,48.661485 44.539234,48.676454 44.539234,48.676454 C 44.539234,48.676454 43.406998,46.454768 43.406998,46.454768 C 43.406998,46.454768 47.981321,46.43975 47.981321,46.43975 C 47.981321,46.43975 47.272147,45.444277 47.272147,45.444277 C 47.272147,45.444277 42.899644,45.459229 42.899644,45.459229 C 42.899644,45.459229 42.03171,43.756159 42.03171,43.756159 C 42.03171,43.756159 46.059057,43.741448 46.059057,43.741448 C 46.059057,43.741448 45.50623,42.965436 45.50623,42.965436 C 45.50623,42.965436 41.636149,42.979985 41.636149,42.979985 C 41.636149,42.979985 40.949688,41.632998 40.949688,41.632998 C 40.949688,41.632998 44.546895,41.618812 44.546895,41.618812 C 44.546895,41.618812 44.103877,40.99694 44.103877,40.99694 C 44.103877,40.99694 40.632662,41.010926 40.632662,41.010926 C 40.632662,41.010926 40.060774,39.888763 40.060774,39.888763 C 40.060774,39.888763 38.220316,39.896462 38.220316,39.896462 C 38.220316,39.896462 38.663374,41.018861 38.663374,41.018861 C 38.663374,41.018861 24.952577,41.074102 24.952577,41.074102 C 24.952577,41.074102 25.404679,39.950068 25.404679,39.950068 C 25.404679,39.950068 23.571591,39.957736 23.571591,39.957736 C 23.571591,39.957736 23.571591,39.957736 23.571591,39.957736 M 24.702011,41.697076 C 24.702011,41.697076 38.908974,41.641047 38.908974,41.641047 C 38.908974,41.641047 39.440765,42.988238 39.440765,42.988238 C 39.440765,42.988238 24.159583,43.045683 24.159583,43.045683 C 24.159583,43.045683 24.702011,41.697076 24.702011,41.697076 C 24.702011,41.697076 24.702011,41.697076 24.702011,41.697076 M 23.847105,43.822585 C 23.847105,43.822585 39.74719,43.764504 39.74719,43.764504 C 39.74719,43.764504 40.419515,45.46771 40.419515,45.46771 C 40.419515,45.46771 23.161679,45.526724 23.161679,45.526724 C 23.161679,45.526724 23.847105,43.822585 23.847105,43.822585 C 23.847105,43.822585 23.847105,43.822585 23.847105,43.822585 M 22.761145,46.522553 C 22.761145,46.522553 40.812508,46.463287 40.812508,46.463287 C 40.812508,46.463287 41.689487,48.684943 41.689487,48.684943 C 41.689487,48.684943 21.867655,48.743991 21.867655,48.743991 C 21.867655,48.743991 22.761145,46.522553 22.761145,46.522553 C 22.761145,46.522553 22.761145,46.522553 22.761145,46.522553 M 21.335824,50.066255 C 21.335824,50.066255 42.211691,50.007848 42.211691,50.007848 C 42.211691,50.007848 43.403381,53.026766 43.403381,53.026766 C 43.403381,53.026766 20.122743,53.08228 20.122743,53.08228 C 20.122743,53.08228 21.335824,50.066255 21.335824,50.066255 C 21.335824,50.066255 21.335824,50.066255 21.335824,50.066255 M 19.382612,54.92243 C 19.382612,54.92243 44.130844,54.869658 44.130844,54.869658 C 44.130844,54.869658 45.843253,59.207716 45.843253,59.207716 C 45.843253,59.207716 17.641561,59.251116 17.641561,59.251116 C 17.641561,59.251116 19.382612,54.92243 19.382612,54.92243 C 19.382612,54.92243 19.382612,54.92243 19.382612,54.92243 M 16.541581,61.985937 C 16.541581,61.985937 46.92597,61.950576 46.92597,61.950576 C 46.92597,61.950576 49.594317,68.710319 49.594317,68.710319 C 49.594317,68.710319 13.833504,68.718898 13.833504,68.718898 C 13.833504,68.718898 16.541581,61.985937 16.541581,61.985937 C 16.541581,61.985937 16.541581,61.985937 16.541581,61.985937"
-       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccsssccsssc"
-       id="rect4085"
-       d="M 21.261305,4.032258 L 21.261305,7.170507 L 25.478326,7.170507 L 25.478326,10.308756 L 21.947797,10.308756 C 17.635055,10.308756 14.200245,13.841633 14.200245,18.154378 L 14.200245,34.139833 C 14.200245,37.590027 16.399084,40.468265 19.49604,41.495104 L 19.49604,47.967742 L 22.242007,47.967742 L 22.242007,41.985455 L 41.465189,41.985455 L 41.465189,47.967742 L 44.209749,47.967742 L 44.209749,41.593174 C 47.444587,40.639397 49.799761,37.694267 49.799755,34.139833 L 49.799755,18.154378 C 49.799755,13.841637 46.364941,10.308756 42.052203,10.308756 L 38.031322,10.308756 L 38.031322,7.170507 L 42.738695,7.170507 L 42.738695,4.032258 L 21.261305,4.032258 z M 28.616575,7.170507 L 34.893074,7.170507 L 34.893074,10.308756 L 28.616575,10.308756 L 28.616575,7.170507 z M 20.182532,14.133496 L 43.229047,14.133496 C 44.869472,14.133496 46.269225,15.435186 46.269225,17.075605 L 46.269225,23.940524 C 46.269219,25.580947 44.869465,26.882632 43.229047,26.882632 L 20.182532,26.882632 C 18.542113,26.882639 17.142353,25.580947 17.142353,23.940524 L 17.142353,17.075605 C 17.142353,15.435186 18.542113,14.133496 20.182532,14.133496 z M 42.542555,31.491935 C 44.292382,31.491939 45.680803,32.880354 45.680803,34.630184 C 45.680801,36.380025 44.292389,37.768434 42.542555,37.768434 C 40.792717,37.76843 39.306236,36.380019 39.306236,34.630184 C 39.306242,32.880356 40.792721,31.491935 42.542555,31.491935 z M 21.359375,31.590005 C 23.109206,31.589999 24.595694,32.978424 24.595694,34.728254 C 24.595694,36.478086 23.109209,37.866504 21.359375,37.866504 C 19.609541,37.866504 18.221126,36.478089 18.221126,34.728254 C 18.221123,32.97842 19.609541,31.590005 21.359375,31.590005 z"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/transport__subway.svg b/public/potlatch2/features/transport__subway.svg
deleted file mode 100644 (file)
index 4dcd213..0000000
+++ /dev/null
@@ -1,91 +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="svg2383"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="subway.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.75"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="725"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
-  <defs
-     id="defs2385">
-    <inkscape:perspective
-       id="perspective2391"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 8 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="16 : 8 : 1"
-       inkscape:persp3d-origin="8 : 5.3333333 : 1"
-       id="perspective3435" />
-  </defs>
-  <metadata
-     id="metadata2388">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 25.46875,18.3125 L 21.9375,18.3125 C 17.624757,18.3125 14.1875,21.843505 14.1875,26.15625 L 14.1875,42.125 C 14.1875,45.575195 16.403044,48.473161 19.5,49.5 L 19.5,51.96875 L 22.25,51.96875 L 22.25,50 L 41.46875,50 L 41.46875,51.96875 L 44.21875,51.96875 L 44.21875,49.59375 C 47.45359,48.639973 49.812506,45.679434 49.8125,42.125 L 49.8125,26.15625 C 49.8125,21.843508 46.375238,18.3125 42.0625,18.3125 L 38.03125,18.3125 L 25.46875,18.3125 z M 34.90625,18.3125 L 28.625,18.3125 L 34.90625,18.3125 z M 20.1875,22.125 L 43.21875,22.125 C 44.859176,22.125001 46.28125,23.422081 46.28125,25.0625 L 46.28125,35.9375 C 46.281243,37.577922 44.859168,38.875 43.21875,38.875 L 20.1875,38.875 C 18.547082,38.875006 17.15625,37.577923 17.15625,35.9375 L 17.15625,25.0625 C 17.15625,23.422081 18.547081,22.125 20.1875,22.125 z M 21.03125,41.09375 C 22.38454,41.093751 23.46875,42.20921 23.46875,43.5625 C 23.46875,44.91579 22.38454,46 21.03125,46 C 19.67796,45.999999 18.59375,44.91579 18.59375,43.5625 C 18.59375,42.20921 19.67796,41.09375 21.03125,41.09375 z M 42.375,41.09375 C 43.728289,41.093751 44.84375,42.20921 44.84375,43.5625 C 44.843751,44.91579 43.72829,46 42.375,46 C 41.021708,45.999999 39.9375,44.91579 39.9375,43.5625 C 39.9375,42.20921 41.02171,41.09375 42.375,41.09375 z"
-       id="rect4085"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccsssccsssc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3478"
-       sodipodi:cx="31.870968"
-       sodipodi:cy="29.290323"
-       sodipodi:rx="24.774193"
-       sodipodi:ry="24.774193"
-       d="M 56.645161,29.290323 A 24.774193,24.774193 0 1 1 7.0967751,29.290323 A 24.774193,24.774193 0 1 1 56.645161,29.290323 z"
-       transform="translate(0.1290321,6)" />
-    <rect
-       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3480"
-       width="60"
-       height="5"
-       x="2"
-       y="1.2903225" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/transport__tram.svg b/public/potlatch2/features/transport__tram.svg
deleted file mode 100644 (file)
index 6651874..0000000
+++ /dev/null
@@ -1,88 +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="svg2383"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="tram.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.75"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="725"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
-  <defs
-     id="defs2385">
-    <inkscape:perspective
-       id="perspective2391"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 8 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="16 : 8 : 1"
-       inkscape:persp3d-origin="8 : 5.3333333 : 1"
-       id="perspective3435" />
-  </defs>
-  <metadata
-     id="metadata2388">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path3446"
-       d="M 51.618364,66.685745 L 45.651403,65.483871 L 40.59365,44.351457 L 42.98465,44.817898 L 51.618364,66.685745 z"
-       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2342611;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2342611;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 11.968523,65.395422 L 17.677419,64.83871 L 23.037461,44.860302 L 20.816077,44.902706 L 11.968523,65.395422 z"
-       id="path3444"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2342611;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 30.53125 44.875 L 30.34375 49.28125 L 33.375 49.28125 L 32.90625 45.34375 L 30.53125 44.875 z M 30.25 51.21875 L 29.96875 57.28125 L 34.34375 57.28125 L 33.625 51.21875 L 30.25 51.21875 z M 29.8125 60.90625 L 29.59375 66 L 35.5625 67.1875 L 34.8125 60.90625 L 29.8125 60.90625 z "
-       id="path3448" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 25.359198,4.6875 L 25.375,7.03125 L 25.59375,7.03125 L 19.53125,10.6875 L 25.46875,14.3125 L 21.9375,14.3125 C 17.624757,14.3125 14.1875,17.843505 14.1875,22.15625 L 14.1875,38.125 C 14.1875,41.575195 16.403044,44.473161 19.5,45.5 L 19.5,47.96875 L 22.25,47.96875 L 22.25,46 L 41.46875,46 L 41.46875,47.96875 L 44.21875,47.96875 L 44.21875,45.59375 C 47.45359,44.639973 49.812506,41.679434 49.8125,38.125 L 49.8125,22.15625 C 49.8125,17.843508 46.375238,14.3125 42.0625,14.3125 L 38.03125,14.3125 L 44.09375,10.6875 L 38.15625,7.03125 L 38.424619,7.03125 L 38.408817,4.6875 L 25.359198,4.6875 z M 28.75,7.03125 L 35.03125,7.03125 L 40.96875,10.6875 L 34.90625,14.3125 L 28.625,14.3125 L 22.6875,10.6875 L 28.75,7.03125 z M 20.1875,18.125 L 43.21875,18.125 C 44.859176,18.125001 46.28125,19.422081 46.28125,21.0625 L 46.28125,31.9375 C 46.281243,33.577922 44.859168,34.875 43.21875,34.875 L 20.1875,34.875 C 18.547082,34.875006 17.15625,33.577923 17.15625,31.9375 L 17.15625,21.0625 C 17.15625,19.422081 18.547081,18.125 20.1875,18.125 z M 21.03125,37.09375 C 22.38454,37.093751 23.46875,38.20921 23.46875,39.5625 C 23.46875,40.91579 22.38454,42 21.03125,42 C 19.67796,41.999999 18.59375,40.91579 18.59375,39.5625 C 18.59375,38.20921 19.67796,37.09375 21.03125,37.09375 z M 42.375,37.09375 C 43.728289,37.093751 44.84375,38.20921 44.84375,39.5625 C 44.843751,40.91579 43.72829,42 42.375,42 C 41.021708,41.999999 39.9375,40.91579 39.9375,39.5625 C 39.9375,38.20921 41.02171,37.09375 42.375,37.09375 z"
-       id="rect4085"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccsssccsssc" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/waterway__basin.png b/public/potlatch2/features/waterway__basin.png
new file mode 100644 (file)
index 0000000..29798db
Binary files /dev/null and b/public/potlatch2/features/waterway__basin.png differ
diff --git a/public/potlatch2/features/waterway__canal.svg b/public/potlatch2/features/waterway__canal.svg
deleted file mode 100644 (file)
index 57c4ee3..0000000
+++ /dev/null
@@ -1,176 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg3001"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="New document 8">
-  <defs
-     id="defs3003">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective3010" />
-    <inkscape:perspective
-       id="perspective2961"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       y2="0"
-       x2="215"
-       y1="188.75"
-       x1="215"
-       gradientTransform="matrix(1.001462,0,0,1,-0.314327,-0.625)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2970"
-       xlink:href="#linearGradient3619"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective3039"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       gradientTransform="translate(150.71429,368.70147)"
-       y2="430.5"
-       x2="215"
-       y1="188.25"
-       x1="215"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2932"
-       xlink:href="#linearGradient3609"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <linearGradient
-       y2="430.5"
-       x2="215"
-       y1="188.25"
-       x1="215"
-       gradientTransform="translate(1.250011,-1.87501)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3048"
-       xlink:href="#linearGradient3609"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective3077"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.6"
-     inkscape:cx="180.09249"
-     inkscape:cy="197.39958"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview3005"
-     showgrid="false"
-     inkscape:window-width="1294"
-     inkscape:window-height="851"
-     inkscape:window-x="1660"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3007">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient2970);fill-opacity:1"
-       id="rect3617"
-       width="428.125"
-       height="188.75"
-       x="0.9375"
-       y="-0.625" />
-    <rect
-       style="fill:url(#linearGradient3048);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="1.25"
-       y="186.875" />
-    <path
-       style="fill:#3144d6;fill-opacity:1;stroke:#000000;stroke-width:1.2310518px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 2.9270183,310.47891 427.8949617,2.84307 -0.62467,-94.76896 -429.1442841,1.89539 1.8739924,90.0305 z"
-       id="path2904"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#5e1400;fill-opacity:1;stroke:#000000;stroke-width:1.2688756px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 71.049006,265.24391 282.115414,0.87164 36.07613,-59.27301 -320.356112,-0.87166 2.164568,59.27303 z"
-       id="path3091" />
-    <path
-       style="fill:#942406;fill-opacity:1;stroke:#000000;stroke-width:1.2688756px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 120.11255,163.25945 0,41.83977 246.7608,1.74332 -0.72151,-42.71145 -246.03929,-0.87164 z"
-       id="path3093" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/waterway__coastline.png b/public/potlatch2/features/waterway__coastline.png
new file mode 100644 (file)
index 0000000..2239eb0
Binary files /dev/null and b/public/potlatch2/features/waterway__coastline.png differ
index 477ad3a..c5f720e 100644 (file)
Binary files a/public/potlatch2/features/waterway__dam.png and b/public/potlatch2/features/waterway__dam.png differ
diff --git a/public/potlatch2/features/waterway__dam.svg b/public/potlatch2/features/waterway__dam.svg
deleted file mode 100644 (file)
index dd6d242..0000000
+++ /dev/null
@@ -1,180 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg3001"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="waterway__dam.svg"
-   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/waterway__dam.png"
-   inkscape:export-xdpi="8.3623695"
-   inkscape:export-ydpi="8.3623695">
-  <defs
-     id="defs3003">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective3010" />
-    <inkscape:perspective
-       id="perspective2961"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       y2="0"
-       x2="215"
-       y1="188.75"
-       x1="215"
-       gradientTransform="matrix(1.001462,0,0,1,-0.314327,-0.625)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2970"
-       xlink:href="#linearGradient3619"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective3039"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       gradientTransform="translate(150.71429,368.70147)"
-       y2="430.5"
-       x2="215"
-       y1="188.25"
-       x1="215"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2932"
-       xlink:href="#linearGradient3609"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <linearGradient
-       y2="430.5"
-       x2="215"
-       y1="188.25"
-       x1="215"
-       gradientTransform="translate(1.250011,-1.87501)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3048"
-       xlink:href="#linearGradient3609"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective3077"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.6"
-     inkscape:cx="180.09249"
-     inkscape:cy="257.80126"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview3005"
-     showgrid="false"
-     inkscape:window-width="1294"
-     inkscape:window-height="851"
-     inkscape:window-x="1660"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3007">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient2970);fill-opacity:1"
-       id="rect3617"
-       width="428.125"
-       height="188.75"
-       x="0.9375"
-       y="-0.625" />
-    <rect
-       style="fill:url(#linearGradient3048);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="1.25"
-       y="186.875" />
-    <path
-       style="fill:#3144d6;fill-opacity:1;stroke:#000000;stroke-width:0.93578964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 1.9848899,310.61768 163.9847201,-0.27307 82.14017,-91.93922 -247.20438518,1.90129 1.07949508,90.311 z"
-       id="path2904"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#1132ad;stroke-width:16.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 238.75,360 c 13.14501,18.17231 41.04017,34.91936 62.5,38.125 34.43943,0.89692 30.76389,-7.98309 36.875,-28.125 23.35511,-28.27989 76.0228,-14.6102 91.25,-0.625"
-       id="path3890"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#898381;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="M 165.625,310.625 210,404.375 271.25,340.625 247.5,218.75 165.625,310.625 z"
-       id="path3888" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/waterway__dock.png b/public/potlatch2/features/waterway__dock.png
new file mode 100644 (file)
index 0000000..e6e40d1
Binary files /dev/null and b/public/potlatch2/features/waterway__dock.png differ
diff --git a/public/potlatch2/features/waterway__lake.png b/public/potlatch2/features/waterway__lake.png
new file mode 100644 (file)
index 0000000..275bb57
Binary files /dev/null and b/public/potlatch2/features/waterway__lake.png differ
diff --git a/public/potlatch2/features/waterway__marina.png b/public/potlatch2/features/waterway__marina.png
new file mode 100644 (file)
index 0000000..3704b00
Binary files /dev/null and b/public/potlatch2/features/waterway__marina.png differ
diff --git a/public/potlatch2/features/waterway__reservoir.png b/public/potlatch2/features/waterway__reservoir.png
new file mode 100644 (file)
index 0000000..bd118e6
Binary files /dev/null and b/public/potlatch2/features/waterway__reservoir.png differ
diff --git a/public/potlatch2/features/waterway__river.svg b/public/potlatch2/features/waterway__river.svg
deleted file mode 100644 (file)
index ec31e83..0000000
+++ /dev/null
@@ -1,281 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg2816"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="waterway__river.svg"
-   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/waterway__river.png"
-   inkscape:export-xdpi="8.3623695"
-   inkscape:export-ydpi="8.3623695">
-  <defs
-     id="defs2818">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective2825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="linearGradient3615"
-       x1="215"
-       y1="188.25"
-       x2="215"
-       y2="430.5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-2.5)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001462,0,0,1,-0.0018275,-0.625)" />
-    <inkscape:perspective
-       id="perspective3729"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3729-4"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3729-8"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3729-0"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3729-2"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3729-48"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3729-44"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3729-6"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3729-05"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3729-85"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.6"
-     inkscape:cx="91.10182"
-     inkscape:cy="194.75636"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview2820"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2822">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient3615);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="0"
-       y="186.25" />
-    <rect
-       style="fill:url(#linearGradient3625);fill-opacity:1"
-       id="rect3617"
-       width="428.125"
-       height="188.75"
-       x="1.25"
-       y="-0.625" />
-    <path
-       style="fill:#3144d6;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="m 41.875,191.875 85,232.5 266.25,-0.625 L 166.25,193.125 41.875,191.875 z"
-       id="path2904"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#7a4904;fill-opacity:1;stroke:#000000;stroke-width:0.38667664px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 40.291649,266.84233 C 28.178526,237.91216 28.178526,237.91216 28.178526,237.91216 L 26.482688,156.42551 0.31833832,155.94334 0.56060088,267.80666 40.291649,266.84233 z"
-       id="path3694" />
-    <path
-       style="fill:#2ada1d;fill-opacity:1;stroke:#000000;stroke-width:0.38667664px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 0.3773,157.67551 c -6.4980285,7.30337 3.8298071,12.67656 20.291087,14.90267 8.165341,19.03627 15.724976,12.15392 23.257199,4.09845 13.924562,6.18583 31.035446,-15.30505 28.920887,-28.91104 3.970801,-12.24305 -60.648305,-54.218797 -73.357125,-21.19725"
-       id="path3698"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.47905955px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 320.09905,232.13448 c -0.0909,0.21902 -0.0909,0.54774 -0.27279,0.65731 -0.98403,0.59277 -0.6024,-0.58881 -1.36388,0.32864 -0.14369,0.17309 -0.12902,0.48408 -0.27278,0.65728 -0.1437,0.17309 -0.36371,0.21902 -0.54555,0.32867 -0.18194,0.10951 -0.35268,0.25108 -0.54557,0.32864 -0.15382,0.0617 -0.63909,0 -0.81833,0 -0.0909,0 -0.20849,0.0775 -0.27278,0 -0.12859,-0.1549 0.12861,-0.50236 0,-0.65731 -0.12859,-0.15489 -0.41698,0.15489 -0.54555,0 -0.12861,-0.15489 0.12859,-0.50236 0,-0.65728 -0.0643,-0.0775 -0.2085,0.0775 -0.27278,0 -0.1286,-0.15489 0.0813,-0.46133 0,-0.65728 -0.0575,-0.13859 -0.21529,-0.19022 -0.27279,-0.32867 -0.0541,-0.13016 0.0558,-0.91875 0,-0.98592 -0.0643,-0.0775 -0.2085,0.0775 -0.27278,0 -0.12859,-0.1549 0.12861,-0.50236 0,-0.65731 -0.0643,-0.0775 -0.20849,0.0775 -0.27278,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.21526,-0.19022 -0.27277,-0.32864 -0.0416,-0.1 0,-0.83793 0,-0.98595 0,-0.10951 0,-0.21902 0,-0.32864 0,-0.10951 -0.0408,-0.23071 0,-0.32864 0.0575,-0.13859 0.15775,-0.25924 0.27277,-0.32864 0.0986,-0.0595 1.17418,0 1.36389,0 0.18195,0 0.36371,0 0.54557,0 0.091,0 0.27277,-0.10951 0.27277,0 0,0.10951 -0.20849,0.0775 -0.27277,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.21527,-0.19022 -0.27278,-0.32867 -0.0408,-0.0981 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.23212,-0.18152 -0.27279,-0.32864 -0.0575,-0.20788 0.044,-0.44473 0,-0.65728 -0.0494,-0.23777 -0.20847,-0.42492 -0.27276,-0.65731 -0.0288,-0.1038 0,-0.21902 0,-0.32864 0,-0.21902 0,-0.43821 0,-0.65728 0,-1.20505 0,-2.41008 0,-3.61513 0,-0.13831 -0.0405,-1.87409 0,-1.97187 0.0574,-0.13858 0.21527,-0.18994 0.27276,-0.32864 0.0408,-0.0981 -0.0408,-0.2307 0,-0.32864 0.0575,-0.13859 0.18195,-0.21902 0.27279,-0.32867 0.091,-0.10951 0.15776,-0.25924 0.27278,-0.32864 0.0813,-0.0489 0.18649,0.0348 0.27277,0 0.1929,-0.0775 0.34832,-0.26929 0.54556,-0.32864 0.35286,-0.10625 0.73826,0.10625 1.09112,0 0.19724,-0.0595 0.34831,-0.26929 0.54555,-0.32864 0.24354,-0.0734 1.04815,0 1.3639,0 0.091,0 0.20847,-0.0775 0.27278,0 0.0643,0.0775 -0.0408,0.23071 0,0.32864 0.56762,1.36775 -0.0186,-0.35133 0.54556,0.32864 0.0643,0.0775 -0.0643,0.25109 0,0.32864 0.0643,0.0775 0.20848,-0.0775 0.27277,0 0.12861,0.15489 -0.1286,0.50237 0,0.65731 0.0643,0.0775 0.20849,-0.0775 0.27277,0 0.16251,0.19593 -0.27224,0.98592 0.2728,0.98592 0.025,0 -0.0314,-0.92926 0,-0.98592 0.14266,-0.25788 0.39124,-0.40942 0.54556,-0.65731 0.12199,-0.19592 0.16003,-0.45347 0.27277,-0.65728 0.15693,-0.28358 0.60527,-0.72924 0.81834,-0.98595 0.0909,-0.10951 0.18194,-0.21902 0.27276,-0.32864 0.091,-0.10951 0.15776,-0.25924 0.2728,-0.32864 0.0831,-0.05 0.69549,0 0.81834,0 0.21959,0 0.91989,-0.0688 1.09111,0 0.1929,0.0775 0.34831,0.2693 0.54556,0.32864 0.44105,0.13289 0.91808,-0.10734 1.36387,0 0.19932,0.0481 0.34502,0.28837 0.54557,0.32864 0.35876,0.072 0.72741,0 1.09111,0 0.27279,0 0.54557,0 0.81834,0 0.18194,0 0.36914,-0.0533 0.54556,0 0.39449,0.11875 0.69662,0.53849 1.0911,0.65731 0.17637,0.0533 0.36374,0 0.54557,0 0.0909,0 0.19146,-0.0489 0.2728,0 0.11494,0.0693 0.15774,0.25924 0.27276,0.32864 0.0813,0.0489 0.19146,-0.0489 0.27277,0 0.11494,0.0693 0.18196,0.21902 0.2728,0.32864 0.091,0.10951 0.21525,0.19022 0.27277,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.21902 0.0575,0.44943 0,0.65728 -0.0643,0.23234 -0.20849,0.42492 -0.27277,0.65728 -0.0288,0.10408 0.0408,0.23071 0,0.32867 -0.0575,0.13858 -0.21527,0.18995 -0.2728,0.32864 -0.0408,0.0981 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 -0.0643,0.40611 0,0.32864 0.1437,-0.17309 0.12902,-0.48407 0.2728,-0.65728 0.1437,-0.1731 0.3637,-0.21902 0.54555,-0.32864 0.36369,-0.21902 0.71357,-0.47535 1.09112,-0.65731 0.26697,-0.12853 0.54554,-0.21902 0.81834,-0.32864 0.27277,-0.10951 0.55135,-0.19999 0.81834,-0.32864 0.18876,-0.0911 0.34829,-0.26929 0.54553,-0.32864 0.24731,-0.0745 1.04703,0 1.3639,0 0.18195,0 0.36371,0 0.54557,0 0.18174,0 0.37303,-0.0693 0.54554,0 0.244,0.0981 0.33158,0.48541 0.54557,0.65728 0.16912,0.13588 0.34831,0.2693 0.54556,0.32864 0.17636,0.0533 0.39424,-0.12146 0.54554,0 0.16914,0.13588 0.10364,0.52142 0.2728,0.65731 1.29645,1.04133 -0.22931,-1.26222 1.0911,0.32864 0.1437,0.1731 0.15073,0.46134 0.2728,0.65728 0.15424,0.24782 0.3398,0.47138 0.54555,0.65731 0.59077,0.53384 0.63556,0.0712 1.09112,0.98592 0.52154,1.88517 -0.0805,0.19973 0.81834,1.64326 0.12198,0.19592 0.15072,0.46131 0.27277,0.65728 0.15424,0.24782 0.43054,0.38017 0.54556,0.65728 0.0813,0.19593 -0.0813,0.46134 0,0.65731 0.0408,0.0981 0.20849,-0.0775 0.27277,0 0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.3541,0.0489 -0.27277,0 0.25719,-0.15489 0.55135,-0.2 0.81834,-0.32864 0.37755,-0.18207 0.69662,-0.53848 1.0911,-0.65731 0.17637,-0.0533 0.36914,0.0533 0.54557,0 0.39449,-0.11875 0.71355,-0.47533 1.09111,-0.65728 0.86522,-0.41698 1.08287,-0.32864 1.90946,-0.32864 0.12282,0 0.7353,-0.05 0.81834,0 0.11494,0.0693 0.16581,0.24267 0.27276,0.32864 0.16913,0.13587 0.37638,0.19266 0.54557,0.32864 0.21397,0.17174 0.31553,0.51872 0.54555,0.65731 0.0813,0.0489 0.19145,-0.0489 0.27278,0 0.11494,0.0693 0.18196,0.21902 0.27278,0.32864 0.0909,0.10951 0.21528,0.18995 0.27277,0.32864 0.0408,0.0981 -0.0408,0.23071 0,0.32864 0.0575,0.13858 0.23212,0.18179 0.2728,0.32864 0.0248,0.0897 0.0211,1.86986 0,1.9719 -0.0493,0.2375 -0.16003,0.45348 -0.2728,0.65728 -0.14266,0.25788 -0.40288,0.39948 -0.54555,0.65728 -0.11284,0.20381 -0.16002,0.45348 -0.27278,0.65731 -0.25018,0.45212 -0.42082,0.33799 -0.81835,0.65728 -0.1069,0.0859 -0.14803,0.29109 -0.27277,0.32864 -2.04329,0.61546 0.18713,-0.60567 -1.36389,0.32867 -0.18195,0.10951 -0.35267,0.25108 -0.54554,0.32864 -0.16376,0.0658 -1.14624,0 -1.36391,0 -0.0909,0 -0.18194,0 -0.27277,0 -0.0909,0 -0.20849,-0.0775 -0.27279,0 -0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.27277,0.10951 -0.27277,0 0,-0.10951 0.20848,-0.0775 0.27277,0 0.56439,0.67997 -0.86246,-0.0272 0.27279,0.65728 0.67284,0.40535 -0.16375,-0.92019 0.27277,0.65731 0.0813,0.29394 0.46423,0.36334 0.54555,0.65728 0.0575,0.20788 -0.0575,0.44946 0,0.65731 0.0408,0.14701 0.21529,0.19022 0.27279,0.32864 0.0354,0.0851 0.0337,1.85032 0,1.97187 -0.0643,0.23234 -0.16003,0.45348 -0.27279,0.65731 -0.14266,0.25788 -0.36371,0.43817 -0.54555,0.65728 -0.18194,0.21902 -0.36369,0.4382 -0.54556,0.65728 -0.091,0.10951 -0.16582,0.24266 -0.27277,0.32867 -0.16913,0.13586 -0.3764,0.19266 -0.54557,0.32864 -0.1069,0.0859 -0.15072,0.27964 -0.27277,0.32864 -0.17243,0.0693 -0.3767,-0.0813 -0.54556,0 -0.30439,0.14674 -0.50731,0.53238 -0.81834,0.65728 -0.0448,0.019 -1.54917,-0.0163 -1.63667,0 -2.15424,0.43258 0.49104,0.32867 -1.63667,0.32867 -0.17553,0 -1.72486,0.0557 -1.90947,0 -0.19724,-0.0595 -0.36369,-0.21902 -0.54554,-0.32867 -0.27277,-0.10951 -0.53639,-0.2606 -0.81833,-0.32864 -0.17843,-0.043 -0.37305,0.0693 -0.54556,0 -0.122,-0.0489 -0.16583,-0.24266 -0.27278,-0.32864 -0.16913,-0.13587 -0.3764,-0.19267 -0.54557,-0.32864 -0.10713,-0.0859 -0.15775,-0.25924 -0.27277,-0.32864 -0.0813,-0.0489 -0.19145,0.0489 -0.27278,0 -0.14163,-0.0853 -0.73368,-0.98595 -0.81835,-0.98595 -0.0909,0 -0.0408,0.23071 0,0.32864 0.0575,0.13858 0.21528,0.19022 0.2728,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.10951 0.0408,0.23071 0,0.32864 -0.12488,0.30081 -0.619,0.57722 -0.81833,0.65728 -0.0862,0.0348 -0.19146,-0.0489 -0.2728,0 -0.83186,0.50111 0.4989,0.2606 -0.81834,0.65731 -0.17635,0.0533 -0.3637,0 -0.54554,0 -0.63649,0 -1.27297,0 -1.90947,0 -0.23759,0 -1.53598,0.0606 -1.63666,0 -0.11494,-0.0693 -0.16582,-0.24266 -0.27277,-0.32867 -0.33836,-0.27174 -0.7658,-0.36332 -1.09113,-0.65728 -0.0269,-0.0245 -0.99383,-1.13878 -1.09112,-1.31459 -0.11284,-0.2038 -0.12901,-0.48408 -0.27277,-0.65728 -0.14369,-0.1731 -0.43277,-0.12474 -0.54556,-0.32864 -0.10084,-0.18234 0.044,-0.44476 0,-0.65731 0.49396,-1.37497 -0.43055,-0.38017 -0.54557,-0.65728 -0.0813,-0.19593 0.0813,-0.46133 0,-0.65731 -0.0407,-0.0981 -0.18173,0 -0.27276,0 0,-0.21902 0,-0.43818 0,-0.65728 0,-0.10951 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 0.0408,0.23071 0,0.32867 -0.0565,0.13586 -0.70272,0.89307 -0.81834,0.98592 -0.16912,0.13586 -0.35268,0.25108 -0.54556,0.32864 -0.16106,0.0647 -1.21148,0 -1.36388,0 -0.23096,0 -0.94448,0.059 -1.09114,0 -0.12198,-0.0489 -0.18194,-0.21902 -0.27276,-0.32864 -0.091,-0.10951 -0.16582,-0.24266 -0.27279,-0.32864 -0.16912,-0.13587 -0.40179,-0.15544 -0.54555,-0.32864 -1.394,-1.67951 1.14375,0.45836 -0.81833,-1.31459 -0.16272,-0.14701 -0.43278,-0.12473 -0.54557,-0.32864 -0.10085,-0.18234 0.0575,-0.44946 0,-0.65731 -0.0813,-0.29394 -0.46422,-0.36334 -0.54556,-0.65728 -0.0575,-0.20788 0.0575,-0.44946 0,-0.65731 -0.0408,-0.14701 -0.23211,-0.18152 -0.27277,-0.32864 -0.0575,-0.20788 0.0813,-0.4613 0,-0.65728 -0.0408,-0.0981 -0.31957,0.0941 -0.27278,0 0.29955,-0.60149 0.72741,-1.09549 0,-0.65731 z"
-       id="path2906-6" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 319.57051,238.94927 c 0,0.29756 0,0.59514 0,0.89269 0,1.48038 0.0968,-0.31562 -0.20531,0.66954 -0.065,0.21168 0,0.44635 0,0.66953 0,0.52074 0,1.0415 0,1.56222 0,0.0541 0.006,0.66237 0,0.66954 -0.0483,0.0527 -0.15693,-0.0527 -0.20531,0 -0.0483,0.0527 0,0.14892 0,0.2231 0,0.44636 0,0.89271 0,1.33907 0,0.0745 -0.0483,0.17066 0,0.2231 0.0483,0.0527 0.15693,-0.0527 0.20531,0 0.0483,0.0527 0,0.14891 0,0.2231 0,0.0745 0,0.14891 0,0.2231"
-       id="path2908-8" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 322.85504,240.06514 c 0,0.0745 -0.0306,0.15652 0,0.2231 0.0432,0.094 0.1621,0.12907 0.2053,0.2231 0.0457,0.0995 -0.0312,0.79062 0,0.89271 0.0306,0.0998 0.17471,0.12337 0.20531,0.2231 0.0378,0.12337 0,1.11428 0,1.33904 0,0.9671 0,1.93421 0,2.9013"
-       id="path2910-7" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 338.25128,242.74325 c 0,0.44636 0,0.89272 0,1.33908 0,0.0745 0,0.14865 0,0.2231 0,0.0745 0.0306,0.15652 0,0.22309 -0.0432,0.0941 -0.16209,0.12908 -0.2053,0.2231 -0.0306,0.0666 0,0.14891 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.15516 0.037,1.03519 0,1.1159 -0.0432,0.094 -0.1621,0.12907 -0.20531,0.22308 -0.0821,0.17855 0.0821,0.49099 0,0.66954 -0.0432,0.0941 -0.16209,0.12909 -0.20531,0.2231 -0.0312,0.068 0,0.56902 0,0.66952"
-       id="path2912-8" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 335.78788,243.18961 c 0,0.37196 0,0.74392 0,1.1159 0,0.44635 0,0.89269 0,1.33905 0,0.0745 0,0.14891 0,0.2231 0,0.0745 0.0306,0.15651 0,0.22309 -0.0432,0.094 -0.16209,0.12908 -0.2053,0.2231 -0.0709,0.15407 0.0722,1.03755 0,1.11589 -0.0483,0.0527 -0.15693,-0.0527 -0.20532,0 -0.0491,0.0536 0.0467,0.89269 0,0.89269 -0.0685,0 0,-0.14891 0,-0.22309"
-       id="path2914-4" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 315.46483,218.86335 c -0.21236,0 -0.28373,0.0527 -0.41058,-0.2231 -0.0306,-0.0666 0.0485,-0.17065 0,-0.2231 -0.0483,-0.0527 -0.1441,0.0332 -0.2053,0 -0.0866,-0.047 -0.11867,-0.17608 -0.20531,-0.2231 -0.16416,-0.0894 -0.45163,0.0892 -0.61586,0 -0.0866,-0.047 -0.11868,-0.17608 -0.2053,-0.2231 -0.12902,-0.0701 -0.69211,0.0701 -0.82115,0 -0.0866,-0.047 -0.11354,-0.18994 -0.20532,-0.22309 -0.19476,-0.0707 -0.41054,0 -0.61583,0 -0.54742,0 -1.09486,0 -1.64228,0 -0.41056,0 -0.82112,0 -1.23169,0 -0.13688,0 -0.28816,-0.0666 -0.41056,0 -0.0611,0.0332 0.0484,0.17065 0,0.22309 -0.0483,0.0527 -0.14411,-0.0332 -0.20531,0 -0.0866,0.047 -0.11868,0.17609 -0.20531,0.2231 -0.0815,0.0443 -0.57389,-0.0457 -0.61583,0 -0.0483,0.0527 0.0483,0.17065 0,0.2231 -0.0483,0.0527 -0.15693,-0.0527 -0.20531,0 -0.0483,0.0527 0.0483,0.17065 0,0.2231 -0.42475,0.46176 0.0165,-0.70563 -0.41057,0.2231 -0.0306,0.0666 0.0306,0.15651 0,0.2231 -0.0432,0.094 -0.1621,0.12907 -0.20532,0.22308 -0.0306,0.0666 0.0306,0.15653 0,0.2231 -0.0432,0.094 -0.1621,0.12908 -0.2053,0.2231 -0.0306,0.0666 0,0.14864 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.37196 0,0.74391 0,1.11586 0,0.0745 0,0.14891 0,0.2231 0,0.0745 0.0306,0.15652 0,0.2231 -0.0432,0.094 -0.1621,0.12908 -0.20531,0.2231 -0.0373,0.0807 0,0.96068 0,1.1159 0,0.11683 -0.0271,0.83401 0,0.89271 0.42716,0.9288 -0.0144,-0.23859 0.41055,0.22309 0.0968,0.10517 -0.0968,0.34115 0,0.44634 0.0483,0.0527 0.17472,-0.0666 0.20531,0 0.0613,0.13314 -0.0611,0.31328 0,0.44636 0.0306,0.0666 0.15692,-0.0527 0.20531,0 0.0483,0.0527 -0.0306,0.15678 0,0.22308 0.0432,0.0941 0.1621,0.12909 0.2053,0.2231 0.0306,0.0666 -0.0306,0.15653 0,0.2231 0.0548,0.1193 0.50777,0.55204 0.61585,0.66954 0.10807,0.11739 0.50621,0.60992 0.61586,0.66953 0.1224,0.0666 0.28815,-0.0666 0.41054,0 0.85436,0.46441 -0.21943,-0.0163 0.20532,0.44633 0.0484,0.0527 0.1441,-0.0332 0.2053,0 0.0866,0.047 0.11869,0.17609 0.20531,0.2231 0.0611,0.0332 0.15693,-0.0527 0.2053,0 0.0485,0.0527 -0.0483,0.17065 0,0.2231 0.0485,0.0527 0.14412,-0.0332 0.20532,0 0.0866,0.047 0.11867,0.17609 0.2053,0.2231 0.0815,0.0443 0.57389,-0.0457 0.61587,0 0.0483,0.0527 -0.0483,0.17065 0,0.2231 0.0483,0.0527 0.15692,-0.0527 0.2053,0 0.0483,0.0527 -0.0484,0.17065 0,0.2231 0.0968,0.10516 0.28073,-0.047 0.41056,0 0.14514,0.0527 0.26541,0.17064 0.41057,0.22309 0.0649,0.0245 0.14411,-0.0332 0.20531,0 0.0866,0.047 0.11868,0.17609 0.2053,0.22309 0.0742,0.0402 0.88363,0 1.02642,0 0.34214,0 0.68427,0 1.02642,0 0.13686,0 0.27369,0 0.41054,0 0.0685,0 0.20532,-0.0745 0.20532,0 0,0.0217 -0.68083,0.0245 0,-0.22309 0.12984,-0.047 0.27371,0 0.41056,0 0.0685,0 0.14411,0.0332 0.20532,0 0.50733,-0.27579 -0.0709,-0.22309 0.41054,-0.22309"
-       id="path2916-88" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.47905955px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 386.00217,296.67237 c -0.0909,0.21902 -0.0909,0.54774 -0.2728,0.65731 -0.98402,0.59276 -0.60239,-0.58881 -1.36387,0.32864 -0.14369,0.17309 -0.12902,0.48407 -0.27279,0.65728 -0.1437,0.17309 -0.36371,0.21902 -0.54554,0.32867 -0.18195,0.10951 -0.35269,0.25108 -0.54557,0.32864 -0.15382,0.0617 -0.63911,0 -0.81833,0 -0.091,0 -0.2085,0.0775 -0.27278,0 -0.12859,-0.1549 0.1286,-0.50237 0,-0.65731 -0.12859,-0.15489 -0.41698,0.15488 -0.54557,0 -0.12859,-0.15489 0.12861,-0.50237 0,-0.65728 -0.0643,-0.0775 -0.20848,0.0775 -0.27276,0 -0.12861,-0.1549 0.0813,-0.46134 0,-0.65728 -0.0575,-0.1386 -0.21529,-0.19022 -0.2728,-0.32867 -0.0541,-0.13017 0.0558,-0.91875 0,-0.98592 -0.0643,-0.0775 -0.20849,0.0775 -0.27277,0 -0.1286,-0.1549 0.12861,-0.50237 0,-0.65731 -0.0643,-0.0775 -0.20849,0.0775 -0.2728,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.1386 -0.21524,-0.19022 -0.27276,-0.32864 -0.0416,-0.10001 0,-0.83793 0,-0.98595 0,-0.10951 0,-0.21902 0,-0.32864 0,-0.10951 -0.0408,-0.23071 0,-0.32864 0.0575,-0.13859 0.15775,-0.25924 0.27276,-0.32864 0.0986,-0.0595 1.1742,0 1.36391,0 0.18195,0 0.3637,0 0.54557,0 0.0909,0 0.27277,-0.10951 0.27277,0 0,0.10951 -0.20849,0.0775 -0.27277,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.21528,-0.19022 -0.27278,-0.32867 -0.0408,-0.0981 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.23212,-0.18152 -0.27279,-0.32864 -0.0575,-0.20789 0.044,-0.44473 0,-0.65728 -0.0494,-0.23778 -0.20847,-0.42493 -0.27278,-0.65731 -0.0288,-0.1038 0,-0.21902 0,-0.32864 0,-0.21902 0,-0.43821 0,-0.65728 0,-1.20505 0,-2.41008 0,-3.61513 0,-0.13831 -0.0405,-1.8741 0,-1.97187 0.0575,-0.13859 0.21528,-0.18995 0.27278,-0.32864 0.0408,-0.0981 -0.0408,-0.23071 0,-0.32864 0.0575,-0.13859 0.18195,-0.21902 0.27279,-0.32867 0.091,-0.10951 0.15776,-0.25924 0.27278,-0.32864 0.0813,-0.0489 0.18649,0.0348 0.27277,0 0.1929,-0.0775 0.34831,-0.2693 0.54556,-0.32864 0.35285,-0.10625 0.73826,0.10625 1.09111,0 0.19725,-0.0595 0.34832,-0.2693 0.54556,-0.32864 0.24353,-0.0734 1.04815,0 1.3639,0 0.091,0 0.20847,-0.0775 0.27277,0 0.0643,0.0775 -0.0408,0.23071 0,0.32864 0.56763,1.36773 -0.0186,-0.35133 0.54556,0.32864 0.0643,0.0775 -0.0643,0.25108 0,0.32864 0.0643,0.0775 0.20847,-0.0775 0.27278,0 0.1286,0.15489 -0.1286,0.50236 0,0.65731 0.0643,0.0775 0.20849,-0.0775 0.27277,0 0.16251,0.19593 -0.27224,0.98592 0.2728,0.98592 0.025,0 -0.0315,-0.92927 0,-0.98592 0.14266,-0.25788 0.39123,-0.40943 0.54555,-0.65731 0.122,-0.19593 0.16003,-0.45348 0.27278,-0.65728 0.15693,-0.28359 0.60527,-0.72924 0.81834,-0.98595 0.091,-0.10951 0.18194,-0.21902 0.27276,-0.32864 0.091,-0.10951 0.15776,-0.25924 0.2728,-0.32864 0.0831,-0.05 0.69549,0 0.81833,0 0.2196,0 0.9199,-0.0688 1.09111,0 0.1929,0.0775 0.34832,0.2693 0.54556,0.32864 0.44106,0.13288 0.91809,-0.10734 1.36388,0 0.19932,0.0481 0.34502,0.28837 0.54557,0.32864 0.35876,0.072 0.72741,0 1.0911,0 0.2728,0 0.54557,0 0.81835,0 0.18194,0 0.36913,-0.0533 0.54556,0 0.39448,0.11875 0.69661,0.53847 1.0911,0.65731 0.17636,0.0533 0.36372,0 0.54557,0 0.0909,0 0.19146,-0.0489 0.27278,0 0.11494,0.0693 0.15776,0.25924 0.27278,0.32864 0.0813,0.0489 0.19145,-0.0489 0.27277,0 0.11494,0.0693 0.18194,0.21902 0.2728,0.32864 0.0909,0.10951 0.21524,0.19022 0.27277,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.21902 0.0575,0.44943 0,0.65728 -0.0643,0.23234 -0.20849,0.42491 -0.27277,0.65728 -0.0288,0.10407 0.0408,0.23071 0,0.32867 -0.0575,0.13858 -0.21527,0.18994 -0.2728,0.32864 -0.0408,0.0981 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 -0.0643,0.40611 0,0.32864 0.1437,-0.17309 0.12902,-0.48408 0.2728,-0.65728 0.14369,-0.1731 0.36369,-0.21902 0.54554,-0.32864 0.3637,-0.21902 0.71358,-0.47535 1.09113,-0.65731 0.26696,-0.12854 0.54554,-0.21902 0.81833,-0.32864 0.27278,-0.10951 0.55136,-0.2 0.81833,-0.32864 0.18878,-0.0911 0.34831,-0.2693 0.54555,-0.32864 0.24731,-0.0745 1.04703,0 1.3639,0 0.18194,0 0.36371,0 0.54557,0 0.18173,0 0.37303,-0.0693 0.54554,0 0.24399,0.0981 0.33158,0.48541 0.54557,0.65728 0.16912,0.13587 0.34831,0.26929 0.54555,0.32864 0.17637,0.0533 0.39425,-0.12147 0.54555,0 0.16913,0.13587 0.10364,0.52141 0.2728,0.65731 1.29645,1.04132 -0.22932,-1.26223 1.0911,0.32864 0.1437,0.17309 0.15072,0.46133 0.2728,0.65728 0.15424,0.24782 0.3398,0.47138 0.54553,0.65731 0.59079,0.53382 0.63558,0.0712 1.09113,0.98592 0.52155,1.88515 -0.0805,0.19972 0.81834,1.64326 0.12198,0.19591 0.15072,0.4613 0.27278,0.65728 0.15423,0.24782 0.43054,0.38015 0.54555,0.65728 0.0813,0.19592 -0.0813,0.46133 0,0.65731 0.0408,0.0981 0.2085,-0.0775 0.27278,0 0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.35411,0.0489 -0.27278,0 0.25718,-0.1549 0.55136,-0.20001 0.81835,-0.32864 0.37755,-0.18207 0.69661,-0.53848 1.0911,-0.65731 0.17636,-0.0533 0.36914,0.0533 0.54556,0 0.3945,-0.11875 0.71356,-0.47533 1.09111,-0.65728 0.86523,-0.41699 1.08288,-0.32864 1.90946,-0.32864 0.12281,0 0.73531,-0.05 0.81835,0 0.11493,0.0693 0.16581,0.24266 0.27276,0.32864 0.16913,0.13586 0.37638,0.19265 0.54557,0.32864 0.21396,0.17173 0.31552,0.51872 0.54554,0.65731 0.0813,0.0489 0.19146,-0.0489 0.27279,0 0.11494,0.0693 0.18194,0.21902 0.27277,0.32864 0.0909,0.10951 0.21527,0.18994 0.27278,0.32864 0.0408,0.0981 -0.0408,0.2307 0,0.32864 0.0575,0.13858 0.23212,0.18179 0.27279,0.32864 0.0248,0.0897 0.0211,1.86985 0,1.9719 -0.0493,0.23749 -0.16004,0.45347 -0.27279,0.65728 -0.14267,0.25788 -0.40289,0.39948 -0.54555,0.65728 -0.11284,0.2038 -0.16003,0.45347 -0.27279,0.65731 -0.25018,0.45211 -0.42081,0.33798 -0.81834,0.65728 -0.1069,0.0859 -0.14803,0.29108 -0.27277,0.32864 -2.0433,0.61546 0.18711,-0.60569 -1.3639,0.32867 -0.18194,0.10951 -0.35266,0.25108 -0.54554,0.32864 -0.16375,0.0658 -1.14623,0 -1.3639,0 -0.091,0 -0.18194,0 -0.27277,0 -0.0909,0 -0.20849,-0.0775 -0.2728,0 -0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.27277,0.10951 -0.27277,0 0,-0.10951 0.20849,-0.0775 0.27277,0 0.5644,0.67997 -0.86245,-0.0272 0.2728,0.65728 0.67284,0.40535 -0.16375,-0.92019 0.27277,0.65731 0.0813,0.29394 0.46423,0.36334 0.54555,0.65728 0.0575,0.20787 -0.0575,0.44945 0,0.65731 0.0408,0.14701 0.21529,0.19021 0.27278,0.32864 0.0354,0.0851 0.0337,1.85032 0,1.97187 -0.0643,0.23233 -0.16002,0.45347 -0.27278,0.65731 -0.14267,0.25787 -0.36371,0.43817 -0.54555,0.65728 -0.18194,0.21902 -0.36371,0.4382 -0.54557,0.65728 -0.091,0.10951 -0.16581,0.24266 -0.27277,0.32867 -0.16912,0.13586 -0.37639,0.19265 -0.54556,0.32864 -0.1069,0.0859 -0.15072,0.27964 -0.27277,0.32864 -0.17243,0.0693 -0.37671,-0.0813 -0.54556,0 -0.30439,0.14673 -0.50732,0.53238 -0.81834,0.65727 -0.0448,0.019 -1.54918,-0.0163 -1.63668,0 -2.15423,0.43259 0.49105,0.32867 -1.63666,0.32867 -0.17554,0 -1.72486,0.0557 -1.90947,0 -0.19724,-0.0595 -0.3637,-0.21903 -0.54555,-0.32867 -0.27276,-0.10951 -0.53638,-0.26059 -0.81833,-0.32864 -0.17842,-0.043 -0.37305,0.0693 -0.54557,0 -0.12198,-0.0489 -0.16581,-0.24266 -0.27276,-0.32863 -0.16913,-0.13588 -0.3764,-0.19267 -0.54557,-0.32864 -0.10713,-0.0859 -0.15775,-0.25924 -0.27277,-0.32864 -0.0813,-0.0489 -0.19146,0.0489 -0.27279,0 -0.14162,-0.0853 -0.73367,-0.98595 -0.81834,-0.98595 -0.091,0 -0.0408,0.2307 0,0.32864 0.0575,0.13858 0.21527,0.19021 0.2728,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.10951 0.0408,0.23069 0,0.32864 -0.12488,0.3008 -0.61901,0.57722 -0.81835,0.65727 -0.0862,0.0348 -0.19144,-0.0489 -0.27278,0 -0.83186,0.50112 0.4989,0.2606 -0.81834,0.65731 -0.17636,0.0533 -0.3637,0 -0.54554,0 -0.63649,0 -1.27298,0 -1.90947,0 -0.2376,0 -1.53598,0.0606 -1.63667,0 -0.11494,-0.0693 -0.16582,-0.24266 -0.27276,-0.32867 -0.33836,-0.27174 -0.76581,-0.36332 -1.09113,-0.65727 -0.0269,-0.0245 -0.99384,-1.13878 -1.09112,-1.31459 -0.11284,-0.20381 -0.12901,-0.48408 -0.27277,-0.65728 -0.14369,-0.17311 -0.43278,-0.12474 -0.54556,-0.32864 -0.10085,-0.18234 0.044,-0.44476 0,-0.65731 0.49396,-1.37498 -0.43055,-0.38017 -0.54557,-0.65728 -0.0813,-0.19593 0.0813,-0.46134 0,-0.65731 -0.0408,-0.0981 -0.18173,0 -0.27277,0 0,-0.21902 0,-0.43818 0,-0.65728 0,-0.10951 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 0.0408,0.2307 0,0.32867 -0.0565,0.13586 -0.70271,0.89306 -0.81833,0.98592 -0.16912,0.13586 -0.35269,0.25108 -0.54556,0.32864 -0.16106,0.0647 -1.21149,0 -1.36389,0 -0.23096,0 -0.94447,0.059 -1.09113,0 -0.12198,-0.0489 -0.18194,-0.21902 -0.27276,-0.32864 -0.0909,-0.10951 -0.16583,-0.24267 -0.2728,-0.32864 -0.16913,-0.13588 -0.40179,-0.15544 -0.54554,-0.32864 -1.39401,-1.67951 1.14375,0.45836 -0.81833,-1.31459 -0.16272,-0.14701 -0.43279,-0.12474 -0.54557,-0.32864 -0.10085,-0.18234 0.0575,-0.44946 0,-0.65731 -0.0813,-0.29394 -0.46423,-0.36334 -0.54556,-0.65728 -0.0575,-0.20789 0.0575,-0.44946 0,-0.65731 -0.0408,-0.14701 -0.23211,-0.18152 -0.27278,-0.32864 -0.0575,-0.20789 0.0813,-0.46131 0,-0.65728 -0.0408,-0.0981 -0.31956,0.094 -0.27277,0 0.29955,-0.6015 0.72741,-1.09549 0,-0.65731 z"
-       id="path2906-9" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 385.47363,303.48716 c 0,0.29755 0,0.59514 0,0.89268 0,1.48038 0.0968,-0.31562 -0.20532,0.66954 -0.0649,0.21168 0,0.44636 0,0.66954 0,0.52073 0,1.04149 0,1.56222 0,0.0541 0.006,0.66237 0,0.66954 -0.0483,0.0527 -0.15693,-0.0527 -0.2053,0 -0.0484,0.0527 0,0.14892 0,0.22309 0,0.44636 0,0.89272 0,1.33908 0,0.0745 -0.0484,0.17065 0,0.2231 0.0483,0.0527 0.15693,-0.0527 0.2053,0 0.0485,0.0527 0,0.14891 0,0.2231 0,0.0745 0,0.1489 0,0.22309"
-       id="path2908-9" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 388.75815,304.60302 c 0,0.0745 -0.0306,0.15653 0,0.2231 0.0432,0.094 0.16209,0.12908 0.20531,0.2231 0.0456,0.0995 -0.0312,0.79062 0,0.89272 0.0306,0.0997 0.17471,0.12336 0.20531,0.2231 0.0378,0.12336 0,1.11428 0,1.33904 0,0.96708 0,1.93421 0,2.90129"
-       id="path2910-4" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 404.1544,307.28114 c 0,0.44636 0,0.89271 0,1.33907 0,0.0745 0,0.14865 0,0.2231 0,0.0745 0.0306,0.15653 0,0.2231 -0.0432,0.0941 -0.1621,0.12907 -0.2053,0.2231 -0.0306,0.0666 0,0.14891 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.15515 0.037,1.03518 0,1.11589 -0.0432,0.094 -0.1621,0.12908 -0.20532,0.22309 -0.0821,0.17854 0.0821,0.49099 0,0.66954 -0.0432,0.094 -0.16208,0.12907 -0.2053,0.2231 -0.0312,0.068 0,0.56902 0,0.6695"
-       id="path2912-4" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 401.691,307.7275 c 0,0.37196 0,0.74391 0,1.11589 0,0.44636 0,0.8927 0,1.33905 0,0.0745 0,0.14891 0,0.22309 0,0.0745 0.0306,0.15653 0,0.2231 -0.0432,0.094 -0.1621,0.12908 -0.20531,0.2231 -0.0709,0.15408 0.0722,1.03756 0,1.1159 -0.0483,0.0527 -0.15692,-0.0527 -0.20531,0 -0.0491,0.0535 0.0467,0.89268 0,0.89268 -0.0685,0 0,-0.14891 0,-0.22309"
-       id="path2914-40" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 381.36795,283.40123 c -0.21236,0 -0.28373,0.0527 -0.41058,-0.2231 -0.0306,-0.0666 0.0484,-0.17065 0,-0.22309 -0.0483,-0.0527 -0.14411,0.0332 -0.2053,0 -0.0866,-0.047 -0.11868,-0.1761 -0.20532,-0.2231 -0.16416,-0.0894 -0.45163,0.0892 -0.61586,0 -0.0866,-0.047 -0.11867,-0.17609 -0.2053,-0.2231 -0.12901,-0.0701 -0.69211,0.0701 -0.82115,0 -0.0866,-0.047 -0.11354,-0.18994 -0.20531,-0.2231 -0.19476,-0.0707 -0.41055,0 -0.61584,0 -0.54742,0 -1.09485,0 -1.64227,0 -0.41056,0 -0.82113,0 -1.23171,0 -0.13686,0 -0.28814,-0.0666 -0.41054,0 -0.0613,0.0332 0.0483,0.17065 0,0.2231 -0.0483,0.0527 -0.14411,-0.0332 -0.20532,0 -0.0866,0.047 -0.11867,0.17609 -0.2053,0.2231 -0.0815,0.0443 -0.57389,-0.0457 -0.61585,0 -0.0483,0.0527 0.0485,0.17065 0,0.2231 -0.0483,0.0527 -0.15691,-0.0527 -0.2053,0 -0.0484,0.0527 0.0483,0.17065 0,0.22309 -0.42474,0.46177 0.0165,-0.70562 -0.41057,0.2231 -0.0306,0.0666 0.0306,0.15652 0,0.22309 -0.0432,0.094 -0.1621,0.12909 -0.20531,0.2231 -0.0306,0.0666 0.0306,0.15653 0,0.2231 -0.0432,0.094 -0.1621,0.12907 -0.2053,0.2231 -0.0306,0.0666 0,0.14864 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.37194 0,0.7439 0,1.11586 0,0.0745 0,0.14891 0,0.2231 0,0.0745 0.0306,0.15652 0,0.2231 -0.0432,0.094 -0.1621,0.12907 -0.20532,0.22309 -0.0373,0.0807 0,0.96067 0,1.11589 0,0.11685 -0.0271,0.83402 0,0.89272 0.42716,0.9288 -0.0144,-0.23859 0.41056,0.2231 0.0968,0.10516 -0.0968,0.34114 0,0.44633 0.0483,0.0527 0.17471,-0.0666 0.2053,0 0.0613,0.13315 -0.0611,0.31329 0,0.44636 0.0306,0.0666 0.15693,-0.0527 0.20532,0 0.0483,0.0527 -0.0306,0.15679 0,0.22309 0.0432,0.0941 0.16208,0.12907 0.2053,0.2231 0.0306,0.0666 -0.0306,0.15653 0,0.2231 0.0548,0.11929 0.50777,0.55204 0.61585,0.66953 0.10806,0.11739 0.50621,0.60992 0.61586,0.66954 0.1224,0.0666 0.28815,-0.0666 0.41054,0 0.85436,0.4644 -0.21945,-0.0163 0.20531,0.44633 0.0483,0.0527 0.14411,-0.0332 0.20531,0 0.0866,0.047 0.11868,0.17609 0.20531,0.2231 0.0611,0.0332 0.15693,-0.0527 0.2053,0 0.0485,0.0527 -0.0483,0.17065 0,0.2231 0.0485,0.0527 0.14411,-0.0332 0.20532,0 0.0866,0.047 0.11867,0.17608 0.2053,0.22309 0.0815,0.0443 0.57389,-0.0457 0.61586,0 0.0484,0.0527 -0.0483,0.17066 0,0.2231 0.0484,0.0527 0.15692,-0.0527 0.20531,0 0.0484,0.0527 -0.0483,0.17066 0,0.2231 0.0968,0.10516 0.28073,-0.047 0.41056,0 0.14513,0.0527 0.2654,0.17065 0.41057,0.22309 0.065,0.0245 0.1441,-0.0332 0.20531,0 0.0866,0.047 0.11867,0.17609 0.2053,0.2231 0.0742,0.0402 0.88363,0 1.02642,0 0.34213,0 0.68427,0 1.02641,0 0.13687,0 0.2737,0 0.41055,0 0.0685,0 0.20531,-0.0745 0.20531,0 0,0.0217 -0.68082,0.0245 0,-0.2231 0.12984,-0.047 0.27372,0 0.41057,0 0.0685,0 0.14411,0.0332 0.20532,0 0.50732,-0.27578 -0.0709,-0.22309 0.41054,-0.22309"
-       id="path2916-76" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.47905955px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 239.98155,252.51487 c -0.0909,0.21902 -0.0909,0.54774 -0.2728,0.65731 -0.98403,0.59276 -0.6024,-0.58881 -1.36388,0.32864 -0.1437,0.17309 -0.12901,0.48407 -0.27279,0.65728 -0.14369,0.17309 -0.3637,0.21902 -0.54555,0.32867 -0.18194,0.10951 -0.35268,0.25108 -0.54556,0.32864 -0.15383,0.0617 -0.6391,0 -0.81834,0 -0.091,0 -0.20848,0.0775 -0.27276,0 -0.12861,-0.1549 0.12859,-0.50237 0,-0.65731 -0.12861,-0.15489 -0.41699,0.15488 -0.54557,0 -0.1286,-0.15489 0.12861,-0.50237 0,-0.65728 -0.0643,-0.0775 -0.20849,0.0775 -0.27277,0 -0.1286,-0.1549 0.0813,-0.46134 0,-0.65728 -0.0575,-0.1386 -0.2153,-0.19022 -0.27279,-0.32867 -0.0542,-0.13017 0.0558,-0.91875 0,-0.98592 -0.0643,-0.0775 -0.20849,0.0775 -0.27277,0 -0.12861,-0.1549 0.12859,-0.50237 0,-0.65731 -0.0643,-0.0775 -0.2085,0.0775 -0.2728,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.1386 -0.21525,-0.19022 -0.27277,-0.32864 -0.0416,-0.10001 0,-0.83793 0,-0.98595 0,-0.10951 0,-0.21902 0,-0.32864 0,-0.10951 -0.0408,-0.23071 0,-0.32864 0.0575,-0.1386 0.15775,-0.25924 0.27277,-0.32864 0.0986,-0.0595 1.17418,0 1.3639,0 0.18194,0 0.3637,0 0.54556,0 0.0909,0 0.27277,-0.10951 0.27277,0 0,0.10951 -0.20849,0.0775 -0.27277,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.1386 -0.21527,-0.19022 -0.27276,-0.32867 -0.0408,-0.0981 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.23213,-0.18152 -0.2728,-0.32864 -0.0575,-0.20789 0.044,-0.44473 0,-0.65728 -0.0494,-0.23778 -0.20847,-0.42493 -0.27277,-0.65731 -0.0288,-0.1038 0,-0.21902 0,-0.32864 0,-0.21902 0,-0.43821 0,-0.65728 0,-1.20505 0,-2.41008 0,-3.61513 0,-0.13831 -0.0405,-1.8741 0,-1.97187 0.0575,-0.13859 0.21527,-0.18995 0.27277,-0.32864 0.0408,-0.0981 -0.0408,-0.23071 0,-0.32864 0.0575,-0.13859 0.18194,-0.21902 0.2728,-0.32867 0.0909,-0.10951 0.15774,-0.25924 0.27276,-0.32864 0.0813,-0.0489 0.18649,0.0348 0.27277,0 0.19291,-0.0775 0.34833,-0.2693 0.54557,-0.32864 0.35285,-0.10625 0.73826,0.10625 1.09111,0 0.19724,-0.0595 0.34832,-0.2693 0.54557,-0.32864 0.24353,-0.0734 1.04813,0 1.3639,0 0.0909,0 0.20847,-0.0775 0.27276,0 0.0643,0.0775 -0.0408,0.23071 0,0.32864 0.56762,1.36773 -0.0186,-0.35133 0.54557,0.32864 0.0643,0.0775 -0.0643,0.25108 0,0.32864 0.0643,0.0775 0.20847,-0.0775 0.27277,0 0.1286,0.15489 -0.12861,0.50236 0,0.65731 0.0643,0.0775 0.20849,-0.0775 0.27278,0 0.1625,0.19592 -0.27224,0.98592 0.27278,0.98592 0.025,0 -0.0314,-0.92927 0,-0.98592 0.14266,-0.25788 0.39125,-0.40943 0.54557,-0.65731 0.12198,-0.19593 0.16003,-0.45348 0.27277,-0.65728 0.15693,-0.28358 0.60528,-0.72924 0.81833,-0.98595 0.0909,-0.10951 0.18195,-0.21902 0.27278,-0.32864 0.0909,-0.10951 0.15775,-0.25924 0.27279,-0.32864 0.0831,-0.05 0.69548,0 0.81833,0 0.2196,0 0.9199,-0.0688 1.09111,0 0.1929,0.0775 0.34833,0.2693 0.54557,0.32864 0.44104,0.13288 0.91807,-0.10734 1.36388,0 0.19931,0.0481 0.345,0.28837 0.54555,0.32864 0.35878,0.072 0.72741,0 1.09112,0 0.27279,0 0.54556,0 0.81833,0 0.18194,0 0.36914,-0.0533 0.54557,0 0.39449,0.11875 0.69662,0.53847 1.09111,0.65731 0.17636,0.0533 0.36372,0 0.54555,0 0.0909,0 0.19146,-0.0489 0.2728,0 0.11494,0.0693 0.15776,0.25924 0.27277,0.32864 0.0813,0.0489 0.19146,-0.0489 0.27278,0 0.11493,0.0693 0.18194,0.21902 0.27278,0.32864 0.0909,0.10951 0.21526,0.19022 0.27277,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.21902 0.0575,0.44943 0,0.65728 -0.0643,0.23233 -0.20849,0.42491 -0.27277,0.65728 -0.0288,0.10407 0.0408,0.23071 0,0.32867 -0.0575,0.13858 -0.21527,0.18994 -0.27278,0.32864 -0.0408,0.0981 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 -0.0643,0.40611 0,0.32864 0.14368,-0.17309 0.12901,-0.48408 0.27278,-0.65728 0.1437,-0.1731 0.36371,-0.21902 0.54555,-0.32864 0.36371,-0.21902 0.71357,-0.47535 1.09113,-0.65731 0.26696,-0.12854 0.54554,-0.21902 0.81834,-0.32864 0.27276,-0.10951 0.55134,-0.2 0.81833,-0.32864 0.18877,-0.0911 0.3483,-0.2693 0.54555,-0.32864 0.24729,-0.0745 1.04702,0 1.3639,0 0.18194,0 0.36369,0 0.54556,0 0.18174,0 0.37302,-0.0693 0.54554,0 0.24399,0.0981 0.33157,0.48541 0.54556,0.65728 0.16913,0.13587 0.34833,0.26929 0.54557,0.32864 0.17636,0.0533 0.39424,-0.12147 0.54555,0 0.16912,0.13587 0.10364,0.52141 0.27278,0.65731 1.29647,1.04132 -0.2293,-1.26223 1.09112,0.32864 0.14368,0.17309 0.15072,0.46133 0.27278,0.65728 0.15424,0.24782 0.3398,0.47138 0.54555,0.65731 0.59077,0.53382 0.63556,0.0712 1.09113,0.98592 0.52153,1.88515 -0.0805,0.19972 0.81833,1.64326 0.12199,0.19591 0.15073,0.4613 0.27277,0.65728 0.15424,0.24782 0.43055,0.38015 0.54557,0.65728 0.0813,0.19592 -0.0813,0.46133 0,0.65731 0.0408,0.0981 0.20849,-0.0775 0.27277,0 0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.35411,0.0489 -0.27277,0 0.25718,-0.1549 0.55135,-0.20001 0.81833,-0.32864 0.37756,-0.18207 0.69662,-0.53849 1.09111,-0.65731 0.17636,-0.0533 0.36914,0.0533 0.54557,0 0.39448,-0.11875 0.71354,-0.47533 1.0911,-0.65728 0.86523,-0.41699 1.08288,-0.32864 1.90947,-0.32864 0.12281,0 0.7353,-0.05 0.81833,0 0.11494,0.0693 0.16581,0.24266 0.27277,0.32864 0.16913,0.13586 0.37638,0.19265 0.54556,0.32864 0.21398,0.17173 0.31554,0.51872 0.54555,0.65731 0.0813,0.0489 0.19145,-0.0489 0.2728,0 0.11493,0.0693 0.18194,0.21902 0.27277,0.32864 0.0909,0.10951 0.21527,0.18994 0.27277,0.32864 0.0408,0.0981 -0.0408,0.2307 0,0.32864 0.0575,0.13858 0.23212,0.18179 0.27279,0.32864 0.0248,0.0897 0.0211,1.86985 0,1.9719 -0.0491,0.23749 -0.16003,0.45347 -0.27279,0.65728 -0.14266,0.25788 -0.40288,0.39948 -0.54554,0.65728 -0.11284,0.2038 -0.16003,0.45347 -0.2728,0.65731 -0.25017,0.45211 -0.42081,0.33798 -0.81833,0.65728 -0.1069,0.0859 -0.14805,0.29108 -0.27278,0.32864 -2.04329,0.61546 0.18712,-0.60568 -1.3639,0.32867 -0.18194,0.10951 -0.35265,0.25108 -0.54554,0.32864 -0.16374,0.0658 -1.14622,0 -1.3639,0 -0.0909,0 -0.18195,0 -0.27277,0 -0.0909,0 -0.20849,-0.0775 -0.27279,0 -0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.27277,0.10951 -0.27277,0 0,-0.10951 0.20849,-0.0775 0.27277,0 0.5644,0.67997 -0.86246,-0.0272 0.27279,0.65728 0.67284,0.40534 -0.16375,-0.92019 0.27277,0.65731 0.0813,0.29394 0.46423,0.36334 0.54554,0.65728 0.0575,0.20788 -0.0575,0.44945 0,0.65731 0.0408,0.14701 0.2153,0.19021 0.2728,0.32864 0.0354,0.0851 0.0336,1.85032 0,1.97187 -0.0643,0.23233 -0.16003,0.45347 -0.2728,0.65731 -0.14266,0.25787 -0.36369,0.43817 -0.54554,0.65728 -0.18195,0.21902 -0.3637,0.4382 -0.54556,0.65727 -0.091,0.10951 -0.16582,0.24267 -0.27277,0.32867 -0.16913,0.13587 -0.37641,0.19266 -0.54557,0.32864 -0.10691,0.0859 -0.15073,0.27965 -0.27277,0.32864 -0.17244,0.0693 -0.37671,-0.0813 -0.54557,0 -0.30437,0.14674 -0.50731,0.53239 -0.81833,0.65728 -0.0448,0.019 -1.54917,-0.0163 -1.63667,0 -2.15424,0.43259 0.49103,0.32867 -1.63668,0.32867 -0.17553,0 -1.72485,0.0557 -1.90945,0 -0.19725,-0.0595 -0.36371,-0.21903 -0.54555,-0.32867 -0.27277,-0.10951 -0.53638,-0.26059 -0.81833,-0.32864 -0.17844,-0.043 -0.37305,0.0693 -0.54557,0 -0.12198,-0.0489 -0.16582,-0.24266 -0.27277,-0.32864 -0.16913,-0.13587 -0.3764,-0.19266 -0.54556,-0.32864 -0.10714,-0.0859 -0.15776,-0.25923 -0.27278,-0.32864 -0.0813,-0.0489 -0.19145,0.0489 -0.27279,0 -0.14163,-0.0853 -0.73367,-0.98594 -0.81833,-0.98594 -0.091,0 -0.0408,0.2307 0,0.32864 0.0575,0.13858 0.21527,0.19021 0.27278,0.32863 0.0408,0.0981 0,0.21902 0,0.32867 0,0.10951 0.0408,0.2307 0,0.32864 -0.12487,0.30081 -0.619,0.57723 -0.81833,0.65728 -0.0862,0.0348 -0.19146,-0.0489 -0.2728,0 -0.83185,0.50112 0.49891,0.2606 -0.81833,0.65731 -0.17636,0.0533 -0.3637,0 -0.54554,0 -0.6365,0 -1.27297,0 -1.90946,0 -0.23761,0 -1.53598,0.0606 -1.63668,0 -0.11493,-0.0693 -0.16581,-0.24266 -0.27277,-0.32867 -0.33836,-0.27174 -0.7658,-0.36332 -1.09113,-0.65728 -0.0269,-0.0245 -0.99383,-1.13877 -1.0911,-1.31458 -0.11284,-0.20381 -0.12902,-0.48408 -0.27278,-0.65728 -0.1437,-0.17311 -0.43277,-0.12474 -0.54557,-0.32864 -0.10084,-0.18234 0.044,-0.44476 0,-0.65731 0.49396,-1.37498 -0.43054,-0.38017 -0.54555,-0.65728 -0.0813,-0.19593 0.0813,-0.46134 0,-0.65731 -0.0408,-0.0981 -0.18175,0 -0.27278,0 0,-0.21902 0,-0.43818 0,-0.65728 0,-0.10951 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 0.0408,0.2307 0,0.32867 -0.0565,0.13586 -0.70272,0.89306 -0.81833,0.98592 -0.16913,0.13586 -0.35268,0.25108 -0.54557,0.32864 -0.16106,0.0647 -1.21148,0 -1.36388,0 -0.23096,0 -0.94448,0.059 -1.09112,0 -0.12198,-0.0489 -0.18194,-0.21902 -0.27278,-0.32864 -0.0909,-0.10951 -0.16581,-0.24267 -0.27279,-0.32864 -0.16912,-0.13588 -0.40178,-0.15544 -0.54554,-0.32864 -1.394,-1.67951 1.14374,0.45836 -0.81834,-1.31459 -0.16272,-0.14701 -0.43278,-0.12474 -0.54556,-0.32864 -0.10096,-0.18234 0.0575,-0.44946 0,-0.65731 -0.0813,-0.29394 -0.46423,-0.36334 -0.54557,-0.65728 -0.0575,-0.20789 0.0575,-0.44946 0,-0.65731 -0.0408,-0.14701 -0.23209,-0.18152 -0.27277,-0.32864 -0.0575,-0.20789 0.0813,-0.46131 0,-0.65728 -0.0408,-0.0981 -0.31955,0.094 -0.27276,0 0.29954,-0.6015 0.72739,-1.09549 0,-0.65731 z"
-       id="path2906-0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 239.45299,259.32966 c 0,0.29755 0,0.59514 0,0.89268 0,1.48038 0.0968,-0.31562 -0.2053,0.66954 -0.065,0.21168 0,0.44636 0,0.66954 0,0.52073 0,1.04149 0,1.56222 0,0.0541 0.006,0.66237 0,0.66954 -0.0484,0.0527 -0.15693,-0.0527 -0.20531,0 -0.0483,0.0527 0,0.14892 0,0.22309 0,0.44636 0,0.89272 0,1.33908 0,0.0745 -0.0483,0.17065 0,0.2231 0.0484,0.0527 0.15692,-0.0527 0.20531,0 0.0483,0.0527 0,0.14891 0,0.2231 0,0.0745 0,0.1489 0,0.22309"
-       id="path2908-80" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 242.73752,260.44552 c 0,0.0745 -0.0306,0.15653 0,0.2231 0.0432,0.094 0.1621,0.12908 0.20531,0.2231 0.0457,0.0995 -0.0312,0.79062 0,0.89272 0.0306,0.0997 0.17471,0.12336 0.2053,0.2231 0.0378,0.12336 0,1.11428 0,1.33904 0,0.96708 0,1.93421 0,2.90129"
-       id="path2910-9" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 258.13377,263.12364 c 0,0.44636 0,0.89271 0,1.33907 0,0.0745 0,0.14865 0,0.2231 0,0.0745 0.0306,0.15653 0,0.2231 -0.0432,0.0941 -0.16209,0.12907 -0.20531,0.2231 -0.0306,0.0666 0,0.14891 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.15515 0.037,1.03518 0,1.11589 -0.0432,0.094 -0.16209,0.12908 -0.2053,0.22309 -0.0821,0.17854 0.0821,0.49099 0,0.66954 -0.0432,0.094 -0.1621,0.12908 -0.20531,0.2231 -0.0312,0.068 0,0.56902 0,0.6695"
-       id="path2912-84" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 255.67037,263.57 c 0,0.37196 0,0.74391 0,1.11589 0,0.44636 0,0.8927 0,1.33905 0,0.0745 0,0.14891 0,0.22309 0,0.0745 0.0306,0.15653 0,0.2231 -0.0432,0.094 -0.1621,0.12908 -0.20531,0.2231 -0.0709,0.15408 0.0722,1.03756 0,1.1159 -0.0483,0.0527 -0.15693,-0.0527 -0.2053,0 -0.0493,0.0536 0.0467,0.89268 0,0.89268 -0.0685,0 0,-0.14891 0,-0.22309"
-       id="path2914-8" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 235.34731,239.24373 c -0.21235,0 -0.28373,0.0527 -0.41056,-0.2231 -0.0306,-0.0666 0.0483,-0.17065 0,-0.22309 -0.0485,-0.0527 -0.14411,0.0332 -0.20532,0 -0.0866,-0.047 -0.11867,-0.1761 -0.2053,-0.2231 -0.16416,-0.0894 -0.45164,0.0892 -0.61586,0 -0.0866,-0.047 -0.11869,-0.17609 -0.20531,-0.2231 -0.12902,-0.0701 -0.69211,0.0701 -0.82115,0 -0.0866,-0.047 -0.11354,-0.18994 -0.2053,-0.2231 -0.19477,-0.0707 -0.41056,0 -0.61584,0 -0.54743,0 -1.09485,0 -1.64227,0 -0.41056,0 -0.82114,0 -1.23171,0 -0.13688,0 -0.28816,-0.0666 -0.41056,0 -0.0613,0.0332 0.0484,0.17065 0,0.2231 -0.0483,0.0527 -0.14411,-0.0332 -0.2053,0 -0.0866,0.047 -0.11867,0.17609 -0.20531,0.2231 -0.0815,0.0443 -0.57388,-0.0457 -0.61584,0 -0.0484,0.0527 0.0484,0.17065 0,0.2231 -0.0484,0.0527 -0.15693,-0.0527 -0.2053,0 -0.0485,0.0527 0.0483,0.17065 0,0.22309 -0.42474,0.46177 0.0165,-0.70562 -0.41058,0.2231 -0.0306,0.0666 0.0306,0.15652 0,0.22309 -0.0432,0.094 -0.1621,0.12909 -0.2053,0.2231 -0.0306,0.0666 0.0306,0.15653 0,0.2231 -0.0432,0.0941 -0.1621,0.12907 -0.20532,0.2231 -0.0306,0.0666 0,0.14864 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.37194 0,0.7439 0,1.11586 0,0.0745 0,0.14891 0,0.2231 0,0.0745 0.0306,0.15652 0,0.2231 -0.0432,0.094 -0.1621,0.12907 -0.2053,0.22309 -0.0373,0.0807 0,0.96068 0,1.11589 0,0.11685 -0.0271,0.83402 0,0.89272 0.42715,0.9288 -0.0144,-0.23859 0.41055,0.2231 0.0968,0.10516 -0.0968,0.34114 0,0.44633 0.0484,0.0527 0.17471,-0.0666 0.20531,0 0.0611,0.13315 -0.0613,0.31329 0,0.44636 0.0306,0.0666 0.15693,-0.0527 0.2053,0 0.0484,0.0527 -0.0306,0.15679 0,0.22309 0.0432,0.094 0.1621,0.12907 0.20532,0.2231 0.0306,0.0666 -0.0306,0.15653 0,0.2231 0.0547,0.11929 0.50776,0.55204 0.61583,0.66953 0.10818,0.11739 0.50622,0.60992 0.61586,0.66954 0.1224,0.0666 0.28816,-0.0666 0.41056,0 0.85435,0.4644 -0.21945,-0.0163 0.2053,0.44633 0.0484,0.0527 0.14412,-0.0332 0.20531,0 0.0866,0.047 0.11868,0.17609 0.2053,0.2231 0.0613,0.0332 0.15693,-0.0527 0.20532,0 0.0484,0.0527 -0.0485,0.17065 0,0.2231 0.0484,0.0527 0.14411,-0.0332 0.2053,0 0.0866,0.047 0.11869,0.17608 0.20531,0.22309 0.0815,0.0443 0.57389,-0.0457 0.61586,0 0.0485,0.0527 -0.0484,0.17066 0,0.2231 0.0485,0.0527 0.15693,-0.0527 0.20532,0 0.0483,0.0527 -0.0484,0.17066 0,0.2231 0.0968,0.10516 0.28072,-0.047 0.41054,0 0.14515,0.0527 0.26542,0.17065 0.41058,0.22309 0.0649,0.0245 0.14411,-0.0332 0.2053,0 0.0866,0.047 0.11868,0.17609 0.20532,0.2231 0.0742,0.0402 0.88362,0 1.0264,0 0.34214,0 0.68429,0 1.02642,0 0.13687,0 0.2737,0 0.41056,0 0.0685,0 0.2053,-0.0745 0.2053,0 0,0.0217 -0.68082,0.0245 0,-0.2231 0.12984,-0.047 0.27373,0 0.41058,0 0.0685,0 0.14411,0.0332 0.2053,0 0.50734,-0.27578 -0.0709,-0.22309 0.41056,-0.22309"
-       id="path2916-3" />
-  </g>
-</svg>
diff --git a/public/potlatch2/features/waterway__riverbank.png b/public/potlatch2/features/waterway__riverbank.png
new file mode 100644 (file)
index 0000000..7152808
Binary files /dev/null and b/public/potlatch2/features/waterway__riverbank.png differ
diff --git a/public/potlatch2/features/waterway__stream.svg b/public/potlatch2/features/waterway__stream.svg
deleted file mode 100644 (file)
index 3380ca1..0000000
+++ /dev/null
@@ -1,162 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="343pt"
-   height="340pt"
-   id="svg2816"
-   version="1.1"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="waterway__stream.svg"
-   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/waterway__stream.png"
-   inkscape:export-xdpi="8.3623695"
-   inkscape:export-ydpi="8.3623695">
-  <defs
-     id="defs2818">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3619">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop3621" />
-      <stop
-         style="stop-color:#00ffff;stop-opacity:0;"
-         offset="1"
-         id="stop3623" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3609">
-      <stop
-         style="stop-color:#008000;stop-opacity:1;"
-         offset="0"
-         id="stop3611" />
-      <stop
-         style="stop-color:#008000;stop-opacity:0;"
-         offset="1"
-         id="stop3613" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 212.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="428.75 : 212.5 : 1"
-       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
-       id="perspective2825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3609"
-       id="linearGradient3615"
-       x1="215"
-       y1="188.25"
-       x2="215"
-       y2="430.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3619"
-       id="linearGradient3625"
-       x1="215"
-       y1="188.75"
-       x2="215"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.6"
-     inkscape:cx="187.35182"
-     inkscape:cy="219.75636"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer1"
-     id="namedview2820"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2822">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
-       id="rect2827"
-       width="430"
-       height="241.25"
-       x="0"
-       y="188.75" />
-    <rect
-       style="fill:url(#linearGradient3625);fill-opacity:1"
-       id="rect3617"
-       width="428.125"
-       height="188.75"
-       x="0"
-       y="-6.5955419e-10" />
-    <path
-       style="fill:#3144d6;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="m 125,193.125 137.5,230.625 130.625,0 -226.875,-230.625 -41.25,0 z"
-       id="path2904"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.39884067px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 289.73421,231.54044 c -0.27683,0.61358 -0.27683,1.53394 -0.8305,1.84073 -2.99595,1.66007 -1.83405,-1.64894 -4.15247,0.92036 -0.43771,0.48507 -0.39279,1.35566 -0.8305,1.84073 -0.4377,0.48507 -1.10732,0.61358 -1.66099,0.92036 -0.55367,0.30679 -1.07374,0.70344 -1.66099,0.92037 -0.46856,0.17308 -1.94576,0 -2.49148,0 -0.27683,0 -0.63475,0.21692 -0.8305,0 -0.3915,-0.43387 0.3915,-1.40686 0,-1.84073 -0.3915,-0.43387 -1.26949,0.43387 -1.66099,0 -0.3915,-0.43387 0.3915,-1.40686 0,-1.84073 -0.19574,-0.21693 -0.63475,0.21693 -0.83049,0 -0.3915,-0.43387 0.2476,-1.29192 0,-1.84073 -0.17508,-0.38805 -0.65542,-0.53231 -0.8305,-0.92036 -0.16464,-0.36492 0.16978,-2.57294 0,-2.76109 -0.19574,-0.21693 -0.63475,0.21692 -0.83049,0 -0.3915,-0.43387 0.3915,-1.40686 0,-1.84073 -0.19575,-0.21693 -0.63475,0.21693 -0.8305,0 -0.19574,-0.21693 0.12385,-0.64596 0,-0.92036 -0.17508,-0.38806 -0.65541,-0.53231 -0.83049,-0.92037 -0.12637,-0.2801 0,-2.3466 0,-2.76109 0,-0.30678 0,-0.61358 0,-0.92036 0,-0.30679 -0.12385,-0.64597 0,-0.92037 0.17508,-0.38805 0.48033,-0.72633 0.83049,-0.92036 0.30034,-0.16642 3.57484,0 4.15248,0 0.55366,0 1.10732,0 1.66099,0 0.27682,0 0.83049,-0.30678 0.83049,0 0,0.30678 -0.63475,0.21693 -0.83049,0 -0.19575,-0.21693 0.12384,-0.64596 0,-0.92036 -0.17508,-0.38806 -0.65542,-0.53231 -0.8305,-0.92037 -0.12384,-0.2744 0.12385,-0.64596 0,-0.92036 -0.17508,-0.38806 -0.70669,-0.50876 -0.83049,-0.92037 -0.17508,-0.58208 0.13428,-1.24546 0,-1.84072 -0.15013,-0.66552 -0.63475,-1.18994 -0.8305,-1.84073 -0.0876,-0.29104 0,-0.61358 0,-0.92036 0,-0.61359 0,-1.22715 0,-1.84073 0,-3.37467 0,-6.74933 0,-10.124 0,-0.38716 -0.12358,-5.2484 0,-5.52219 0.17508,-0.38805 0.65542,-0.53231 0.8305,-0.92036 0.12384,-0.2744 -0.12385,-0.64596 0,-0.92036 0.17508,-0.38806 0.55366,-0.61359 0.83049,-0.92037 0.27683,-0.30678 0.48033,-0.72633 0.8305,-0.92036 0.2476,-0.13725 0.56787,0.097 0.83049,0 0.58725,-0.21693 1.06046,-0.75399 1.66099,-0.92037 1.07426,-0.29762 2.24772,0.29763 3.32198,0 0.60054,-0.16637 1.06046,-0.75399 1.66099,-0.92036 0.74145,-0.20543 3.19116,0 4.15248,0 0.27682,0 0.63475,-0.21693 0.83049,0 0.19575,0.21693 -0.12384,0.64596 0,0.92036 1.72816,3.83034 -0.0574,-0.9839 1.66099,0.92037 0.19575,0.21692 -0.19574,0.70344 0,0.92036 0.19575,0.21693 0.63475,-0.21692 0.8305,0 0.3915,0.43387 -0.39151,1.40686 0,1.84073 0.19574,0.21693 0.63475,-0.21693 0.83049,0 0.49483,0.54837 -0.82889,2.76109 0.8305,2.76109 0.0764,0 -0.0954,-2.60241 0,-2.76109 0.43433,-0.72199 1.19119,-1.14655 1.66099,-1.84073 0.37141,-0.5488 0.48712,-1.26994 0.83049,-1.84073 0.47776,-0.79417 1.8428,-2.0422 2.49149,-2.76109 0.27682,-0.30678 0.55366,-0.61358 0.83049,-0.92036 0.27683,-0.30678 0.48033,-0.72634 0.8305,-0.92037 0.25275,-0.14004 2.11747,0 2.49148,0 0.66858,0 2.80072,-0.19255 3.32198,0 0.58725,0.21693 1.06046,0.754 1.66099,0.92037 1.34284,0.37203 2.79519,-0.30084 4.15248,0 0.60699,0.13459 1.05039,0.80759 1.66099,0.92036 1.09225,0.20175 2.21465,0 3.32198,0 0.83049,0 1.66099,0 2.49148,0 0.55367,0 1.12385,-0.14882 1.66099,0 1.20107,0.33276 2.12091,1.50797 3.32198,1.84073 0.53714,0.14882 1.10732,0 1.66099,0 0.27683,0 0.58289,-0.13724 0.8305,0 0.35016,0.19403 0.48033,0.72634 0.83049,0.92036 0.24761,0.13725 0.58289,-0.13724 0.8305,0 0.35016,0.19403 0.55366,0.61358 0.83049,0.92037 0.27683,0.30678 0.65541,0.53231 0.8305,0.92036 0.12384,0.2744 0,0.61358 0,0.92037 0,0.61358 0.17508,1.25864 0,1.84072 -0.19575,0.6508 -0.63476,1.18994 -0.8305,1.84073 -0.0876,0.29104 0.12384,0.64596 0,0.92036 -0.17508,0.38806 -0.65541,0.53231 -0.83049,0.92037 -0.12385,0.2744 0,0.61358 0,0.92036 0,0.30679 0,0.61358 0,0.92037 0,0.30678 -0.19575,1.13729 0,0.92036 0.4377,-0.48507 0.39279,-1.35566 0.83049,-1.84073 0.4377,-0.48507 1.10732,-0.61358 1.66099,-0.92036 1.10732,-0.61358 2.1725,-1.33119 3.32198,-1.84073 0.81281,-0.36031 1.66099,-0.61358 2.49149,-0.92036 0.83049,-0.30679 1.67867,-0.56006 2.49148,-0.92037 0.57474,-0.25477 1.06046,-0.75399 1.66099,-0.92036 0.75288,-0.20859 3.18772,0 4.15248,0 0.55366,0 1.10732,0 1.66099,0 0.55366,0 1.13574,-0.19403 1.66098,0 0.74283,0.2744 1.0095,1.3594 1.66099,1.84073 0.51506,0.38053 1.06046,0.75399 1.66099,0.92036 0.53714,0.14882 1.20032,-0.34036 1.66099,0 0.51506,0.38053 0.31545,1.4602 0.8305,1.84073 3.94716,2.9162 -0.69816,-3.5348 3.32198,0.92036 0.4377,0.48507 0.45908,1.29193 0.83049,1.84073 0.4698,0.69417 1.0346,1.3201 1.66099,1.84073 1.79866,1.49496 1.93502,0.19933 3.32198,2.76109 1.58792,5.27926 -0.24452,0.55905 2.49149,4.60182 0.37141,0.5488 0.45908,1.29192 0.83049,1.84073 0.4698,0.69417 1.31083,1.0646 1.66099,1.84072 0.24761,0.54881 -0.2476,1.29193 0,1.84073 0.12385,0.2744 0.63476,-0.21693 0.8305,0 0.19574,0.21693 0.19574,0.70344 0,0.92036 -0.19574,0.21693 -1.0781,0.13725 -0.8305,0 0.78301,-0.43386 1.67868,-0.56005 2.49149,-0.92036 1.14948,-0.50954 2.12091,-1.50797 3.32198,-1.84073 0.53714,-0.14882 1.12385,0.14882 1.66099,0 1.20107,-0.33276 2.17249,-1.33118 3.32198,-1.84072 2.63425,-1.16773 3.29688,-0.92037 5.81346,-0.92037 0.37402,0 2.23874,-0.14004 2.49149,0 0.35016,0.19403 0.50474,0.6797 0.83049,0.92037 0.51506,0.38053 1.14594,0.53983 1.66099,0.92036 0.6515,0.48133 0.96065,1.45267 1.66099,1.84073 0.24761,0.13724 0.58289,-0.13725 0.8305,0 0.35016,0.19402 0.55367,0.61358 0.83049,0.92036 0.27683,0.30678 0.65542,0.53231 0.8305,0.92036 0.12384,0.27441 -0.12384,0.64597 0,0.92037 0.17508,0.38805 0.70669,0.50876 0.83049,0.92036 0.0756,0.25139 0.0645,5.23647 0,5.52219 -0.15012,0.66551 -0.48712,1.26994 -0.83049,1.84072 -0.43433,0.722 -1.22666,1.11874 -1.66099,1.84073 -0.34337,0.57079 -0.48712,1.26994 -0.8305,1.84073 -0.76167,1.26614 -1.28122,0.94657 -2.49148,1.84073 -0.32575,0.24066 -0.45069,0.81513 -0.8305,0.92036 -6.22099,1.72354 0.56976,-1.69625 -4.15247,0.92036 -0.55367,0.30679 -1.07374,0.70344 -1.66099,0.92037 -0.49824,0.18406 -3.48978,0 -4.15248,0 -0.27682,0 -0.55366,0 -0.83049,0 -0.27683,0 -0.63475,-0.21693 -0.8305,0 -0.19574,0.21692 0.19575,0.70343 0,0.92036 -0.19574,0.21693 -0.83049,0.30678 -0.83049,0 0,-0.30678 0.63475,-0.21693 0.83049,0 1.71833,1.90427 -2.62582,-0.0744 0.8305,1.84073 2.04856,1.13511 -0.4983,-2.57702 0.83049,1.84073 0.24761,0.8232 1.41339,1.01752 1.66099,1.84072 0.17509,0.58209 -0.17508,1.25865 0,1.84073 0.12385,0.4116 0.65542,0.53231 0.8305,0.92037 0.10737,0.23807 0.10232,5.18178 0,5.52218 -0.19575,0.65079 -0.48712,1.26994 -0.8305,1.84073 -0.43432,0.72199 -1.10732,1.22714 -1.66099,1.84072 -0.55366,0.61358 -1.10732,1.22715 -1.66099,1.84073 -0.27682,0.30678 -0.50474,0.6797 -0.83049,0.92036 -0.51505,0.38053 -1.14594,0.53984 -1.66099,0.92037 -0.32575,0.24066 -0.45909,0.78316 -0.8305,0.92036 -0.52524,0.19403 -1.14692,-0.22788 -1.66099,0 -0.92674,0.41081 -1.54457,1.49093 -2.49148,1.84073 -0.13685,0.0505 -4.71659,-0.0492 -4.98297,0 -6.55872,1.21141 1.49501,0.92036 -4.98297,0.92036 -0.53443,0 -5.25143,0.15571 -5.81347,0 -0.60053,-0.16637 -1.10732,-0.61358 -1.66099,-0.92036 -0.83049,-0.30678 -1.63307,-0.73011 -2.49148,-0.92036 -0.54292,-0.12031 -1.13575,0.19402 -1.66099,0 -0.37141,-0.13725 -0.50474,-0.6797 -0.83049,-0.92037 -0.51506,-0.38053 -1.14594,-0.53983 -1.66099,-0.92036 -0.32576,-0.24067 -0.48034,-0.72634 -0.8305,-0.92037 -0.24761,-0.13724 -0.58289,0.13725 -0.83049,0 -0.43089,-0.23874 -2.23373,-2.76109 -2.49149,-2.76109 -0.27683,0 -0.12384,0.64597 0,0.92037 0.17508,0.38805 0.65541,0.53231 0.8305,0.92036 0.12384,0.2744 0,0.61358 0,0.92036 0,0.30679 0.12384,0.64597 0,0.92037 -0.38009,0.84243 -1.88458,1.61653 -2.49149,1.84073 -0.26262,0.097 -0.58289,-0.13725 -0.83049,0 -2.53266,1.40335 1.51892,0.72963 -2.49149,1.84072 -0.53714,0.14882 -1.10732,0 -1.66099,0 -1.93782,0 -3.87565,0 -5.81346,0 -0.72343,0 -4.67644,0.16985 -4.98297,0 -0.35017,-0.19402 -0.50475,-0.6797 -0.8305,-0.92036 -1.03011,-0.76104 -2.33155,-1.01752 -3.32198,-1.84073 -0.0818,-0.068 -3.0258,-3.18912 -3.32198,-3.68145 -0.34337,-0.57079 -0.39279,-1.35566 -0.83049,-1.84073 -0.43771,-0.48507 -1.31762,-0.34958 -1.66099,-0.92036 -0.30713,-0.51053 0.13428,-1.24547 0,-1.84073 1.5039,-3.85058 -1.31083,-1.06461 -1.66099,-1.84073 -0.24761,-0.5488 0.2476,-1.29193 0,-1.84073 -0.12385,-0.2744 -0.55367,0 -0.8305,0 0,-0.61358 0,-1.22714 0,-1.84072 0,-0.30679 0,0.61358 0,0.92036 0,0.30678 0,0.61358 0,0.92036 0,0.30679 0.12384,0.64597 0,0.92037 -0.17181,0.38079 -2.13947,2.50102 -2.49148,2.76109 -0.51506,0.38053 -1.07375,0.70344 -1.66099,0.92036 -0.4901,0.18104 -3.68846,0 -4.15248,0 -0.70314,0 -2.8755,0.16493 -3.32198,0 -0.37141,-0.13724 -0.55367,-0.61358 -0.83049,-0.92036 -0.27683,-0.30678 -0.50475,-0.6797 -0.8305,-0.92037 -0.51505,-0.38053 -1.22328,-0.43529 -1.66099,-0.92036 -4.24415,-4.70341 3.48225,1.28367 -2.49148,-3.68145 -0.49522,-0.41161 -1.31762,-0.34958 -1.66099,-0.92037 -0.30713,-0.51053 0.17508,-1.25864 0,-1.84073 -0.24761,-0.8232 -1.41339,-1.01752 -1.66099,-1.84072 -0.17508,-0.58209 0.17508,-1.25865 0,-1.84073 -0.12385,-0.4116 -0.70669,-0.50876 -0.8305,-0.92037 -0.17508,-0.58208 0.24761,-1.29192 0,-1.84072 -0.12384,-0.2744 -0.97293,0.26306 -0.83049,0 0.91199,-1.68446 2.21465,-3.06788 0,-1.84073 z"
-       id="path2906" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 288.125,250.625 c 0,0.83333 0,1.66667 0,2.5 0,4.14573 0.29463,-0.88388 -0.625,1.875 -0.19764,0.59293 0,1.25 0,1.875 0,1.45833 0,2.91667 0,4.375 0,0.15158 0.0201,1.8549 0,1.875 -0.14731,0.14731 -0.47769,-0.14731 -0.625,0 -0.14731,0.14731 0,0.41667 0,0.625 0,1.25 0,2.5 0,3.75 0,0.20833 -0.14731,0.47769 0,0.625 0.14731,0.14731 0.47769,-0.14731 0.625,0 0.14731,0.14731 0,0.41667 0,0.625 0,0.20833 0,0.41667 0,0.625"
-       id="path2908" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 298.125,253.75 c 0,0.20833 -0.0932,0.43866 0,0.625 0.13176,0.26352 0.49324,0.36148 0.625,0.625 0.13906,0.27811 -0.0953,2.21413 0,2.5 0.0932,0.27951 0.53183,0.34549 0.625,0.625 0.11521,0.34564 0,3.12059 0,3.75 0,2.70833 0,5.41667 0,8.125"
-       id="path2910" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 345,261.25 c 0,1.25 0,2.5 0,3.75 0,0.20833 0,0.41667 0,0.625 0,0.20833 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.0932,0.18634 0,0.41667 0,0.625 0,0.20833 0,0.41667 0,0.625 0,0.43471 0.11301,2.89898 0,3.125 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.25,0.5 0.25,1.375 0,1.875 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.0951,0.19021 0,1.59353 0,1.875"
-       id="path2912" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 337.5,262.5 c 0,1.04167 0,2.08333 0,3.125 0,1.25 0,2.5 0,3.75 0,0.20833 0,0.41667 0,0.625 0,0.20833 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.21585,0.43171 0.21939,2.90561 0,3.125 -0.14731,0.14731 -0.47769,-0.14731 -0.625,0 -0.14964,0.14964 0.14208,2.5 0,2.5 -0.20833,0 0,-0.41667 0,-0.625"
-       id="path2914" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 275.625,194.375 c -0.64657,0 -0.86384,0.14731 -1.25,-0.625 -0.0932,-0.18634 0.14731,-0.47769 0,-0.625 -0.14731,-0.14731 -0.43866,0.0932 -0.625,0 -0.26352,-0.13176 -0.36148,-0.49324 -0.625,-0.625 -0.5,-0.25 -1.375,0.25 -1.875,0 -0.26352,-0.13176 -0.36148,-0.49324 -0.625,-0.625 -0.39283,-0.19641 -2.10717,0.19641 -2.5,0 -0.26352,-0.13176 -0.34549,-0.53183 -0.625,-0.625 -0.59293,-0.19764 -1.25,0 -1.875,0 -1.66667,0 -3.33333,0 -5,0 -1.25,0 -2.5,0 -3.75,0 -0.41667,0 -0.87732,-0.18634 -1.25,0 -0.18634,0.0932 0.14731,0.47769 0,0.625 -0.14731,0.14731 -0.43866,-0.0932 -0.625,0 -0.26352,0.13176 -0.36148,0.49324 -0.625,0.625 -0.24781,0.1239 -1.74723,-0.12777 -1.875,0 -0.14731,0.14731 0.14731,0.47769 0,0.625 -0.14731,0.14731 -0.47769,-0.14731 -0.625,0 -0.14731,0.14731 0.14731,0.47769 0,0.625 -1.29315,1.29315 0.0505,-1.9761 -1.25,0.625 -0.0932,0.18634 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.0932,0.18634 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.0932,0.18634 0,0.41667 0,0.625 0,0.20833 0,0.41667 0,0.625 0,1.04167 0,2.08333 0,3.125 0,0.20833 0,0.41667 0,0.625 0,0.20833 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.11301,0.22602 0,2.69029 0,3.125 0,0.32683 -0.0822,2.33566 0,2.5 1.30055,2.6011 -0.0431,-0.66815 1.25,0.625 0.29463,0.29463 -0.29463,0.95537 0,1.25 0.14731,0.14731 0.53183,-0.18634 0.625,0 0.18634,0.37268 -0.18634,0.87732 0,1.25 0.0932,0.18634 0.47769,-0.14731 0.625,0 0.14731,0.14731 -0.0932,0.43866 0,0.625 0.13176,0.26352 0.49324,0.36148 0.625,0.625 0.0932,0.18634 -0.0932,0.43866 0,0.625 0.1669,0.3338 1.54596,1.54596 1.875,1.875 0.32904,0.32904 1.5412,1.7081 1.875,1.875 0.37268,0.18634 0.87732,-0.18634 1.25,0 2.6011,1.30055 -0.66815,-0.0431 0.625,1.25 0.14731,0.14731 0.43866,-0.0932 0.625,0 0.26352,0.13176 0.36148,0.49324 0.625,0.625 0.18634,0.0932 0.47769,-0.14731 0.625,0 0.14731,0.14731 -0.14731,0.47769 0,0.625 0.14731,0.14731 0.43866,-0.0932 0.625,0 0.26352,0.13176 0.36148,0.49324 0.625,0.625 0.24781,0.1239 1.74723,-0.12777 1.875,0 0.14731,0.14731 -0.14731,0.47769 0,0.625 0.14731,0.14731 0.47769,-0.14731 0.625,0 0.14731,0.14731 -0.14731,0.47769 0,0.625 0.29463,0.29463 0.85472,-0.13176 1.25,0 0.44194,0.14731 0.80806,0.47769 1.25,0.625 0.19764,0.0659 0.43866,-0.0932 0.625,0 0.26352,0.13176 0.36148,0.49324 0.625,0.625 0.22602,0.11301 2.69029,0 3.125,0 1.04167,0 2.08333,0 3.125,0 0.41667,0 0.83333,0 1.25,0 0.20833,0 0.625,-0.20833 0.625,0 0,0.0575 -2.07286,0.0659 0,-0.625 0.39528,-0.13176 0.83333,0 1.25,0 0.20833,0 0.43866,0.0932 0.625,0 1.54463,-0.77231 -0.21574,-0.625 1.25,-0.625"
-       id="path2916" />
-    <path
-       style="fill:#7a4904;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="m 103.125,287.5 c -31.25,-75 -31.25,-75 -31.25,-75 L 67.5,1.25 0,0 l 0.625,290 102.5,-2.5 z"
-       id="path3694" />
-    <path
-       style="fill:#2ada1d;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="M 35.625,1.25 C 18.861084,20.183648 10.032426,37.353905 52.5,43.125 c 21.065323,49.350537 40.568025,31.508402 60,10.625 35.92323,16.036466 62.33024,20.272833 56.875,-15 58.2311,-0.685821 44.48212,-18.308128 18.75,-38.75"
-       id="path3698"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
diff --git a/public/potlatch2/help/introduction.jpg b/public/potlatch2/help/introduction.jpg
new file mode 100644 (file)
index 0000000..c24ce53
Binary files /dev/null and b/public/potlatch2/help/introduction.jpg differ
diff --git a/public/potlatch2/help/introduction.mp4 b/public/potlatch2/help/introduction.mp4
new file mode 100644 (file)
index 0000000..9800792
Binary files /dev/null and b/public/potlatch2/help/introduction.mp4 differ
index ffc1256..1827b0a 100644 (file)
Binary files a/public/potlatch2/icons/health_pharmacy.n.16.png and b/public/potlatch2/icons/health_pharmacy.n.16.png differ
diff --git a/public/potlatch2/locales/en_GB.swf b/public/potlatch2/locales/en_GB.swf
new file mode 100644 (file)
index 0000000..808dde8
Binary files /dev/null and b/public/potlatch2/locales/en_GB.swf differ
diff --git a/public/potlatch2/locales/en_US.swf b/public/potlatch2/locales/en_US.swf
new file mode 100644 (file)
index 0000000..6fd6413
Binary files /dev/null and b/public/potlatch2/locales/en_US.swf differ
diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf
new file mode 100644 (file)
index 0000000..26f9337
Binary files /dev/null and b/public/potlatch2/locales/fr_FR.swf differ
index 42d2728..93d7209 100644 (file)
@@ -10,6 +10,7 @@ Quick documentation:
   category: [ctext] corresponding to category id
   icon
     @image: path to .png file
+    @dnd: path to optional dnd-specific-override .png file
     @background: colour spec
     @foreground: colour spec
     (general html goes here?) Variables substituted with ${ref}
@@ -42,69 +43,36 @@ Quick documentation:
     @k: key
     @v: value
   icon: see above
+</input>
+
+<include
+  @file="map_features/roads.xml": external file to drop into place here. Include files behave exactly as if written out in full.
+/>
 -->
 
 <mapFeatures>
 
   <!-- Categories -->
-
-  <category name="Roads" id="roads">
-  </category>
-
-  <category name="Paths" id="paths">
-  </category>
-
-  <category name="Shopping" id="shopping">
-  </category>
-
-  <category name="Food and Drink" id="foodanddrink">
-  </category>
-
-  <category name="Amenity" id="amenity">
-  </category>
-
-  <category name="Tourism" id="tourism">
-  </category>
-
-  <category name="Accommodation" id="accommodation">
-  </category>
-
-  <category name="Transport" id="transport">
-  </category>
-
-  <category name="Water" id="water">
-  </category>
-
-  <category name="Natural" id="natural">
-  </category>
-
-  <category name="Barrier" id="barrier">
-  </category>
-
-  <category name="Power" id="power">
-  </category>
-
-  <category name="Admin" id="admin">
-  </category>
-
-  <category name="Buildings" id="buildings">
-  </category>
-
-  <category name="Landuse" id="landuse">
-  </category>
-
-  <category name="Agriculture" id="agriculture">
-  </category>
-
-  <category name="Advanced" id="advanced">
-  </category>
-
-  <category name="Places" id="places">
-  </category>
-
-  <category name="Sport&amp;Leisure" id="sport">
-  </category>
-
+  <category name="Roads" id="roads"/>
+  <category name="Paths" id="paths"/>
+  <category name="Shopping" id="shopping"/>
+  <category name="Food and Drink" id="foodanddrink"/>
+  <category name="Amenity" id="amenity"/>
+  <category name="Tourism" id="tourism"/>
+  <category name="Accommodation" id="accommodation"/>
+  <category name="Transport" id="transport"/>
+  <category name="Water" id="water"/>
+  <category name="Natural" id="natural"/>
+  <category name="Barrier" id="barrier"/>
+  <category name="Power" id="power"/>
+  <category name="Admin" id="admin"/>
+  <category name="Buildings" id="buildings"/>
+  <category name="Landuse" id="landuse"/>
+  <category name="Agriculture" id="agriculture"/>
+  <category name="Advanced" id="advanced"/>
+  <category name="Places" id="places"/>
+  <category name="Sport and Leisure" id="sport"/>
+  <category name="Man-made" id="manmade"/>
 
   <!-- Common input sets -->
 
@@ -112,12 +80,23 @@ Quick documentation:
     <input type="freetext" presence="always" name="Name" key="name" description="The name" priority="highest"/>
   </inputSet>
 
+  <inputSet id="nameAndRef">
+    <inputSet ref="simpleName" />
+    <input type="freetext" presence="always" name="Reference number" key="ref" description="A reference number or code used to identify this thing." />
+  </inputSet>
+
+
   <inputSet id="source">
     <input type="freetext" category="Misc" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>
   </inputSet>
 
+  <inputSet id="designation">
+    <input type="freetext" category="Misc" presence="onTagMatch" description="Official designation or classification" name="Designation" key="designation"/>
+  </inputSet>
+
   <inputSet id="common">
     <inputSet ref="source"/>
+    <inputSet ref="designation"/>
   </inputSet>
 
   <inputSet id="names">
@@ -207,6 +186,7 @@ Quick documentation:
     <inputSet ref="roadRoundabout"/>
     <inputSet ref="permissions"/>
   </inputSet>
+  
 
   <inputSet id="minorRoad">
     <inputSet ref="names"/>
@@ -419,7 +399,7 @@ Quick documentation:
     <input type="route" name="Bus Route" description="Bus route" category="Transport" priority="low" presence="onTagMatch">
       <match k="type" v="route"/>
       <match k="route" v="bus"/>
-      <icon image="features/transport__bus.png">
+      <icon image="features/route__bus.png">
         <font size="12pt">${operator} <b>${ref}</b></font>
       </icon>
     </input>
@@ -441,7 +421,7 @@ Quick documentation:
       <match k="type" v="route"/>
       <match k="route" v="bicycle"/>
       <match k="network" v="ncn"/>
-      <icon image="features/cycle__ncn.png" background="#ff6f7a" foreground="white">
+      <icon image="features/route__ncn.png" background="#ff6f7a" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
@@ -450,7 +430,7 @@ Quick documentation:
       <match k="type" v="route"/>
       <match k="route" v="bicycle"/>
       <match k="network" v="rcn"/>
-      <icon image="features/cycle__rcn.png" background="#6ff7ff" foreground="white">
+      <icon image="features/route__rcn.png" background="#6ff7ff" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
@@ -459,7 +439,7 @@ Quick documentation:
       <match k="type" v="route"/>
       <match k="route" v="bicycle"/>
       <match k="network" v="lcn"/>
-      <icon image="features/cycle__lcn.png" background="#7d6fff" foreground="white">
+      <icon image="features/route__lcn.png" background="#7d6fff" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
@@ -470,11 +450,11 @@ Quick documentation:
     <input type="choice"
            name="Bicycles permitted" category="Cycle" description="Are bicyles allowed to use this road (regardless of physical suitability)?"
            key="bicycle">
-      <choice value="no" text="Prohibited" desciption="Cycling is not allowed. Pushing your bicycle is not allowed either."/>
       <choice value="yes" text="Allowed"/>
+      <choice value="no" text="Prohibited" desciption="Cycling is not allowed. Pushing your bicycle is not allowed either."/>
+      <choice value="private" text="Private"/>
       <choice value="dismount" text="Cyclists dismount" description="Signage states that cyclists should dismount and push their bike for the selected path or road."/>
       <choice value="designated" text="Designated"/>
-      <choice value="private" text="Private"/>
       <help>http://wiki.openstreetmap.org/wiki/Key:access</help>
     </input>
   </inputSet>
@@ -489,8 +469,6 @@ Quick documentation:
       <choice value="opposite_lane" text="Contraflow lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
       <choice value="opposite_track" text="Contraflow track" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
       <choice value="opposite" text="Contraflow unmarked" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane."/>
-      <choice value="segregated" text="Segregated cycle path" description="A path where cyclists and pedestrians are separated by a painted line or kerb."/>
-      <choice value="shared" text="Shared cycle path" description="A path where cyclists and pedestrians share the full width of the path."/>
       <help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help>
     </input>
   </inputSet>
@@ -498,24 +476,27 @@ Quick documentation:
   <inputSet id="ldp">
     <input type="route" name="National Walking Route" description="National walking route" category="Walking" priority="normal">
       <match k="type" v="route"/>
+      <match k="route" v="hiking|foot"/>
       <match k="network" v="nwn"/>
-      <icon background="red" foreground="white">
+      <icon image="features/route__nwn.png" background="red" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
     </input>
     <input type="route" name="Regional Walking Route" description="Regional walking route" category="Walking" priority="low">
       <match k="type" v="route"/>
+      <match k="route" v="hiking|foot"/>
       <match k="network" v="rwn"/>
-      <icon background="cyan" foreground="white">
+      <icon image="features/route__rwn.png" background="cyan" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
     </input>
     <input type="route" name="Local Walking Route" description="Local walking route" category="Walking" priority="lowest">
       <match k="type" v="route"/>
+      <match k="route" v="hiking|foot"/>
       <match k="network" v="lwn"/>
-      <icon background="blue" foreground="white">
+      <icon image="features/route__lwn.png" background="blue" foreground="white">
         <font size="14pt"><b>${ref}</b></font><br/>
         <font size="12pt">${name}</font>
       </icon>
@@ -528,7 +509,7 @@ Quick documentation:
   </inputSet>
 
   <inputSet id="waterways">
-    <input type="freetext" presence="always" name="Name" category="Naming" key="name" description="The name"/>
+    <inputSet ref="simpleName"/>
     <input type="freetext" presence="always" name="Width" category="Properties" key="width" description="The width in metres"/>
     <inputSet ref="boatPermissions"/>
   </inputSet>
@@ -536,37 +517,37 @@ Quick documentation:
   <!-- all the description fields are identical at the moment for ease of maintenance, should be tailored in future. -->
   <inputSet id="boatPermissions">
     <input type="choice" name="Boat permission" category="Permission" key="boat" description="Are boats allowed to use this waterway?">
-      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
       <choice value="yes" text="Allowed" description="General right of way."/>
+      <choice value="no" text="Prohibited" description="No access to the public."/>
       <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
       <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
-      <choice value="no" text="Prohibited" description="No access to the public."/>
+      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>
   </inputSet>
 
   <inputSet id="permissions">
     <input type="choice" name="General access" category="Permission" key="access" description="Is there a general right of access, regardless of mode of transport?">
-      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
       <choice value="yes" text="Allowed" description="General right of way."/>
+      <choice value="no" text="Prohibited" description="No access to the public."/>
       <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
       <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
-      <choice value="no" text="Prohibited" description="No access to the public."/>
+      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>
 
     <input type="choice" name="Motor vehicles" category="Permission" key="motor_vehicle" description="Are cars and other private vehicles allowed?">
-      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
       <choice value="yes" text="Allowed" description="General right of way."/>
+      <choice value="no" text="Prohibited" description="No access to the public."/>
       <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
       <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
-      <choice value="no" text="Prohibited" description="No access to the public."/>
+      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>
 
     <input type="choice" name="Horses" category="Permission" key="horse" description="Are cars and other private vehicles allowed?">
-      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
       <choice value="yes" text="Allowed" description="General right of way."/>
+      <choice value="no" text="Prohibited" description="No access to the public."/>
       <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
       <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
-      <choice value="no" text="Prohibited" description="No access to the public."/>
+      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>
 
   </inputSet>
@@ -593,3266 +574,59 @@ Quick documentation:
     <input type="checkbox" presence="onTagMatch" category="Misc" description="Does this thing also represent one, solid building?" name="Building" key="building"/>
   </inputSet>
 
-  <!-- ************************************************************************
-       Roads
-       ************************************************************************ -->
-
-  <feature name="Motorway">
-    <category>roads</category>
-    <icon image="features/highway__motorway.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmotorway</help>
-
-    <line/>
-    <tag k="highway" v="motorway"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Motorway link">
-    <category>roads</category>
-    <icon image="features/highway__motorway_link.png"/>
-    <line/>
-    <tag k="highway" v="motorway_link"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Trunk road">
-    <category>roads</category>
-    <icon image="features/highway__trunk.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
-      <font size="10pt">${name}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtrunk</help>
-
-    <line/>
-    <tag k="highway" v="trunk"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Trunk link">
-    <category>roads</category>
-    <icon image="features/highway__trunk_link.png"/>
-    <line/>
-    <tag k="highway" v="trunk_link"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Primary road">
-    <category>roads</category>
-    <icon image="features/highway__primary.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
-      <font size="10pt">${name}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary</help>
-
-    <line/>
-    <tag k="highway" v="primary"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Primary link">
-    <category>roads</category>
-    <icon image="features/highway__primary_link.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"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Secondary road">
-    <category>roads</category>
-    <icon image="features/highway__secondary.png">
-      <font size="16pt"><b>${ref}</b></font><br/>
-      <font size="10pt">${name}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary</help>
-
-    <line/>
-    <tag k="highway" v="secondary"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Secondary link">
-    <category>roads</category>
-    <icon image="features/highway__secondary_link.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"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Tertiary road">
-    <category>roads</category>
-    <icon image="features/highway__tertiary.png">
-      <font size="14pt"><b>${name}</b></font><br/>
-      <font size="10pt">${ref}</font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary</help>
-
-    <line/>
-    <tag k="highway" v="tertiary"/>
-
-    <inputSet ref="majorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Tertiary link">
-    <category>roads</category>
-    <icon image="features/highway__tertiary_link.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"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Minor road">
-    <category>roads</category>
-    <icon image="features/highway__unclassified.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified</help>
-
-    <line/>
-    <tag k="highway" v="unclassified"/>
-
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Residential road">
-    <category>roads</category>
-    <icon image="features/highway__residential.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-      <br/>
-      <font size="8pt">${postal_code}</font>
-      <br/>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dresidential</help>
-
-    <line/>
-    <tag k="highway" v="residential"/>
-
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Service road">
-    <category>roads</category>
-    <icon image="features/highway__service.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dservice</help>
-    <description>
-      Access roads
-    </description>
-
-    <line/>
-    <tag k="highway" v="service"/>
-
-    <inputSet ref="minorRoad"/>
-    <input type="choice" presence="always" name="Type of service road" key="service" category="">
-      <choice value="alley" text="Alleyway/laneway"/>
-      <choice value="parking_aisle" text="Parking aisle" description="The path that cars drive on through a parking lot."/>
-      <choice value="driveway" text="Driveway"/>
-      <choice value="drive-through" text="Drive-through" description="For drive-through restaurants, bottle shops etc."/>
-      <choice value="emergency_access" text="Emergency access" description="For firefighters and other emergency services."/>
+  <inputSet id="powerCables">
+    <input type="choice" name="Cables" key="cables" presence="always" category="Power">
+      <choice value="2" text="2"/>
+      <choice value="3" text="3"/>
+      <choice value="4" text="4"/>
+      <choice value="6" text="6"/>
+      <choice value="8" text="8"/>
+      <choice value="10" text="10"/>
+      <choice value="12" text="12"/>
     </input>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Unknown road">
-    <category>roads</category>
-    <icon image="features/highway__unknown.png">
-      <font size="10pt">This road has not been given a specific type. It's a road, and that's all that's known.</font>
-    </icon>
-
-    <line/>
-    <tag k="highway" v="road"/>
-
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Living Street">
-    <category>roads</category>
-    <icon image="features/highway__living_street.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dliving_street</help>
-
-    <line/>
-    <tag k="highway" v="living_street"/>
-
-    <inputSet ref="minorRoad"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Track">
-    <category>roads</category>
-    <icon image="features/highway__track.png">
-      <font size="14pt"><b>${name}</b></font>
-    </icon>
-
-    <line/>
-    <tag k="highway" v="track"/>
-
-    <inputSet ref="path"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Raceway/racing track">
-    <category>roads</category>
-    <category>sport</category>
-    <icon>
-      <font size="10pt">A purpose built track for racing motor vehicles.</font>
-    </icon>
-
-    <line/>
-    <area/>
-    <tag k="highway" v="raceway"/>
-
-    <inputSet ref="simpleName"/>
-    <inputSet ref="roadPhysical"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Sports track">
-    <category>roads</category>
-    <category>sport</category>
-    <icon>
-      <font size="10pt">A purpose built track for running, cycling, greyhound racing, horse racing.</font>
-    </icon>
-
-    <line/>
-    <area/>
-    <tag k="leisure" v="track"/>
-
-    <inputSet ref="simpleName"/>
-    <inputSet ref="roadPhysical"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-
-  <!-- ************************************************************************
-       Paths
-       ************************************************************************ -->
-
-  <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="Generic path">
-    <category>paths</category>
-    <icon >
-      ${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>
-
-
-  <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>
-
-  <!-- ************************************************************************
-       Natural
-       ************************************************************************ -->
-
-  <feature name="Park">
-    <category>natural</category>
-    <category>sport</category>
-    <icon image="icons/natural_blank.png">
-      <b>${name}</b>
-      <br/>
-    </icon>
-
-    <area/>
-    <tag k="leisure" v="park"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Forest">
-    <category>natural</category>
-    <icon image="/features/pois/landuse_coniferous.n.24.png"/>
+    <input type="choice" name="Voltage" key="voltage" presence="always" category="Power">
+      <!-- choices based on http://osmdoc.com/en/tag/voltage/#values-->
+      <choice value="400" text="400 V"/>
+      <choice value="600" text="600 V"/>
+      <choice value="750" text="750 V"/>
+      <choice value="1500" text="1500 V"/>
+      <choice value="3000" text="3000 V"/>
+      <choice value="15000" text="15 kV"/>
+      <choice value="20000" text="20 kV"/>
+      <choice value="35000" text="35 kV"/>
+      <choice value="110000" text="110 kV"/>
+      <choice value="132000" text="132 kV"/>
+      <choice value="138000" text="238 kV"/>
+      <choice value="220000" text="220 kV"/>
+      <choice value="380000" text="380 kV"/>
+    </input>
+  </inputSet>
 
-    <area/>
-    <tag k="landuse" v="forest"/>
-    <inputSet ref="common"/>
-  </feature>
 
-  <feature name="Meadow">
-    <category>natural</category>
-    <icon image="icons/natural_blank.png"/>
+<!-- Features -->
 
-    <area/>
-    <tag k="landuse" v="meadow"/>
-    <inputSet ref="common"/>
-  </feature>
+  <include file="map_features/roads.xml" />     <!-- includes traffic calming, roundabouts, race track -->
+  <include file="map_features/paths.xml" />     <!-- includes steps, highway=pedestrian, bike/hike routes -->
+  <include file="map_features/water.xml" />     <!-- includes coastline -->
+  <include file="map_features/transport.xml" /> <!-- includes rail, trams, bus, airports, car rental, bike parking... -->
+  <include file="map_features/power.xml" />     <!-- includes power lines, pylons, stations -->
+  <include file="map_features/places.xml" />    <!-- includes boundaries (inc. NP) -->
+  <include file="map_features/tourism.xml" />   <!-- includes accommodation -->
+  <include file="map_features/barriers.xml" /> 
+  <include file="map_features/shopping.xml" />  <!-- no clear distinction between this, amenities and buildings -->
+  <include file="map_features/amenities.xml" /> <!-- includes cafe, bar... --> 
+  <include file="map_features/landuse.xml" />   <!-- includes outdoor leisure/sporting stuff, agriculture, natural. --> 
+  <include file="map_features/buildings.xml" /> <!-- a bit of a dumping ground, includes sports centre, shopping centre, hospital... --> 
+  <include file="map_features/man_made.xml" />  
 
 
   
-
-
-  <!-- ************************************************************************
-       Waterways
-       ************************************************************************ -->
-
-  <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/pois/water_generic.24.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/pois/water_generic.24.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/pois/water_generic.24.png">
-      <font size="14pt">
-        <b>${name}</b>
-      </font>
-    </icon>
-    <area/>
-    <tag k="natural" v="water"/>
-    <inputSet ref="names"/>
-    <inputSet ref="boatPermissions"/>
+  <!-- Relations -->
+  <feature name="Multipolygon">
+    <category>advanced</category>
+    <relation/>
+    <tag k="type" v="multipolygon"/>
     <inputSet ref="common"/>
   </feature>
-
-
-  <feature name="Basin">
-    <category>water</category>
-    <icon image="features/pois/water_generic.24.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/pois/water_generic.24.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/pois/transport_marina.n.24.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>
-    <line/>
-    <tag k="natural" v="coastline"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <!-- ************************************************************************
-       Transport
-       ************************************************************************ -->
-
-  <feature name="Railway line">
-    <category>transport</category>
-    <icon image="features/transport__railway.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/transport__railway.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/transport__railway.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/transport__railway.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/transport__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/transport__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/transport__tram.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/transport__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/transport__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/transport__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="icons/transport_blank.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="icons/transport_blank.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>
-
-
-  <!-- ************************************************************************
-       Buildings
-       ************************************************************************ -->
-
-  <feature name="School">
-    <category>buildings</category>
-    <icon image="features/pois/education_school.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="school"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="College">
-    <category>buildings</category>
-    <icon image="features/pois/education_university.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="college"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="University">
-    <category>buildings</category>
-    <icon image="features/pois/education_university.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="university"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Supermarket">
-    <category>buildings</category>
-    <icon image="features/pois/shopping_supermarket.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="shop" v="supermarket"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Place of worship">
-    <category>buildings</category>
-    <icon image="icons/place_of_worship.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="place_of_worship"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <!-- sorted in reverse order of popularity in taginfo. -->
-    <input type="choice" category="Religion" name="Religion" key="religion" description="The religion to which this place of worship belongs." presence="always">
-      <choice value="christian" text="Christianity (church)"/>
-      <choice value="muslim" text="Islam (mosque)"/>
-      <choice value="buddhist" text="Buddhist (temple)"/>
-      <choice value="jewish" text="Judaism (synagogue)"/>
-      <choice value="hindu" text="Hindu (temple)"/>
-      <choice value="sikh" text="Sikh (gurdwara)"/>
-      <choice value="spiritualist" text="Spiritualism"/>
-      <choice value="unitarian" text="Unitarianism"/>
-      <choice value="taoist" text="Taoism"/>
-      <choice value="multifaith" text="Multi-faith"/>
-      <choice value="scientologist" text="Scientology"/>
-      <choice value="bahai" text="Bahai"/>
-    </input>
-    <!-- sorted in reverse order of popularity in taginfo. -->
-    <input type="choice" category="Religion" name="Denomination" key="denomination" description="The denomination, or sub-branch of the main religion." presence="always">
-      <choice value="catholic" text="Catholic"/>
-      <choice value="baptist" text="Baptist"/>
-      <choice value="methodist" text="Methodist"/>
-      <choice value="lutheran" text="Lutheran"/>
-      <choice value="protestant" text="Prostant"/>
-      <choice value="orthodox" text="Orthodox"/>
-      <choice value="presbyterian" text="Presbyterian"/>
-      <choice value="anglican" text="Anglican"/>
-      <choice value="roman_catholic" text="Roman Catholic"/>
-      <choice value="evangelical" text="Evangelical"/>
-      <choice value="pentecostal" text="Pentecostal"/>
-      <choice value="mormon" text="Mormon"/>
-      <choice value="sunni" text="Sunni"/>
-      <choice value="jehovahs_witness" text="Jehovah's Witness"/>
-      <!-- duplicate of Anglican? -->
-      <choice value="church_of_england" text="Church of England"/>
-      <choice value="greek_orthodox" text="Greek Orthodox"/>
-      <choice value="new_apostolic" text="New Apostolic"/>
-      <choice value="episcopal" text="Episcopal"/>
-      <choice value="russian_orthodox" text="Russian Orthodox"/>
-      <choice value="adventist" text="Adventist"/>
-      <choice value="seventh_day_adventist" text="Seventh Day Adventist"/>
-      <choice value="united_reformed" text="United Reformed"/>
-      <choice value="reformed" text="Reformed"/>
-      <choice value="iglesia_ni_cristo" text="Iglesia Ni Cristo"/>
-      <choice value="uniting" text="Uniting"/>
-      <choice value="salvation_army" text="Salvation Army"/>
-      <choice value="church_of_scotland" text="Church of Scotland"/>
-      <choice value="quaker" text="Quaker"/>
-      <choice value="scientist" text="Scientist"/>
-      <choice value="shia" text="Shia"/>
-      <choice value="congregational" text="Congregational"/>
-      <choice value="assembly_of_god" text="Assembly of God"/>
-      <choice value="united" text="United"/>
-      <choice value="mennonite" text="Mennonite"/>
-      <choice value="nazarene" text="Nazarene"/>
-      <!-- duplicate of Mormon? -->
-      <choice value="latter_day_saints" text="Latter Day Saints"/>
-      <choice value="dutch_reformed" text="Dutch Reformed"/>
-      <choice value="tibetan" text="Tibetan"/>
-      <choice value="shingon" text="Shingon"/>
-      <choice value="georgian_orthodox" text="Georgian Orthodox"/>
-      <choice value="unitarian" text="Unitarian"/>
-      <choice value="brethren" text="Brethren"/>
-      <choice value="armenian_apostolic" text="Armenian Apostolic"/>
-      <choice value="maronite" text="Maronite"/>
-    </input>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Public building">
-    <category>buildings</category>
-    <icon image="features/pois/building_generic.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="public_building"/>
-    <tag k="building" v="yes"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hospital">
-    <category>buildings</category>
-    <icon image="features/pois/health_hospital.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="hospital"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Museum">
-    <category>buildings</category>
-    <icon image="features/pois/tourist_museum.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="tourism" v="museum"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Shopping centre">
-    <category>buildings</category>
-    <category>shopping</category>
-    <node/>
-    <area/>
-    <tag k="shop" v="mall"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Zoo">
-    <category>buildings</category>
-    <icon image="features/pois/tourist_zoo.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="tourism" v="zoo"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Stadium">
-    <category>buildings</category>
-    <icon image="icons/tourist_blank.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="leisure" v="stadium"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Building">
-    <category>buildings</category>
-    <icon image="features/pois/building_generic.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <!-- This should catch all the "building=*" tags in use: yes, hut, house, residential, entrance, apartments, garage, industrial,  garages, service, manufacture, collapsed... 
-         Is this possible? -->
-    <!-- <tag k="building" v="*"/> -->
-    <tag k="building" v="yes"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Sports centre">
-    <category>buildings</category>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
-      <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"/>
-    <inputSet ref="isBuilding"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <!-- ************************************************************************
-       Landuse
-       ************************************************************************ -->
-
-  <feature name="Industrial Area">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="industrial"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Offices">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="commercial"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Residential Area">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="residential"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Retail Area">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="retail"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Construction Site">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/building_generic.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="construction"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Marketplace">
-    <category>landuse</category>
-    <point />
-    <area/>
-    <icon image="features/pois/shopping_greengrocer.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="amenity" v="marketplace"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Cemetery">
-    <category>landuse</category>
-    <point />
-    <area/>
-    <icon image="features/pois/place_of_worship_unknown3.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="landuse" v="cemetery"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Graveyard">
-    <category>landuse</category>
-    <point />
-    <area/>
-    <icon image="features/pois/place_of_worship_unknown3.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="amenity" v="grave_yard"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Quarry">
-    <category>landuse</category>
-    <icon image="features/pois/poi_mine.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="quarry"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Military">
-    <category>landuse</category>
-    <icon image="features/pois/poi_military_bunker.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="military"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Conservation">
-    <category>natural</category>
-    <icon image="icons/natural_blank.png"/>
-    <area/>
-    <tag k="landuse" v="conservation"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-
-
-  <feature name="Playground">
-    <category>sport</category>
-    <area/>
-    <point/>
-    <icon image="features/pois/amenity_playground.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="leisure" v="playground"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Golf course">
-    <category>sport</category>
-    <area/>
-    <icon  image="features/pois/sport_golf.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="leisure" v="golf_course"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Recreation ground">
-    <category>landuse</category>
-    <category>sport</category>    
-    <area/>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="leisure" v="recreation_ground"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Sports pitch">
-    <category>landuse</category>
-    <area/>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="leisure" v="pitch"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="pitchSport"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <inputSet id="pitchSport">
-    <input name="Sport" presence="always" category="Sport" key="sport" type="choice" description="The sport that is predominantly played here.">
-      <choice value="9pin" text="9 pin bowling"/>
-      <choice value="10pin" text="10 pin bowling"/>
-      <choice value="american_football" text="American football"/>
-      <choice value="archery" text="Archery"/>
-      <choice value="athletics" text="Athletics"/>
-      <choice value="australian_football" text="Australian Rules Football"/>
-      <choice value="baseball" text="Baseball"/>
-      <choice value="basketball" text="Basketball"/>
-      <choice value="beachvolleyball" text="Beach volleyball"/>
-      <choice value="boules" text="Boules/petanque/bocci"/>
-      <choice value="bowls" text="Lawn bowls"/>
-      <choice value="canadian_football" text="Canadian football"/>
-      <choice value="chess" text="Chess"/>
-      <choice value="cricket" text="Cricket"/>
-      <choice value="cricket_nets" text="Cricket nets"/>
-      <choice value="croquet" text="Croquet"/>
-      <choice value="equestrian" text="Equestrian"/>
-      <choice value="gaelic_football" text="Gaelic football"/>
-      <choice value="gymnastics" text="Gymnastics"/>
-      <choice value="team_handball" text="(Team) handball"/>
-      <choice value="hockey" text="(Field) hockey"/>
-      <choice value="korfball" text="Korball"/>
-      <choice value="pelota" text="Pelota"/>
-      <choice value="rugby_league" text="Rugby league"/>
-      <choice value="rugby_union" text="Rugby union"/>
-      <choice value="shooting" text="Shooting"/>
-      <choice value="skating" text="Ice skating"/>
-      <choice value="skateboard" text="Skateboarding"/>
-      <choice value="soccer" text="Soccer/football"/>
-      <choice value="swimming" text="Swimming"/>
-      <choice value="table_tennis" text="Table tennis"/>
-      <choice value="tennis" text="Tennis"/>
-      <choice value="volleyball" text="Volleyball"/>
-    </input>
-  </inputSet>
-
-  <feature name="Sports track">
-    <category>landuse</category>
-    <category>sport</category>
-    <area/>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
-      <b>${name}</b>
-    </icon>
-    <tag k="leisure" v="track"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <!-- ************************************************************************
-       Power
-       ************************************************************************ -->
-
-  <feature name="High-voltage line">
-    <category>power</category>
-    <icon image="features/power_high.png"/>
-    <line/>
-    <tag k="power" v="line"/>
-    <inputSet ref="powerCables"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Low-voltage line">
-    <category>power</category>
-    <icon image="features/power_low.png"/>
-    <line/>
-    <tag k="power" v="minor_line"/>
-    <inputSet ref="powerCables"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="High-voltage pylon">
-    <category>power</category>
-    <icon image="icons/power_tower_24.png"/>
-    <point/>
-    <tag k="power" v="tower"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Power pole">
-    <category>power</category>
-    <icon image="icons/power_pole_24.png"/>
-    <point/>
-    <tag k="power" v="pole"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Plant (station)">
-    <category>power</category>
-    <icon image="icons/power_blank.png"/>
-    <area/>
-    <point/>
-    <tag k="power" v="generator"/>
-    <inputSet ref="names"/>
-    <input type="choice" presence="always"  name="Energy source" key="power_source" category="Power">
-      <choice value="coal" text="Coal"/>
-      <choice value="gas" text="Gas"/>
-      <choice value="oil" text="Oil"/>
-      <choice value="fossil" text="Unspecified fossil fuel"/>
-      <choice value="hydro" text="Hydroelectric"/>
-      <choice value="geothermal" text="Geothermal"/>
-      <choice value="nuclear" text="Nuclear"/>
-      <choice value="wind" text="Wind"/>
-      <choice value="photovoltaic" text="Solar PV"/>
-      <choice value="solar_thermal" text="Solar thermal"/>
-      <choice value="biofuel" text="Biofuel"/>
-    </input>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Substation">
-    <category>power</category>
-    <icon image="icons/power_blank.png"/>"
-    <area/>
-    <point/>
-    <tag k="power" v="station"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Transformer">
-    <category>power</category>
-    <icon image="icons/power_blank.png"/>
-    <area/>
-    <point/>
-    <tag k="power" v="sub_station"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <inputSet id="powerCables">
-    <input type="choice" name="Cables" key="cables" presence="always" category="Power">
-      <choice value="2" text="2"/>
-      <choice value="3" text="3"/>
-      <choice value="4" text="4"/>
-      <choice value="6" text="6"/>
-      <choice value="8" text="8"/>
-      <choice value="10" text="10"/>
-      <choice value="12" text="12"/>
-    </input>
-    <input type="choice" name="Voltage" key="voltage" presence="always" category="Power">
-      <!-- choices based on http://osmdoc.com/en/tag/voltage/#values-->
-      <choice value="400" text="400 V"/>
-      <choice value="600" text="600 V"/>
-      <choice value="750" text="750 V"/>
-      <choice value="1500" text="1500 V"/>
-      <choice value="3000" text="3000 V"/>
-      <choice value="15000" text="15 kV"/>
-      <choice value="20000" text="20 kV"/>
-      <choice value="35000" text="35 kV"/>
-      <choice value="110000" text="110 kV"/>
-      <choice value="132000" text="132 kV"/>
-      <choice value="138000" text="238 kV"/>
-      <choice value="220000" text="220 kV"/>
-      <choice value="380000" text="380 kV"/>
-    </input>
-  </inputSet>
-
-  <!-- Places -->
-
-
-  <feature name="Hamlet">
-    <category>places</category>
-    <icon image="icons/place.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="hamlet" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Village">
-    <category>places</category>
-    <icon image="icons/place.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="village" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Suburb">
-    <category>places</category>
-    <icon image="icons/place.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="suburb" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Town">
-    <category>places</category>
-    <icon image="icons/place.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="town" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="City">
-    <category>places</category>
-    <icon image="icons/place.png"/>
-    <point/>
-    <area/>
-    <tag k="place" v="city" />
-    <inputSet ref="names"/>
-    <inputSet ref="places"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <!-- ************************************************************************
-       POIs
-       ************************************************************************ -->
-
-  <!-- =========== Amenity ============ -->
-
-  <feature name="Fire station">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_firestation2.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station</help>
-    <point/>
-    <tag k="amenity" v="fire_station"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Police Station">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_police2.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="police"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Library">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_library.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="library"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hospital">
-    <category>amenity</category>
-    <icon image="features/pois/health_hospital.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="hospital"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
-    <input type="choice" presence="always" category="Hospital" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?">
-      <choice value="yes" text="Yes"/>
-      <choice value="no" text="No"/>
-    </input>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Place of Worship">
-    <category>amenity</category>
-    <icon image="icons/place_of_worship.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dplace_of_worship</help>
-    <point/>
-    <tag k="amenity" v="place_of_worship"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of it." priority="low"/>
-    <input type="choice" presence="always" category="" name="Religion" key="religion" description="The religion worshipped here.">
-      <choice value="christian" text="Christianity (church)"/>
-      <choice value="jewish" text="Judaism (synagogue)"/>
-      <choice value="muslim" text="Islam (mosque)"/>
-      <choice value="hindu" text="Hinduism (temple)"/>
-      <choice value="buddhist" text="Buddhism (temple)"/>
-      <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"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="ATM">
-    <category>amenity</category>
-    <icon image="features/pois/money_atm.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Atm</help>
-    <point/>
-    <tag k="amenity" v="atm"/>
-    <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?"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bank">
-    <category>amenity</category>
-    <icon image="features/pois/money_bank2.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbank</help>
-    <point/>
-    <tag k="amenity" v="bank"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <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>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Recycling">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_recycling.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>
-    <point/>
-    <tag k="amenity" v="recycling"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="School">
-    <category>amenity</category>
-    <icon image="features/pois/education_school.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool</help>
-    <point/>
-    <tag k="amenity" v="school"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Kindergarten">
-    <category>amenity</category>
-    <category>buildings</category>
-    <icon image="features/pois/education_nursery3.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten</help>
-    <point/>
-    <tag k="amenity" v="kindergarten"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Town hall">
-    <category>amenity</category>
-    <icon >
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtownhall</help>
-    <point/>
-    <tag k="amenity" v="townhall"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Post Box">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_post_box.n.24.png">
-      ${ref}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Post_box</help>
-    <point/>
-    <tag k="amenity" v="post_box"/>
-    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post box"/>
-    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Post Office">
-    <category>amenity</category>
-    <category>buildings</category>
-    <icon image="features/pois/amenity_post_office.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="post_office"/>
-    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post office"/>
-    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
-    <inputSet ref="common"/>
-    <inputset ref="simpleName"/>
-  </feature>
-
-  <feature name="Trash/rubbish bin">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_waste_bin.n.24.png">
-      ${ref}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket</help>
-    <point/>
-    <tag k="amenity" v="waste_basket"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Toilets">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_toilets.n.24.png">
-      ${ref}
-    </icon>
-    <point/>
-    <tag k="amenity" v="toilets"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Water fountain">
-    <category>amenity</category>
-    <category>water</category>
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_drinkingtap.n.24.png">
-      ${ref}
-    </icon>
-    <point/>
-    <tag k="amenity" v="drinking_water"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Shelter">
-    <category>amenity</category>
-    <icon image="features/pois/accommodation_shelter2.n.24.png">
-      ${name}
-    </icon>    
-    <point/>
-    <area/>
-    <tag k="amenity" v="shelter"/>
-    <inputset ref="names"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Barbecue">
-    <category>amenity</category>
-    <icon image="features/pois/tourist_picnic.n.24.png"/>
-    <!-- specific icon needed -->
-    <point/>
-    <tag k="amenity" v="bbq"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Hunting stand">
-    <category>amenity</category>
-    <category>sport</category>
-    <!-- icon needed -->
-    <point/>
-    <tag k="amenity" v="hunting_stand"/>
-    <inputSet ref="common"/>
-    <inputSet ref="names"/>
-  </feature>
-
-
-  <feature name="Park bench">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_bench.n.24.png" />
-    <point/>
-    <tag k="amenity" v="bench"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Public telephone">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_telephone.n.24.png" />
-    <point/>
-    <tag k="amenity" v="telephone"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Emergency phone">
-    <category>amenity</category>
-    <icon image="features/pois/emergency-telephone-24.png" />
-    <!-- icon from http://www.clker.com/clipart-emergency-telephone-blue.html, feel free to (re)move this notice -->
-    <point/>
-    <tag k="amenity" v="emergency_phone"/>
-    <inputSet ref="common"/>
-    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of emergency phone."/>    
-  </feature>
-
-
-  <feature name="Swimming pool">
-    <category>amenity</category>
-    <category>sport</category>
-    <icon image="features/pois/sport_swimming_outdoor.n.24.png">
-      ${name}
-    </icon>
-    <point/>
-    <area/>
-    <tag k="amenity" v="swimming_pool"/>
-    <inputSet ref="simpleName"/>    
-    <inputSet ref="common"/>
-
-  </feature>
-
-  <feature name="Fountain">
-    <category>amenity</category>
-    <icon image="features/pois/amenity_fountain2.n.24.png">
-    ${name}
-    </icon>
-    <point/>
-    <tag k="amenity" v="fountain"/>
-    <inputSet ref="common"/>
-    <inputSet ref="simpleName"/>
-  </feature>
-
-  <feature name="Vending machine">
-    <category>amenity</category>
-    <category>foodanddrink</category>
-    <icon>A vending machine.</icon>
-    <!-- icon needed -->
-    <point/>
-    <tag k="amenity" v="vending_machine"/>
-    <inputSet ref="common"/>
-    <inputSet ref="simpleName"/>
-    <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>
-    <input type="operator" presence="always" name="Operator" key="operator" description="Which company provides the service" />
-  </feature>
-
-
-  <!-- ========= Accommodation ========= -->
-  <!-- Split off from tourism by Steve Bennett, can be remerged if it doesn't work out. -->
-  <feature name="Hotel">
-    <category>accommodation</category>
-    <icon image="features/pois/accommodation_hotel.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dhotel</help>
-    <point/>
-    <area/>
-    <tag k="tourism" v="hotel"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Motel">
-    <category>accommodation</category>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmotel</help>
-    <point/>
-    <area/>
-    <icon image="features/pois/accommodation_motel.n.24.png"/>
-    <tag k="tourism" v="motel"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Hostel">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_youth_hostel.n.24.png"/>
-    <tag k="tourism" v="hostel"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <!-- Note that tourism=bed_and_breakfast also gets some use. -->
-  <feature name="Guesthouse (B&amp;B)">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_bed_and_breakfast.n.24.png"/>
-    <tag k="tourism" v="guest_house"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Campsite">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_camping.n.24.png"/>
-    <tag k="tourism" v="camp_site"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Caravan park">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_caravan_park.n.24.png"/>
-    <tag k="tourism" v="caravan_site"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Alpine hut">
-    <category>accommodation</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/accommodation_alpinehut.n.24.png"/>
-    <tag k="tourism" v="alpine_hut"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Chalet">
-    <category>accommodation</category>
-    <icon image="features/pois/accommodation_chalet.n.24.png"/>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <tag k="tourism" v="chalet"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <!-- ========= Tourism ========= -->
-  <feature name="Attraction">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_attraction.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="tourism" v="attraction"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Museum">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_museum.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmuseum</help>
-    <point/>
-    <area/>
-    <tag k="tourism" v="museum"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Archaeological">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_archaeological.n.24.png"/>
-    <tag k="historic" v="archaeological_site"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Battlefield">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_battlefield.n.24.png"/>
-    <tag k="historic" v="battlefield"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Castle">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_castle.n.24.png"/>
-    <tag k="historic" v="castle"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Memorial">
-    <category>tourism</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_memorial.n.24.png"/>
-    <tag k="historic" v="memorial"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Monument">
-    <category>tourism</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_monument.n.24.png"/>
-    <tag k="historic" v="monument"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Picnic site">
-    <category>tourism</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_picnic.n.24.png"/>
-    <tag k="tourism" v="picnic_site"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Ruin">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_ruin.n.24.png"/>
-    <tag k="historic" v="ruin"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Cinema">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_cinema.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcinema</help>
-    <point/>
-    <area/>
-    <tag k="amenity" v="cinema"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the cinema" priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Theatre">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_theatre.n.24.png"/>
-    <tag k="amenity" v="theatre"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Viewpoint">
-    <category>tourism</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/tourist_view_point.n.24.png"/>
-    <tag k="tourism" v="viewpoint"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Zoo">
-    <category>tourism</category>
-    <point/>
-    <area/>
-    <icon image="features/pois/tourist_zoo.n.24.png"/>
-    <tag k="tourism" v="zoo"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Information">
-    <category>tourism</category>
-    <icon image="features/pois/amenity_information.n.24.png"/>
-    <point/>
-    <tag k="tourism" v="information"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Artwork">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_art_gallery2.n.24.png"/>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <tag k="tourism" v="artwork"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Theme park">
-    <category>tourism</category>
-    <icon image="features/pois/tourist_theme_park.n.24.png"/>
-    <point/>
-    <area/>
-    <inputSet ref="simpleName"/>
-    <tag k="tourism" v="theme_park"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <!-- ========= Transport ========= -->
-
-  <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>
-
-
-  <!-- ========= Barriers ========= -->
-
-  <feature name="Wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help>
-
-    <line/>
-    <tag k="barrier" v="wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Ditch">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
-
-    <line/>
-    <tag k="barrier" v="ditch"/>
-    <inputSet ref="common"/>
-  </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>
-
-    <line/>
-    <tag k="barrier" v="retaining_wall"/>
-    <inputSet ref="common"/>
-  </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>
-
-    <line/>
-    <tag k="barrier" v="city_wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Fence">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help>
-
-    <line/>
-    <tag k="barrier" v="fence"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hedge">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help>
-
-    <line/>
-    <tag k="barrier" v="hedge"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Bollard">
-    <category>barrier</category>
-    <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"/>
-    <inputSet ref="common"/>
-  </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>
-
-    <point/>
-    <tag k="barrier" v="gate"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Lift Gate">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_lift_gate.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dlift_gate</help>
-    <point/>
-    <tag k="barrier" v="lift_gate"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Kissing Gate">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_kissing_gate.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dkissing_gate</help>
-    <point/>
-    <tag k="barrier" v="kissing_gate"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Cycle Barrier">
-    <category>barrier</category>
-    <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"/>
-    <inputSet ref="common"/>
-  </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>
-
-    <point/>
-    <tag k="barrier" v="block"/>
-    <inputSet ref="common"/>
-  </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>
-
-    <point/>
-    <tag k="barrier" v="cattle_grid"/>
-    <inputSet ref="common"/>
-  </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>
-
-    <point/>
-    <tag k="barrier" v="toll_booth"/>
-    <tagSet ref="fee"/>
-    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Stile">
-    <category>barrier</category>
-    <icon image="features/pois/barrier_stile.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dstile</help>
-    <point/>
-    <tag k="barrier" v="stile"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Wire fence">
-    <!-- no idea, but taginfo says 2700 uses -->
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-   
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwire_fence</help>
-
-    <line/>
-    <tag k="barrier" v="wire_fence"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <!-- **************************************************************** -->
-
-  <feature name="Turning circle">
-    <category>transport</category>
-    <icon image="features/pois/transport_turning_circle.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle</help>
-    <point/>
-    <tag k="highway" v="turning_circle"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Mini Roundabout">
-    <category>transport</category>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
-    <point/>
-    <tag k="highway" v="mini_roundabout"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Traffic calming">
-
-    <category>transport</category>
-    <icon image="icons/speed_hump_16.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Key:traffic%3Dcalming</help>
-    <point/>
-    <!-- Warning: creates "traffic_calming=*" by default, but it's the best we can do. Steve Bennett-->
-    <!--<tag k="traffic_calming" v="*"/>-->
-    <tag k="traffic_calming" v="yes"/>
-    <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
-      <choice value="yes" text="Unspecified"/>
-      <choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/>
-      <choice value="hump" text="Speed hump" description="A gentler, longer bump, typically slowing cars to 30 kph or less."/>
-      <choice value="cushion" text="Speed cushion" description="A narrow speed bump allowing emergency vehicles and buses to pass without slowing."/>
-      <choice value="table" text="Speed table" description="A very long speed hump allowing the whole wheelbase to rest on top."/>
-      <choice value="chicane" text="Chicane" description="A set of obstacles causing vehicles to weave through."/>
-      <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>
-
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <!-- ========= Entertainment ========= -->
-
-  <feature name="Pub">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_pub.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub</help>
-    <point/>
-    <tag k="amenity" v="pub"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="wifi"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bar">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_bar.n.24.png">
-      ${name}
-    </icon>
-    <point/>
-    <tag k="amenity" v="bar"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="wifi"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Restaurant">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_restaurant.n.24.png">
-      ${name}
-    </icon>
-    <point/>
-    <tag k="amenity" v="restaurant"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="cuisine"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Cafe">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_cafe.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe</help>
-    <point/>
-    <tag k="amenity" v="cafe"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="cuisine"/>
-    <inputSet ref="wifi"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Fast Food">
-    <category>foodanddrink</category>
-    <icon image="features/pois/food_fastfood.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food</help>
-    <point/>
-    <tag k="amenity" v="fast_food"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="cuisine"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <!-- ========= Shops ========= -->
-  <feature name="Supermarket">
-    <category>shopping</category>
-    <icon image="features/pois/shopping_supermarket.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>
-    <point/>
-    <tag k="shop" v="supermarket"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Small Convenience Store">
-    <category>shopping</category>
-    <icon image="features/pois/shopping_convenience.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience</help>
-    <point/>
-    <tag k="shop" v="convenience"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Bakery">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_bakery.n.24.png"/>
-    <tag k="shop" v="bakery"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-
-  <feature name="Alcohol shop">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_alcohol.n.24.png"/>
-    <tag k="shop" v="alcohol"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-
-  <feature name="Bike shop">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_bicycle.n.24.png"/>
-    <tag k="shop" v="bicycle"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Bookshop">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_book.n.24.png"/>
-    <tag k="shop" v="books"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Butcher">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_butcher.n.24.png"/>
-    <tag k="shop" v="butcher"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Car sales">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_car.n.24.png"/>
-    <tag k="shop" v="car"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Car repair">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_car_repair.n.24.png"/>
-    <tag k="shop" v="car_repair"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Clothes shop">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_clothes.n.24.png"/>
-    <tag k="shop" v="clothes"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Confectionery">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_confectionery.n.24.png"/>
-    <tag k="shop" v="confectionery"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="DIY">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_diy.n.24.png"/>
-    <tag k="shop" v="doityourself"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Fishmonger">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_fish.n.24.png"/>
-    <tag k="shop" v="fishmonger"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Florist">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/flowers.png"/>
-    <tag k="shop" v="florist"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Garden centre">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_garden_centre.n.24.png"/>
-    <tag k="shop" v="garden_centre"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Gift shop">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_gift.n.24.png"/>
-    <tag k="shop" v="gift"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Greengrocer">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_greengrocer.n.24.png"/>
-    <tag k="shop" v="greengrocer"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hairdresser">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_hairdresser.n.24.png"/>
-    <tag k="shop" v="hairdresser"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hifi shop">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_hifi.n.24.png"/>
-    <tag k="shop" v="hifi"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Jewellery">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_jewelry.n.24.png"/>
-    <tag k="shop" v="jewelry"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Kiosk">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_jewelry.n.24.png"/>
-    <tag k="shop" v="kiosk"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Laundrette">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_laundrette.n.24.png"/>
-    <tag k="shop" v="laundry"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Motorbike shop">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_motorcycle.n.24.png"/>
-    <tag k="shop" v="motorcycle"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Music shop">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_music.n.24.png"/>
-    <tag k="shop" v="music"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Pharmacy">
-    <category>shopping</category>
-    <icon image="features/pois/health_pharmacy.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Pharmacy</help>
-    <point/>
-    <tag k="amenity" v="pharmacy"/>
-    <inputSet ref="names"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <input type="checkbox" category="Amenity" presence="always" description="Does this pharmacy sell prescription drugs?" name="Dispensing" key="dispensing" layout="horizontal"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <!-- **************** Agriculture *************** -->
-  <feature name="Farm">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="farm"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Farmyard">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="farmyard"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Farmland">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="farmland"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Field">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="meadow"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Orchard">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="orchard"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Vineyard">
-    <category>agriculture</category>
-    <icon image="features/pois/landuse_grass.n.24.png"/>
-    <area/>
-    <tag k="landuse" v="vineyard"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <!-- Top 10 boundaries in order of usage on taginfo.openstreetmap.de -->
-
-  <feature name="Admin Boundary">
-    <category>places</category>
-    <line/>
-    <icon image="features/pois/poi_boundary_administrative.n.24.png"/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
-    <tag k="boundary" v="administrative"/>
-    <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="National Park">
-    <category>places</category>
-    <category>natural</category>
-    <line/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park</help>
-    <tag k="boundary" v="national_park"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Post Code">
-    <category>places</category>
-    <line/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code</help>
-    <tag k="boundary" v="postal_code"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Protected Area">
-    <category>places</category>
-    <category>natural</category>
-    <line/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area</help>
-    <tag k="boundary" v="protected_area"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Town boundary">
-    <category>places</category>
-    <line/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=town</help>
-    <tag k="boundary" v="town"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <!-- boundary=landuse goes here. no idea what it is.-->
-
-  <feature name="Census boundary">
-    <category>places</category>
-    <line/>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=census</help>
-    <tag k="boundary" v="census"/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <!-- next three are marker, postcode_area, administrative. all seem dubious -->
-  
-
-  <!-- ************************************************************************
-       Relations
-       ************************************************************************ -->
-
-  <feature name="Turn restriction">
-    <category>advanced</category>
-    <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>
-    <relation/>
-    <tag k="type" v="restriction"/>
-    <input type="choice" category="Restrictions" presence="always" name="Type" key="restriction" description="What's the restriction?" layout="horizontal" priority="high">
-      <choice value="no_left_turn"      text="No left turn"/>
-      <choice value="no_right_turn"     text="No right turn"/>
-      <choice value="no_u_turn"         text="No U turns"/>
-      <choice value="no_straight_on"    text="No straight on"/>
-      <choice value="only_left_turn"    text="Left turn only"/>
-      <choice value="only_right_turn"   text="Right turn only"/>
-      <choice value="only_straight_on"  text="Straight on only"/>
-    </input>
-    <input type="choice" category="Restrictions" presence="always" name="Except" key="except" description="Are any vehicles exempt?" layout="horizontal">
-      <choice value="psv"      text="Bus"/>
-      <choice value="bicycle"  text="Bicycle"/>
-      <choice value="motorcar" text="Car"/>
-      <choice value="hgv"      text="HGV"/>
-    </input>
-    <input type="freetext" category="Restrictions" presence="always" name="Start day"  key="day_on"   description="What day of the week does it start?" layout="horizontal" priority="low"/>
-    <input type="freetext" category="Restrictions" presence="always" name="Start time" key="hour_on"  description="What time of day does it start?"     layout="horizontal" priority="low"/>
-    <input type="freetext" category="Restrictions" presence="always" name="End day"    key="day_off"  description="What day of the week does it end?"   layout="horizontal" priority="lowest"/>
-    <input type="freetext" category="Restrictions" presence="always" name="End time"   key="hour_off" description="What time of day does it end?"       layout="horizontal" priority="lowest"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Multipolygon">
-    <category>advanced</category>
-    <relation/>
-    <tag k="type" v="multipolygon"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <!-- cycle stuff -->
-  <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>
-
-
-
-  <!-- paths -->
-  <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>
-
-
-
-  <!-- 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>
-
-
-
-  <!-- Junction nodes (for turn restrictions) -->
-
-  <feature>
-    <point/>
-    <within entity="way" k="highway" minimum="2"/>
-    <inputSet ref="junctionNode"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
 </mapFeatures>
diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml
new file mode 100644 (file)
index 0000000..7b6ef52
--- /dev/null
@@ -0,0 +1,398 @@
+<featureGroup>
+  <!-- =========== Amenity ============ -->
+
+  <feature name="Fire station">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_firestation2.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station</help>
+    <point/>
+    <tag k="amenity" v="fire_station"/>
+    <inputSet ref="simpleName" />
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Police Station">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_police2.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="police"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Library">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_library.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="library"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hospital">
+    <category>amenity</category>
+    <icon image="features/pois/health_hospital.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="hospital"/>
+    <inputSet ref="simpleName"/>
+    <input type="choice" presence="always" category="Hospital" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Place of Worship">
+    <category>amenity</category>
+    <icon image="features/pois/place_of_worship_unknown.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dplace_of_worship</help>
+    <point/>
+    <tag k="amenity" v="place_of_worship"/>
+    <inputSet ref="simpleName" />
+    <input type="choice" presence="always" category="" name="Religion" key="religion" description="The religion worshipped here.">
+      <choice value="christian" text="Christianity (church)"/>
+      <choice value="jewish" text="Judaism (synagogue)"/>
+      <choice value="muslim" text="Islam (mosque)"/>
+      <choice value="hindu" text="Hinduism (temple)"/>
+      <choice value="buddhist" text="Buddhism (temple)"/>
+      <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"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="ATM">
+    <category>amenity</category>
+    <icon image="features/pois/money_atm.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Atm</help>
+    <point/>
+    <tag k="amenity" v="atm"/>
+    <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?"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bank">
+    <category>amenity</category>
+    <icon image="features/pois/money_bank2.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbank</help>
+    <point/>
+    <tag k="amenity" v="bank"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <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>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Recycling">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_recycling.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>
+    <point/>
+    <tag k="amenity" v="recycling"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="School">
+    <category>amenity</category>
+    <icon image="features/pois/education_school.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool</help>
+    <point/>
+    <tag k="amenity" v="school"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Kindergarten">
+    <category>amenity</category>
+    <category>buildings</category>
+    <icon image="features/pois/education_nursery3.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten</help>
+    <point/>
+    <tag k="amenity" v="kindergarten"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town hall">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_town_hall.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtownhall</help>
+    <point/>
+    <tag k="amenity" v="townhall"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Post Box">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_post_box.n.24.png">
+      ${ref}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Post_box</help>
+    <point/>
+    <tag k="amenity" v="post_box"/>
+    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post box"/>
+    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Post Office">
+    <category>amenity</category>
+    <category>buildings</category>
+    <icon image="features/pois/amenity_post_office.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="post_office"/>
+    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post office"/>
+    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <inputSet ref="common"/>
+    <inputset ref="simpleName"/>
+  </feature>
+
+  <feature name="Trash/rubbish bin">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_waste_bin.n.24.png">
+      ${ref}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket</help>
+    <point/>
+    <tag k="amenity" v="waste_basket"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Toilets">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_toilets.n.24.png">
+      ${ref}
+    </icon>
+    <point/>
+    <tag k="amenity" v="toilets"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Water fountain">
+    <category>amenity</category>
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_drinkingtap.n.24.png">
+      ${ref}
+    </icon>
+    <point/>
+    <tag k="amenity" v="drinking_water"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Shelter">
+    <category>amenity</category>
+    <icon image="features/pois/accommodation_shelter2.n.24.png">
+      ${name}
+    </icon>    
+    <point/>
+    <area/>
+    <tag k="amenity" v="shelter"/>
+    <inputset ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Barbecue">
+    <category>amenity</category>
+    <icon image="features/pois/tourist_picnic.n.24.png"/>
+    <!-- specific icon needed -->
+    <point/>
+    <tag k="amenity" v="bbq"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Hunting stand">
+    <category>sport</category>
+    <icon image="features/pois/sport_shooting.n.24.png"/>
+    <point/>
+    <tag k="amenity" v="hunting_stand"/>
+    <inputSet ref="common"/>
+    <inputSet ref="names"/>
+  </feature>
+
+
+  <feature name="Park bench">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_bench.n.24.png" />
+    <point/>
+    <tag k="amenity" v="bench"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Public telephone">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_telephone.n.24.png" />
+    <point/>
+    <tag k="amenity" v="telephone"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Emergency phone">
+    <category>amenity</category>
+    <icon image="features/pois/emergency-telephone-24.png" />
+    <!-- icon from http://www.clker.com/clipart-emergency-telephone-blue.html, feel free to (re)move this notice -->
+    <point/>
+    <tag k="amenity" v="emergency_phone"/>
+    <inputSet ref="common"/>
+    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of emergency phone."/>    
+  </feature>
+
+
+  <feature name="Swimming pool">
+    <category>amenity</category>
+    <category>sport</category>
+    <icon image="features/pois/sport_swimming_outdoor.n.24.png">
+      ${name}
+    </icon>
+    <point/>
+    <area/>
+    <tag k="amenity" v="swimming_pool"/>
+    <inputSet ref="simpleName"/>    
+    <inputSet ref="common"/>
+
+  </feature>
+
+  <feature name="Fountain">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_fountain2.n.24.png">
+    ${name}
+    </icon>
+    <point/>
+    <tag k="amenity" v="fountain"/>
+    <inputSet ref="common"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Vending machine">
+    <category>amenity</category>
+    <category>foodanddrink</category>
+    <icon image="features/pois/amenity_vendingmachine.png">A vending machine.</icon>
+
+    <point/>
+    <tag k="amenity" v="vending_machine"/>
+    <inputSet ref="common"/>
+    <inputSet ref="simpleName"/>
+    <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>
+    <input type="operator" presence="always" name="Operator" key="operator" description="Which company provides the service" />
+  </feature>
+
+  <!-- ========= Entertainment ========= -->
+
+  <feature name="Pub">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_pub.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub</help>
+    <point/>
+    <tag k="amenity" v="pub"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="wifi"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bar">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_bar.n.24.png">
+      ${name}
+    </icon>
+    <point/>
+    <tag k="amenity" v="bar"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="wifi"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Restaurant">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_restaurant.n.24.png">
+      ${name}
+    </icon>
+    <point/>
+    <tag k="amenity" v="restaurant"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="cuisine"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Cafe">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_cafe.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe</help>
+    <point/>
+    <tag k="amenity" v="cafe"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="cuisine"/>
+    <inputSet ref="wifi"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Fast Food">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_fastfood.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food</help>
+    <point/>
+    <tag k="amenity" v="fast_food"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="cuisine"/>
+    <inputSet ref="common"/>
+  </feature>
+
+</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/barriers.xml b/public/potlatch2/map_features/barriers.xml
new file mode 100644 (file)
index 0000000..2b82a5a
--- /dev/null
@@ -0,0 +1,191 @@
+<featureGroup>
+  <feature name="Wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help>
+
+    <line/>
+    <tag k="barrier" v="wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Ditch">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
+
+    <line/>
+    <tag k="barrier" v="ditch"/>
+    <inputSet ref="common"/>
+  </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>
+
+    <line/>
+    <tag k="barrier" v="retaining_wall"/>
+    <inputSet ref="common"/>
+  </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>
+
+    <line/>
+    <tag k="barrier" v="city_wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Fence">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help>
+
+    <line/>
+    <tag k="barrier" v="fence"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hedge">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help>
+
+    <line/>
+    <tag k="barrier" v="hedge"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Bollard">
+    <category>barrier</category>
+    <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"/>
+    <inputSet ref="common"/>
+  </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>
+
+    <point/>
+    <tag k="barrier" v="gate"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Lift Gate">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_lift_gate.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dlift_gate</help>
+    <point/>
+    <tag k="barrier" v="lift_gate"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Kissing Gate">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_kissing_gate.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dkissing_gate</help>
+    <point/>
+    <tag k="barrier" v="kissing_gate"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <feature name="Cycle Barrier">
+    <category>barrier</category>
+    <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"/>
+    <inputSet ref="common"/>
+  </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>
+
+    <point/>
+    <tag k="barrier" v="block"/>
+    <inputSet ref="common"/>
+  </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>
+
+    <point/>
+    <tag k="barrier" v="cattle_grid"/>
+    <inputSet ref="common"/>
+  </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>
+
+    <point/>
+    <tag k="barrier" v="toll_booth"/>
+    <tagSet ref="fee"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Stile">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_stile.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dstile</help>
+    <point/>
+    <tag k="barrier" v="stile"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Wire fence">
+    <!-- no idea, but taginfo says 2700 uses -->
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+   
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwire_fence</help>
+
+    <line/>
+    <tag k="barrier" v="wire_fence"/>
+    <inputSet ref="common"/>
+  </feature>
+</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml
new file mode 100644 (file)
index 0000000..5a3205f
--- /dev/null
@@ -0,0 +1,272 @@
+<featureGroup>
+  <feature name="School">
+    <category>buildings</category>
+    <icon image="features/pois/education_school.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="school"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="College">
+    <category>buildings</category>
+    <icon image="features/pois/education_university.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="college"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="University">
+    <category>buildings</category>
+    <icon image="features/pois/education_university.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="university"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Supermarket">
+    <category>buildings</category>
+    <icon image="features/pois/shopping_supermarket.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="shop" v="supermarket"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Place of worship">
+    <category>buildings</category>
+    <icon image="icons/place_of_worship.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="place_of_worship"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <!-- sorted in reverse order of popularity in taginfo. -->
+    <input type="choice" category="Religion" name="Religion" key="religion" description="The religion to which this place of worship belongs." presence="always">
+      <choice value="christian" text="Christianity (church)"/>
+      <choice value="muslim" text="Islam (mosque)"/>
+      <choice value="buddhist" text="Buddhist (temple)"/>
+      <choice value="jewish" text="Judaism (synagogue)"/>
+      <choice value="hindu" text="Hindu (temple)"/>
+      <choice value="sikh" text="Sikh (gurdwara)"/>
+      <choice value="spiritualist" text="Spiritualism"/>
+      <choice value="unitarian" text="Unitarianism"/>
+      <choice value="taoist" text="Taoism"/>
+      <choice value="multifaith" text="Multi-faith"/>
+      <choice value="scientologist" text="Scientology"/>
+      <choice value="bahai" text="Bahai"/>
+    </input>
+    <!-- sorted in reverse order of popularity in taginfo. -->
+    <input type="choice" category="Religion" name="Denomination" key="denomination" description="The denomination, or sub-branch of the main religion." presence="always">
+      <choice value="catholic" text="Catholic"/>
+      <choice value="baptist" text="Baptist"/>
+      <choice value="methodist" text="Methodist"/>
+      <choice value="lutheran" text="Lutheran"/>
+      <choice value="protestant" text="Prostant"/>
+      <choice value="orthodox" text="Orthodox"/>
+      <choice value="presbyterian" text="Presbyterian"/>
+      <choice value="anglican" text="Anglican"/>
+      <choice value="roman_catholic" text="Roman Catholic"/>
+      <choice value="evangelical" text="Evangelical"/>
+      <choice value="pentecostal" text="Pentecostal"/>
+      <choice value="mormon" text="Mormon"/>
+      <choice value="sunni" text="Sunni"/>
+      <choice value="jehovahs_witness" text="Jehovah's Witness"/>
+      <!-- duplicate of Anglican? -->
+      <choice value="church_of_england" text="Church of England"/>
+      <choice value="greek_orthodox" text="Greek Orthodox"/>
+      <choice value="new_apostolic" text="New Apostolic"/>
+      <choice value="episcopal" text="Episcopal"/>
+      <choice value="russian_orthodox" text="Russian Orthodox"/>
+      <choice value="adventist" text="Adventist"/>
+      <choice value="seventh_day_adventist" text="Seventh Day Adventist"/>
+      <choice value="united_reformed" text="United Reformed"/>
+      <choice value="reformed" text="Reformed"/>
+      <choice value="iglesia_ni_cristo" text="Iglesia Ni Cristo"/>
+      <choice value="uniting" text="Uniting"/>
+      <choice value="salvation_army" text="Salvation Army"/>
+      <choice value="church_of_scotland" text="Church of Scotland"/>
+      <choice value="quaker" text="Quaker"/>
+      <choice value="scientist" text="Scientist"/>
+      <choice value="shia" text="Shia"/>
+      <choice value="congregational" text="Congregational"/>
+      <choice value="assembly_of_god" text="Assembly of God"/>
+      <choice value="united" text="United"/>
+      <choice value="mennonite" text="Mennonite"/>
+      <choice value="nazarene" text="Nazarene"/>
+      <!-- duplicate of Mormon? -->
+      <choice value="latter_day_saints" text="Latter Day Saints"/>
+      <choice value="dutch_reformed" text="Dutch Reformed"/>
+      <choice value="tibetan" text="Tibetan"/>
+      <choice value="shingon" text="Shingon"/>
+      <choice value="georgian_orthodox" text="Georgian Orthodox"/>
+      <choice value="unitarian" text="Unitarian"/>
+      <choice value="brethren" text="Brethren"/>
+      <choice value="armenian_apostolic" text="Armenian Apostolic"/>
+      <choice value="maronite" text="Maronite"/>
+    </input>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Public building">
+    <category>buildings</category>
+    <icon image="features/pois/building_generic.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="public_building"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hospital">
+    <category>buildings</category>
+    <icon image="features/pois/health_hospital.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="hospital"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <feature name="Museum">
+    <category>buildings</category>
+    <icon image="features/pois/tourist_museum.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="tourism" v="museum"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Shopping centre">
+    <category>buildings</category>
+    <category>shopping</category>
+    <node/>
+    <area/>
+    <tag k="shop" v="mall"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Zoo">
+    <category>buildings</category>
+    <icon image="features/pois/tourist_zoo.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="tourism" v="zoo"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Stadium">
+    <category>buildings</category>
+    <icon image="icons/tourist_blank.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="leisure" v="stadium"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Building">
+    <category>buildings</category>
+    <icon image="features/pois/building_generic.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <!-- This should catch all the "building=*" tags in use: yes, hut, house, residential, entrance, apartments, garage, industrial,  garages, service, manufacture, collapsed... 
+         Is this possible? -->
+    <!-- <tag k="building" v="*"/> -->
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Sports centre">
+    <category>buildings</category>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <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"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+</featureGroup>
+  
\ No newline at end of file
diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml
new file mode 100644 (file)
index 0000000..20ad351
--- /dev/null
@@ -0,0 +1,328 @@
+<!-- This is a bit of a dumping ground for real landuse=*, but also outdoor natural/leisure/agriculture type keys. -->
+<featureGroup>
+  <feature name="Industrial Area">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="industrial"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Offices">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="commercial"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Residential Area">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="residential"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Retail Area">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="retail"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Construction Site">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="construction"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Marketplace">
+    <category>shopping</category>
+    <point />
+    <area/>
+    <icon image="features/pois/shopping_greengrocer.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="amenity" v="marketplace"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Cemetery">
+    <category>landuse</category>
+    <point />
+    <area/>
+    <icon image="features/pois/place_of_worship_unknown3.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="cemetery"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Graveyard">
+    <category>landuse</category>
+    <point />
+    <area/>
+    <icon image="features/pois/place_of_worship_unknown3.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="amenity" v="grave_yard"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Quarry">
+    <category>landuse</category>
+    <icon image="features/pois/poi_mine.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="quarry"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Military">
+    <category>landuse</category>
+    <icon image="features/pois/poi_military_bunker.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="military"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Conservation">
+    <category>natural</category>
+    <icon image="icons/natural_blank.png"/>
+    <area/>
+    <tag k="landuse" v="conservation"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+
+
+  <feature name="Playground">
+    <category>sport</category>
+    <area/>
+    <point/>
+    <icon image="features/pois/amenity_playground.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="leisure" v="playground"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Golf course">
+    <category>sport</category>
+    <area/>
+    <icon  image="features/pois/sport_golf.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="leisure" v="golf_course"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Recreation ground">
+    <category>sport</category>    
+    <area/>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="leisure" v="recreation_ground"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Sports pitch">
+    <category>sport</category>
+    <area/>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="leisure" v="pitch"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="pitchSport"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <inputSet id="pitchSport">
+    <input name="Sport" presence="always" category="Sport" key="sport" type="choice" description="The sport that is predominantly played here.">
+      <choice value="9pin" text="9 pin bowling"/>
+      <choice value="10pin" text="10 pin bowling"/>
+      <choice value="american_football" text="American football"/>
+      <choice value="archery" text="Archery"/>
+      <choice value="athletics" text="Athletics"/>
+      <choice value="australian_football" text="Australian Rules Football"/>
+      <choice value="baseball" text="Baseball"/>
+      <choice value="basketball" text="Basketball"/>
+      <choice value="beachvolleyball" text="Beach volleyball"/>
+      <choice value="boules" text="Boules/petanque/bocci"/>
+      <choice value="bowls" text="Lawn bowls"/>
+      <choice value="canadian_football" text="Canadian football"/>
+      <choice value="chess" text="Chess"/>
+      <choice value="cricket" text="Cricket"/>
+      <choice value="cricket_nets" text="Cricket nets"/>
+      <choice value="croquet" text="Croquet"/>
+      <choice value="equestrian" text="Equestrian"/>
+      <choice value="gaelic_football" text="Gaelic football"/>
+      <choice value="gymnastics" text="Gymnastics"/>
+      <choice value="team_handball" text="(Team) handball"/>
+      <choice value="hockey" text="(Field) hockey"/>
+      <choice value="korfball" text="Korball"/>
+      <choice value="pelota" text="Pelota"/>
+      <choice value="rugby_league" text="Rugby league"/>
+      <choice value="rugby_union" text="Rugby union"/>
+      <choice value="shooting" text="Shooting"/>
+      <choice value="skating" text="Ice skating"/>
+      <choice value="skateboard" text="Skateboarding"/>
+      <choice value="soccer" text="Soccer/football"/>
+      <choice value="swimming" text="Swimming"/>
+      <choice value="table_tennis" text="Table tennis"/>
+      <choice value="tennis" text="Tennis"/>
+      <choice value="volleyball" text="Volleyball"/>
+    </input>
+  </inputSet>
+
+  <feature name="Sports track">
+    <category>sport</category>
+    <area/>
+    <line/>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <b>${name}</b>
+      <font size="10pt">A purpose built track for running, cycling, greyhound racing, horse racing.</font>
+    </icon>
+    <tag k="leisure" v="track"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- **************** Agriculture *************** -->
+  <feature name="Farm">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="farm"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Farmyard">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="farmyard"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Farmland">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="farmland"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Field">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="meadow"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Orchard">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="orchard"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Vineyard">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="vineyard"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+<!-- ************************************************************************
+       Natural
+       ************************************************************************ -->
+
+  <feature name="Park">
+    <category>natural</category>
+    <category>sport</category>
+    <icon image="icons/natural_blank.png">
+      <b>${name}</b>
+      <br/>
+    </icon>
+
+    <area/>
+    <tag k="leisure" v="park"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Forest">
+    <category>natural</category>
+    <icon image="/features/pois/landuse_coniferous.n.24.png"/>
+
+    <area/>
+    <tag k="landuse" v="forest"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Meadow">
+    <category>natural</category>
+    <icon image="icons/natural_blank.png"/>
+
+    <area/>
+    <tag k="landuse" v="meadow"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/man_made.xml b/public/potlatch2/map_features/man_made.xml
new file mode 100644 (file)
index 0000000..52db936
--- /dev/null
@@ -0,0 +1,65 @@
+<featureGroup>
+  <feature name="Tower/mast">
+    <category>manmade</category>
+    <icon image="features/manmade_tower.png"/>
+    <point/>
+    <tag k="man_made" v="tower" vmatch="tower|water_tower|lighthouse|chimney|mast|communications_tower|flagpole|antenna|pole|cross"/>
+    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">
+      <choice value="tower" text="Tower"/>
+      <choice value="water_tower" text="Water tower"/>
+      <choice value="lookout_tower" text="Lookout tower"/>
+      <choice value="lighthouse" text="Lighthouse"/>
+      <choice value="chimney" text="Chimney"/>
+      <choice value="mast" text="Mast"/>
+      <choice value="flagpole" text="Flagpole"/>
+      <choice value="pole" text="Pole"/>
+      <choice value="cross" text="Cross"/>
+      <choice value="communications_tower" text="Comm. tower"/>
+      <choice value="communications_transponder" text="Comm. transponder"/>
+      <choice value="antenna" text="Antenna"/>
+    </input>
+    <inputSet ref="nameAndRef" />
+    <inputSet ref="common"/>
+  </feature>
+  
+  <feature name="Navigation mark">
+    <category>manmade</category>
+    <icon image="features/manmade_lighthouse.png"/>
+    <point/>
+    <tag k="man_made" v="survey_point" vmatch="survey_point|lighthouse|beacon|cairn|buoy"/>
+    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">
+      <choice value="survey_point" text="Trig point"/>
+      <choice value="lighthouse" text="Lighthouse"/>
+      <choice value="beacon" text="Beacon"/>
+      <choice value="cairn" text="Cairn"/>
+      <choice value="buoy" text="Buoy"/>
+    </input>
+    <inputSet ref="nameAndRef" />
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Silo/tank">
+    <category>manmade</category>
+    <icon image="features/manmade_silo.png"/>
+    <point/>
+    <area/>
+    <tag k="man_made" v="silo" vmatch="silo|storage_tank|tank|oil_tank|water_tank|fuel_storage_tank|reservoir|reservoir_covered|gasometer|bladder"/>
+    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">
+      <choice value="silo" text="Silo"/>
+      <choice value="storage_tank" text="Storage tank"/>
+      <choice value="tank" text="Tank"/>
+      <choice value="oil_tank" text="Oil tank"/>
+      <choice value="water_tank" text="Water tank"/>
+      <choice value="water_tower" text="Water tower"/> <!-- supported here but grouped under "tower/mast" -->
+      <choice value="fuel_storage_tank" text="Fuel storage tank"/>
+      <choice value="reservoir" text="Reservoir"/>
+      <choice value="reservoir_covered" text="Covered reservoir"/>
+      <choice value="gasometer" text="Gasometer"/>
+      <choice value="bladder" text="Bladder"/>
+    </input>
+    <inputSet ref="nameAndRef" />
+    <inputSet ref="common"/>
+  </feature>
+</featureGroup>  
+
diff --git a/public/potlatch2/map_features/paths.xml b/public/potlatch2/map_features/paths.xml
new file mode 100644 (file)
index 0000000..fbac906
--- /dev/null
@@ -0,0 +1,174 @@
+<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"/>
+    <input type="choice"
+        name="Cycleway type" category="Cycle" description="What kind of bike path is this?"
+        key="cycleway" presence="onTagMatch" priority="low">
+        <choice value="segregated" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb."/>
+        <choice value="shared" text="Shared" description="Cyclists and pedestrians share the full width of the path."/>
+    </input> 
+  </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/route__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="route" v="bicycle"/>
+    <tag k="network" v="ncn"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Regional Cycle Network">
+    <category>paths</category>
+    <icon image="features/route__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="route" v="bicycle"/>
+    <tag k="network" v="rcn"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Local Cycle Network">
+    <category>paths</category>
+    <icon image="features/route__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="route" v="bicycle"/>
+    <tag k="network" v="lcn"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+  
+  <!-- hiking -->
+  
+  <feature name="Long Distance Path">
+    <category>paths</category>
+    <icon image="features/route__nwn.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="hiking" vmatch="hiking|foot"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+  
+</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/places.xml b/public/potlatch2/map_features/places.xml
new file mode 100644 (file)
index 0000000..0beea23
--- /dev/null
@@ -0,0 +1,114 @@
+<featureGroup>
+  <feature name="Hamlet">
+    <category>places</category>
+    <icon image="features/pois/poi_place_hamlet.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="hamlet" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Village">
+    <category>places</category>
+    <icon image="features/pois/poi_place_village.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="village" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town">
+    <category>places</category>
+    <icon image="features/pois/poi_place_town.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="town" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Suburb">
+    <category>places</category>
+    <icon image="features/pois/poi_place_suburb.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="suburb" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="City">
+    <category>places</category>
+    <icon image="features/pois/poi_place_city.p.24.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="city" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+  
+<!-- Top 10 boundaries in order of usage on taginfo.openstreetmap.de -->
+
+  <feature name="Admin Boundary">
+    <category>places</category>
+    <line/>
+    <icon image="features/pois/poi_boundary_administrative.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
+    <tag k="boundary" v="administrative"/>
+    <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="National Park">
+    <category>places</category>
+    <category>natural</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park</help>
+    <tag k="boundary" v="national_park"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Protected Area">
+    <category>places</category>
+    <category>natural</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area</help>
+    <tag k="boundary" v="protected_area"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town boundary">
+    <category>places</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=town</help>
+    <tag k="boundary" v="town"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- boundary=landuse goes here. no idea what it is.-->
+
+  <feature name="Census boundary">
+    <category>places</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=census</help>
+    <tag k="boundary" v="census"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- next three are marker, postcode_area, administrative. all seem dubious -->
+  
+  
+  
+</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/power.xml b/public/potlatch2/map_features/power.xml
new file mode 100644 (file)
index 0000000..47769a7
--- /dev/null
@@ -0,0 +1,82 @@
+<featureGroup>
+  <feature name="High-voltage line">
+    <category>power</category>
+    <icon image="features/power_high.png"/>
+    <line/>
+    <tag k="power" v="line"/>
+    <inputSet ref="powerCables"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Low-voltage line">
+    <category>power</category>
+    <icon image="features/power_low.png"/>
+    <line/>
+    <tag k="power" v="minor_line"/>
+    <inputSet ref="powerCables"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="High-voltage pylon">
+    <category>power</category>
+    <icon image="icons/power_tower_24.png"/>
+    <point/>
+    <tag k="power" v="tower"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Power pole">
+    <category>power</category>
+    <icon image="icons/power_pole_24.png"/>
+    <point/>
+    <tag k="power" v="pole"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Plant (station)">
+    <category>power</category>
+    <icon image="features/pois/power_station.png"/>
+    <area/>
+    <point/>
+    <tag k="power" v="generator"/>
+    <inputSet ref="names"/>
+    <input type="choice" presence="always"  name="Energy source" key="power_source" category="Power">
+      <choice value="coal" text="Coal"/>
+      <choice value="gas" text="Gas"/>
+      <choice value="oil" text="Oil"/>
+      <choice value="fossil" text="Unspecified fossil fuel"/>
+      <choice value="hydro" text="Hydroelectric"/>
+      <choice value="geothermal" text="Geothermal"/>
+      <choice value="nuclear" text="Nuclear"/>
+      <choice value="wind" text="Wind"/>
+      <choice value="photovoltaic" text="Solar PV"/>
+      <choice value="solar_thermal" text="Solar thermal"/>
+      <choice value="biofuel" text="Biofuel"/>
+    </input>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Substation">
+    <category>power</category>
+    <icon image="icons/power_blank.png"/>"
+    <area/>
+    <point/>
+    <tag k="power" v="station"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Transformer">
+    <category>power</category>
+    <icon image="icons/power_blank.png"/>
+    <area/>
+    <point/>
+    <tag k="power" v="sub_station"/>
+    <inputSet ref="common"/>
+  </feature>
+</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/roads.xml b/public/potlatch2/map_features/roads.xml
new file mode 100644 (file)
index 0000000..a9da303
--- /dev/null
@@ -0,0 +1,343 @@
+<featureGroup>
+  <!-- ************************************************************************
+       Roads
+       ************************************************************************ -->
+
+
+  <feature name="Motorway">
+    <category>roads</category>
+    <icon image="features/highway__motorway.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmotorway</help>
+
+    <line/>
+    <tag k="highway" v="motorway"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Motorway link">
+    <category>roads</category>
+    <icon image="features/highway__motorway_link.png"/>
+    <line/>
+    <tag k="highway" v="motorway_link"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Trunk road">
+    <category>roads</category>
+    <icon image="features/highway__trunk.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtrunk</help>
+
+    <line/>
+    <tag k="highway" v="trunk"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Trunk link">
+    <category>roads</category>
+    <icon image="features/highway__trunk_link.png"/>
+    <line/>
+    <tag k="highway" v="trunk_link"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Primary road">
+    <category>roads</category>
+    <icon image="features/highway__primary.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary</help>
+
+    <line/>
+    <tag k="highway" v="primary"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Primary link">
+    <category>roads</category>
+    <icon image="features/highway__primary_link.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"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Secondary road">
+    <category>roads</category>
+    <icon image="features/highway__secondary.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary</help>
+
+    <line/>
+    <tag k="highway" v="secondary"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Secondary link">
+    <category>roads</category>
+    <icon image="features/highway__secondary_link.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"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <feature name="Tertiary road">
+    <category>roads</category>
+    <icon image="features/highway__tertiary.png">
+      <font size="14pt"><b>${name}</b></font><br/>
+      <font size="10pt">${ref}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary</help>
+
+    <line/>
+    <tag k="highway" v="tertiary"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Tertiary link">
+    <category>roads</category>
+    <icon image="features/highway__tertiary_link.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"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Minor road">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified</help>
+
+    <line/>
+    <tag k="highway" v="unclassified"/>
+
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Residential road">
+    <category>roads</category>
+    <icon image="features/highway__residential.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+      <br/>
+      <font size="8pt">${postal_code}</font>
+      <br/>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dresidential</help>
+
+    <line/>
+    <tag k="highway" v="residential"/>
+
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Service road">
+    <category>roads</category>
+    <icon image="features/highway__service.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dservice</help>
+    <description>
+      Access roads
+    </description>
+
+    <line/>
+    <tag k="highway" v="service"/>
+
+    <inputSet ref="minorRoad"/>
+    <input type="choice" presence="always" name="Type of service road" key="service" category="">
+      <choice value="alley" text="Alleyway/laneway"/>
+      <choice value="parking_aisle" text="Parking aisle" description="The path that cars drive on through a parking lot."/>
+      <choice value="driveway" text="Driveway"/>
+      <choice value="drive-through" text="Drive-through" description="For drive-through restaurants, bottle shops etc."/>
+      <choice value="emergency_access" text="Emergency access" description="For firefighters and other emergency services."/>
+    </input>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Unknown road">
+    <category>roads</category>
+    <icon image="features/highway__unknown.png">
+      <font size="10pt">This road has not been given a specific type. It's a road, and that's all that's known.</font>
+    </icon>
+
+    <line/>
+    <tag k="highway" v="road"/>
+
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Living Street">
+    <category>roads</category>
+    <icon image="features/highway__living_street.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dliving_street</help>
+
+    <line/>
+    <tag k="highway" v="living_street"/>
+
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Track">
+    <category>roads</category>
+    <icon image="features/highway__track.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="highway" v="track"/>
+
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Raceway/racing track">
+    <category>sport</category>
+    <icon>
+      <font size="10pt">A purpose built track for racing motor vehicles.</font>
+    </icon>
+
+    <line/>
+    <area/>
+    <tag k="highway" v="raceway"/>
+
+    <inputSet ref="simpleName"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="common"/>
+  </feature>
+  
+  
+  <feature name="Turning circle">
+    <category>transport</category>
+    <icon image="features/pois/transport_turning_circle.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle</help>
+    <point draganddrop="no"/>
+    <tag k="highway" v="turning_circle"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Mini Roundabout">
+    <category>transport</category>
+    <icon image="features/pois/transport_mini_roundabout.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
+    <point/>
+    <tag k="highway" v="mini_roundabout"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Traffic calming">
+    <category>transport</category>
+    <icon image="features/pois/transport_traffic_calming.n.24.png"/>
+<!--    <help>http://wiki.openstreetmap.org/wiki/Key:traffic_calming</help>-->
+    <point/>
+    <tag k="traffic_calming" v="yes" vmatch="*"/>
+    <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
+      <choice value="yes" text="Unspecified"/>
+      <choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/>
+      <choice value="hump" text="Speed hump" description="A gentler, longer bump, typically slowing cars to 30 kph or less."/>
+      <choice value="cushion" text="Speed cushion" description="A narrow speed bump allowing emergency vehicles and buses to pass without slowing."/>
+      <choice value="table" text="Speed table" description="A very long speed hump allowing the whole wheelbase to rest on top."/>
+      <choice value="chicane" text="Chicane" description="A set of obstacles causing vehicles to weave through."/>
+      <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>
+
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Turn restriction">
+    <category>advanced</category>
+    <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>
+    <relation/>
+    <tag k="type" v="restriction"/>
+    <input type="choice" category="Restrictions" presence="always" name="Type" key="restriction" description="What's the restriction?" layout="horizontal" priority="high">
+      <choice value="no_left_turn"      text="No left turn"/>
+      <choice value="no_right_turn"     text="No right turn"/>
+      <choice value="no_u_turn"         text="No U turns"/>
+      <choice value="no_straight_on"    text="No straight on"/>
+      <choice value="only_left_turn"    text="Left turn only"/>
+      <choice value="only_right_turn"   text="Right turn only"/>
+      <choice value="only_straight_on"  text="Straight on only"/>
+    </input>
+    <input type="choice" category="Restrictions" presence="always" name="Except" key="except" description="Are any vehicles exempt?" layout="horizontal">
+      <choice value="psv"      text="Bus"/>
+      <choice value="bicycle"  text="Bicycle"/>
+      <choice value="motorcar" text="Car"/>
+      <choice value="hgv"      text="HGV"/>
+    </input>
+    <input type="freetext" category="Restrictions" presence="always" name="Start day"  key="day_on"   description="What day of the week does it start?" layout="horizontal" priority="low"/>
+    <input type="freetext" category="Restrictions" presence="always" name="Start time" key="hour_on"  description="What time of day does it start?"     layout="horizontal" priority="low"/>
+    <input type="freetext" category="Restrictions" presence="always" name="End day"    key="day_off"  description="What day of the week does it end?"   layout="horizontal" priority="lowest"/>
+    <input type="freetext" category="Restrictions" presence="always" name="End time"   key="hour_off" description="What time of day does it end?"       layout="horizontal" priority="lowest"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  
+  <!-- Junction nodes (for turn restrictions) -->
+
+  <feature>
+    <point/>
+    <within entity="way" k="highway" minimum="2"/>
+    <inputSet ref="junctionNode"/>
+    <inputSet ref="common"/>
+  </feature>
+  
+  
+</featureGroup>
\ No newline at end of file
diff --git a/public/potlatch2/map_features/shopping.xml b/public/potlatch2/map_features/shopping.xml
new file mode 100644 (file)
index 0000000..b7055bf
--- /dev/null
@@ -0,0 +1,347 @@
+<featureGroup>
+  <feature name="Supermarket">
+    <category>shopping</category>
+    <icon image="features/pois/shopping_supermarket.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>
+    <point/>
+    <area/>
+    <tag k="shop" v="supermarket"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Small Convenience Store">
+    <category>shopping</category>
+    <icon image="features/pois/shopping_convenience.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience</help>
+    <point/>
+    <area/>
+    <tag k="shop" v="convenience"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Bakery">
+    <category>shopping</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_bakery.n.24.png"/>
+    <tag k="shop" v="bakery"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+
+  <feature name="Alcohol shop">
+    <category>shopping</category>
+    <point/>
+   &