Changeset 6385 in josm

Timestamp:

2013-11-15T01:43:48+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #8434 - Full support of man_made=monitoring_station instead of man_made=measurement_station:

• rename icon
• update presets
• update map style
• deprecate old tags
• fix a bug in tagchecker where keys defined inside checkgroups were not known from validator

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• images/presets/monitoring_station.png (moved) (moved from trunk/images/presets/measurement_station.png )
• src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (3 diffs)
• styles/standard/elemstyles.xml (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -5244 +5244 @@
             <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />                                                                                        
         </item> 
-        <item name="Measurement Station" icon="presets/measurement_station.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
-            <label text="Edit Measurement Station" />
+        <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station" 
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=monitoring_station"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=monitoring_station" />
+            <label text="Edit Monitoring Station" />
             <space />            
-            <key key="man_made" value="measurement_station" />
+            <key key="man_made" value="monitoring_station" />
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />             
-            <combo key="measurement" text="Measurement" values="particulate_matter,seismic,water_level,weather" />
+            <label text="Monitoring:" />
+            <checkgroup columns="3">
+                <check key="monitoring:weather"          text="Weather" />
+                <check key="monitoring:water_level"      text="Water level" />
+                <check key="monitoring:tide_gauge"       text="Tide Level" />
+                <check key="monitoring:traffic"          text="Traffic" />
+                <check key="monitoring:air_quality"      text="Air Quality" />
+                <check key="monitoring:noise"            text="Noise" />
+                <check key="monitoring:gps"              text="GPS Signals" />
+                <check key="monitoring:glonass"          text="GLONASS Signals" />
+                <check key="monitoring:galileo"          text="Galileo Signals" />
+                <check key="monitoring:radiation"        text="Radiation" />
+                <check key="monitoring:seismic_activity" text="Seismic Activity" />
+            </checkgroup>
             <combo key="recording" text="Recording" values="manually,automated,remote,no" />  
             <combo key="display" text="Display" values="analog,digital,no" />

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

@@ -94 +94 @@
                 testAndRemove("amenity", "emergency_phone").
                 add("emergency", "phone"));
-        // http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football
-        // fix #8132
+        // fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football
         checks.add(new DeprecationCheck(2117).
                 testAndRemove("sport", "gaelic_football").
                 add("sport", "gaelic_games"));
-        // http://wiki.openstreetmap.org/wiki/Tag:power=station
-        // see #8847 / #8961
+        // see #8847 / #8961 - http://wiki.openstreetmap.org/wiki/Tag:power=station
         checks.add(new DeprecationCheck(2118).
                 test("power", "station").
@@ -114 +112 @@
                 testAndRemove("generator:method", "pumping").
                 add("generator:method", "water-pumped-storage"));
-        // http://wiki.openstreetmap.org/wiki/Key:fence_type
-        // see #8962
+        // see #8962 - http://wiki.openstreetmap.org/wiki/Key:fence_type
         checks.add(new DeprecationCheck(2122).
                 test("fence_type", "chain").
                 alternative("barrier", "chain").
                 alternative("fence_type", "chain_link"));
-        // http://wiki.openstreetmap.org/wiki/Key:entrance
-        // see #9000
+        // see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance
         checks.add(new DeprecationCheck(2123).
                 test("building", "entrance").
                 alternative("entrance"));
-        // Useless tag proposed in internal preset for years
-        // see #9213
+        // see #9213 - Useless tag proposed in internal preset for years
         checks.add(new DeprecationCheck(2124).
                 testAndRemove("board_type", "board"));
+        // see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station
+        checks.add(new DeprecationCheck(2125).
+                testAndRemove("man_made", "measurement_station").
+                add("man_made", "monitoring_station"));
+        checks.add(new DeprecationCheck(2126).
+                testAndRemove("measurement", "water_level").
+                add("monitoring:water_level", "yes"));
+        checks.add(new DeprecationCheck(2127).
+                testAndRemove("measurement", "weather").
+                add("monitoring:weather", "yes"));
+        checks.add(new DeprecationCheck(2128).
+                testAndRemove("measurement", "seismic").
+                add("monitoring:seismic_activity", "yes"));
+        checks.add(new DeprecationCheck(2129).
+                test("monitoring:river_level").
+                alternative("monitoring:water_level"));
     }
 

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

@@ -57 +57 @@
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Check;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.CheckGroup;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.KeyedItem;
 import org.openstreetmap.josm.io.MirroredInputStream;
@@ -68 +70 @@
  * @author frsantos
  */
-public class TagChecker extends Test
-{
+public class TagChecker extends Test {
+    
     /** The default data files */
     public static final String DATA_FILE = "resource://data/tagchecker.cfg";
@@ -307 +309 @@
                 for (TaggingPresetItem i : p.data) {
                     if (i instanceof KeyedItem) {
-                        KeyedItem ky = (KeyedItem) i;
-                        if (ky.key != null && ky.getValues() != null) {
-                            try {
-                                presetsValueData.putAll(ky.key, ky.getValues());
-                            } catch (NullPointerException e) {
-                                Main.error(p+": Unable to initialize "+ky);
-                            }
+                        addPresetValue(p, (KeyedItem) i);
+                    } else if (i instanceof CheckGroup) {
+                        for (Check c : ((CheckGroup) i).checks) {
+                            addPresetValue(p, c);
                         }
                     }
                 }
+            }
+        }
+    }
+
+    private static void addPresetValue(TaggingPreset p, KeyedItem ky) {
+        if (ky.key != null && ky.getValues() != null) {
+            try {
+                presetsValueData.putAll(ky.key, ky.getValues());
+            } catch (NullPointerException e) {
+                Main.error(p+": Unable to initialize "+ky);
             }
         }

trunk/styles/standard/elemstyles.xml

@@ -1416 +1416 @@
 
         <rule>
-                <condition k="man_made" v="measurement_station"/>
+                <condition k="man_made" v="monitoring_station"/>
                 <icon annotate="true" src="misc/landmark/measurement_station.png"/>
                 <area colour="manmade#d8d8d8"/>