From a3e82be9175f18268cb273b7d0febb683d454178 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Fri, 7 Jun 2013 02:07:33 +0200
Subject: [PATCH] changed 'fixed' line option to 'fix'

---
 src/org/oscim/theme/renderTheme.xsd           | 460 ++++++++----------
 .../oscim/theme/renderinstruction/Line.java   |   2 +-
 2 files changed, 215 insertions(+), 247 deletions(-)

diff --git a/src/org/oscim/theme/renderTheme.xsd b/src/org/oscim/theme/renderTheme.xsd
index e59f6c0f..c23fa72e 100644
--- a/src/org/oscim/theme/renderTheme.xsd
+++ b/src/org/oscim/theme/renderTheme.xsd
@@ -1,272 +1,240 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://mapsforge.org/renderTheme" xmlns:tns="http://mapsforge.org/renderTheme"
-	elementFormDefault="qualified" xml:lang="en">
-	<!-- attribute types -->
-	<xs:simpleType name="cap">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="butt" />
-			<xs:enumeration value="round" />
-			<xs:enumeration value="square" />
-		</xs:restriction>
-	</xs:simpleType>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://mapsforge.org/renderTheme"
+  xmlns:tns="http://mapsforge.org/renderTheme" elementFormDefault="qualified" xml:lang="en">
+  <!-- attribute types -->
+  <xs:simpleType name="cap">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="butt" />
+      <xs:enumeration value="round" />
+      <xs:enumeration value="square" />
+    </xs:restriction>
+  </xs:simpleType>
 
-	<xs:simpleType name="closed">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="yes" />
-			<xs:enumeration value="no" />
-			<xs:enumeration value="any" />
-		</xs:restriction>
-	</xs:simpleType>
+  <xs:simpleType name="closed">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="yes" />
+      <xs:enumeration value="no" />
+      <xs:enumeration value="any" />
+    </xs:restriction>
+  </xs:simpleType>
 
-	<xs:simpleType name="color">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="#([0-9a-fA-F]{6}|[0-9a-fA-F]{8})" />
-		</xs:restriction>
-	</xs:simpleType>
+  <xs:simpleType name="color">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="#([0-9a-fA-F]{6}|[0-9a-fA-F]{8})" />
+    </xs:restriction>
+  </xs:simpleType>
 
-	<xs:simpleType name="elementList">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="node" />
-			<xs:enumeration value="way" />
-			<xs:enumeration value="any" />
-		</xs:restriction>
-	</xs:simpleType>
+  <xs:simpleType name="elementList">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="node" />
+      <xs:enumeration value="way" />
+      <xs:enumeration value="any" />
+    </xs:restriction>
+  </xs:simpleType>
 
-	<xs:simpleType name="fontFamily">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="default" />
-			<xs:enumeration value="default_bold" />
-			<xs:enumeration value="monospace" />
-			<xs:enumeration value="sans_serif" />
-			<xs:enumeration value="serif" />
-		</xs:restriction>
-	</xs:simpleType>
+  <xs:simpleType name="fontFamily">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="default" />
+      <xs:enumeration value="default_bold" />
+      <xs:enumeration value="monospace" />
+      <xs:enumeration value="sans_serif" />
+      <xs:enumeration value="serif" />
+    </xs:restriction>
+  </xs:simpleType>
 
-	<xs:simpleType name="fontStyle">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="bold" />
-			<xs:enumeration value="bold_italic" />
-			<xs:enumeration value="italic" />
-			<xs:enumeration value="normal" />
-		</xs:restriction>
-	</xs:simpleType>
+  <xs:simpleType name="fontStyle">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="bold" />
+      <xs:enumeration value="bold_italic" />
+      <xs:enumeration value="italic" />
+      <xs:enumeration value="normal" />
+    </xs:restriction>
+  </xs:simpleType>
 
-	<xs:simpleType name="nonNegativeFloat">
-		<xs:restriction base="xs:float">
-			<xs:minInclusive value="0" />
-		</xs:restriction>
-	</xs:simpleType>
+  <xs:simpleType name="nonNegativeFloat">
+    <xs:restriction base="xs:float">
+      <xs:minInclusive value="0" />
+    </xs:restriction>
+  </xs:simpleType>
 
