Changeset 3279 in josm

Timestamp:

May 24, 2010 11:36:44 PM (3 years ago)

Author:

stoecker

Message:

fix #4192 - allow definition of true/false values in presets

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (4 diffs)

trunk/data/defaultpresets.xml

@@ -45 +45 @@
   default: ticked on/off
   delete_if_empty: true/false
+  value_on: the value to set when checked (default is "yes")
+  value_off: the value to set when unchecked (default is 'no')
 
 For external files the <annotations> should have following elements:
@@ -1330 +1332 @@
             <combo key="operator" text="Operator" values="Agip,Aral,Avia,BP,Esso,OMV,Q8,Repsol,Shell,Statoil,Tamoil,Texaco,Total,Indipend." default="" delete_if_empty="true" />
             <optional>
-                                <text key="name" text="Name" default="" delete_if_empty="true" />
-                                <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" default="" delete_if_empty="true" />
-                                <label text="Fuel types:" />
-                                <check key="fuel:diesel" text="Diesel" default="off" delete_if_empty="true" />
-                                <check key="fuel:biodiesel" text="Bio Diesel" default="off" delete_if_empty="true" />
-                                <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" delete_if_empty="true" />
-                                <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" delete_if_empty="true" />
-                                <check key="fuel:octane_91" text="Octane 91" default="off" delete_if_empty="true" />
-                                <check key="fuel:octane_95" text="Octane 95" default="off" delete_if_empty="true" />
-                                <check key="fuel:octane_98" text="Octane 98" default="off" delete_if_empty="true" />
-                                <check key="fuel:octane_100" text="Octane 100" default="off" delete_if_empty="true" />
-                                <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" delete_if_empty="true" />
-                                <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" delete_if_empty="true" />
-                                <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" delete_if_empty="true" />
-                                <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" delete_if_empty="true" />
-                                <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" delete_if_empty="true" />
-                                <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" delete_if_empty="true" />
+                <text key="name" text="Name" default="" delete_if_empty="true" />
+                <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" default="" delete_if_empty="true" />
+                <label text="Fuel types:" />
+                <check key="fuel:diesel" text="Diesel" default="off" delete_if_empty="true" />
+                <check key="fuel:biodiesel" text="Bio Diesel" default="off" delete_if_empty="true" />
+                <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" delete_if_empty="true" />
+                <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" delete_if_empty="true" />
+                <check key="fuel:octane_91" text="Octane 91" default="off" delete_if_empty="true" />
+                <check key="fuel:octane_95" text="Octane 95" default="off" delete_if_empty="true" />
+                <check key="fuel:octane_98" text="Octane 98" default="off" delete_if_empty="true" />
+                <check key="fuel:octane_100" text="Octane 100" default="off" delete_if_empty="true" />
+                <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" delete_if_empty="true" />
+                <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" delete_if_empty="true" />
+                <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" delete_if_empty="true" />
+                <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" delete_if_empty="true" />
+                <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" delete_if_empty="true" />
+                <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" delete_if_empty="true" />
+                <check key="shop" text="With kiosk" value_on="kiosk" value_off="" default="off" delete_if_empty="true" />
             </optional>
         </item>
@@ -2213 +2216 @@
             <key key="amenity" value="post_office" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+        <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
         <separator/>
@@ -2425 +2428 @@
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
             <text key="ref" text="Line reference" default="" delete_if_empty="true" />
-                        <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+            <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
             <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" default="" delete_if_empty="true" />
             <text key="cables" text="Amount of Cables" default="" delete_if_empty="true" />

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -224 +224 @@
         public String text_context;
         public String locale_text;
+        public String value_on = OsmUtils.trueval;
+        public String value_off = OsmUtils.falseval;
         public boolean default_ = false; // only used for tagless objects
         public boolean use_last_as_default = false;
@@ -249 +251 @@
                 oneValue = s;
             }
-            if (usage.values.size() < 2 && (oneValue == null || OsmUtils.trueval.equals(oneValue) || OsmUtils.falseval.equals(oneValue))) {
+            if (usage.values.size() < 2 && (oneValue == null || value_on.equals(oneValue) || value_off.equals(oneValue))) {
                 if(def)
                 {
@@ -260 +262 @@
                 // all selected objects share the same value which is either true or false or unset,
                 // we can display a standard check box.
-                initialState = OsmUtils.trueval.equals(oneValue) ?
+                initialState = value_on.equals(oneValue) ?
                         QuadStateCheckBox.State.SELECTED :
-                            OsmUtils.falseval.equals(oneValue) ?
+                            value_off.equals(oneValue) ?
                                     QuadStateCheckBox.State.NOT_SELECTED :
                                         def ? QuadStateCheckBox.State.SELECTED
@@ -294 +296 @@
             // otherwise change things according to the selected value.
             cmds.add(new ChangePropertyCommand(sel, key,
-                    check.getState() == QuadStateCheckBox.State.SELECTED ? OsmUtils.trueval :
-                        check.getState() == QuadStateCheckBox.State.NOT_SELECTED ? OsmUtils.falseval :
+                    check.getState() == QuadStateCheckBox.State.SELECTED ? value_on :
+                        check.getState() == QuadStateCheckBox.State.NOT_SELECTED ? value_off :
                             null));
         }