Changeset 6346 in josm for trunk

Timestamp:

2013-10-31T02:37:01+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9076, fix #9213:

• Presets: add internet_access preset, remove useless default board value for board_type (modified patch by skyper)
• Validator: deprecates board_type=board

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (6 diffs)
• images/presets/network-wireless.svg (added)
• src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -3120 +3120 @@
             <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 +3594 @@
             <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 +3604 @@
             <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 +3626 @@
             <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 +3661 @@
             <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 +4379 @@
                   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">

trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java

@@ -125 +125 @@
                 test("building", "entrance").
                 alternative("entrance"));
+        // Useless tag proposed in internal preset for years
+        // see #9213
+        checks.add(new DeprecationCheck(2124).
+                testAndRemove("board_type", "board"));
     }