-	<xs:simpleType name="src">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="(jar|file)\:.+" />
-		</xs:restriction>
-	</xs:simpleType>
+  <xs:simpleType name="src">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="(jar|file)\:.+" />
+    </xs:restriction>
+  </xs:simpleType>
 
-	<xs:simpleType name="strokeDasharray">
-		<xs:restriction base="xs:string">
-			<xs:pattern
-				value="([0-9]+(\.[0-9]+)? *, *[0-9]+(\.[0-9]+)? *, *)*[0-9]+(\.[0-9]+)? *, *[0-9]+(\.[0-9]+)?" />
-		</xs:restriction>
-	</xs:simpleType>
+  <xs:simpleType name="strokeDasharray">
+    <xs:restriction base="xs:string">
+      <xs:pattern
+        value="([0-9]+(\.[0-9]+)? *, *[0-9]+(\.[0-9]+)? *, *)*[0-9]+(\.[0-9]+)? *, *[0-9]+(\.[0-9]+)?" />
+    </xs:restriction>
+  </xs:simpleType>
 
-	<xs:simpleType name="textKey">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ele" />
-			<xs:enumeration value="addr:housenumber" />
-			<xs:enumeration value="name" />
-			<xs:enumeration value="ref" />
-		</xs:restriction>
-	</xs:simpleType>
+  <xs:simpleType name="textKey">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="ele" />
+      <xs:enumeration value="addr:housenumber" />
+      <xs:enumeration value="name" />
+      <xs:enumeration value="ref" />
+    </xs:restriction>
+  </xs:simpleType>
 
 
-	<!-- rendering instructions -->
-	<xs:complexType name="area">
-			<xs:attribute name="name" type="xs:string" use="optional"
-			default="0" />
-		<xs:attribute name="src" type="tns:src" use="optional" />
-		<xs:attribute name="fill" type="tns:color" use="optional"
-			default="#000000" />
-		<xs:attribute name="stroke" type="tns:color" use="optional"
-			default="#00000000" />
-		<xs:attribute name="stroke-width" type="tns:nonNegativeFloat"
-			use="optional" default="0" />
-		<xs:attribute name="fade" type="xs:integer" use="optional"
-			default="-1" />
-		<xs:attribute name="blend" type="xs:integer" use="optional"
-			default="-1" />
-		<xs:attribute name="blend-fill" type="tns:color" use="optional"
-			default="#000000" />
-	</xs:complexType>
+  <!-- rendering instructions -->
+  <xs:complexType name="area">
+    <xs:attribute name="name" type="xs:string" use="optional" default="0" />
+    <xs:attribute name="src" type="tns:src" use="optional" />
+    <xs:attribute name="fill" type="tns:color" use="optional" default="#000000" />
+    <xs:attribute name="stroke" type="tns:color" use="optional" default="#00000000" />
+    <xs:attribute name="stroke-width" type="tns:nonNegativeFloat" use="optional"
+      default="0" />
+    <xs:attribute name="fade" type="xs:integer" use="optional" default="-1" />
+    <xs:attribute name="blend" type="xs:integer" use="optional" default="-1" />
+    <xs:attribute name="blend-fill" type="tns:color" use="optional" default="#000000" />
+  </xs:complexType>
 
-	<xs:complexType name="caption">
-		<xs:attribute name="k" type="tns:textKey" use="required" />
-		<xs:attribute name="dy" type="xs:float" use="optional"
-			default="0" />
-		<xs:attribute name="font-family" type="tns:fontFamily"
-			use="optional" default="default" />
-		<xs:attribute name="font-style" type="tns:fontStyle" use="optional"
-			default="normal" />
-		<xs:attribute name="font-size" type="tns:nonNegativeFloat"
-			use="optional" default="0" />
-		<xs:attribute name="fill" type="tns:color" use="optional"
-			default="#000000" />
-		<xs:attribute name="stroke" type="tns:color" use="optional"
-			default="#000000" />
-		<xs:attribute name="stroke-width" type="tns:nonNegativeFloat"
-			use="optional" default="0" />
-	</xs:complexType>
+  <xs:complexType name="caption">
+    <xs:attribute name="k" type="tns:textKey" use="required" />
+    <xs:attribute name="dy" type="xs:float" use="optional" default="0" />
+    <xs:attribute name="font-family" type="tns:fontFamily" use="optional"
+      default="default" />
+    <xs:attribute name="font-style" type="tns:fontStyle" use="optional"
+      default="normal" />
+    <xs:attribute name="font-size" type="tns:nonNegativeFloat" use="optional"
+      default="0" />
+    <xs:attribute name="fill" type="tns:color" use="optional" default="#000000" />
+    <xs:attribute name="stroke" type="tns:color" use="optional" default="#000000" />
+    <xs:attribute name="stroke-width" type="tns:nonNegativeFloat" use="optional"
+      default="0" />
+  </xs:complexType>
 
