From ae1d4fd5d956dfb873aa1058f40d8efa9625fad8 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Sun, 19 Jun 2016 13:14:36 +0300
Subject: [PATCH] Render theme XSD improvements / fixes, closes #26

---
 resources/rendertheme.xsd                    | 13 +++++++++----
 vtm/src/org/oscim/theme/XmlThemeBuilder.java |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/resources/rendertheme.xsd b/resources/rendertheme.xsd
index d03a1740..c01e09e9 100644
--- a/resources/rendertheme.xsd
+++ b/resources/rendertheme.xsd
@@ -36,6 +36,7 @@
     <xs:restriction base="xs:string">
       <xs:enumeration value="first" />
       <xs:enumeration value="any" />
+      <xs:enumeration value="when-matched" />
     </xs:restriction>
   </xs:simpleType>
   
@@ -116,7 +117,7 @@
   </xs:complexType>
 
   <xs:complexType name="circle">
-    <xs:attribute name="r" type="tns:nonNegativeFloat" use="required" />
+    <xs:attribute name="radius" type="tns:nonNegativeFloat" use="required" />
     <xs:attribute name="scale-radius" type="xs:boolean" use="optional" default="false" />
     <xs:attribute name="fill" type="tns:color" use="optional" default="#00000000" />
     <xs:attribute name="stroke" type="tns:color" use="optional" default="#00000000" />
@@ -225,10 +226,14 @@
 
   </xs:complexType>
 
+  <xs:complexType name="atlasRect">
+    <xs:attribute name="id" type="xs:string" use="required" />
+    <xs:attribute name="pos" type="xs:string" use="required" />
+  </xs:complexType>
+
   <xs:complexType name="atlas">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <!-- TODO -->
-      <xs:element name="rect"></xs:element>
+      <xs:element name="rect" type="tns:atlasRect" />
     </xs:choice>
     <xs:attribute name="img" type="xs:string" use="required" />
   </xs:complexType>
@@ -259,7 +264,7 @@
     <xs:attribute name="version" type="xs:positiveInteger" use="required" />
     <xs:attribute name="map-background" type="tns:color" use="optional" default="#ffffff" />
     <xs:attribute name="base-stroke-width" type="tns:nonNegativeFloat" use="optional" default="1" />
-    <xs:attribute name="base-text-size" type="tns:nonNegativeFloat" use="optional" default="1" />
+    <xs:attribute name="base-text-scale" type="tns:nonNegativeFloat" use="optional" default="1" />
   </xs:complexType>
 
 
diff --git a/vtm/src/org/oscim/theme/XmlThemeBuilder.java b/vtm/src/org/oscim/theme/XmlThemeBuilder.java
index 7c8fc8e0..05fee70e 100644
--- a/vtm/src/org/oscim/theme/XmlThemeBuilder.java
+++ b/vtm/src/org/oscim/theme/XmlThemeBuilder.java
@@ -1,6 +1,7 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
  * Copyright 2013 Hannes Janetzek
+ * Copyright 2016 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -812,7 +813,7 @@ public class XmlThemeBuilder extends DefaultHandler {
 				logUnknownAttribute(elementName, name, value, i);
 		}
 
-		validateExists("r", radius, elementName);
+		validateExists("radius", radius, elementName);
 		validateNonNegative("radius", radius);
 		validateNonNegative("stroke-width", strokeWidth);