From 60aa9600d87b6785c558a2886072e2fc30a6dfc6 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Thu, 28 Sep 2017 14:41:59 +0300
Subject: [PATCH] Render themes: rule types order, fix #418

---
 .../oscim/theme/XmlMapsforgeThemeBuilder.java |  2 +-
 vtm/src/org/oscim/theme/rule/RuleBuilder.java | 42 ++++++++-----------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/vtm/src/org/oscim/theme/XmlMapsforgeThemeBuilder.java b/vtm/src/org/oscim/theme/XmlMapsforgeThemeBuilder.java
index 99ca271c..37532544 100644
--- a/vtm/src/org/oscim/theme/XmlMapsforgeThemeBuilder.java
+++ b/vtm/src/org/oscim/theme/XmlMapsforgeThemeBuilder.java
@@ -429,7 +429,7 @@ public class XmlMapsforgeThemeBuilder extends DefaultHandler {
         if (zoomMin > zoomMax)
             throw new ThemeException("zoom-min must be less or equal zoom-max: " + zoomMin);
 
-        RuleBuilder b = RuleBuilder.create(keys, values, true);
+        RuleBuilder b = RuleBuilder.create(keys, values);
         b.cat(cat);
         b.zoom(zoomMin, zoomMax);
         b.element(element);
diff --git a/vtm/src/org/oscim/theme/rule/RuleBuilder.java b/vtm/src/org/oscim/theme/rule/RuleBuilder.java
index 6e8720b5..8faeb2ad 100644
--- a/vtm/src/org/oscim/theme/rule/RuleBuilder.java
+++ b/vtm/src/org/oscim/theme/rule/RuleBuilder.java
@@ -28,7 +28,9 @@ import org.oscim.theme.styles.RenderStyle;
 import org.oscim.theme.styles.RenderStyle.StyleBuilder;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
 public class RuleBuilder {
 
@@ -85,45 +87,35 @@ public class RuleBuilder {
         this.values = EMPTY_KV;
     }
 
-    public static RuleBuilder create(String keys, String values) {
-        return create(keys, values, false);
-    }
-
-    /**
-     * Mapsforge themes don't support (-) 'exclusive negation'.
-     */
-    public static RuleBuilder create(String keys, String values, boolean isMapsforge) {
-
-        String[] keyList = EMPTY_KV;
-        String[] valueList = EMPTY_KV;
+    public static RuleBuilder create(String k, String v) {
+        String[] keys = EMPTY_KV;
+        String[] values = EMPTY_KV;
         RuleType type = RuleType.POSITIVE;
 
-        if (values != null) {
-            if (values.startsWith(STRING_NEGATION)) {
+        if (v != null) {
+            String[] split = v.split(SEPARATOR);
+            List<String> valueList = new ArrayList<>(Arrays.asList(split));
+            if (valueList.remove(STRING_NEGATION)) {
                 type = RuleType.NEGATIVE;
-                if (values.length() > 2)
-                    valueList = values.substring(2)
-                            .split(SEPARATOR);
-            } else if (values.startsWith(STRING_EXCLUSIVE) && !isMapsforge) {
+                values = valueList.toArray(new String[valueList.size()]);
+            } else if (valueList.remove(STRING_EXCLUSIVE)) {
                 type = RuleType.EXCLUDE;
-                if (values.length() > 2)
-                    valueList = values.substring(2)
-                            .split(SEPARATOR);
+                values = valueList.toArray(new String[valueList.size()]);
             } else {
-                valueList = values.split(SEPARATOR);
+                values = split;
             }
         }
 
-        if (keys != null) {
-            keyList = keys.split(SEPARATOR);
+        if (k != null) {
+            keys = k.split(SEPARATOR);
         }
 
         if (type != RuleType.POSITIVE) {
-            if (keyList == null || keyList.length == 0)
+            if (keys == null || keys.length == 0)
                 throw new ThemeException("negative rule requires key");
         }
 
-        return new RuleBuilder(type, keyList, valueList);
+        return new RuleBuilder(type, keys, values);
     }
 
     public RuleBuilder zoom(byte zoomMin, byte zoomMax) {