-	<xs:complexType name="circle">
-		<xs:attribute name="r" 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" />
-		<xs:attribute name="stroke-width" type="tns:nonNegativeFloat"
-			use="optional" default="0" />
-	</xs:complexType>
+  <xs:complexType name="circle">
+    <xs:attribute name="r" 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" />
+    <xs:attribute name="stroke-width" type="tns:nonNegativeFloat" use="optional"
+      default="0" />
+  </xs:complexType>
 
-	<xs:complexType name="line">
-		<!-- named style -->
-		<xs:attribute name="name" type="xs:string" use="optional"
-			default="0" />
-		<!-- inherited style -->
-		<xs:attribute name="from" type="xs:string" use="optional"
-			default="0" />
-		<xs:attribute name="src" type="tns:src" use="optional" />
-		<xs:attribute name="stroke" type="tns:color" use="optional"
-			default="#000000" />
-		<xs:attribute name="width" type="xs:float"
-			use="optional" default="0" />
-		<!-- minimum scaled width to draw outline -->
-		<xs:attribute name="min" type="xs:float"
-			use="optional" default="0" />
-		<xs:attribute name="stroke-dasharray" type="tns:strokeDasharray"
-			use="optional" />
-		<xs:attribute name="cap" type="tns:cap" use="optional"
-			default="round" />
-		<xs:attribute name="outline" type="xs:integer" use="optional"
-			default="0" />
-		<xs:attribute name="fade" type="xs:integer" use="optional"
-			default="-1" />
-		<xs:attribute name="blur" type="xs:float" use="optional"
-			default="-1" />
-		<xs:attribute name="fixed" type="xs:boolean" use="optional"
-			default="false" />
-	</xs:complexType>
+  <xs:complexType name="line">
+    <!-- named style -->
+    <xs:attribute name="name" type="xs:string" use="optional" default="0" />
+    <!-- inherited style -->
+    <xs:attribute name="from" type="xs:string" use="optional" default="0" />
+    <xs:attribute name="src" type="tns:src" use="optional" />
+    <xs:attribute name="stroke" type="tns:color" use="optional" default="#000000" />
+    <xs:attribute name="width" type="xs:float" use="optional" default="0" />
+    <!-- minimum scaled width to draw outline -->
+    <xs:attribute name="min" type="xs:float" use="optional" default="0" />
+    <xs:attribute name="stroke-dasharray" type="tns:strokeDasharray" use="optional" />
+    <xs:attribute name="cap" type="tns:cap" use="optional" default="round" />
+    <xs:attribute name="outline" type="xs:integer" use="optional" default="0" />
+    <xs:attribute name="fade" type="xs:integer" use="optional" default="-1" />
+    <xs:attribute name="blur" type="xs:float" use="optional" default="-1" />
+    <xs:attribute name="fix" type="xs:boolean" use="optional" default="false" />
+  </xs:complexType>
 
-<!--  <xs:complexType name="outline">
-		<xs:attribute name="name" type="xs:string" use="optional"
-			default="0" />
-		<xs:attribute name="src" type="tns:src" use="optional" />
-		<xs:attribute name="stroke" type="tns:color" use="optional"
-			default="#000000" />
-		<xs:attribute name="stroke-width" type="tns:nonNegativeFloat"
-			use="optional" default="0" />
-	</xs:complexType>
--->
-	<xs:complexType name="lineSymbol">
-		<xs:attribute name="src" type="tns:src" use="required" />
-		<xs:attribute name="align-center" type="xs:boolean" use="optional"
-			default="false" />
-		<xs:attribute name="repeat" type="xs:boolean" use="optional"
-			default="false" />
-	</xs:complexType>
+  <!-- <xs:complexType name="outline">
+    <xs:attribute name="name" type="xs:string" use="optional"
+    default="0" />
+    <xs:attribute name="src" type="tns:src" use="optional" />
+    <xs:attribute name="stroke" type="tns:color" use="optional"
+    default="#000000" />
+    <xs:attribute name="stroke-width" type="tns:nonNegativeFloat"
+    use="optional" default="0" />
+    </xs:complexType>
+  -->
+  <xs:complexType name="lineSymbol">
+    <xs:attribute name="src" type="tns:src" use="required" />
+    <xs:attribute name="align-center" type="xs:boolean" use="optional"
+      default="false" />
+    <xs:attribute name="repeat" type="xs:boolean" use="optional" default="false" />
+  </xs:complexType>
 
