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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2012-08-10 15:09:47 +02:00
commit 98d6de5977
2 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,11 +37,11 @@
</renderingAttribute> </renderingAttribute>
<!-- <!--
All-Purpose Renderer (by Hardy Mueller), v023: All-Purpose Renderer (with attr="hmRendered" name="Show more map detail") (by Hardy Mueller), v023:
- with ShowMoreMapDetails some roads already rendered at lower zooms (travel/orienteering) - some roads already rendered at lower zooms (travel/orienteering)
- with ShowMoreMapDetails motorways shown blue and trunk roads red, aligned with conventional road atlas - motorways shown blue and trunk roads red to assimilate primaries, aligned with conventional road atlas
(road color scheme intensified on 2012-08-10. Old values commented with PALE-SCHEME) (road color scheme intensified and unfied to Brightness=100, Saturation=50 on 2012-08-10. Old values commented with PALE-SCHEME)
- with ShowMoreMapDetails map rendering is aligned to typical map use for all zoom levels (scales), to always give a complete and reliable map. - map rendering is aligned to typical map use for all zoom levels (scales), to always give a complete and reliable map.
Typical zoom level use (zX) and alignment of features displayed: Typical zoom level use (zX) and alignment of features displayed:
- z7 = "Rough Region Level Overview": Shows motorways, trunks, primary roads and city names - z7 = "Rough Region Level Overview": Shows motorways, trunks, primary roads and city names
- z11 = "Country Road Atlas": Secondary roads (already from z9) and tertiary (already from z10). Show large scale landuse like forest and residential areas (already from z10). Also all town names (already from z9) and now all other locality names. Shows mountain peaks for orientation. - z11 = "Country Road Atlas": Secondary roads (already from z9) and tertiary (already from z10). Show large scale landuse like forest and residential areas (already from z10). Also all town names (already from z9) and now all other locality names. Shows mountain peaks for orientation.
@ -1009,19 +1009,21 @@
<line> <line>
<filter minzoom="1" tag="natural" value="coastline_broken" color="#111111" strokeWidth="1"/> <filter minzoom="1" tag="natural" value="coastline_broken" color="#111111" strokeWidth="1"/>
<group> <group>
<filter hmRendered="true" tag="highway" value="motorway" maxzoom="13" color="#809bff"/>
<filter viRendered="true" tag="highway" value="motorway" maxzoom="13" color="#6666CC"/> <filter viRendered="true" tag="highway" value="motorway" maxzoom="13" color="#6666CC"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="motorway" maxzoom="13" color="#809bff"/ -->
<filter hmRendered="true" tag="highway" value="motorway" maxzoom="13" color="#809bff"/>
<filter tag="highway" value="motorway" maxzoom="13" color="#a58dff"/> <filter tag="highway" value="motorway" maxzoom="13" color="#a58dff"/>
<filter hmRendered="true" tag="highway" value="motorway_link" maxzoom="13" color="#809bff"/>
<filter viRendered="true" tag="highway" value="motorway_link" maxzoom="13" color="#6666CC"/> <filter viRendered="true" tag="highway" value="motorway_link" maxzoom="13" color="#6666CC"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="motorway_link" maxzoom="13" color="#809bff"/ -->
<filter hmRendered="true" tag="highway" value="motorway_link" maxzoom="13" color="#809bff"/>
<filter tag="highway" value="motorway_link" maxzoom="13" color="#a58dff"/> <filter tag="highway" value="motorway_link" maxzoom="13" color="#a58dff"/>
<filter viRendered="true" tag="highway" value="trunk" maxzoom="13" color="#A02067"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk" maxzoom="13" color="#df1346"/ --> <!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk" maxzoom="13" color="#df1346"/ -->
<filter hmRendered="true" tag="highway" value="trunk" maxzoom="13" color="#ed154b"/> <filter hmRendered="true" tag="highway" value="trunk" maxzoom="13" color="#ed154b"/>
<filter viRendered="true" tag="highway" value="trunk" maxzoom="13" color="#A02067"/>
<filter tag="highway" value="trunk" maxzoom="13" color="#ffaf80"/> <filter tag="highway" value="trunk" maxzoom="13" color="#ffaf80"/>
<filter viRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#A02067"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#df1346"/ --> <!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#df1346"/ -->
<filter hmRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#ed154b"/> <filter hmRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#ed154b"/>
<filter viRendered="true" tag="highway" value="trunk_link" maxzoom="13" color="#A02067"/>
<filter tag="highway" value="trunk_link" maxzoom="13" color="#ffaf80"/> <filter tag="highway" value="trunk_link" maxzoom="13" color="#ffaf80"/>
<groupFilter cap="ROUND"> <groupFilter cap="ROUND">
<filter minzoom="5" maxzoom="9" strokeWidth="5"/> <filter minzoom="5" maxzoom="9" strokeWidth="5"/>
@ -1033,13 +1035,13 @@
</group> </group>
<group> <group>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary" maxzoom="13" color="#eb989a"/ -->
<filter hmRendered="true" tag="highway" value="primary" maxzoom="13" color="#ed5a7f"/>
<filter viRendered="true" tag="highway" value="primary" maxzoom="13" color="#C04D61"/> <filter viRendered="true" tag="highway" value="primary" maxzoom="13" color="#C04D61"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary" maxzoom="13" color="#eb989a"/ -->
<filter hmRendered="true" tag="highway" value="primary" maxzoom="13" color="#ff80a0"/>
<filter tag="highway" value="primary" maxzoom="13" color="#eb989a"/> <filter tag="highway" value="primary" maxzoom="13" color="#eb989a"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#eb989a"/ -->
<filter hmRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#ed5a7f"/>
<filter viRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#C04D61"/> <filter viRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#C04D61"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#eb989a"/ -->
<filter hmRendered="true" tag="highway" value="primary_link" maxzoom="13" color="#ff80a0"/>
<filter tag="highway" value="primary_link" maxzoom="13" color="#eb989a"/> <filter tag="highway" value="primary_link" maxzoom="13" color="#eb989a"/>
<groupFilter cap="ROUND"> <groupFilter cap="ROUND">
<filter minzoom="7" maxzoom="9" strokeWidth="4"/> <filter minzoom="7" maxzoom="9" strokeWidth="4"/>
@ -1051,13 +1053,13 @@
</group> </group>
<group> <group>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary" maxzoom="13" color="##fdd6a4"/ -->
<filter hmRendered="true" tag="highway" value="secondary" maxzoom="13" color="#ffd080"/>
<filter viRendered="true" tag="highway" value="secondary" maxzoom="13" color="#F7D131"/> <filter viRendered="true" tag="highway" value="secondary" maxzoom="13" color="#F7D131"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary" maxzoom="13" color="#fdd6a4"/ -->
<filter hmRendered="true" tag="highway" value="secondary" maxzoom="13" color="#ffd080"/>
<filter tag="highway" value="secondary" maxzoom="13" color="#fdd6a4"/> <filter tag="highway" value="secondary" maxzoom="13" color="#fdd6a4"/>
<filter viRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#F7D131"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#fdd6a4"/ --> <!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#fdd6a4"/ -->
<filter hmRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#ffd080"/> <filter hmRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#ffd080"/>
<filter viRendered="true" tag="highway" value="secondary_link" maxzoom="13" color="#F7D131"/>
<filter tag="highway" value="secondary_link" maxzoom="13" color="#fdd6a4"/> <filter tag="highway" value="secondary_link" maxzoom="13" color="#fdd6a4"/>
<groupFilter shadowRadius="1" cap="ROUND"> <groupFilter shadowRadius="1" cap="ROUND">
<filter minzoom="9" maxzoom="9" strokeWidth="3"/> <filter minzoom="9" maxzoom="9" strokeWidth="3"/>
@ -1069,35 +1071,37 @@
</group> </group>
<group> <group>
<filter hmRendered="true" tag="highway" value="motorway" color="#809bff"/>
<filter viRendered="true" tag="highway" value="motorway" color="#6666CC"/> <filter viRendered="true" tag="highway" value="motorway" color="#6666CC"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="motorway" color="#809bff"/ -->
<filter hmRendered="true" tag="highway" value="motorway" color="#809bff"/>
<filter tag="highway" value="motorway" color="#a58dff"/> <filter tag="highway" value="motorway" color="#a58dff"/>
<filter hmRendered="true" tag="highway" value="motorway_link" color="#809bff"/>
<filter viRendered="true" tag="highway" value="motorway_link" color="#6666CC"/> <filter viRendered="true" tag="highway" value="motorway_link" color="#6666CC"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="motorway_link" color="#809bff"/ -->
<filter hmRendered="true" tag="highway" value="motorway_link" color="#809bff"/>
<filter tag="highway" value="motorway_link" color="#a58dff"/> <filter tag="highway" value="motorway_link" color="#a58dff"/>
<filter viRendered="true" tag="highway" value="trunk" color="#A02067"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk" color="#df1346"/ --> <!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk" color="#df1346"/ -->
<filter hmRendered="true" tag="highway" value="trunk" color="#ed154b"/> <filter hmRendered="true" tag="highway" value="trunk" color="#ed154b"/>
<filter viRendered="true" tag="highway" value="trunk" color="#A02067"/>
<filter tag="highway" value="trunk" color="#ffaf80"/> <filter tag="highway" value="trunk" color="#ffaf80"/>
<filter viRendered="true" tag="highway" value="trunk_link" color="#A02067"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk_link" color="#df1346"/ --> <!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="trunk_link" color="#df1346"/ -->
<filter hmRendered="true" tag="highway" value="trunk_link" color="#ed154b"/> <filter hmRendered="true" tag="highway" value="trunk_link" color="#ed154b"/>
<filter viRendered="true" tag="highway" value="trunk_link" color="#A02067"/>
<filter tag="highway" value="trunk_link" color="#ffaf80"/> <filter tag="highway" value="trunk_link" color="#ffaf80"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary" color="#eb989a"/ -->
<filter hmRendered="true" tag="highway" value="primary" color="#ed5a7f"/>
<filter viRendered="true" tag="highway" value="primary" color="#C04D61"/> <filter viRendered="true" tag="highway" value="primary" color="#C04D61"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary" color="#eb989a"/ -->
<filter hmRendered="true" tag="highway" value="primary" color="#ff80a0"/>
<filter tag="highway" value="primary" color="#eb989a"/> <filter tag="highway" value="primary" color="#eb989a"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary_link" color="#eb989a"/ -->
<filter hmRendered="true" tag="highway" value="primary_link" color="#ed5a7f"/>
<filter viRendered="true" tag="highway" value="primary_link" color="#C04D61"/> <filter viRendered="true" tag="highway" value="primary_link" color="#C04D61"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="primary_link" color="#eb989a"/ -->
<filter hmRendered="true" tag="highway" value="primary_link" color="#ff80a0"/>
<filter tag="highway" value="primary_link" color="#eb989a"/> <filter tag="highway" value="primary_link" color="#eb989a"/>
<filter viRendered="true" tag="highway" value="secondary" color="#F7D131"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary" color="#fdd6a4"/ --> <!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary" color="#fdd6a4"/ -->
<filter hmRendered="true" tag="highway" value="secondary" color="#ffd080"/> <filter hmRendered="true" tag="highway" value="secondary" color="#ffd080"/>
<filter viRendered="true" tag="highway" value="secondary" color="#F7D131"/>
<filter tag="highway" value="secondary" color="#fdd6a4"/> <filter tag="highway" value="secondary" color="#fdd6a4"/>
<filter viRendered="true" tag="highway" value="secondary_link" color="#F7D131"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary_link" color="#fdd6a4"/ --> <!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="secondary_link" color="#fdd6a4"/ -->
<filter hmRendered="true" tag="highway" value="secondary_link" color="#ffd080"/> <filter hmRendered="true" tag="highway" value="secondary_link" color="#ffd080"/>
<filter viRendered="true" tag="highway" value="secondary_link" color="#F7D131"/>
<filter tag="highway" value="secondary_link" color="#fdd6a4"/> <filter tag="highway" value="secondary_link" color="#fdd6a4"/>
<groupFilter shadowRadius="1" cap="ROUND"> <groupFilter shadowRadius="1" cap="ROUND">
@ -1122,13 +1126,13 @@
</group> </group>
<group> <group>
<!-- PALE-SCHEME filter hmRendered="true" tag="tertiary" value="trunk_link" color="#fefeb3"/ --> <filter viRendered="true" tag="highway" value="tertiary" color="#F0CE30"/>
<filter hmRendered="true" tag="tertiary" value="trunk_link" color="#fefe83"/> <!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="tertiary" color="#fefeb3"/ -->
<filter viRendered="true" tag="tertiary" value="trunk_link" color="#F0CE30"/> <filter hmRendered="true" tag="highway" value="tertiary" color="#ffff80"/>
<filter tag="highway" value="tertiary" color="#fefeb3"/> <filter tag="highway" value="tertiary" color="#fefeb3"/>
<!-- PALE-SCHEME filter hmRendered="true" tag="tertiary_link" value="trunk_link" color="#fefeb3"/ --> <filter viRendered="true" tag="highway" value="tertiary_link" color="#F0CE30"/>
<filter hmRendered="true" tag="tertiary_link" value="trunk_link" color="#fefe83"/> <!-- PALE-SCHEME filter hmRendered="true" tag="highway" value="tertiary_link" color="#fefeb3"/ -->
<filter viRendered="true" tag="tertiary_link" value="trunk_link" color="#F0CE30"/> <filter hmRendered="true" tag="highway" value="tertiary_link" color="#ffff80"/>
<filter tag="highway" value="tertiary_link" color="#fefeb3"/> <filter tag="highway" value="tertiary_link" color="#fefeb3"/>
<groupFilter shadowRadius="1" cap="ROUND"> <groupFilter shadowRadius="1" cap="ROUND">
<filter minzoom="10" maxzoom="10" strokeWidth="3"/> <filter minzoom="10" maxzoom="10" strokeWidth="3"/>

2
OsmAnd/res/values/colors.xml
View file

@ -16,7 +16,7 @@
<!-- LAYER and SPECIAL PURPOSE consistency colors --> <!-- LAYER and SPECIAL PURPOSE consistency colors -->
<color name="gpx_track">#B4A00AD7</color> <color name="gpx_track">#B4A00AD7</color>
<!-- try magenta instead of cyan color name="gpx_track_fluorescent">#B400FFFF</color> <!-- try magenta instead of cyan color name="gpx_track_fluorescent">#B400FFFF</color -->
<color name="gpx_track_fluorescent">#B4FF00FF</color> <color name="gpx_track_fluorescent">#B4FF00FF</color>
<color name="pos_heading">#320000FF</color> <color name="pos_heading">#320000FF</color>
<color name="pos_area">#280000FF</color> <color name="pos_area">#280000FF</color>