ADD three new multi-type man_made features: navigation mark, tower, and silo. All...

diff --git a/resources/features/manmade_lighthouse.png b/resources/features/manmade_lighthouse.png
new file mode 100644 (file)
index 0000000..6aaf5f9
Binary files /dev/null and b/resources/features/manmade_lighthouse.png differ

diff --git a/resources/features/manmade_lighthouse.svg b/resources/features/manmade_lighthouse.svg
new file mode 100644 (file)
index 0000000..3c327bf
--- /dev/null
+++ b/resources/features/manmade_lighthouse.svg
@@ -0,0 +1,139 @@
+<?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="744.09448819"
+   height="1052.3622047"
+   id="svg9871"
+   version="1.1"
+   inkscape:version="0.48+devel r9797"
+   sodipodi:docname="lighthouse.svg"
+   inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\lighthouse.png"
+   inkscape:export-xdpi="6.7296271"
+   inkscape:export-ydpi="6.7296271">
+  <defs
+     id="defs9873">
+    <linearGradient
+       id="linearGradient10431">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop10433" />
+      <stop
+         id="stop10457"
+         offset="0.58333331"
+         style="stop-color:#ffffff;stop-opacity:0.91150445;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop10435" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10431"
+       id="linearGradient10437"
+       x1="359.5"
+       y1="197.36218"
+       x2="470.5"
+       y2="197.36218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3636363,0,0,1,-130.90909,14)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="225.92956"
+     inkscape:cy="830.94563"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="990"
+     inkscape:window-x="-32000"
+     inkscape:window-y="-32000"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid9897" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata9876">
+    <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:#b54d4d;fill-opacity:1;stroke:#000000;stroke-width:0.9511677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4550"
+       width="320"
+       height="320"
+       x="200"
+       y="132.36218"
+       ry="39.835293"
+       inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\navigation.png"
+       inkscape:export-xdpi="6.5367885"
+       inkscape:export-ydpi="6.5367885" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 284,262.36218 -20,170 80,0 -20,-170 z"
+       id="path9899"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:11.99999905;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect10425"
+       width="25"
+       height="80"
+       x="292"
+       y="182.36218"
+       ry="40"
+       rx="0" />
+    <path
+       style="fill:url(#linearGradient10437);fill-opacity:1;stroke:none"
+       d="m 510,156.36218 -150,40 0,20 150,50 z"
+       id="path10429"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="6.7296271"
+       inkscape:export-ydpi="6.7296271" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:12.86856556;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect10425-5"
+       width="115"
+       height="20"
+       x="247"
+       y="412.36218"
+       ry="10"
+       rx="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.09929514;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect10425-7"
+       width="70"
+       height="10"
+       x="270"
+       y="232.36218"
+       ry="5"
+       rx="0" />
+  </g>
+</svg>

diff --git a/resources/features/manmade_silo.png b/resources/features/manmade_silo.png
new file mode 100644 (file)
index 0000000..be207ce
Binary files /dev/null and b/resources/features/manmade_silo.png differ

