Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

re-instate old rendering consistency partly damaged by April 10 commit

Browse source
This commit is contained in:
sonora 2012-05-24 20:42:40 +02:00
parent d55052cbae
commit 3e7ef38464
1 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
DataExtractionOSM/src/net/osmand/render/default.render.xml
View file

@ -416,9 +416,9 @@
<filter minzoom="13" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="landuse" value="reservoir"/> <filter minzoom="13" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="landuse" value="reservoir"/>
<!-- Railroad --> <!-- Railroad -->
<filter minzoom="14" maxzoom="14" textSize="12" textHaloRadius="1" textColor="#6666ff" textBold="true" textDy="7" tag="railway" value="station"/> <filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textHaloRadius="1" textBold="true" textDy="7" tag="railway" value="station"/>
<filter minzoom="15" textSize="13" textColor="#6666ff" textHaloRadius="1" textBold="true" textDy="7" tag="railway" value="station"/> <filter minzoom="15" textSize="13" textColor="#6666ff" textHaloRadius="1" textBold="true" textDy="7" tag="railway" value="station"/>
<filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="7" tag="railway" value="halt"/> <filter minzoom="14" maxzoom="14" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="7" tag="railway" value="halt"/>
<filter minzoom="15" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="7" tag="railway" value="halt"/> <filter minzoom="15" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="7" tag="railway" value="halt"/>
<filter minzoom="15" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="7" tag="railway" value="tram_stop"/> <filter minzoom="15" textSize="12" textColor="#6666ff" textHaloRadius="1" textDy="7" tag="railway" value="tram_stop"/>
@ -1049,7 +1049,7 @@
<filter minzoom="13" maxzoom="13" strokeWidth="6"/> <filter minzoom="13" maxzoom="13" strokeWidth="6"/>
<!-- Bridges --> <!-- Bridges -->
<filter layer="1" color="#000000" shadowRadius="0" cap="BUTT" cap_2="SQUARE"> <filter layer="1" color="#000000" shadowRadius="0" cap="BUTT" cap_2="SQUARE">
<filter minzoom="13" maxzoom="14" strokeWidth="8" strokeWidth_2="6"/> <filter minzoom="14" maxzoom="14" strokeWidth="8" strokeWidth_2="6"/>
<filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8"/> <filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8"/>
<filter minzoom="16" maxzoom="16" strokeWidth="12" strokeWidth_2="10"/> <filter minzoom="16" maxzoom="16" strokeWidth="12" strokeWidth_2="10"/>
<filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13"/> <filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13"/>
@ -1072,15 +1072,10 @@
<filter tag="highway" value="unclassified"/> <filter tag="highway" value="unclassified"/>
<filter tag="highway" value="residential"/> <filter tag="highway" value="residential"/>
<groupFilter color="#ffffff" color_2="#ffffff" shadowRadius="1" cap="ROUND"> <groupFilter color="#ffffff" color_2="#ffffff" shadowRadius="1" cap="ROUND">
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="3">
<filter nightMode="true" color="#9F9F9F" color_2="#9F9F9F"/>
</filter>
<filter minzoom="13" maxzoom="13" strokeWidth="2" shadowRadius="0">
<filter nightMode="true" color="#9F9F9F" color_2="#9F9F9F"/>
</filter>
<!-- Bridges --> <!-- Bridges -->
<filter layer="1" color="#000000" shadowRadius="0" cap="BUTT" cap_2="SQUARE"> <filter layer="1" color="#000000" shadowRadius="0" cap="BUTT" cap_2="SQUARE">
<filter minzoom="14" maxzoom="14" strokeWidth="8" strokeWidth_2="6"/> <filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth="8" strokeWidth_2="6"/>
<filter minzoom="14" maxzoom="14" strokeWidth="5" strokeWidth_2="3"/>
<filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8"/> <filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8"/>
<filter minzoom="16" maxzoom="16" strokeWidth="12" strokeWidth_2="10"/> <filter minzoom="16" maxzoom="16" strokeWidth="12" strokeWidth_2="10"/>
<filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13"/> <filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13"/>
@ -1088,6 +1083,10 @@
<groupFilter nightMode="true" color="#ffffff" color_2="#9F9F9F"/> <groupFilter nightMode="true" color="#ffffff" color_2="#9F9F9F"/>
</filter> </filter>
<filter> <filter>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="3"/>
<filter hmRendered="true" minzoom="13" maxzoom="13" strokeWidth="4"/>
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth="6"/>
<filter minzoom="13" maxzoom="13" strokeWidth="2" shadowRadius="0"/>
<filter minzoom="14" maxzoom="14" strokeWidth="3" shadowRadius="0"/> <filter minzoom="14" maxzoom="14" strokeWidth="3" shadowRadius="0"/>
<filter minzoom="15" maxzoom="15" strokeWidth="8"/> <filter minzoom="15" maxzoom="15" strokeWidth="8"/>
<filter minzoom="16" maxzoom="16" strokeWidth="10"/> <filter minzoom="16" maxzoom="16" strokeWidth="10"/>
@ -1107,11 +1106,9 @@
<filter tag="highway" value="living_street"/> <filter tag="highway" value="living_street"/>
<filter tag="highway" value="pedestrian"/> <filter tag="highway" value="pedestrian"/>
<groupFilter color="#ececec" color_2="#ececec" shadowRadius="1" cap="ROUND"> <groupFilter color="#ececec" color_2="#ececec" shadowRadius="1" cap="ROUND">
<filter hmRendered="true" minzoom="13" maxzoom="13" strokeWidth="2"/>
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth="3"/>
<!-- Bridges --> <!-- Bridges -->
<filter layer="1" color="#000000" shadowRadius="0" cap="BUTT" cap_2="SQUARE"> <filter layer="1" color="#000000" shadowRadius="0" cap="BUTT" cap_2="SQUARE">
<filter hmRendered="true" minzoom="13" maxzoom="14" strokeWidth="5" strokeWidth_2="3"/> <filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth="5" strokeWidth_2="3"/>
<filter minzoom="15" maxzoom="15" strokeWidth="6" strokeWidth_2="4"/> <filter minzoom="15" maxzoom="15" strokeWidth="6" strokeWidth_2="4"/>
<filter minzoom="16" maxzoom="16" strokeWidth="7" strokeWidth_2="5"/> <filter minzoom="16" maxzoom="16" strokeWidth="7" strokeWidth_2="5"/>
<filter minzoom="17" maxzoom="17" strokeWidth="10" strokeWidth_2="8"/> <filter minzoom="17" maxzoom="17" strokeWidth="10" strokeWidth_2="8"/>
@ -1119,6 +1116,8 @@
<groupFilter nightMode="true" color="#ffffff"/> <groupFilter nightMode="true" color="#ffffff"/>
</filter> </filter>
<filter> <filter>
<filter hmRendered="true" minzoom="13" maxzoom="13" strokeWidth="2"/>
<filter hmRendered="true" minzoom="14" maxzoom="14" strokeWidth="3"/>
<filter minzoom="15" maxzoom="15" strokeWidth="4"/> <filter minzoom="15" maxzoom="15" strokeWidth="4"/>
<filter minzoom="16" maxzoom="16" strokeWidth="5"/> <filter minzoom="16" maxzoom="16" strokeWidth="5"/>
<filter minzoom="17" maxzoom="17" strokeWidth="8"/> <filter minzoom="17" maxzoom="17" strokeWidth="8"/>
@ -1130,50 +1129,63 @@
<group> <group>
<filter tag="highway" value="track" color="#996600" pathEffect="6_3" color_3="#996600" pathEffect_3="6_3"> <filter tag="highway" value="track" color="#996600" pathEffect="6_3" color_3="#996600" pathEffect_3="6_3">
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/> <filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/> <filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="14" strokeWidth="1" strokeWidth_3="1"/> <filter minzoom="14" strokeWidth="1" strokeWidth_3="1"/>
</filter> </filter>
<!-- byway is deprecated tag, describes UK-only road. Proper tag should be highway=track or highway=path --> <!-- byway is deprecated tag, describes UK-only road. Proper tag should be highway=track or highway=path -->
<filter tag="highway" value="byway" color="#996600" pathEffect="6_3" color_3="#996600" pathEffect_3="6_3"> <filter tag="highway" value="byway" color="#996600" pathEffect="6_3" color_3="#996600" pathEffect_3="6_3">
<filter appMode="bicycle" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/> <filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/> <filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter minzoom="12" strokeWidth="1" strokeWidth_3="1"/> <filter appMode="bicycle" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="14" strokeWidth="1" strokeWidth_3="1"/>
</filter> </filter>
<group> <group>
<filter tag="highway" value="path" color="#000000" pathEffect="6_3" color_3="#000000" pathEffect_3="6_3"> <filter tag="highway" value="path" color="#000000" pathEffect="6_3" color_3="#000000" pathEffect_3="6_3">
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/> <filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/> <filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter minzoom="13" strokeWidth="1" strokeWidth_3="1"/> <filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="14" strokeWidth="1" strokeWidth_3="1"/>
</filter> </filter>
<groupFilter nightMode="true" color="#787878" color_3="#787878"/> <groupFilter nightMode="true" color="#787878" color_3="#787878"/>
</group> </group>
<filter tag="highway" value="cycleway" color="#0000ff" pathEffect="2_2" color_3="#0000ff" pathEffect_3="2_2"> <filter tag="highway" value="cycleway" color="#0000ff" pathEffect="2_2" color_3="#0000ff" pathEffect_3="2_2">
<filter appMode="bicycle" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/> <filter appMode="bicycle" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/> <filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter minzoom="14" strokeWidth="1" strokeWidth_3="1"/> <filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="14" strokeWidth="1" strokeWidth_3="1"/>
</filter> </filter>
<filter tag="highway" value="footway" color="#fa5073" pathEffect="2_2" color_3="#fa5073" pathEffect_3="2_2"> <filter tag="highway" value="footway" color="#fa5073" pathEffect="2_2" color_3="#fa5073" pathEffect_3="2_2">
<filter appMode="pedestrian" minzoom="16" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/> <filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/> <filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter hmRendered="true" minzoom="13" maxzoom="14" strokeWidth="1" strokeWidth_3="1"/> <filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="15" strokeWidth="1" strokeWidth_3="1"/> <filter minzoom="16" strokeWidth="1" strokeWidth_3="1"/>
</filter> </filter>
<filter tag="highway" value="steps" color="#fa5073" pathEffect="1_2" color_3="#fa5073" pathEffect_3="1_2"> <filter tag="highway" value="steps" color="#fa5073" pathEffect="1_2" color_3="#fa5073" pathEffect_3="1_2">
<filter appMode="pedestrian" minzoom="16" strokeWidth="4" pathEffect="2_2" strokeWidth_3="4" pathEffect_3="2_2"/> <filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="4" pathEffect="2_2" strokeWidth_3="4" pathEffect_3="2_2"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="4" pathEffect="2_2" strokeWidth_3="4" pathEffect_3="2_2"/>
<filter hmRendered="true" minzoom="14" strokeWidth="4" strokeWidth_3="4"/> <filter hmRendered="true" minzoom="14" strokeWidth="4" strokeWidth_3="4"/>
<filter minzoom="16" strokeWidth="4" strokeWidth_3="4"/> <filter minzoom="16" strokeWidth="4" strokeWidth_3="4"/>
</filter> </filter>
<filter tag="highway" value="bridleway" color="#339900" pathEffect="2_2" color_3="#339900" pathEffect_3="2_2"> <filter tag="highway" value="bridleway" color="#339900" pathEffect="2_2" color_3="#339900" pathEffect_3="2_2">
<filter appMode="pedestrian" hmRendered="true" minzoom="14" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/> <filter appMode="pedestrian" minzoom="15" strokeWidth="2" pathEffect="10_3" strokeWidth_3="2" pathEffect_3="10_3"/>
<filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/> <filter hmRendered="true" minzoom="12" maxzoom="12" strokeWidth="0.5" strokeWidth_3="0.5"/>
<filter minzoom="13" strokeWidth="1" strokeWidth_3="1"/> <filter hmRendered="true" minzoom="13" strokeWidth="1" strokeWidth_3="1"/>
<filter minzoom="16" strokeWidth="1" strokeWidth_3="1"/>
</filter> </filter>
<!-- Bridges --> <!-- Bridges -->