0.7.0

docs/Changelog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 0.7.0 (2017-02-26)
+
+- Same as 0.7.0-rc2
+
+### Version 0.7.0-rc2 (2017-02-20)
+
+- Fix theme parsing in non-Latin locales [#297](https://github.com/mapsforge/vtm/issues/297)
+
 ### Version 0.7.0-rc1 (2017-02-16)
 
 - Mapsforge multiple map files [#208](https://github.com/mapsforge/vtm/issues/208)

vtm-android-example/build.gradle

@@ -4,11 +4,13 @@ dependencies {
     compile project(':vtm-android')
     compile project(':vtm-extras')
     compile project(':vtm-http')
-    compile project(':vtm-jeo')
+    compile(project(':vtm-jeo')) {
+        exclude group: 'com.vividsolutions', module: 'jts'
+    }
     compile project(':vtm-jts')
     compile project(':vtm-themes')
     compile 'com.noveogroup.android:android-logger:1.3.6'
-    compile 'com.android.support:support-v4:25.1.1'
+    compile 'com.android.support:support-v4:25.2.0'
 }
 
 android {

vtm-extras/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     compile project(':vtm')
     compile 'com.fasterxml.jackson.core:jackson-core:2.8.4'
     compile 'com.google.protobuf:protobuf-java:2.6.1'
-    compile 'com.vividsolutions:jts:1.13'
+    compile 'com.vividsolutions:jts-core:1.14.0'
     compile 'org.openstreetmap.osmosis:osmosis-osm-binary:0.45'
 }
 

vtm-jts/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'maven'
 
 dependencies {
     compile project(':vtm')
-    compile 'com.vividsolutions:jts:1.13'
+    compile 'com.vividsolutions:jts-core:1.14.0'
 }
 
 sourceSets {

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

@@ -1,7 +1,7 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
  * Copyright 2013 Hannes Janetzek
- * Copyright 2016 devemux86
+ * Copyright 2016-2017 devemux86
  * Copyright 2016 Longri
  * Copyright 2016 Andrey Novikov
  *
@@ -375,7 +375,7 @@ public class XmlThemeBuilder extends DefaultHandler {
             String value = attributes.getValue(i);
 
             if ("e".equals(name)) {
-                String val = value.toUpperCase();
+                String val = value.toUpperCase(Locale.ENGLISH);
                 if ("WAY".equals(val))
                     element = Rule.Element.WAY;
                 else if ("NODE".equals(val))
@@ -387,7 +387,7 @@ public class XmlThemeBuilder extends DefaultHandler {
             } else if ("cat".equals(name)) {
                 cat = value;
             } else if ("closed".equals(name)) {
-                String val = value.toUpperCase();
+                String val = value.toUpperCase(Locale.ENGLISH);
                 if ("YES".equals(val))
                     closed = Closed.YES;
                 else if ("NO".equals(val))
@@ -514,7 +514,7 @@ public class XmlThemeBuilder extends DefaultHandler {
                         b.strokeWidth = 1;
                 }
             } else if ("cap".equals(name) || "stroke-linecap".equals(name))
-                b.cap = Cap.valueOf(value.toUpperCase());
+                b.cap = Cap.valueOf(value.toUpperCase(Locale.ENGLISH));
 
             else if ("fix".equals(name))
                 b.fixed = parseBoolean(value);
@@ -894,10 +894,10 @@ public class XmlThemeBuilder extends DefaultHandler {
                 b.textKey = value.intern();
 
             else if ("font-family".equals(name))
-                b.fontFamily = FontFamily.valueOf(value.toUpperCase());
+                b.fontFamily = FontFamily.valueOf(value.toUpperCase(Locale.ENGLISH));
 
             else if ("style".equals(name))
-                b.fontStyle = FontStyle.valueOf(value.toUpperCase());
+                b.fontStyle = FontStyle.valueOf(value.toUpperCase(Locale.ENGLISH));
 
             else if ("size".equals(name))
                 b.fontSize = Float.parseFloat(value);