xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed 'fixed' line option to 'fix'

Browse Source
This commit is contained in:
Hannes Janetzek 2013-06-07 02:07:33 +02:00
parent 38b3443927
commit a3e82be917
2 changed files with 215 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/org/oscim/theme/renderTheme.xsd
View File

@ -1,7 +1,6 @@
<?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">
<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">
@ -83,80 +82,58 @@
<!-- rendering instructions -->
<xs:complexType name="area">
<xs:attribute name="name" type="xs:string" use="optional"
default="0" />
<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: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="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="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: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" />
<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="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" />
<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: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">
@ -173,32 +150,25 @@
<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: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="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="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: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">
@ -231,8 +201,7 @@
<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="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"
@ -256,14 +225,13 @@
<xs:element name="rule" type="tns:rule" />
</xs:sequence>
</xs:sequence>
<xs:attribute name="version" type="xs:positiveInteger"
use="required" />
<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-stroke-width" type="tns:nonNegativeFloat" use="optional"
default="1" />
<xs:attribute name="base-text-size" type="tns:nonNegativeFloat" use="optional"
default="1" />
</xs:complexType>

2
src/org/oscim/theme/renderinstruction/Line.java
View File

@ -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);