Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6345)
+++ /trunk/data/defaultpresets.xml	(revision 6346)
@@ -3120,4 +3120,6 @@
             <key key="aeroway" value="terminal" />
             <text key="name" text="Name" />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
         </item>
         <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node">
@@ -3592,4 +3594,6 @@
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
         </item>
         <item name="Map" icon="presets/map.png" type="node">
@@ -3600,5 +3604,5 @@
             <key key="information" value="map" />
             <text key="name" text="Name" />
-            <combo key="map_type" text="Detail Grade" values="topo,street,scheme" />
+            <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" />
             <combo key="map_size" text="Shown Area" values="site,city,region" />
             <text key="description" text="Closer Description" />
@@ -3622,5 +3626,5 @@
             <key key="information" value="board" />
             <text key="name" text="Name" />
-            <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" default="board" />
+            <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" />
             <text key="description" text="Closer Description" />
         </item>
@@ -3657,4 +3661,6 @@
             <text key="ref" text="Reference number" />
             <combo key="fee" text="Fee" values="yes,no" />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
         </item>
         <item name="Audioguide" icon="presets/information.png" type="node">
@@ -4373,4 +4379,16 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
             <key key="emergency" value="phone" />
+        </item>
+        <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access" 
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:internet_access"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:internet_access"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:internet_access"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:internet_access"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" />
+            <label text="Edit Internet Access" />
+            <space />
+            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
+            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
         </item>
         <item name="Automated Defibrillator" icon="presets/aed.svg" type="node">
Index: /trunk/images/presets/network-wireless.svg
===================================================================
--- /trunk/images/presets/network-wireless.svg	(revision 6346)
+++ /trunk/images/presets/network-wireless.svg	(revision 6346)
@@ -0,0 +1,230 @@
+<?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="48"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="network-wireless.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.395833"
+     inkscape:cx="38.873857"
+     inkscape:cy="24"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-bbox="true"
+     objecttolerance="10000"
+     gridtolerance="10000"
+     guidetolerance="10000"
+     inkscape:window-width="1022"
+     inkscape:window-height="918"
+     inkscape:window-x="256"
+     inkscape:window-y="26">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <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>Network Wireless</dc:title>
+        <dc:date>December 2008</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Luca Ferretti &lt;elle.uca@libero.it&gt;</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>network</rdf:li>
+            <rdf:li>wireless</rdf:li>
+            <rdf:li>antenna</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>An antenna with EM waves</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Livello 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:none;fill-opacity:0.50000000000000000;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3169"
+       width="48"
+       height="48"
+       x="0"
+       y="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path3201"
+       d="M 20,34 L 32,41 L 24,23 L 16,41"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:11;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3199"
+       sodipodi:cx="24"
+       sodipodi:cy="18"
+       sodipodi:rx="14"
+       sodipodi:ry="14"
+       d="M 36.349644,11.405586 A 14,14 0 0 1 36.493432,24.317765"
+       sodipodi:start="5.7927277"
+       sodipodi:end="6.7513721"
+       transform="matrix(-1,0,0,1,51.849644,0.1394818)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3177"
+       sodipodi:cx="24"
+       sodipodi:cy="18"
+       sodipodi:rx="19"
+       sodipodi:ry="19"
+       d="M 39.064398,6.4214032 A 19,19 0 0 1 39.24004,29.346418"
+       sodipodi:start="5.6278819"
+       sodipodi:end="6.9231659"
+       sodipodi:open="true"
+       transform="matrix(-1,0,0,1,49.122899,-0.4214032)" />
+    <path
+       transform="translate(-1.0658982,-0.4214032)"
+       sodipodi:open="true"
+       sodipodi:end="6.9231659"
+       sodipodi:start="5.6278819"
+       d="M 39.064398,6.4214032 A 19,19 0 0 1 39.24004,29.346418"
+       sodipodi:ry="19"
+       sodipodi:rx="19"
+       sodipodi:cy="18"
+       sodipodi:cx="24"
+       id="path3175"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:open="true"
+       transform="translate(-3.600083,0.1394818)"
+       sodipodi:end="6.7513721"
+       sodipodi:start="5.7927277"
+       d="M 36.349644,11.405586 A 14,14 0 0 1 36.493432,24.317765"
+       sodipodi:ry="14"
+       sodipodi:rx="14"
+       sodipodi:cy="18"
+       sodipodi:cx="24"
+       id="path3173"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:11;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       transform="translate(0,-6)"
+       d="M 29,24 A 5,5 0 1 1 19,24 A 5,5 0 1 1 29,24 z"
+       sodipodi:ry="5"
+       sodipodi:rx="5"
+       sodipodi:cy="24"
+       sodipodi:cx="24"
+       id="path3171"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2385"
+       sodipodi:cx="24"
+       sodipodi:cy="24"
+       sodipodi:rx="5"
+       sodipodi:ry="5"
+       d="M 29,24 A 5,5 0 1 1 19,24 A 5,5 0 1 1 29,24 z"
+       transform="translate(0,-6)" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 20,34 L 32,41 L 24,23 L 16,41"
+       id="path3157"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3159"
+       sodipodi:cx="24"
+       sodipodi:cy="18"
+       sodipodi:rx="14"
+       sodipodi:ry="14"
+       d="M 36.349644,11.405586 A 14,14 0 0 1 36.493432,24.317765"
+       sodipodi:start="5.7927277"
+       sodipodi:end="6.7513721"
+       transform="translate(-3.600083,0.1394818)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.7456074"
+       sodipodi:start="5.8050181"
+       d="M 36.429757,11.557862 A 14,14 0 0 1 36.529644,24.24564"
+       sodipodi:ry="14"
+       sodipodi:rx="14"
+       sodipodi:cy="18"
+       sodipodi:cx="24"
+       id="path3163"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       transform="matrix(-1,0,0,1,51.600083,0.1394818)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3165"
+       sodipodi:cx="24"
+       sodipodi:cy="18"
+       sodipodi:rx="19"
+       sodipodi:ry="19"
+       d="M 39.064398,6.4214032 A 19,19 0 0 1 39.24004,29.346418"
+       sodipodi:start="5.6278819"
+       sodipodi:end="6.9231659"
+       sodipodi:open="true"
+       transform="translate(-1.0658982,-0.4214032)" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.9231659"
+       sodipodi:start="5.6278819"
+       d="M 39.064398,6.4214032 A 19,19 0 0 1 39.24004,29.346418"
+       sodipodi:ry="19"
+       sodipodi:rx="19"
+       sodipodi:cy="18"
+       sodipodi:cx="24"
+       id="path3167"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc"
+       transform="matrix(-1,0,0,1,49.24004,-0.3464176)" />
+  </g>
+</svg>
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(revision 6345)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(revision 6346)
@@ -125,4 +125,8 @@
                 test("building", "entrance").
                 alternative("entrance"));
+        // Useless tag proposed in internal preset for years
+        // see #9213
+        checks.add(new DeprecationCheck(2124).
+                testAndRemove("board_type", "board"));
     }