Include values with negative match and update taginfo information

Mannivu · Mar 28, 2019 · 6e7287f · 6e7287f
1 parent dc44b1a
commit 6e7287f
Show file tree

Hide file tree

Showing 2 changed files with 1,889 additions and 115 deletions.
diff --git a/src/main/java/de/blau/android/presets/Preset.java b/src/main/java/de/blau/android/presets/Preset.java
@@ -120,7 +120,7 @@
 public class Preset implements Serializable {
 
     private static final String USE_LAST_AS_DEFAULT        = "use_last_as_default";
-    private static final String PO_EXT                         = ".po";
+    private static final String PO_EXT                     = ".po";
     private static final String DEFAULT_PRESET_TRANSLATION = "preset_";
     private static final String NO                         = "no";
     private static final String VALUE_TYPE                 = "value_type";
@@ -3819,7 +3819,8 @@ public String toJSON() {
                     }
                     jsonString.append(tagToJSON(presetName, k, null));
                 }
-                if (!isEditable(k) && field instanceof PresetComboField && (match == null || match == MatchType.KEY_VALUE || match == MatchType.KEY)) {
+                if (!isEditable(k) && field instanceof PresetComboField
+                        && (match == null || match == MatchType.KEY_VALUE || match == MatchType.KEY || match == MatchType.KEY_VALUE_NEG)) {
                     for (StringWithDescription v : ((PresetComboField) entry.getValue()).getValues()) {
                         if (jsonString.length() != 0) {
                             jsonString.append(",\n");