Negative rule improvement

Author: devemux86

docs/Changelog.md

@@ -2,6 +2,7 @@
 
 ## Next version
 
+- Negative rule improvement [#1270](https://github.com/mapsforge/vtm/pull/1270)
 - Render themes: `map-background-outside` [#1262](https://github.com/mapsforge/vtm/pull/1262)
 - `ThemeCallback.getColor` method [#1251](https://github.com/mapsforge/vtm/pull/1251)
 - Map theme improvements

vtm/src/org/oscim/theme/rule/Rule.java

@@ -3,7 +3,7 @@
  * Copyright 2016 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
- * 
+ *
  * This program is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software
  * Foundation, either version 3 of the License, or (at your option) any later version.
@@ -318,10 +318,16 @@ public boolean matchesTags(Tag[] tags) {
             if (!containsKeys(tags))
                 return true;
 
-            for (Tag tag : tags)
-                for (String value : values)
-                    if (Utils.equals(value, tag.value))
-                        return !exclusive;
+            for (Tag tag : tags) {
+                for (String key : keys) {
+                    if (Utils.equals(key, tag.key)) {
+                        for (String value : values) {
+                            if (Utils.equals(value, tag.value))
+                                return !exclusive;
+                        }
+                    }
+                }
+            }
 
             return exclusive;
         }