Changeset 4218 in josm for trunk/data

Timestamp:

2011-07-09T21:54:22+02:00 (14 years ago)

Author:

stoecker

Message:

introduce force parameter for use_last_as_default and fix default value handling for multiselect

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (4 diffs)
• tagging-preset.xsd (modified) (5 diffs)

trunk/data/defaultpresets.xml

@@ -31 +31 @@
   default: default string to display
   delete_if_empty: true/false
-  use_last_as_default: true/false
+  use_last_as_default: true/false/force
 
 combo: combo box, with multiple choices and possible to enter free form text
@@ -48 +48 @@
   default: default string to display
   delete_if_empty: true/false
-  use_last_as_default: true/false
+  use_last_as_default: true/false/force
 
 multiselect: list of values from which zero or more can be selected
@@ -68 +68 @@
   default: default string to display
   delete_if_empty: true/false
-  use_last_as_default: true/false
+  use_last_as_default: true/false/force
 
 check: checkbox
@@ -4068 +4068 @@
             <optional>
                 <text key="addr:housename" text="House name" default="" delete_if_empty="true" />
-                <text key="addr:street" text="Street name" use_last_as_default="true" delete_if_empty="true" />
-                <text key="addr:city" text="City name" use_last_as_default="true" delete_if_empty="true" />
-                <text key="addr:postcode" text="Post code" use_last_as_default="true" delete_if_empty="true" />
-                <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="true" delete_if_empty="true" />
+                <text key="addr:street" text="Street name" use_last_as_default="force" delete_if_empty="true" />
+                <text key="addr:city" text="City name" use_last_as_default="force" delete_if_empty="true" />
+                <text key="addr:postcode" text="Post code" use_last_as_default="force" delete_if_empty="true" />
+                <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="force" delete_if_empty="true" />
             </optional>
         </item>

trunk/data/tagging-preset.xsd

@@ -114 +114 @@
                 <attribute name="default" type="string" />
                 <attribute name="delete_if_empty" type="boolean" />
-                <attribute name="use_last_as_default" type="boolean" />
+                <attribute name="use_last_as_default" type="tns:last_default" />
                 <attribute name="required" type="boolean" />
 
@@ -136 +136 @@
                 <attribute name="display_values" type="string" />
                 <attribute name="default" type="string" />
+                <attribute name="use_last_as_default" type="tns:last_default" />
                 <attribute name="editable" type="boolean" />
                 <attribute name="delete_if_empty" type="boolean" />
@@ -156 +157 @@
                 <attribute name="display_values" type="string" />
                 <attribute name="default" type="string" />
+                <attribute name="use_last_as_default" type="tns:last_default" />
                 <attribute name="delimiter" type="string" />
                 <attribute name="delete_if_empty" type="boolean" />
@@ -173 +175 @@
                 <attribute name="text_context" type="string" />
                 <attribute name="default" type="tns:check_default" />
-                <attribute name="use_last_as_default" type="boolean" />
                 <attribute name="required" type="boolean" />
                 <attribute name="value_on" type="string" />
@@ -191 +192 @@
         </simpleType>
 
+        <simpleType name="last_default">
+                <restriction base="string">
+                        <enumeration value="true" />
+                        <enumeration value="false" />
+                        <enumeration value="force" />
+                </restriction>
+        </simpleType>
+
         <complexType name="roles">
                 <sequence>