-	<xs:complexType name="text">
-		<xs:attribute name="name" type="xs:string" use="optional"
-			default="0" />
-		<xs:attribute name="style" type="xs:string" use="optional"
-			default="0" />
-		<xs:attribute name="k" type="tns:textKey" use="optional" default="name"/>
-		<xs:attribute name="dy" type="xs:float" use="optional"
-			default="0" />
-		<xs:attribute name="font-family" type="tns:fontFamily"
-			use="optional" default="default" />
-		<xs:attribute name="font-style" type="tns:fontStyle" use="optional"
-			default="normal" />
-		<xs:attribute name="font-size" type="tns:nonNegativeFloat"
-			use="optional" default="0" />
-		<xs:attribute name="fill" type="tns:color" use="optional"
-			default="#000000" />
-		<xs:attribute name="stroke" type="tns:color" use="optional"
-			default="#000000" />
-		<xs:attribute name="stroke-width" type="tns:nonNegativeFloat"
-			use="optional" default="0" />
-		<xs:attribute name="caption" type="xs:boolean" use="optional"
-			default="false" />
-	</xs:complexType>
+  <xs:complexType name="text">
+    <xs:attribute name="name" type="xs:string" use="optional" default="0" />
+    <xs:attribute name="style" type="xs:string" use="optional" default="0" />
+    <xs:attribute name="k" type="tns:textKey" use="optional" default="name" />
+    <xs:attribute name="dy" type="xs:float" use="optional" default="0" />
+    <xs:attribute name="font-family" type="tns:fontFamily" use="optional"
+      default="default" />
+    <xs:attribute name="font-style" type="tns:fontStyle" use="optional"
+      default="normal" />
+    <xs:attribute name="font-size" type="tns:nonNegativeFloat" use="optional"
+      default="0" />
+    <xs:attribute name="fill" type="tns:color" use="optional" default="#000000" />
+    <xs:attribute name="stroke" type="tns:color" use="optional" default="#000000" />
+    <xs:attribute name="stroke-width" type="tns:nonNegativeFloat" use="optional"
+      default="0" />
+    <xs:attribute name="caption" type="xs:boolean" use="optional" default="false" />
+  </xs:complexType>
 
-	<xs:complexType name="symbol">
-		<xs:attribute name="src" type="tns:src" use="required" />
-	</xs:complexType>
+  <xs:complexType name="symbol">
+    <xs:attribute name="src" type="tns:src" use="required" />
+  </xs:complexType>
 
 
-	<!-- rule elements -->
-	<xs:complexType name="rule">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<!-- recursion to allow for nested rules -->
-			<xs:element name="rule" type="tns:rule" />
+  <!-- rule elements -->
+  <xs:complexType name="rule">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <!-- recursion to allow for nested rules -->
+      <xs:element name="rule" type="tns:rule" />
 