diff --git a/resources/features/manmade_silo.svg b/resources/features/manmade_silo.svg
new file mode 100644 (file)
index 0000000..34627ae
--- /dev/null
+++ b/resources/features/manmade_silo.svg
@@ -0,0 +1,208 @@
+<?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="744.09448819"
+   height="1052.3622047"
+   id="svg8585"
+   version="1.1"
+   inkscape:version="0.48+devel r9797"
+   sodipodi:docname="silo2.svg"
+   inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\silo2.png"
+   inkscape:export-xdpi="8.7157183"
+   inkscape:export-ydpi="8.7157183">
+  <defs
+     id="defs8587">
+    <linearGradient
+       id="linearGradient9233">
+      <stop
+         id="stop9235"
+         offset="0"
+         style="stop-color:#fdfdfd;stop-opacity:1;" />
+      <stop
+         style="stop-color:#f06a6a;stop-opacity:1;"
+         offset="0.44444445"
+         id="stop9237" />
+      <stop
+         id="stop9239"
+         offset="1"
+         style="stop-color:#ffa2a2;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9221">
+      <stop
+         style="stop-color:#fff7f7;stop-opacity:1;"
+         offset="0"
+         id="stop9223" />
+      <stop
+         id="stop9241"
+         offset="0.3888889"
+         style="stop-color:#f28484;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffc2c2;stop-opacity:1;"
+         offset="1"
+         id="stop9225" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9189">
+      <stop
+         style="stop-color:#fdfdfd;stop-opacity:1;"
+         offset="0"
+         id="stop9191" />
+      <stop
+         id="stop9229"
+         offset="0.44444445"
+         style="stop-color:#970d0d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#cb8484;stop-opacity:1;"
+         offset="1"
+         id="stop9231" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect8621"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect8621-7"
+       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9233"
+       id="linearGradient9199"
+       x1="237.02328"
+       y1="565.65161"
+       x2="399.77402"
+       y2="565.65161"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9221"
+       id="linearGradient9227"
+       x1="240.49247"
+       y1="550.54355"
+       x2="480.25142"
+       y2="550.54355"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9221"
+       id="linearGradient9243"
+       gradientUnits="userSpaceOnUse"
+       x1="240.49247"
+       y1="550.54355"
+       x2="480.25142"
+       y2="550.54355" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9221"
+       id="linearGradient9245"
+       gradientUnits="userSpaceOnUse"
+       x1="240.49247"
+       y1="550.54355"
+       x2="480.25142"
+       y2="550.54355" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9221"
+       id="linearGradient9249"
+       gradientUnits="userSpaceOnUse"
+       x1="240.49247"
+       y1="550.54355"
+       x2="480.25142"
+       y2="550.54355"
+       gradientTransform="matrix(0.61263232,0,0,0.66933285,233.06152,218.70491)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="415.56296"
+     inkscape:cy="583.98346"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="990"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8590">
+    <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:#b54d4d;fill-opacity:1;stroke:#000000;stroke-width:0.97926915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4550"
+       width="329.45413"
+       height="329.45413"
+       x="210.27293"
+       y="367.63513"
+       ry="41.012192"
+       inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\navigation.png"
+       inkscape:export-xdpi="8.7157183"
+       inkscape:export-ydpi="8.7157183" />
+    <path
+       style="fill:url(#linearGradient9199);stroke:#ffffff;stroke-width:30.38682365000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1.0"
+       d="m 252.21669,477.70387 0,175.89547 132.36393,0 0,-174.56292"
+       id="path8619"
+       inkscape:path-effect="#path-effect8621"
+       inkscape:original-d="m 252.21669,477.70387 0,175.89547 132.36393,0 0,-174.56292"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ffffff;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path9131"
+       sodipodi:cx="307.84399"
+       sodipodi:cy="449.30112"
+       sodipodi:rx="53.790623"
+       sodipodi:ry="12.626906"
+       d="m 361.63462,449.30112 a 53.790623,12.626906 0 1 1 -107.58125,0 53.790623,12.626906 0 1 1 107.58125,0 z"
+       transform="matrix(1.279682,0,0,1.8440371,-75.709034,-361.63854)" />
+    <path
+       style="fill:url(#linearGradient9249);fill-opacity:1;stroke:#ffffff;stroke-width:24.66721344;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 392.53513,530.72325 0,124.82327 122.91317,0 0,-123.87763"
+       id="path8619-8"
+       inkscape:path-effect="#path-effect8621-7"
+       inkscape:original-d="m 392.53513,530.72325 0,124.82327 122.91317,0 0,-123.87763"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#b63d3d;fill-opacity:1;stroke:#ffffff;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path9131-4"
+       sodipodi:cx="307.84399"
+       sodipodi:cy="449.30112"
+       sodipodi:rx="53.790623"
+       sodipodi:ry="12.626906"
+       d="m 361.63462,449.30112 a 53.790623,12.626906 0 1 1 -107.58125,0 53.790623,12.626906 0 1 1 107.58125,0 z"
+       transform="matrix(1.1977505,0,0,1.3177007,85.116714,-59.591976)" />
+  </g>
+</svg>

diff --git a/resources/features/manmade_tower.png b/resources/features/manmade_tower.png
new file mode 100644 (file)
index 0000000..bcb4e3f
Binary files /dev/null and b/resources/features/manmade_tower.png differ

