ThemeCallback: add getColor with tags (#1251)

Author: devemux86

docs/Changelog.md

@@ -2,6 +2,7 @@
 
 ## Next version
 
+- `ThemeCallback.getColor` method [#1251](https://github.com/mapsforge/vtm/pull/1251)
 - Minor improvements and bug fixes
 - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.27.0)
 

vtm/src/org/oscim/theme/ThemeCallback.java

@@ -32,6 +32,11 @@ public interface ThemeCallback {
      */
     int getColor(RenderStyle origin, int color);
 
+    /**
+     * @return the color-int
+     */
+    int getColor(String[] keys, String[] values, int color);
+
     /**
      * @return the text
      */

vtm/src/org/oscim/theme/XmlThemeBuilder.java

@@ -825,6 +825,13 @@ else if ("symbol-scaling".equals(name))
         if (src != null)
             b.texture = Utils.loadTexture(mTheme.getRelativePathPrefix(), src, mTheme.getResourceProvider(), b.symbolWidth, b.symbolHeight, b.symbolPercent, mThemeCallback);
 
+        if (mThemeCallback != null) {
+            if (mCurrentRule != null) {
+                b.color(mThemeCallback.getColor(mCurrentRule.keys, mCurrentRule.values, b.fillColor));
+                b.strokeColor(mThemeCallback.getColor(mCurrentRule.keys, mCurrentRule.values, b.strokeColor));
+            }
+        }
+
         return b.build();
     }
 

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

@@ -3,7 +3,7 @@
  * Copyright 2016-2017 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.
@@ -18,12 +18,7 @@
 package org.oscim.theme.rule;
 
 import org.oscim.theme.IRenderTheme.ThemeException;
-import org.oscim.theme.rule.Rule.Element;
-import org.oscim.theme.rule.Rule.NegativeRule;
-import org.oscim.theme.rule.Rule.PositiveRuleK;
-import org.oscim.theme.rule.Rule.PositiveRuleKV;
-import org.oscim.theme.rule.Rule.PositiveRuleMultiKV;
-import org.oscim.theme.rule.Rule.PositiveRuleV;
+import org.oscim.theme.rule.Rule.*;
 import org.oscim.theme.styles.RenderStyle;
 import org.oscim.theme.styles.RenderStyle.StyleBuilder;
 
@@ -48,8 +43,8 @@ public enum RuleType {
     int selector;
     RuleType type;
 
-    String keys[];
-    String values[];
+    public String keys[];
+    public String values[];
 
     ArrayList<RenderStyle> renderStyles = new ArrayList<>(4);
     ArrayList<RuleBuilder> subRules = new ArrayList<>(4);