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

fix rendering bug with layer 1 orders

Browse source
This commit is contained in:
sonora 2012-12-01 22:27:35 +01:00
parent 94b2a48586
commit 7404b145d3
2 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
DataExtractionOSM/src/net/osmand/render/Winter-and-ski.render.xml
View file

@ -21,10 +21,10 @@
<order>
<!-- Winter layers -->
<group objectType="2">
<filter tag="oa_nordic" value="" order="57"/>
<filter tag="oa_downhill" value="" order="57"/>
<filter tag="oa_skitour" value="" order="57"/>
<filter tag="oa_hike" value="" order="57"/>
<filter tag="oa_nordic" value="" order="60"/>
<filter tag="oa_downhill" value="" order="60"/>
<filter tag="oa_skitour" value="" order="60"/>
<filter tag="oa_hike" value="" order="60"/>
</group>
</order>

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

@ -195,17 +195,18 @@
<group objectType="2" area="false" point="false">
<!-- Over buildings -->
<filter tag="aerialway" value="" order="68"/>
<filter tag="power" value="line" order="68"/>
<filter tag="power" value="minor_line" order="68"/>
<filter tag="aerialway" value="" order="96"/>
<filter tag="power" value="line" order="96"/>
<filter tag="power" value="minor_line" order="96"/>
<filter layer="1" tag="railway" value="" order="66"/>
<filter layer="1" tag="railway" value="" order="88"/>
<filter appMode="car" layer="1" tag="railway" value="" order="71"/>
<filter appMode="car" tag="railway" value="" order="36"/>
<filter tag="railway" value="" order="58"/>
<filter appMode="car" tag="public_transport" value="" order="36"/>
<filter tag="public_transport" value="" order="58"/>
<filter layer="1" tag="waterway" value="" order="66"/>
<filter layer="1" tag="waterway" value="" order="68"/>
<filter tag="waterway" value="" order="18"/>
<!-- Admin_levels under highways unless appMode=default -->
@ -217,80 +218,80 @@
<filter tag="administrative" value="" order="62"/>
<filter tag="boundary" value="" order="62"/>
<!-- Highways: 35-57, bridges 66+/-1 -->
<filter layer="1" tag="highway" value="motorway" order="66"/>
<!-- Highways: 35-57, bridges 70-88 -->
<filter layer="1" tag="highway" value="motorway" order="87"/>
<filter tag="highway" value="motorway" order="57"/>
<filter layer="1" tag="highway" value="trunk" order="66"/>
<filter layer="1" tag="highway" value="trunk" order="86"/>
<filter tag="highway" value="trunk" order="56"/>
<filter layer="1" tag="highway" value="primary" order="66"/>
<filter layer="1" tag="highway" value="primary" order="85"/>
<filter tag="highway" value="primary" order="55"/>
<filter layer="1" tag="highway" value="secondary" order="66"/>
<filter layer="1" tag="highway" value="secondary" order="84"/>
<filter tag="highway" value="secondary" order="54"/>
<filter layer="1" tag="highway" value="tertiary" order="66"/>
<filter layer="1" tag="highway" value="tertiary" order="83"/>
<filter tag="highway" value="tertiary" order="53"/>
<filter layer="1" tag="highway" value="road" order="66"/>
<filter layer="1" tag="highway" value="road" order="82"/>
<filter tag="highway" value="road" order="52"/>
<filter layer="1" tag="highway" value="unclassified" order="66"/>
<filter layer="1" tag="highway" value="unclassified" order="82"/>
<filter tag="highway" value="unclassified" order="52"/>
<filter layer="1" tag="highway" value="residential" order="66" area="false"/>
<filter layer="1" tag="highway" value="residential" order="81" area="false"/>
<filter tag="highway" value="residential" order="51" area="false"/>
<filter layer="1" tag="highway" value="service" order="66"/>
<filter layer="1" tag="highway" value="service" order="81"/>
<filter tag="highway" value="service" order="51"/>
<filter layer="1" tag="highway" value="living_street" order="66"/>
<filter layer="1" tag="highway" value="living_street" order="80"/>
<filter tag="highway" value="living_street" order="50"/>
<filter layer="1" tag="highway" value="pedestrian" order="66"/>
<filter layer="1" tag="highway" value="pedestrian" order="80"/>
<filter appMode="pedestrian" tag="highway" value="pedestrian" order="58"/>
<filter tag="highway" value="pedestrian" order="50"/>
<filter layer="1" tag="highway" value="construction" order="65"/>
<filter layer="1" tag="highway" value="construction" order="76"/>
<filter tag="highway" value="construction" order="46"/>
<filter layer="1" tag="highway" value="proposed" order="65"/>
<filter layer="1" tag="highway" value="proposed" order="75"/>
<filter tag="highway" value="proposed" order="45"/>
<filter layer="1" tag="highway" value="motorway_link" order="65"/>
<filter layer="1" tag="highway" value="motorway_link" order="74"/>
<filter tag="highway" value="motorway_link" order="44"/>
<filter layer="1" tag="highway" value="trunk_link" order="65"/>
<filter layer="1" tag="highway" value="trunk_link" order="73"/>
<filter tag="highway" value="trunk_link" order="43"/>
<filter layer="1" tag="highway" value="primary_link" order="65"/>
<filter layer="1" tag="highway" value="primary_link" order="72"/>
<filter tag="highway" value="primary_link" order="42"/>
<filter layer="1" tag="highway" value="secondary_link" order="65"/>
<filter layer="1" tag="highway" value="secondary_link" order="71"/>
<filter tag="highway" value="secondary_link" order="41"/>
<filter layer="1" tag="highway" value="tertiary_link" order="65"/>
<filter layer="1" tag="highway" value="tertiary_link" order="70"/>
<filter tag="highway" value="tertiary_link" order="40"/>
<filter layer="1" tag="highway" value="cycleway" order="67"/>
<filter layer="1" tag="highway" value="cycleway" order="90"/>
<filter appMode="pedestrian" tag="highway" value="cycleway" order="59"/>
<filter appMode="bicycle" tag="highway" value="cycleway" order="60"/>
<filter tag="highway" value="cycleway" order="39"/>
<filter layer="1" appMode="bicycle" tag="cycleway" value="" order="67"/>
<filter layer="1" appMode="bicycle" tag="cycleway" value="" order="90"/>
<filter appMode="bicycle" tag="cycleway" value="" order="60"/>
<!-- byway is deprecated tag, describes UK-only road. Proper tag should be highway=track or highway=path -->
<filter layer="1" tag="highway" value="byway" order="67"/>
<filter layer="1" tag="highway" value="byway" order="90"/>
<filter appMode="pedestrian" tag="highway" value="byway" order="60"/>
<filter appMode="bicycle" tag="highway" value="byway" order="59"/>
<filter tag="highway" value="byway" order="37"/>
<filter layer="1" tag="highway" value="track" order="67"/>
<filter layer="1" tag="highway" value="track" order="90"/>
<filter appMode="pedestrian" tag="highway" value="track" order="60"/>
<filter tag="highway" value="track" order="37"/>
<filter layer="1" tag="highway" value="path" order="67"/>
<filter layer="1" tag="highway" value="path" order="90"/>
<filter appMode="pedestrian" tag="highway" value="path" order="60"/>
<filter tag="highway" value="path" order="37"/>
<filter layer="1" tag="highway" value="footway" order="67"/>
<filter layer="1" tag="highway" value="footway" order="90"/>
<filter appMode="pedestrian" tag="highway" value="footway" order="60"/>
<filter tag="highway" value="footway" order="37"/>
<filter layer="1" tag="highway" value="steps" order="67"/>
<filter layer="1" tag="highway" value="steps" order="91"/>
<filter appMode="pedestrian" tag="highway" value="steps" order="61"/>
<filter tag="highway" value="steps" order="38"/>
<filter layer="1" tag="highway" value="bridleway" order="67"/>
<filter layer="1" tag="highway" value="bridleway" order="90"/>
<filter appMode="pedestrian" tag="highway" value="bridleway" order="59"/>
<filter tag="highway" value="bridleway" order="36"/>
<filter tag="highway" value="bridleway" order="37"/>
<filter tag="natural" value="coastline_broken" order="35"/>
<filter tag="natural" value="coastline_line" order="35"/>