diff --git a/resources/features/manmade_tower.svg b/resources/features/manmade_tower.svg
new file mode 100644 (file)
index 0000000..a304b6b
--- /dev/null
+++ b/resources/features/manmade_tower.svg
@@ -0,0 +1,154 @@
+<?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="svg9262"
+   version="1.1"
+   inkscape:version="0.48+devel r9797"
+   sodipodi:docname="tower2.svg"
+   inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\tower2.png"
+   inkscape:export-xdpi="6.7296271"
+   inkscape:export-ydpi="6.7296271">
+  <defs
+     id="defs9264" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="247.92434"
+     inkscape:cy="505.53254"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="990"
+     inkscape:window-x="-32000"
+     inkscape:window-y="-32000"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid9281" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata9267">
+    <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:#b54d4d;fill-opacity:1;stroke:#000000;stroke-width:0.9511677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4550"
+       width="320"
+       height="320"
+       x="200"
+       y="372.36218"
+       ry="39.835293"
+       inkscape:export-filename="I:\OSM\pot2b\potlatch2\resources\features\navigation.png"
+       inkscape:export-xdpi="8.7157183"
+       inkscape:export-ydpi="8.7157183" />
+    <path
+       style="fill:none;stroke:#fff5f5;stroke-width:12;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 400,668.36218 -40,-200 -40,200 65,-80 -40,-40 30,0 -40,40 z"
+       id="path9283"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <g
+       id="g9820"
+       transform="matrix(0.87696958,0,0,1,30.175024,16)"
+       style="stroke-width:21.35687625;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="4.1146426"
+         sodipodi:start="2.0743857"
+         transform="matrix(1.1428573,0,0,1.125,-42.857177,-62.545271)"
+         d="m 327.16495,487.39643 c -25.3954,-10.6607 -34.63956,-34.98827 -20.64739,-54.33714 3.9829,-5.50771 9.61405,-10.22237 16.43643,-13.76135"
+         sodipodi:ry="40"
+         sodipodi:rx="52.5"
+         sodipodi:cy="452.36218"
+         sodipodi:cx="352.5"
+         id="path9793"
+         style="fill:none;stroke:#fff5f5;stroke-width:18.83499315;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:open="true"
+         sodipodi:end="4.1146426"
+         sodipodi:start="2.0743857"
+         transform="matrix(1.472485,0,0,1.9824234,-191.74549,-447.86391)"
+         d="m 327.16495,487.39643 c -25.3954,-10.6607 -34.63956,-34.98827 -20.64739,-54.33714 3.9829,-5.50771 9.61405,-10.22237 16.43643,-13.76135"
+         sodipodi:ry="40"
+         sodipodi:rx="52.5"
+         sodipodi:cy="452.36218"
+         sodipodi:cx="352.5"
+         id="path9793-5"
+         style="fill:none;stroke:#fff5f5;stroke-width:12.50011717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       transform="matrix(-0.79867749,0,0,1,665.6227,16.999998)"
+       id="g9820-0"
+       style="stroke-width:22.37918536;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="4.1146426"
+         sodipodi:start="2.0743857"
+         transform="matrix(1.1428573,0,0,1.125,-42.857177,-62.545271)"
+         d="m 327.16495,487.39643 c -25.3954,-10.6607 -34.63956,-34.98827 -20.64739,-54.33714 3.9829,-5.50771 9.61405,-10.22237 16.43643,-13.76135"
+         sodipodi:ry="40"
+         sodipodi:rx="52.5"
+         sodipodi:cy="452.36218"
+         sodipodi:cx="352.5"
+         id="path9793-9"
+         style="fill:none;stroke:#fff5f5;stroke-width:19.73658498;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:open="true"
+         sodipodi:end="4.1146426"
+         sodipodi:start="2.0743857"
+         transform="matrix(1.472485,0,0,1.9824234,-191.74549,-447.86391)"
+         d="m 327.16495,487.39643 c -25.3954,-10.6607 -34.63956,-34.98827 -20.64739,-54.33714 3.9829,-5.50771 9.61405,-10.22237 16.43643,-13.76135"
+         sodipodi:ry="40"
+         sodipodi:rx="52.5"
+         sodipodi:cy="452.36218"
+         sodipodi:cx="352.5"
+         id="path9793-5-5"
+         style="fill:none;stroke:#fff5f5;stroke-width:13.0984717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path9867"
+       sodipodi:cx="77.5"
+       sodipodi:cy="517.36218"
+       sodipodi:rx="42.5"
+       sodipodi:ry="60"
+       d="m 56.990672,569.91355 a 42.5,60 0 1 1 0.806567,0.61149"
+       sodipodi:start="2.0743857"
+       sodipodi:end="8.3360292"
+       sodipodi:open="true"
+       transform="matrix(0.35072682,0,0,0.2739415,332.81867,322.0717)" />
+  </g>
+</svg>

