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

change rendertheme 'rule' to 'm' (matcher) - makes themes better readable imo

Browse Source
This commit is contained in:
Hannes Janetzek 2013-06-17 02:11:32 +02:00
parent b9ffb48dd4
commit 569ad7764d
5 changed files with 1678 additions and 1674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/oscim/theme/RenderThemeHandler.java
View File

@ -53,7 +53,7 @@ public class RenderThemeHandler extends DefaultHandler {
} }
private static final String ELEMENT_NAME_RENDER_THEME = "rendertheme"; private static final String ELEMENT_NAME_RENDER_THEME = "rendertheme";
private static final String ELEMENT_NAME_RULE = "rule"; private static final String ELEMENT_NAME_MATCH = "m";
private static final String ELEMENT_NAME_STYLE_TEXT = "style-text"; private static final String ELEMENT_NAME_STYLE_TEXT = "style-text";
private static final String ELEMENT_NAME_STYLE_AREA = "style-area"; private static final String ELEMENT_NAME_STYLE_AREA = "style-area";
private static final String ELEMENT_NAME_STYLE_LINE = "style-line"; private static final String ELEMENT_NAME_STYLE_LINE = "style-line";
@ -142,7 +142,7 @@ public class RenderThemeHandler extends DefaultHandler {
public void endElement(String uri, String localName, String qName) { public void endElement(String uri, String localName, String qName) {
mElementStack.pop(); mElementStack.pop();
if (ELEMENT_NAME_RULE.equals(localName)) { if (ELEMENT_NAME_MATCH.equals(localName)) {
mRuleStack.pop(); mRuleStack.pop();
if (mRuleStack.empty()) { if (mRuleStack.empty()) {
mRulesList.add(mCurrentRule); mRulesList.add(mCurrentRule);
@ -166,7 +166,7 @@ public class RenderThemeHandler extends DefaultHandler {
mRenderTheme = RenderTheme.create(localName, attributes); mRenderTheme = RenderTheme.create(localName, attributes);
} }
else if (ELEMENT_NAME_RULE.equals(localName)) { else if (ELEMENT_NAME_MATCH.equals(localName)) {
checkState(localName, Element.RULE); checkState(localName, Element.RULE);
Rule rule = Rule.create(localName, attributes, mRuleStack); Rule rule = Rule.create(localName, attributes, mRuleStack);
if (!mRuleStack.empty()) { if (!mRuleStack.empty()) {

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

@ -176,11 +176,11 @@
</xs:complexType> </xs:complexType>
<!-- rule elements --> <!-- match elements -->
<xs:complexType name="rule"> <xs:complexType name="m">
<xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:choice minOccurs="0" maxOccurs="unbounded">
<!-- recursion to allow for nested rules --> <!-- recursion to allow for nested m -->
<xs:element name="rule" type="tns:rule" /> <xs:element name="m" type="tns:m" />
<xs:element name="area" type="tns:area" /> <xs:element name="area" type="tns:area" />
<xs:element name="use-area" type="tns:area" /> <xs:element name="use-area" type="tns:area" />
@ -222,7 +222,7 @@
</xs:sequence> </xs:sequence>
<xs:sequence minOccurs="0" maxOccurs="unbounded"> <xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="rule" type="tns:rule" /> <xs:element name="m" type="tns:m" />
</xs:sequence> </xs:sequence>
</xs:sequence> </xs:sequence>
<xs:attribute name="version" type="xs:positiveInteger" use="required" /> <xs:attribute name="version" type="xs:positiveInteger" use="required" />

610
src/org/oscim/theme/styles/carto.xml
View File

@ -82,80 +82,80 @@
<!-- <style-area name="building" fill="#eae8e6" fade="15"/> --> <!-- <style-area name="building" fill="#eae8e6" fade="15"/> -->
<style-area name="building" fade="15" fill="#f2f0eb" /> <style-area name="building" fade="15" fill="#f2f0eb" />
<!-- ways --> <!-- ways -->
<rule e="way" k="*" v="*"> <m e="way">
<!-- landuse base --> <!-- landuse base -->
<rule e="way" k="landuse" v="*"> <m k="landuse">
<rule e="way" k="*" v="industrial|railway"> <m v="industrial|railway">
<use-area name="railway|industrial" /> <use-area name="railway|industrial" />
</rule> </m>
<rule e="way" k="*" v="school"> <m v="school">
<!-- <area fill="#cdabde" /> --> <!-- <area fill="#cdabde" /> -->
<area fade="15" fill="#cdbbca" /> <area fade="15" fill="#cdbbca" />
<line cap="butt" fade="15" fix="true" stroke="#9aabae" width="1.0" /> <line cap="butt" fade="15" fix="true" stroke="#9aabae" width="1.0" />
</rule> </m>
<rule e="way" k="*" v="hospital"> <m v="hospital">
<area fill="#e6e4c5" /> <area fill="#e6e4c5" />
</rule> </m>
<rule e="way" k="*" v="parking"> <m v="parking">
<area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" /> <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
</rule> </m>
<rule e="way" k="*" v="cemetery"> <m v="cemetery">
<use-area name="park" /> <use-area name="park" />
</rule> </m>
<rule e="way" k="*" v="park"> <m v="park">
<use-area name="park" /> <use-area name="park" />
</rule> </m>
<!-- Heideland, keep below forest --> <!-- Heideland, keep below forest -->
<rule e="way" k="*" v="sand" zoom-min="11"> <m v="sand" zoom-min="11">
<area fade="11" fill="#fffad1" /> <area fade="11" fill="#fffad1" />
</rule> </m>
<rule e="way" k="*" v="wood"> <m v="wood">
<use-area name="forest|wood" /> <use-area name="forest|wood" />
</rule> </m>
<rule e="way" k="*" v="pitch"> <m v="pitch">
<area fill="#f4f4de" /> <area fill="#f4f4de" />
<line cap="butt" fix="true" stroke="#d9d9a3" width="1.0" /> <line cap="butt" fix="true" stroke="#d9d9a3" width="1.0" />
</rule> </m>
<rule e="way" k="*" v="swimming_pool"> <m v="swimming_pool">
<area fill="#d4ebfc" stroke="#6060ff" stroke-width="0.2" /> <area fill="#d4ebfc" stroke="#6060ff" stroke-width="0.2" />
</rule> </m>
</rule> </m>
<rule e="way" k="water" v="*"> <m k="water">
<use-area name="water" /> <use-area name="water" />
<!-- <use-line name="water:outline"/> --> <!-- <use-line name="water:outline"/> -->
</rule> </m>
<!-- waterways --> <!-- waterways -->
<rule e="way" k="waterway" v="*"> <m k="waterway">
<rule e="way" k="type" v="ditch|drain"> <m k="type" v="ditch|drain">
<use-line name="water" fix="true" width="0.1" /> <use-line name="water" fix="true" width="0.1" />
</rule> </m>
<rule e="way" k="type" v="canal"> <m k="type" v="canal">
<use-line name="water" width="-0.2" /> <use-line name="water" width="-0.2" />
</rule> </m>
<rule e="way" k="type" v="stream"> <m k="type" v="stream">
<use-line name="water" fix="true" width="0.2" /> <use-line name="water" fix="true" width="0.2" />
</rule> </m>
<rule e="way" k="type" v="river"> <m k="type" v="river">
<rule e="way" k="*" v="*" zoom-min="12"> <m zoom-min="12">
<use-line name="water" width="0.3" /> <use-line name="water" width="0.3" />
</rule> </m>
<rule e="way" k="*" v="*" zoom-max="11"> <m zoom-max="11">
<use-line name="water" fade="7" fix="true" width="0.3" /> <use-line name="water" fade="7" fix="true" width="0.3" />
</rule> </m>
</rule> </m>
</rule> </m>
<!-- outline 0 --> <!-- outline 0 -->
@ -163,148 +163,148 @@
<style-outline name="0" stroke="#44000000" width="0.1" /> <style-outline name="0" stroke="#44000000" width="0.1" />
<!-- tunnel --> <!-- tunnel -->
<rule e="way" k="tunnel" v="yes" zoom-min="11"> <m k="tunnel" v="yes" zoom-min="11">
<!-- highway tunnels --> <!-- highway tunnels -->
<rule e="way" k="*" v="*" zoom-min="16"> <m zoom-min="16">
<rule e="way" k="*" v="steps"> <m v="steps">
<use-line name="steps" /> <use-line name="steps" />
<!-- <use-outline name="0"/> --> <!-- <use-outline name="0"/> -->
</rule> </m>
<!-- <!--
<rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="16"> <m v="track|footway|path|cycleway" zoom-min="16">
<use-line name="footway:z16"/> <use-line name="footway:z16"/>
</rule> </m>
--> -->
</rule> </m>
<rule e="way" k="*" v="*" zoom-min="14"> <m zoom-min="14">
<rule e="way" k="*" v="footway"> <m v="footway">
<use-line name="footway" /> <use-line name="footway" />
</rule> </m>
<rule e="way" k="*" v="cycleway"> <m v="cycleway">
<use-line name="highway:cycleway" /> <use-line name="highway:cycleway" />
</rule> </m>
<rule e="way" k="*" v="track"> <m v="track">
<use-line name="highway:track" /> <use-line name="highway:track" />
</rule> </m>
<rule e="way" k="*" v="path"> <m v="path">
<use-line name="highway:path" /> <use-line name="highway:path" />
</rule> </m>
<rule e="way" k="*" v="bridleway"> <m v="bridleway">
<use-line name="bridleway" /> <use-line name="bridleway" />
</rule> </m>
<rule e="way" k="*" v="construction"> <m v="construction">
<use-line name="construction" /> <use-line name="construction" />
<use-outline name="0" /> <use-outline name="0" />
</rule> </m>
<rule e="way" k="*" v="service"> <m v="service">
<rule e="way" k="service" v="~|parking_aisle"> <m k="service" v="~|parking_aisle">
<use-line name="highway-service" /> <use-line name="highway-service" />
<use-outline name="0" /> <use-outline name="0" />
</rule> </m>
</rule> </m>
</rule> </m>
<rule e="way" k="*" v="trunk_link|motorway_link"> <m v="trunk_link|motorway_link">
<use-line name="trunk_link" /> <use-line name="trunk_link" />
<use-outline name="0" /> <use-outline name="0" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="*" v="*" zoom-min="13"> <m zoom-min="13">
<rule e="way" k="*" v="byway|pedestrian"> <m v="byway|pedestrian">
<use-line name="pedestrian" /> <use-line name="pedestrian" />
<use-outline name="0" /> <use-outline name="0" />
<use-text name="road" /> <use-text name="road" />
</rule> </m>
<rule e="way" k="*" v="residential|road|unclassified|living_street"> <m v="residential|road|unclassified|living_street">
<use-line name="residential" /> <use-line name="residential" />
<use-outline name="0" /> <use-outline name="0" />
<use-text name="road" /> <use-text name="road" />
</rule> </m>
</rule> </m>
<rule e="way" k="*" v="tertiary|secondary_link"> <m v="tertiary|secondary_link">
<use-line name="tertiary" /> <use-line name="tertiary" />
<use-outline name="0" /> <use-outline name="0" />
<use-text name="road" /> <use-text name="road" />
</rule> </m>
<rule e="way" k="*" v="secondary|primary_link"> <m v="secondary|primary_link">
<use-line name="secondary:z11" /> <use-line name="secondary:z11" />
<use-outline name="0" /> <use-outline name="0" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="*" v="primary"> <m v="primary">
<use-line name="primary:z11" /> <use-line name="primary:z11" />
<use-outline name="0" /> <use-outline name="0" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="*" v="trunk"> <m v="trunk">
<use-line name="trunk" blur="0.3" /> <use-line name="trunk" blur="0.3" />
<use-outline name="0" /> <use-outline name="0" />
<!-- <use-outline name="glow"/> --> <!-- <use-outline name="glow"/> -->
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="*" v="motorway"> <m v="motorway">
<use-line name="highway:z11" blur="0.3" /> <use-line name="highway:z11" blur="0.3" />
<use-outline name="0" /> <use-outline name="0" />
<!-- <use-outline name="glow"/> --> <!-- <use-outline name="glow"/> -->
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<!-- railway tunnel --> <!-- railway tunnel -->
<rule e="way" k="railway" v="*"> <m k="railway">
<!-- <!--
<rule e="way" k="railway" v="tram|subway|light_rail|narrow_gauge"> <m k="railway" v="tram|subway|light_rail|narrow_gauge">
<line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/> <line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
</rule> </m>
--> -->
<rule e="way" k="railway" v="rail"> <m k="railway" v="rail">
<line cap="butt" fix="true" stroke="#aa888888" width="0.9" /> <line cap="butt" fix="true" stroke="#aa888888" width="0.9" />
</rule> </m>
</rule> </m>
</rule> <!-- end tunnel --> </m> <!-- end tunnel -->
<!-- platform cores --> <!-- platform cores -->
<rule e="way" k="highway|railway|public_transport" v="platform"> <m k="highway|railway|public_transport" v="platform">
<rule closed="yes" e="way" k="*" v="*"> <m closed="yes">
<area fill="#dbdbc9" /> <area fill="#dbdbc9" />
</rule> </m>
<rule closed="no" e="way" k="*" v="*"> <m closed="no">
<line stroke="#dbdbc9" width="0.3" /> <line stroke="#dbdbc9" width="0.3" />
</rule> </m>
</rule> </m>
<!-- runways areas --> <!-- runways areas -->
<rule e="way" k="aeroway" v="*"> <m k="aeroway">
<rule closed="yes" e="way" k="*" v="aerodrome"> <m closed="yes" v="aerodrome">
<area fill="#e8ecde" /> <area fill="#e8ecde" />
</rule> </m>
<!-- A place where planes are parked --> <!-- A place where planes are parked -->
<rule e="way" k="*" v="apron"> <m v="apron">
<area fill="#f0f0f0" /> <area fill="#f0f0f0" />
</rule> </m>
<!-- TODO taxiway, helipad, runway --> <!-- TODO taxiway, helipad, runway -->
</rule> </m>
<!-- turning circles --> <!-- turning circles -->
<!-- <!--
<rule e="node" k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true" <m k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
fill="#707070" /> fill="#707070" />
</rule> </m>
--> -->
<!-- building --> <!-- building -->
<rule e="way" k="building" v="*"> <m k="building">
<rule e="way" k="*" v="*" zoom-max="16" zoom-min="14"> <m zoom-max="16" zoom-min="14">
<use-area name="building" fade="14" /> <use-area name="building" fade="14" />
<use-line name="building" fade="14" /> <use-line name="building" fade="14" />
<!-- <!--
<line stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/> <line stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/>
<area fill="#e9e6e3" fade="15" /> <area fill="#e9e6e3" fade="15" />
--> -->
</rule> </m>
<rule e="way" k="*" v="*" zoom-min="17"> <m zoom-min="17">
<caption fill="#4040ff" font-size="10" font-style="bold" k="name" stroke="#ffffff" <caption fill="#4040ff" font-size="10" font-style="bold" k="name" stroke="#ffffff"
stroke-width="2.0" /> stroke-width="2.0" />
<caption fill="#606060" font-size="10" font-style="bold" k="addr:housenumber" <caption fill="#606060" font-size="10" font-style="bold" k="addr:housenumber"
stroke="#ffffff" stroke-width="2.0" /> stroke="#ffffff" stroke-width="2.0" />
</rule> </m>
</rule> </m>
<!-- outline 1 - 4 --> <!-- outline 1 - 4 -->
<style-outline name="1" stroke="#aa807040" width="0.1" /> <style-outline name="1" stroke="#aa807040" width="0.1" />
@ -312,401 +312,401 @@
<style-outline name="primary" stroke="#aa7f7700" width="0.1" /> <style-outline name="primary" stroke="#aa7f7700" width="0.1" />
<style-outline name="motorway" stroke="#aa805f2e" width="0.1" /> <style-outline name="motorway" stroke="#aa805f2e" width="0.1" />
<rule e="way" k="*" v="*" zoom-max="10"> <m zoom-max="10">
<rule e="way" k="*" v="main"> <m v="main">
<!-- <line cap="butt" fade="5" fix="true" stroke="#e2cf5d" width="1.5" /> --> <!-- <line cap="butt" fade="5" fix="true" stroke="#e2cf5d" width="1.5" /> -->
<line cap="butt" fade="8" fix="true" stroke="#c6c5a2" width="1.3" /> <line cap="butt" fade="8" fix="true" stroke="#c6c5a2" width="1.3" />
</rule> </m>
<rule e="way" k="*" v="motorway"> <m v="motorway">
<line cap="butt" fade="6" fix="true" stroke="#deb683" width="1.5" /> <line cap="butt" fade="6" fix="true" stroke="#deb683" width="1.5" />
</rule> </m>
<!-- <rule e="way" k="class" v="-main|motorway"> <!-- <m k="class" v="-main|motorway">
<line cap="butt" fix="true" stroke="#00ff00" width="1.8" /> <line cap="butt" fix="true" stroke="#00ff00" width="1.8" />
</rule> </m>
--> -->
</rule> </m>
<rule e="way" k="*" v="*" zoom-min="11"> <m zoom-min="11">
<rule e="way" k="*" v="*" zoom-min="14"> <m zoom-min="14">
<rule e="way" k="*" v="footway"> <m v="footway">
<use-line name="footway" /> <use-line name="footway" />
</rule> </m>
<rule e="way" k="*" v="cycleway"> <m v="cycleway">
<use-line name="highway:cycleway" /> <use-line name="highway:cycleway" />
</rule> </m>
<rule e="way" k="*" v="track"> <m v="track">
<use-line name="highway:track" /> <use-line name="highway:track" />
</rule> </m>
<rule e="way" k="*" v="path"> <m v="path">
<use-line name="highway:path" /> <use-line name="highway:path" />
</rule> </m>
<rule e="way" k="*" v="bridleway"> <m v="bridleway">
<use-line name="bridleway" /> <use-line name="bridleway" />
</rule> </m>
<rule e="way" k="*" v="construction"> <m v="construction">
<use-line name="construction" /> <use-line name="construction" />
<use-outline name="1" /> <use-outline name="1" />
</rule> </m>
<rule e="way" k="*" v="service"> <m v="service">
<rule e="way" k="service" v="-|parking_aisle"> <m k="service" v="-|parking_aisle">
<use-line name="highway-service" /> <use-line name="highway-service" />
<use-outline name="1" /> <use-outline name="1" />
</rule> </m>
<rule e="way" k="service" v="parking_aisle" zoom-min="16"> <m k="service" v="parking_aisle" zoom-min="16">
<use-line name="highway-service" width="-0.4" /> <use-line name="highway-service" width="-0.4" />
<use-outline name="1" /> <use-outline name="1" />
</rule> </m>
</rule> </m>
</rule> </m>
<rule e="way" k="*" v="trunk_link|motorway_link"> <m v="trunk_link|motorway_link">
<use-line name="trunk_link" /> <use-line name="trunk_link" />
<use-outline name="motorway" /> <use-outline name="motorway" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="*" v="*" zoom-min="13"> <m zoom-min="13">
<rule e="way" k="*" v="byway|pedestrian"> <m v="byway|pedestrian">
<use-line name="residential" width="-0.4" /> <use-line name="residential" width="-0.4" />
<use-outline name="1" /> <use-outline name="1" />
<use-text name="road" /> <use-text name="road" />
</rule> </m>
<rule e="way" k="*" v="street|street_limited"> <m v="street|street_limited">
<use-line name="residential" /> <use-line name="residential" />
<use-outline name="1" /> <use-outline name="1" />
<use-text name="road" /> <use-text name="road" />
</rule> </m>
</rule> </m>
<rule e="way" k="*" v="tertiary|secondary_link"> <m v="tertiary|secondary_link">
<use-line name="tertiary" /> <use-line name="tertiary" />
<use-outline name="1" /> <use-outline name="1" />
<use-text name="road" /> <use-text name="road" />
</rule> </m>
<rule e="way" k="*" v="secondary|primary_link"> <m v="secondary|primary_link">
<!-- <line stroke="#fff939" width="1.6" /> --> <!-- <line stroke="#fff939" width="1.6" /> -->
<use-line name="secondary:z11" /> <use-line name="secondary:z11" />
<use-outline name="primary" /> <use-outline name="primary" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="*" v="main"> <m v="main">
<use-line name="primary:z11" /> <use-line name="primary:z11" />
<use-outline name="primary" /> <use-outline name="primary" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="*" v="trunk"> <m v="trunk">
<use-line name="trunk" /> <use-line name="trunk" />
<use-outline name="motorway" /> <use-outline name="motorway" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="*" v="motorway"> <m v="motorway">
<use-line name="highway:z11" /> <use-line name="highway:z11" />
<use-outline name="motorway" /> <use-outline name="motorway" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="bridge" v="yes"> <m k="bridge" v="yes">
<style-outline name="bridge" stroke="#aa202020" width="0.08" /> <style-outline name="bridge" stroke="#aa202020" width="0.08" />
<rule e="way" k="*" v="*" zoom-min="16"> <m zoom-min="16">
<rule e="way" k="*" v="steps"> <m v="steps">
<use-line name="steps" /> <use-line name="steps" />
<!-- <use-outline name="bridge"/> --> <!-- <use-outline name="bridge"/> -->
</rule> </m>
</rule> </m>
<rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="15"> <m v="track|footway|path|cycleway" zoom-min="15">
<use-line name="footway:z17" cap="butt" /> <use-line name="footway:z17" cap="butt" />
<use-outline name="bridge" /> <use-outline name="bridge" />
</rule> </m>
<rule e="way" k="*" v="*" zoom-min="14"> <m zoom-min="14">
<rule e="way" k="*" v="footway"> <m v="footway">
<use-line name="footway" /> <use-line name="footway" />
</rule> </m>
<rule e="way" k="*" v="cycleway"> <m v="cycleway">
<use-line name="highway:cycleway" /> <use-line name="highway:cycleway" />
</rule> </m>
<rule e="way" k="*" v="track"> <m v="track">
<use-line name="highway:track" /> <use-line name="highway:track" />
</rule> </m>
<rule e="way" k="*" v="path"> <m v="path">
<use-line name="highway:path" /> <use-line name="highway:path" />
</rule> </m>
<rule e="way" k="*" v="bridleway"> <m v="bridleway">
<use-line name="bridleway" /> <use-line name="bridleway" />
</rule> </m>
<rule e="way" k="*" v="construction"> <m v="construction">
<use-line name="construction" cap="square" /> <use-line name="construction" cap="square" />
<use-outline name="bridge" /> <use-outline name="bridge" />
</rule> </m>
<rule e="way" k="*" v="service"> <m v="service">
<use-line name="highway-service" cap="square" /> <use-line name="highway-service" cap="square" />
<use-outline name="bridge" /> <use-outline name="bridge" />
</rule> </m>
</rule> </m>
<rule e="way" k="*" v="byway|pedestrian"> <m v="byway|pedestrian">
<use-line name="pedestrian:bridge" /> <use-line name="pedestrian:bridge" />
<use-outline name="bridge" /> <use-outline name="bridge" />
<use-text name="road" /> <use-text name="road" />
</rule> </m>
<rule e="way" k="*" v="street|street_limited"> <m v="street|street_limited">
<use-line name="residential:bridge" /> <use-line name="residential:bridge" />
<use-outline name="bridge" /> <use-outline name="bridge" />
<use-text name="road" /> <use-text name="road" />
</rule> </m>
<rule e="way" k="*" v="main"> <m v="main">
<use-line name="primary:z11" cap="square" /> <use-line name="primary:z11" cap="square" />
<use-outline name="bridge" /> <use-outline name="bridge" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
<rule e="way" k="*" v="motorway"> <m v="motorway">
<use-line name="highway:z11" cap="square" /> <use-line name="highway:z11" cap="square" />
<use-outline name="bridge" /> <use-outline name="bridge" />
<use-text name="major-road" /> <use-text name="major-road" />
</rule> </m>
</rule> <!-- end bridge=yes --> </m> <!-- end bridge=yes -->
</rule> <!-- end zoom-min=11 --> </m> <!-- end zoom-min=11 -->
<!-- runways cores --> <!-- runways cores -->
<rule e="way" k="aeroway" v="*"> <m k="aeroway">
<rule e="way" k="*" v="runway"> <m v="runway">
<use-line name="aeroway:runway" /> <use-line name="aeroway:runway" />
</rule> </m>
<rule e="way" k="*" v="taxiway"> <m v="taxiway">
<use-line name="aeroway:runway" width="-0.8" /> <use-line name="aeroway:runway" width="-0.8" />
</rule> </m>
</rule> </m>
<!-- man_made features --> <!-- man_made features -->
<!-- <!--
<rule e="way" k="man_made" v="pier"> <m k="man_made" v="pier">
<rule e="way" k="*" v="*" closed="no"> <m closed="no">
<line stroke="#d0d0d0" width="0.4" cap="butt" /> <line stroke="#d0d0d0" width="0.4" cap="butt" />
<line stroke="#e4e4e4" width="0.3" cap="butt" /> <line stroke="#e4e4e4" width="0.3" cap="butt" />
</rule> </m>
<rule e="way" k="*" v="*" closed="yes"> <m closed="yes">
<area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" /> <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
</rule> </m>
</rule> </m>
--> -->
<!-- barriers --> <!-- barriers -->
<rule e="way" k="barrier" v="*"> <m k="barrier">
<!-- <!--
<rule e="way" k="*" v="fence|wall|city_wall" zoom-min="15"> <line <m v="fence|wall|city_wall" zoom-min="15"> <line
stroke="#909090" width="0.1" cap="butt" /> </rule> stroke="#909090" width="0.1" cap="butt" /> </m>
--> -->
<rule e="way" k="*" v="retaining_wall" zoom-min="15"> <m v="retaining_wall" zoom-min="15">
<line cap="butt" fix="true" stroke="#888888" width="1.1" /> <line cap="butt" fix="true" stroke="#888888" width="1.1" />
</rule> </m>
</rule> </m>
<!-- non-physical routes --> <!-- non-physical routes -->
<!-- <!--
<rule e="way" k="route" v="ferry"> <line stroke="#707070" width="0.3" <m k="route" v="ferry"> <line stroke="#707070" width="0.3"
stroke-dasharray="15,10" cap="butt" /> </rule> stroke-dasharray="15,10" cap="butt" /> </m>
--> -->
<!-- aerial ways --> <!-- aerial ways -->
<!-- <!--
<rule e="way" k="aerialway" v="*"> <line stroke="#202020" width="0.4" <m k="aerialway"> <line stroke="#202020" width="0.4"
cap="butt" /> <rule e="way" k="aerialway" v="cable_car"> <lineSymbol cap="butt" /> <m k="aerialway" v="cable_car"> <lineSymbol
src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/cable_car.png" src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/cable_car.png"
/> </rule> <rule e="way" k="aerialway" v="chair_lift"> <lineSymbol /> </m> <m k="aerialway" v="chair_lift"> <lineSymbol
src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png" src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png"
/> </rule> <rule e="way" k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png" /> </m> <m k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png"
/> </rule> <rule e="way" k="*" v="*" zoom-min="14"> <text k="name" /> </m> <m zoom-min="14"> <text k="name"
font-style="bold" font-style="bold"
font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </rule> font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </m>
</rule> </m>
--> -->
<!-- railway (no tunnel) --> <!-- railway (no tunnel) -->
<rule e="way" k="road" v="*" zoom-min="12"> <m k="road" zoom-min="12">
<rule e="way" k="railway" v="station"> <m k="railway" v="station">
<area fill="#dbdbc9" stroke="#707070" stroke-width="0.3" /> <area fill="#dbdbc9" stroke="#707070" stroke-width="0.3" />
</rule> </m>
<!-- railway bridge casings --> <!-- railway bridge casings -->
<rule e="way" k="*" v="*" zoom-min="14"> <m zoom-min="14">
<rule e="way" k="bridge" v="yes|true"> <m k="bridge" v="yes|true">
<rule e="way" k="railway" v="tram"> <m k="railway" v="tram">
<line cap="butt" fix="true" stroke="#777777" width="0.9" /> <line cap="butt" fix="true" stroke="#777777" width="0.9" />
</rule> </m>
<rule e="way" k="railway" v="subway|light_rail|narrow_gauge"> <m k="railway" v="subway|light_rail|narrow_gauge">
<line cap="butt" fix="true" stroke="#777777" width="0.9" /> <line cap="butt" fix="true" stroke="#777777" width="0.9" />
</rule> </m>
<rule e="way" k="railway" v="rail"> <m k="railway" v="rail">
<line cap="butt" fix="true" stroke="#777777" width="0.9" /> <line cap="butt" fix="true" stroke="#777777" width="0.9" />
</rule> </m>
</rule> </m>
</rule> </m>
<!-- railway casings and cores --> <!-- railway casings and cores -->
<rule e="way" k="railway" v="tram" zoom-min="15"> <m k="railway" v="tram" zoom-min="15">
<line fix="true" stroke="#887766" width="1.0" /> <line fix="true" stroke="#887766" width="1.0" />
</rule> </m>
<rule e="way" k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14"> <m k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14">
<line cap="butt" fix="true" stroke="#a0a0a0" width="0.9" /> <line cap="butt" fix="true" stroke="#a0a0a0" width="0.9" />
</rule> </m>
<rule e="way" k="class" v="major_rail" zoom-max="13"> <m k="class" v="major_rail" zoom-max="13">
<line cap="butt" fade="12" fix="true" stroke="#ddaa9988" width="1.0" /> <line cap="butt" fade="12" fix="true" stroke="#ddaa9988" width="1.0" />
</rule> </m>
<rule e="way" k="class" v="major_rail" zoom-min="14"> <m k="class" v="major_rail" zoom-min="14">
<line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#ffffff" <line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#ffffff"
stipple-width="0.8" stroke="#aaa6a4" width="2.0" /> stipple-width="0.8" stroke="#aaa6a4" width="2.0" />
</rule> </m>
<!-- <!--
<rule e="way" k="railway" v="rail" zoom-max="14" zoom-min="13"> <m k="railway" v="rail" zoom-max="14" zoom-min="13">
<line stroke="#8888aa" width="0.6" cap="butt" <line stroke="#8888aa" width="0.6" cap="butt"
fix="true" /> fix="true" />
</rule> </m>
--> -->
<!-- <!--
<rule e="way" k="railway" v="rail" zoom-max="13" zoom-min="11"> <m k="railway" v="rail" zoom-max="13" zoom-min="11">
<line stroke="#bbbbcc" width="0.8" cap="butt" fix="true" /> <line stroke="#bbbbcc" width="0.8" cap="butt" fix="true" />
</rule> </m>
--> -->
<!-- whatever railway:spur means ... --> <!-- whatever railway:spur means ... -->
<rule e="way" k="railway" v="disused|spur|abandoned|preserved"> <m k="railway" v="disused|spur|abandoned|preserved">
<line cap="butt" fade="12" fix="true" stroke="#cccccc" width="0.8" /> <line cap="butt" fade="12" fix="true" stroke="#cccccc" width="0.8" />
</rule> </m>
</rule> </m>
<!-- non-physical boundaries --> <!-- non-physical boundaries -->
<!-- <!--
<rule e="way" k="boundary" v="*"> <rule e="way" k="boundary" v="national_park"> <m k="boundary"> <m k="boundary" v="national_park">
<line stroke="#4ef94b" width="0.25" stroke-dasharray="15, 5, 5, 5" <line stroke="#4ef94b" width="0.25" stroke-dasharray="15, 5, 5, 5"
/> />
--> -->
<rule e="way" k="boundary" v="national_park"> <m k="boundary" v="national_park">
<area fill="#d7e6b0" /> <area fill="#d7e6b0" />
</rule> </m>
<rule e="way" k="admin" v="yes"> <m k="admin" v="yes">
<rule e="way" k="admin_level" v="*"> <m k="admin_level">
<rule e="way" k="admin_level" v="4"> <m k="admin_level" v="4">
<line cap="butt" fix="true" stroke="#afa0dd" width="1.0" /> <line cap="butt" fix="true" stroke="#afa0dd" width="1.0" />
</rule> </m>
<rule e="way" k="admin_level" v="3"> <m k="admin_level" v="3">
<line cap="butt" fix="true" stroke="#0000ff" width="0.95" /> <line cap="butt" fix="true" stroke="#0000ff" width="0.95" />
</rule> </m>
<rule e="way" k="admin_level" v="2"> <m k="admin_level" v="2">
<line cap="butt" fix="true" stroke="#808080" width="1.0" /> <line cap="butt" fix="true" stroke="#808080" width="1.0" />
<!-- stipple-width="1.0" stipple="4" stipple-stroke="#606060"/> --> <!-- stipple-width="1.0" stipple="4" stipple-stroke="#606060"/> -->
</rule> </m>
</rule> </m>
</rule> </m>
<rule e="way" k="debug" v="area"> <m k="debug" v="area">
<line cap="butt" fix="true" stroke="#ff0000" width="1.2" /> <line cap="butt" fix="true" stroke="#ff0000" width="1.2" />
<area fill="#880000ff" /> <area fill="#880000ff" />
<caption fill="#ff0000" font-size="15" k="name" stroke="#444444" <caption fill="#ff0000" font-size="15" k="name" stroke="#444444"
stroke-width="2.0" /> stroke-width="2.0" />
</rule> </m>
<rule e="way" k="debug" v="way"> <m k="debug" v="way">
<line cap="butt" fix="true" stroke="#00ffff" width="1.5" /> <line cap="butt" fix="true" stroke="#00ffff" width="1.5" />
<caption fill="#00ffff" font-size="15" k="name" stroke="#444444" <caption fill="#00ffff" font-size="15" k="name" stroke="#444444"
stroke-width="2.0" /> stroke-width="2.0" />
</rule> </m>
<rule e="way" k="debug" v="box"> <m k="debug" v="box">
<line cap="butt" fix="true" stroke="#000000" width="1.5" /> <line cap="butt" fix="true" stroke="#000000" width="1.5" />
</rule> </m>
</rule> </m>
<rule e="node" k="*" v="*"> <m e="node">
<!-- barrier --> <!-- barrier -->
<rule e="node" k="barrier" v="bollard"> <m k="barrier" v="bollard">
<circle fill="#909090" r="1.5" /> <circle fill="#909090" r="1.5" />
</rule> </m>
<rule e="node" k="debug" v="*"> <m k="debug">
<caption fill="#0000ff" font-size="16" k="name" /> <caption fill="#0000ff" font-size="16" k="name" />
</rule> </m>
<!-- highway --> <!-- highway -->
<!-- <!--
<rule e="node" k="highway" v="*"> <rule e="node" k="highway" v="turning_circle"> <m k="highway"> <m k="highway" v="turning_circle">
<circle r="1.4" scale-radius="true" fill="#ffffff" /> </rule> </rule> <circle r="1.4" scale-radius="true" fill="#ffffff" /> </m> </m>
--> -->
<!-- historic --> <!-- historic -->
<!-- <!--
<rule e="node" k="historic" v="*"> <circle r="3" fill="#4040ff" stroke="#606060" <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
width="1.5" /> <rule e="node" k="*" v="*" zoom-min="17"> <caption width="1.5" /> <m zoom-min="17"> <caption
k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
width="2.0" /> </rule> </rule> width="2.0" /> </m> </m>
--> -->
<!-- house numbers --> <!-- house numbers -->
<!-- <!--
<rule e="node" k="addr:housenumber" v="*" zoom-min="18"> <caption <m k="addr:housenumber" zoom-min="18"> <caption
k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" k="addr:housenumber" font-style="bold" font-size="10" fill="#606060"
stroke="#ffffff" stroke="#ffffff"
width="2.0" /> </rule> width="2.0" /> </m>
--> -->
<!-- place --> <!-- place -->
<rule e="node" k="place_label" v="*"> <m k="place_label">
<rule e="node" k="*" v="suburb" zoom-max="14"> <m v="suburb" zoom-max="14">
<caption fill="#606060" font-size="17" font-style="italic" k="name" <caption fill="#606060" font-size="17" font-style="italic" k="name"
priority="4" stroke="#ffffff" stroke-width="2.0" /> priority="4" stroke="#ffffff" stroke-width="2.0" />
</rule> </m>
<rule e="node" k="*" v="village" zoom-max="14"> <m v="village" zoom-max="14">
<caption fill="#2020cc" font-size="17" k="name" priority="3" stroke="#ffffff" <caption fill="#2020cc" font-size="17" k="name" priority="3" stroke="#ffffff"
stroke-width="2.0" /> stroke-width="2.0" />
</rule> </m>
<rule e="node" k="*" v="island" zoom-min="10"> <m v="island" zoom-min="10">
<caption fill="#000000" font-size="20" font-style="bold" k="name" <caption fill="#000000" font-size="20" font-style="bold" k="name"
priority="1" stroke="#ffffff" stroke-width="2.0" /> priority="1" stroke="#ffffff" stroke-width="2.0" />
</rule> </m>
<rule e="node" k="*" v="town"> <m v="town">
<caption fill="#000000" font-size="19" k="name" priority="2" stroke="#ffffff" <caption fill="#000000" font-size="19" k="name" priority="2" stroke="#ffffff"
stroke-width="2.0" /> stroke-width="2.0" />
</rule> </m>
<rule e="node" k="*" v="city"> <m v="city">
<caption fill="#000000" font-size="20" k="name" priority="1" stroke="#ffffff" <caption fill="#000000" font-size="20" k="name" priority="1" stroke="#ffffff"
stroke-width="2.0" /> stroke-width="2.0" />
</rule> </m>
</rule> </m>
<rule e="node" k="country_label" v="*"> <m k="country_label">
<caption fill="#000000" font-size="20" font-style="bold" k="name" priority="0" <caption fill="#000000" font-size="20" font-style="bold" k="name" priority="0"
stroke="#ffffff" stroke-width="2.0" /> stroke="#ffffff" stroke-width="2.0" />
</rule> </m>
<!-- railway --> <!-- railway -->
<rule e="node" k="railway" v="*"> <m k="railway">
<rule e="node" k="*" v="station" zoom-min="14"> <m v="station" zoom-min="14">
<circle fill="#ec2d2d" r="6" stroke="#606060" stroke-width="1.5" /> <circle fill="#ec2d2d" r="6" stroke="#606060" stroke-width="1.5" />
<!-- <!--
<caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d" <caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d"
stroke="#ffffff" stroke-width="2.0" /> stroke="#ffffff" stroke-width="2.0" />
--> -->
</rule> </m>
<rule e="node" k="*" v="halt|tram_stop" zoom-min="17"> <m v="halt|tram_stop" zoom-min="17">
<circle fill="#ec2d2d" r="4" stroke="#606060" stroke-width="1.5" /> <circle fill="#ec2d2d" r="4" stroke="#606060" stroke-width="1.5" />
<!-- <!--
<caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d" <caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d"
stroke="#ffffff" stroke-width="2.0" /> stroke="#ffffff" stroke-width="2.0" />
--> -->
</rule> </m>
</rule> </m>
<!-- aeroway --> <!-- aeroway -->
<rule e="node" k="aeroway" v="*"> <m k="aeroway">
<rule e="node" k="aeroway" v="helipad" zoom-min="17"> <m k="aeroway" v="helipad" zoom-min="17">
<symbol src="jar:symbols/helipad.png" /> <symbol src="jar:symbols/helipad.png" />
</rule> </m>
<rule e="node" k="aeroway" v="aerodrome|airport" zoom-max="13"> <m k="aeroway" v="aerodrome|airport" zoom-max="13">
<symbol src="jar:symbols/airport.png" /> <symbol src="jar:symbols/airport.png" />
</rule> </m>
</rule> </m>
<rule e="node" k="building_label" v="*" zoom-min="14"> <m k="building_label" zoom-min="14">
<caption fill="#1d2e6f" font-size="14" style="italic" k="name" priority="20" <caption fill="#1d2e6f" font-size="14" style="italic" k="name" priority="20"
stroke="#9daeef" stroke-width="0.8" /> stroke="#9daeef" stroke-width="0.8" />
</rule> </m>
</rule> </m>
</rendertheme> </rendertheme>

1228
src/org/oscim/theme/styles/default.xml
View File

File diff suppressed because it is too large Load Diff

1284
src/org/oscim/theme/styles/tronrender.xml
View File

File diff suppressed because it is too large Load Diff