Changeset 5155 in josm for trunk/data

Timestamp:

2012-04-01T19:48:01+02:00 (12 years ago)

Author:

simon04

Message:

fix #5933 - tagging presets: allow to change the matching process (match=none|key|key!|keyvalue), remove delete_if_empty, default defaults to "", adapted comments in defaultpresets.xml, refactoring of the matching process (removes some duplicate code and some magical arithmetic)

File:

• trunk/data/defaultpresets.xml (modified) (5 diffs)

trunk/data/defaultpresets.xml

@@ -25 +25 @@
   key: key to set
   value: value to set
+  match: none/key/key!/keyvalue (default is "ketvalue", see below for more information)
 
 text: text box
   key: key to set
   text: fixed label to display
-  default: default string to display
-  delete_if_empty: true/false
-  use_last_as_default: true/false/force
+  default: default string to display (defaults to "")
+  use_last_as_default: true/false/force (default is "false")
+  match: none/key/key!/keyvalue (default is "none", see below for more information)
 
 combo: combo box, with multiple choices and possible to enter free form text
@@ -46 +47 @@
                                 ...
                         <short_description>last description</short_description>
-  default: default string to display
-  delete_if_empty: true/false
-  use_last_as_default: true/false/force
+  default: default string to display (defaults to "")
+  use_last_as_default: true/false/force (default is "false")
+  match: none/key/key!/keyvalue (default is none, see below for more information)
 
 multiselect: list of values from which zero or more can be selected
@@ -66 +67 @@
                                 ...
                         <short_description>last description</short_description>
-  default: default string to display
-  delete_if_empty: true/false
-  use_last_as_default: true/false/force
+  default: default string to display (defaults to "")
+  use_last_as_default: true/false/force (default is "false")
+  match: none/key/key!/keyvalue (default is "none", see below for more information)
 
 check: checkbox
@@ -74 +75 @@
   text: fixed label to display
   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')
+  value_off: the value to set when unchecked (default is "no")
+  match: none/key/key!/keyvalue (default is "none", see below for more information)
 
 role: type to specify possible roles in relations
@@ -103 +104 @@
 no specific translation has been given in XML file. When no "display_values"
 are supplied, then "values" will be treated as "display_values" and translated instead.
+
+The match attribute allows to change the matching process, i.e., determining whether
+the tags of an OSM object fit into this preset.
+ - none: neutral, i.e., do not consider this item for matching
+ - key: positive if key matches, neutral otherwise
+ - key!: positive if key matches, negative otherwise
+ - keyvalue: positive if key and value matches, negative otherwise
+Note that for a match, at least one positive and no negative is required.
 -->
   <group name="Highways" icon="presets/way_secondary.png">