-			<xs:element name="area" type="tns:area" />
-			<xs:element name="use-area" type="tns:area" />
-			<xs:element name="caption" type="tns:caption" />
-			<xs:element name="circle" type="tns:circle" />
-			<xs:element name="line" type="tns:line" />
-			<xs:element name="use-line" type="tns:line" />
-			<xs:element name="outline" type="tns:line" />
-			<xs:element name="use-outline" type="tns:line" />
-			<xs:element name="lineSymbol" type="tns:lineSymbol" />
-			<xs:element name="text" type="tns:text" />
-			<xs:element name="use-text" type="tns:text" />
-			<!-- <xs:element name="styletext type="xs:string" /> -->
-			<xs:element name="symbol" type="tns:symbol" />
-			<!-- outline is defined within rules to match layering -->
-			<xs:element name="style-outline" type="tns:line" />
-		</xs:choice>
-		<xs:attribute name="e" type="tns:elementList" use="required" />
-		<xs:attribute name="k" type="xs:string" use="required" />
-		<xs:attribute name="v" type="xs:string" use="required" />
-		<xs:attribute name="closed" type="tns:closed" use="optional"
-			default="any" />
-		<xs:attribute name="zoom-min" type="xs:unsignedByte" use="optional"
-			default="0" />
-		<xs:attribute name="zoom-max" type="xs:unsignedByte" use="optional"
-			default="127" />
-	</xs:complexType>
+      <xs:element name="area" type="tns:area" />
+      <xs:element name="use-area" type="tns:area" />
+      <xs:element name="caption" type="tns:caption" />
+      <xs:element name="circle" type="tns:circle" />
+      <xs:element name="line" type="tns:line" />
+      <xs:element name="use-line" type="tns:line" />
+      <xs:element name="outline" type="tns:line" />
+      <xs:element name="use-outline" type="tns:line" />
+      <xs:element name="lineSymbol" type="tns:lineSymbol" />
+      <xs:element name="text" type="tns:text" />
+      <xs:element name="use-text" type="tns:text" />
+      <!-- <xs:element name="styletext type="xs:string" /> -->
+      <xs:element name="symbol" type="tns:symbol" />
+      <!-- outline is defined within rules to match layering -->
+      <xs:element name="style-outline" type="tns:line" />
+    </xs:choice>
+    <xs:attribute name="e" type="tns:elementList" use="required" />
+    <xs:attribute name="k" type="xs:string" use="required" />
+    <xs:attribute name="v" type="xs:string" use="required" />
+    <xs:attribute name="closed" type="tns:closed" use="optional" default="any" />
+    <xs:attribute name="zoom-min" type="xs:unsignedByte" use="optional"
+      default="0" />
+    <xs:attribute name="zoom-max" type="xs:unsignedByte" use="optional"
+      default="127" />
+  </xs:complexType>
 
 
-	<!-- rendertheme element -->
-	<xs:complexType name="rendertheme">
-		<xs:sequence minOccurs="0" maxOccurs="1">
-			<xs:sequence minOccurs="0" maxOccurs="256">
-				<xs:choice minOccurs="0" maxOccurs="unbounded">
-					<xs:element name="style-text" type="tns:text" />
-					<xs:element name="style-area" type="tns:area" />
-					<xs:element name="style-line" type="tns:line" />
-					<xs:element name="style-outline" type="tns:line" />
-				</xs:choice>
-			</xs:sequence>
-			<xs:sequence minOccurs="0" maxOccurs="unbounded">
-			
-				<xs:element name="rule" type="tns:rule" />				
-			</xs:sequence>
-		</xs:sequence>
-		<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:complexType>
+  <!-- rendertheme element -->
+  <xs:complexType name="rendertheme">
+    <xs:sequence minOccurs="0" maxOccurs="1">
+      <xs:sequence minOccurs="0" maxOccurs="256">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="style-text" type="tns:text" />
+          <xs:element name="style-area" type="tns:area" />
+          <xs:element name="style-line" type="tns:line" />
+          <xs:element name="style-outline" type="tns:line" />
+        </xs:choice>
+      </xs:sequence>
+      <xs:sequence minOccurs="0" maxOccurs="unbounded">
+
+        <xs:element name="rule" type="tns:rule" />
+      </xs:sequence>
+    </xs:sequence>
+    <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:complexType>
 
 
-	<!-- root element -->
-	<xs:element name="rendertheme" type="tns:rendertheme" />
+  <!-- root element -->
+  <xs:element name="rendertheme" type="tns:rendertheme" />
 </xs:schema>
\ No newline at end of file
diff --git a/src/org/oscim/theme/renderinstruction/Line.java b/src/org/oscim/theme/renderinstruction/Line.java
index e814e3b2..a8837abf 100644
--- a/src/org/oscim/theme/renderinstruction/Line.java
+++ b/src/org/oscim/theme/renderinstruction/Line.java
@@ -93,7 +93,7 @@ public final class Line extends RenderInstruction {
 				width = Float.parseFloat(value);
 			} else if ("cap".equals(name)) {
 				cap = Cap.valueOf(value.toUpperCase(Locale.ENGLISH));
-			} else if ("fixed".equals(name)) {
+			} else if ("fix".equals(name)) {
 				fixed = Boolean.parseBoolean(value);
 			} else if ("stipple".equals(name)) {
 				stipple = Integer.parseInt(value);