diff --git a/resources/map_features.xml b/resources/map_features.xml
index c9efc5e..d502fc2 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -52,64 +52,26 @@ Quick documentation:
 <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&amp;Leisure" id="sport"/>
+  <category name="Man-made" id="manmade"/>
 
   <!-- Common input sets -->
 
@@ -117,6 +79,12 @@ 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>
@@ -212,6 +180,7 @@ Quick documentation:
     <inputSet ref="roadRoundabout"/>
     <inputSet ref="permissions"/>
   </inputSet>
+  
 
   <inputSet id="minorRoad">
     <inputSet ref="names"/>
@@ -641,6 +610,7 @@ Quick documentation:
   <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" />  
 
 
   

diff --git a/resources/map_features/man_made.xml b/resources/map_features/man_made.xml
new file mode 100644 (file)
index 0000000..383976d
--- /dev/null
+++ b/resources/map_features/man_made.xml
@@ -0,0 +1,65 @@
+<featureGroup>\r
+  <feature name="Tower/mast">\r
+    <category>manmade</category>\r
+    <icon image="features/manmade_tower.png" dnd="no"/>\r
+    <point/>\r
+    <tag k="man_made" v="tower" vmatch="tower|water_tower|lighthouse|chimney|mast|communications_tower|flagpole|antenna|pole|cross"/>\r
+    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">\r
+      <choice value="tower" text="Tower"/>\r
+      <choice value="water_tower" text="Water tower"/>\r
+      <choice value="lookout_tower" text="Lookout tower"/>\r
+      <choice value="lighthouse" text="Lighthouse"/>\r
+      <choice value="chimney" text="Chimney"/>\r
+      <choice value="mast" text="Mast"/>\r
+      <choice value="flagpole" text="Flagpole"/>\r
+      <choice value="pole" text="Pole"/>\r
+      <choice value="cross" text="Cross"/>\r
+      <choice value="communications_tower" text="Comm. tower"/>\r
+      <choice value="communications_transponder" text="Comm. transponder"/>\r
+      <choice value="antenna" text="Antenna"/>\r
+    </input>\r
+    <inputSet ref="nameAndRef" />\r
+    <inputSet ref="common"/>\r
+  </feature>\r
+  \r
+  <feature name="Navigation mark">\r
+    <category>manmade</category>\r
+    <icon image="features/manmade_lighthouse.png"/>\r
+    <point/>\r
+    <tag k="man_made" v="survey_point" vmatch="survey_point|lighthouse|beacon|cairn|buoy"/>\r
+    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">\r
+      <choice value="survey_point" text="Trig point"/>\r
+      <choice value="lighthouse" text="Lighthouse"/>\r
+      <choice value="beacon" text="Beacon"/>\r
+      <choice value="cairn" text="Cairn"/>\r
+      <choice value="buoy" text="Buoy"/>\r
+    </input>\r
+    <inputSet ref="nameAndRef" />\r
+    <inputSet ref="common"/>\r
+  </feature>\r
+\r
+\r
+  <feature name="Silo/tank">\r
+    <category>manmade</category>\r
+    <icon image="features/manmade_silo.png"/>\r
+    <point/>\r
+    <area/>\r
+    <tag k="man_made" v="silo" vmatch="silo|storage_tank|tank|oil_tank|water_tank|fuel_storage_tank|reservoir|reservoir_covered|gasometer|bladder"/>\r
+    <input type="choice" key="man_made" name="Object" presence="always" priority="highest">\r
+      <choice value="silo" text="Silo"/>\r
+      <choice value="storage_tank" text="Storage tank"/>\r
+      <choice value="tank" text="Tank"/>\r
+      <choice value="oil_tank" text="Oil tank"/>\r
+      <choice value="water_tank" text="Water tank"/>\r
+      <choice value="water_tower" text="Water tower"/> <!-- supported here but grouped under "tower/mast" -->\r
+      <choice value="fuel_storage_tank" text="Fuel storage tank"/>\r
+      <choice value="reservoir" text="Reservoir"/>\r
+      <choice value="reservoir_covered" text="Covered reservoir"/>\r
+      <choice value="gasometer" text="Gasometer"/>\r
+      <choice value="bladder" text="Bladder"/>\r
+    </input>\r
+    <inputSet ref="nameAndRef" />\r
+    <inputSet ref="common"/>\r
+  </feature>\r
+</featureGroup>  \r
+\r