From 3a84a828188d9e1a2e8f4dfe73987ca0a7ba14cc Mon Sep 17 00:00:00 2001
From: Steve Bennett <stevagewp@gmail.com>
Date: Tue, 27 Mar 2012 21:04:33 +1100
Subject: [PATCH 1/2] Add 'road routes', with icon.

---
 resources/features/route__road.png      | Bin 0 -> 1426 bytes
 resources/map_features.xml              |  13 ++++
 resources/map_features/transport.xml    |  20 +++++
 resources/resources_src/route__road.svg |  97 ++++++++++++++++++++++++
 4 files changed, 130 insertions(+)
 create mode 100644 resources/features/route__road.png
 create mode 100644 resources/resources_src/route__road.svg

diff --git a/resources/features/route__road.png b/resources/features/route__road.png
new file mode 100644
index 0000000000000000000000000000000000000000..be90daa999babce587f7f796c93fec74935b0161
GIT binary patch
literal 1426
zcmV;D1#S9?P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11rJF?K~zYIz1Lq%Q&$`Z@b9_Y{sU|Q2`y{*vst4NXfepxTodLN
z0#1h`h8d?JzU)CBocj|Wmt|WQ3>cFw1`~NAA<GPgwTp?NZWSCvurt=RAfpAebs}wV
zDXkRR+k5sPZTJ_#X!lL-%RT4(KIh@&p5G;uQY1nMVQOn@fAstP16Hf`3Z*oPRUw2B
zjYjj9PN!=W1c9;HY+Wvw>-Oq-OLHYvRaFg2rBZJ)nZ8(Fk1U64Yiqyi?Cd<t^E|nF
z_3D(@>veG)_b<nBzMN;tm&@e^)z#G+tyU`r0ISuyaP#KPv0yOh_W68|B9TZ$sZ^>I
z3WZ9gQoXT%|NcUmOon5}j(uk`nZ8b9lu|6=vbMH1M>M`jhi3-pqo-~f7vgkvc!8(x
z@D%-X+CuvuU#C+c7mdZEYvu`5ppWMt(P8fZjqvmI(xppIxm=!;@Yuu#4j(@JeRFg3
zE_>iE9J4k!W^G^zi!5;tvL#zVsQ@nOM=%;doW_$IcZL1|0|p9l7P2K<A!0-bEcy|M
za)=2r0DvIGapJ^@Z5E5=EPzh|fB}Hw;^O><hK5FnC>#M>vM5h^_!eg{J~s+yXbjw<
zZv~o&00Dt0hl$WQ#)2c5S$L8}0bndRf(V_*kt0XywOZ}YBwSNd({l9a(Sp0&ZSa&|
z@0`3;1PHj}8$x}3eV$&gHvj-b2q9%<WqZQ>9L9t9Upbn{RM-jsq8Akv6%~XK5h*Mz
ztS}ml16rL{!qeEs6<#7~goWp!hc-4g9%9SO%Ma;vI!TNd5MH1guYQSSNP(iFB2rRP
zQp2j%Y9%2Ae@}YRZ*!*<uG;k)_LiuTmzS5zq^GB60YD(MkWzHHk(rsfg^^073IO2#
z2bi0S005*?=@te+8~{R37gG+0=AV74<MDW$i9{kn01%7PQVu7KP$(2)!r|~N0Axr-
zDTmXSjM>@Q5aaQ9+_6{;@(fAJVa1Zcaoj^@aB%SF{{H^CBBea#aFJ3DyWJig9v<#t
z0)fDk)oL9rR4PD7YT;s)0v3zK>2kTO3;@{e_FJMff|BCgl%X1RHZo;mjE;`p29|Co
zv)TNE(P;GO%L*V#!Rcnx2&#1j=<Dm_Zrr%hmV~FLr)SJ&^EH`-#oki&D~I>&$cH>b
zg6{6_-$zD9>`52^dV71n?d<Gy>bB(}S0Q_4=$3RbDtG3ir>Dnlu~@!IyidYTr_<fl
z)zvyNF|qJ|MKRbkX5B(B5{3}Gx4Q`5nJ0WlN5@ZgyL}`vwxY`ffaAxHcU`=A@ss%&
z1LMFr!jUx{?xrG>usHa(2FffcPM$pZYez>%!}9SpFd>9(YHI3kZ*M<D84-RPbmFl;
z{6c81LWcTxwj)E5hSR4{n=f3rP){jcaSO4l7g0)iLP#Sa<jVQ;=MOf%yOUhEPGaPN
ze^aPNosGITUq>vuh*PIN|D(OV{iD_By6_SnBZM??9M^W{%$cTIy*_96b`|VXUW`5T
zV<Eb-(-gC5*io2+lHy$CZ_UKLd-p;HgQ4s4<;$O~_cxM2p8M$a`VS2T!?54)7bvAP
z#>eUX2R_=}cc1=Z8KsU%FOBif8vj5bKwDc|@9f*R@8gZ?ZU`@(0j935uDPY9<<{in
zB)|Hv!Q=77&z(E>*MS2Ez68K-rskT%^}G;57@bb{L1krSU1@1)IU$5~I2?C}hK71=
gHk*mk%{S%$0VbsS^TrUyYXATM07*qoM6N<$f(Rv_6aWAK

literal 0
HcmV?d00001

diff --git a/resources/map_features.xml b/resources/map_features.xml
index fbc4a398..ae5ee749 100644
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -142,6 +142,7 @@
     <inputSet ref="cycle"/>
     <inputSet ref="bicycle-lane"/>
     <inputSet ref="bus-route"/>
+    <inputSet ref="road-route"/>
     <inputSet ref="tram-route"/>
     <inputSet ref="pedestrians"/>
     <inputSet ref="roadLanes"/>
@@ -157,6 +158,7 @@
     <inputSet ref="cycle"/>
     <inputSet ref="bicycle-lane"/>
     <inputSet ref="bus-route"/>
+    <inputSet ref="road-route"/>
     <inputSet ref="tram-route"/>
     <inputSet ref="pedestrians"/>
     <inputSet ref="roadLanes"/>
@@ -368,6 +370,17 @@
     </input>
   </inputSet>
 
+  <inputSet id="road-route">
+    <input type="route" name="Highway Route" description="Highway route" category="Transport" priority="low" presence="onTagMatch">
+      <match k="type" v="route"/>
+      <match k="route" v="road"/>
+      <icon image="features/route__road.png">
+         <font size="12pt">Route: <b>${ref}</b> (${network})</font>
+      </icon>
+    </input>
+  </inputSet>
+
+
   <inputSet id="tram-route">
     <input type="route" name="Tram Route" description="Tram route" category="Transport" priority="low" presence="onTagMatch">
       <match k="type" v="route"/>
diff --git a/resources/map_features/transport.xml b/resources/map_features/transport.xml
index a6462be6..19cf26a1 100755
--- a/resources/map_features/transport.xml
+++ b/resources/map_features/transport.xml
@@ -567,5 +567,25 @@
     <inputSet ref="wheelchair-basic" />
   </feature>
 
+  <feature name="Highway Route">
+    <category>transport</category>
+    <!-- this doesn't seem possible: icon image="${symbol}"> -->
+    <icon image="features/route__road.png">
+         <font size="12pt">Route: <b>${ref}</b> (${network})</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="route" v="road"/>
+    <input type="freetext" presence="always" category="Details" name="Name" priority="high" key="name" description="Official route name"/>
+    <input type="freetext" presence="always" category="Details" name="Reference" priority="high" key="ref" description="The official reference number"/>
+    <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network the route is part of" priority="high"/>
+    <input type="freetext" presence="onTagMatch" category="Details" name="Symbol" key="symbol" description="URL of route symbol" priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Details" name="Route authority" key="operator" description="Who manages the route ('operator')" priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Details" name="Description" key="description" description="Text description of the route" priority="low"/>
+    <inputSet ref="source"/>
+    
+  </feature>
+
       
 </featureGroup>
diff --git a/resources/resources_src/route__road.svg b/resources/resources_src/route__road.svg
new file mode 100644
index 00000000..938d3a26
--- /dev/null
+++ b/resources/resources_src/route__road.svg
@@ -0,0 +1,97 @@
+<?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"
+   version="1.0"
+   width="20"
+   height="20"
+   viewBox="0 0 19.966722 19.96669"
+   id="Layer_1"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="route__road.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true"
+   inkscape:export-filename="I:\OSM\potgit6\potlatch2\resources\features\route__road.png"
+   inkscape:export-xdpi="135"
+   inkscape:export-ydpi="135"><metadata
+   id="metadata36"><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><dc:contributor><cc:Agent><dc:title>Steve Bennett. Derived from http://upload.wikimedia.org/wikipedia/commons/f/fa/I-blank.svg</dc:title></cc:Agent></dc:contributor></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   inkscape:window-height="968"
+   inkscape:window-width="1280"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   width="601px"
+   height="601px"
+   inkscape:zoom="29.065494"
+   inkscape:cx="11.917981"
+   inkscape:cy="8.9569822"
+   inkscape:window-x="-4"
+   inkscape:window-y="-4"
+   inkscape:current-layer="g3009"
+   showgrid="false"
+   inkscape:window-maximized="0" /><defs
+   id="defs1659">
+	
+	
+	
+	
+
+		
+	</defs>
+
+
+
+
+
+
+<g
+   id="g3009"
+   transform="translate(0.04857514,-0.09715028)"><g
+     id="g1600"
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:7.16853443;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     transform="matrix(0.03244905,0,0,0.0324491,0.22312056,0.46796879)">
+		
+		
+			<path
+   inkscape:connector-curvature="0"
+   d="M 80.75293,0 C 115.42871,10.583496 149.20112,23.686394 186.14289,23.686451 223.08466,23.686508 265.32422,10.583496 300,4.883e-4 334.67578,10.583496 367.25032,23.686451 405.38899,23.686451 443.52766,23.686451 484.57129,10.583496 519.24707,0 569.8125,63.908203 600,144.67822 600,232.5 600,413.92383 471.16992,565.25391 300,599.99902 128.83008,565.25391 0,413.92383 0,232.5 0,144.67822 30.187988,63.907715 80.75293,0 z"
+   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:7.16853428;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   id="path1604"
+   sodipodi:nodetypes="czcscscsc" />
+	</g><path
+     id="path1608"
+     style="fill:#003f87;fill-opacity:0.44385029;stroke:none"
+     d="m 1.3524786,8.3909095 c 0,-0.9756612 0.1258929,-1.5094293 0.3621682,-2.409979 l 16.4863912,0 c 0.236245,0.9005497 0.362153,1.4343178 0.362153,2.409979 0,5.2813505 -3.688945,9.2454675 -8.6053556,10.2981915 C 5.0414381,17.636377 1.3524786,13.67226 1.3524786,8.3909095 z"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sccscs"
+     inkscape:export-filename="I:\OSM\potgit6\potlatch2\resources\features\path1608.png"
+     inkscape:export-xdpi="135"
+     inkscape:export-ydpi="135" /><g
+     id="g1610"
+     transform="matrix(0.03203507,0,0,0.03249707,0.34731551,0.55915312)"
+     style="fill:#32af1e;fill-opacity:0.4652406;stroke:none">
+		<path
+   inkscape:connector-curvature="0"
+   d="M 40.973965,130.28377 C 52.788703,95.61249 70.897759,61.375721 94.074378,32.927861 125.98706,41.00131 159.60103,56.527346 194.31417,56.527346 c 36.69357,0 72.15943,-16.03149 105.68583,-25.018296 33.5264,8.986806 68.99226,25.018296 105.68583,25.018296 34.71268,0 68.32757,-15.526036 100.24027,-23.599485 23.17567,28.44786 41.2852,62.684629 53.09993,97.355909 z"
+   style="fill:#32af1e;fill-opacity:0.4652406;stroke:none"
+   id="path1612"
+   sodipodi:nodetypes="ccscsccc" />
+	</g></g>
+</svg>
\ No newline at end of file

From bd34a085a0500fea4fae6058506a49792d5b14f8 Mon Sep 17 00:00:00 2001
From: Steve Bennett <stevagewp@gmail.com>
Date: Tue, 27 Mar 2012 21:08:47 +1100
Subject: [PATCH 2/2] Move route__road.svg to correct location.

---
 {resources/resources_src => resources_src}/route__road.svg | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {resources/resources_src => resources_src}/route__road.svg (100%)

diff --git a/resources/resources_src/route__road.svg b/resources_src/route__road.svg
similarity index 100%
rename from resources/resources_src/route__road.svg
rename to resources_src/route__road.svg