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

Re-instate exactly old render functionality as starting point for AXES (1)

Browse source
This commit is contained in:
sonora 2011-10-20 22:42:18 +02:00 committed by Victor Shcherb
parent 9c2481a780
commit 32829aed2f
2 changed files with 28 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
DataExtractionOSM/src/net/osmand/render/new_default.render.xml
View file

@ -80,9 +80,8 @@
<filter tag="natural" value="" order="1" /> <filter tag="natural" value="" order="1" />
</group> </group>
<group orderType="2"> <group orderType="2">
<!-- Below see level --> <!-- Below sea level -->
<filter tag="admin_level" value="0" order="0" /> <filter tag="admin_level" value="0" order="0" />
<filter tag="admin_level" value="1" order="0" /> <filter tag="admin_level" value="1" order="0" />
<filter tag="railway" value="" layer="-1" order="58" /> <filter tag="railway" value="" layer="-1" order="58" />
@ -128,7 +127,6 @@
<filter tag="highway" value="footway" order="37" /> <filter tag="highway" value="footway" order="37" />
<filter tag="highway" value="steps" order="36" /> <filter tag="highway" value="steps" order="36" />
<filter tag="highway" value="bridleway" order="35" /> <filter tag="highway" value="bridleway" order="35" />
</group> </group>
<filter tag="" value="" order="128" orderType="1"/> <filter tag="" value="" order="128" orderType="1"/>
@ -139,7 +137,6 @@
<filter tag="" value="" layer="-1" order="10" orderType="2"/> <filter tag="" value="" layer="-1" order="10" orderType="2"/>
<filter tag="" value="" layer="1" order="67" orderType="2"/> <filter tag="" value="" layer="1" order="67" orderType="2"/>
<filter tag="" value="" order="11" orderType="2"/> <filter tag="" value="" order="11" orderType="2"/>
</order> </order>
@ -242,7 +239,6 @@
</groupFilter> </groupFilter>
</group> </group>
<group> <group>
<filter tag="highway" value="track" textOrder="9"/> <filter tag="highway" value="track" textOrder="9"/>
<filter tag="highway" value="path" textOrder="9"/> <filter tag="highway" value="path" textOrder="9"/>
@ -272,7 +268,6 @@
<filter minzoom="14" textSize="12" textHaloRadius="1" textColor="#6699cc" textWrapWidth="20" tag="natural" value="beach" textOrder="10"/> <filter minzoom="14" textSize="12" textHaloRadius="1" textColor="#6699cc" textWrapWidth="20" tag="natural" value="beach" textOrder="10"/>
<group> <group>
<filter minzoom="15" textSize="12" textDy="7" textWrapWidth="20" tag="natural" value="cave_entrance" textOrder="15"/> <filter minzoom="15" textSize="12" textDy="7" textWrapWidth="20" tag="natural" value="cave_entrance" textOrder="15"/>
<filter minzoom="12" maxzoom="14" textSize="12" textHaloRadius="1" textDy="7" tag="natural" value="peak" textOrder="10"/> <filter minzoom="12" maxzoom="14" textSize="12" textHaloRadius="1" textDy="7" tag="natural" value="peak" textOrder="10"/>
@ -466,7 +461,6 @@
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom] --> <!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom] -->
<point> <point>
<filter minzoom="13" icon="highway_ford" tag="highway" value="ford" /> <filter minzoom="13" icon="highway_ford" tag="highway" value="ford" />
<filter minzoom="15" icon="mini_roundabout" tag="highway" value="mini_roundabout" /> <filter minzoom="15" icon="mini_roundabout" tag="highway" value="mini_roundabout" />
<filter minzoom="15" icon="helipad" tag="aeroway" value="helipad" /> <filter minzoom="15" icon="helipad" tag="aeroway" value="helipad" />
@ -691,7 +685,6 @@
</groupFilter> </groupFilter>
</group> </group>
<filter minzoom="14" tag="aeroway" value="terminal" color="#cc99ff"> <filter minzoom="14" tag="aeroway" value="terminal" color="#cc99ff">
<filter nightMode="true" color="#560000"/> <filter nightMode="true" color="#560000"/>
</filter> </filter>
@ -700,7 +693,6 @@
<filter nightMode="true" color="#B0B0B0"/> <filter nightMode="true" color="#B0B0B0"/>
</filter> </filter>
<group> <group>
<filter minzoom="13" tag="power" value="station" /> <filter minzoom="13" tag="power" value="station" />
<filter minzoom="13" tag="power" value="sub_station" /> <filter minzoom="13" tag="power" value="sub_station" />
@ -753,8 +745,6 @@
<filter nightMode="true" color="#560000"/> <filter nightMode="true" color="#560000"/>
</filter> </filter>
<!-- leisure --> <!-- leisure -->
<group> <group>
<filter minzoom="13" tag="leisure" value="stadium" /> <filter minzoom="13" tag="leisure" value="stadium" />
@ -794,7 +784,6 @@
<groupFilter nightMode="true" color="#004333" /> <groupFilter nightMode="true" color="#004333" />
</group> </group>
<!-- amenity --> <!-- amenity -->
<group> <group>
<filter minzoom="15" color="#f0f0d8" color_2="#d4a89e" strokeWidth_2="1" tag="amenity" value="kindergarten" /> <filter minzoom="15" color="#f0f0d8" color_2="#d4a89e" strokeWidth_2="1" tag="amenity" value="kindergarten" />
@ -807,7 +796,6 @@
<groupFilter nightMode="true" color="#66004B" /> <groupFilter nightMode="true" color="#66004B" />
</group> </group>
<group> <group>
<filter minzoom="16" color="#bca9a9" tag="amenity" value="library" /> <filter minzoom="16" color="#bca9a9" tag="amenity" value="library" />
<filter minzoom="15" color="#f0f0d8" color_2="#d4a89e" strokeWidth_2="1" tag="amenity" value="hospital" /> <filter minzoom="15" color="#f0f0d8" color_2="#d4a89e" strokeWidth_2="1" tag="amenity" value="hospital" />
@ -815,7 +803,6 @@
<groupFilter nightMode="true" color="#66004B" /> <groupFilter nightMode="true" color="#66004B" />
</group> </group>
<!-- tourism --> <!-- tourism -->
<filter minzoom="13" color="#f2caea" tag="tourism" value="attraction"> <filter minzoom="13" color="#f2caea" tag="tourism" value="attraction">
<filter nightMode="true" color="#66004B"/> <filter nightMode="true" color="#66004B"/>
@ -840,7 +827,6 @@
<filter nightMode="true" color="#a0004333"/> <filter nightMode="true" color="#a0004333"/>
</filter> </filter>
<!-- military --> <!-- military -->
<filter minzoom="12" color="#ff8f8f" tag="military" value="barracks"> <filter minzoom="12" color="#ff8f8f" tag="military" value="barracks">
<filter nightMode="true" color="#560000"/> <filter nightMode="true" color="#560000"/>
@ -863,7 +849,6 @@
<filter nightMode="true" color="#000034" shader=""/> <filter nightMode="true" color="#000034" shader=""/>
</filter> </filter>
<group tag="landuse" value="garages"> <group tag="landuse" value="garages">
<filter minzoom="12" hmRendered="true" color="#dfd1d6" /> <filter minzoom="12" hmRendered="true" color="#dfd1d6" />
<filter minzoom="14" color="#dfd1d6" /> <filter minzoom="14" color="#dfd1d6" />
@ -923,7 +908,6 @@
<filter minzoom="15" nightMode="true" color="#66004B" color_2="#ff0000" strokeWidth_2="1" tag="landuse" value="retail" /> <filter minzoom="15" nightMode="true" color="#66004B" color_2="#ff0000" strokeWidth_2="1" tag="landuse" value="retail" />
</filter> </filter>
<filter tag="landuse" value="wood"> <filter tag="landuse" value="wood">
<filter hmRendered="true"> <filter hmRendered="true">
<filter minzoom="10" color="#aed1a0" /> <filter minzoom="10" color="#aed1a0" />
@ -931,15 +915,17 @@
<filter minzoom="9" color="#aed1a0" /> <filter minzoom="9" color="#aed1a0" />
<groupFilter nightMode="true" color="#000034"/> <groupFilter nightMode="true" color="#000034"/>
</filter> </filter>
</polygon> </polygon>
<line> <line>
<group> <group>
<filter tag="highway" hmRendered="true" 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 tag="highway" hmRendered="true" 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 tag="highway" hmRendered="true" value="trunk" maxzoom="13" color="#df1346" />
<filter tag="highway" value="trunk" maxzoom="13" color="#ffaf80" /> <filter tag="highway" value="trunk" maxzoom="13" color="#ffaf80" />
<filter tag="highway" hmRendered="true" value="trunk_link" maxzoom="13" color="#df1346" />
<filter tag="highway" value="trunk_link" maxzoom="13" color="#ffaf80" /> <filter tag="highway" value="trunk_link" maxzoom="13" color="#ffaf80" />
<groupFilter> <groupFilter>
<filter minzoom="5" maxzoom="9" strokeWidth="5" /> <filter minzoom="5" maxzoom="9" strokeWidth="5" />
@ -975,9 +961,13 @@
</group> </group>
<group> <group>
<filter tag="highway" hmRendered="true" value="motorway" color="#809bff" color_2="#809bff" />
<filter tag="highway" value="motorway" color="#a58dff" color_2="#a58dff" /> <filter tag="highway" value="motorway" color="#a58dff" color_2="#a58dff" />
<filter tag="highway" hmRendered="true" value="motorway_link" color="#809bff" color_2="#809bff" />
<filter tag="highway" value="motorway_link" color="#a58dff" color_2="#a58dff" /> <filter tag="highway" value="motorway_link" color="#a58dff" color_2="#a58dff" />
<filter tag="highway" hmRendered="true" value="trunk" color="#df1346" color_2="#df1346" />
<filter tag="highway" value="trunk" color="#ffaf80" color_2="#ffaf80" /> <filter tag="highway" value="trunk" color="#ffaf80" color_2="#ffaf80" />
<filter tag="highway" hmRendered="true" value="trunk_link" color="#df1346" color_2="#df1346" />
<filter tag="highway" value="trunk_link" color="#ffaf80" color_2="#ffaf80" /> <filter tag="highway" value="trunk_link" color="#ffaf80" color_2="#ffaf80" />
<filter tag="highway" value="primary" color="#eb989a" color_2="#eb989a" /> <filter tag="highway" value="primary" color="#eb989a" color_2="#eb989a" />
<filter tag="highway" value="primary_link" color="#eb989a" color_2="#eb989a" /> <filter tag="highway" value="primary_link" color="#eb989a" color_2="#eb989a" />
@ -1118,7 +1108,6 @@
<filter minzoom="12" maxzoom="12" hmRendered="true" color="#996600" strokeWidth="0.5" pathEffect="4_3" tag="highway" value="track" /> <filter minzoom="12" maxzoom="12" hmRendered="true" color="#996600" strokeWidth="0.5" pathEffect="4_3" tag="highway" value="track" />
<filter minzoom="13" color="#996600" strokeWidth="1" pathEffect="4_3" tag="highway" value="track" /> <filter minzoom="13" color="#996600" strokeWidth="1" pathEffect="4_3" tag="highway" value="track" />
<filter tag="highway" value="footway"> <filter tag="highway" value="footway">
<filter layer="1" minzoom="15" color="#88ffffff" strokeWidth="4" color_2="#fa8073" strokeWidth_2="2" pathEffect_2="2_2" /> <filter layer="1" minzoom="15" color="#88ffffff" strokeWidth="4" color_2="#fa8073" strokeWidth_2="2" pathEffect_2="2_2" />
<filter appMode="pedestrian" minzoom="14" color="#fa8073" strokeWidth="2" pathEffect="10_3" /> <filter appMode="pedestrian" minzoom="14" color="#fa8073" strokeWidth="2" pathEffect="10_3" />
@ -1134,7 +1123,6 @@
<filter minzoom="15" color="#fa8073" strokeWidth="4" pathEffect="1_2"/> <filter minzoom="15" color="#fa8073" strokeWidth="4" pathEffect="1_2"/>
</filter> </filter>
<filter tag="highway" value="bridleway"> <filter tag="highway" value="bridleway">
<filter layer="1" minzoom="15" color="#88ffffff" strokeWidth="2" color_2="#00ff00" strokeWidth_2="2" pathEffect_2="2_2" /> <filter layer="1" minzoom="15" color="#88ffffff" strokeWidth="2" color_2="#00ff00" strokeWidth_2="2" pathEffect_2="2_2" />
<filter appMode="pedestrian" minzoom="14" color="#00ff00" strokeWidth="2" pathEffect="10_3" /> <filter appMode="pedestrian" minzoom="14" color="#00ff00" strokeWidth="2" pathEffect="10_3" />
@ -1152,8 +1140,6 @@
<filter minzoom="15" maxzoom="15" color="#99cccc" strokeWidth="6" color_2="#ffffff" strokeWidth_2="5" pathEffect_2="8_6" tag="highway" value="proposed" /> <filter minzoom="15" maxzoom="15" color="#99cccc" strokeWidth="6" color_2="#ffffff" strokeWidth_2="5" pathEffect_2="8_6" tag="highway" value="proposed" />
<filter minzoom="16" color="#99cccc" strokeWidth="8" color_2="#ffffff" strokeWidth_2="7" pathEffect_2="8_6" tag="highway" value="proposed" /> <filter minzoom="16" color="#99cccc" strokeWidth="8" color_2="#ffffff" strokeWidth_2="7" pathEffect_2="8_6" tag="highway" value="proposed" />
<!-- barrier --> <!-- barrier -->
<filter minzoom="16" color="#000000" strokeWidth="1" tag="highway" value="gate" /> <filter minzoom="16" color="#000000" strokeWidth="1" tag="highway" value="gate" />
<filter minzoom="16" color="#aed1a0" strokeWidth="3" tag="barrier" value="hedge" /> <filter minzoom="16" color="#aed1a0" strokeWidth="3" tag="barrier" value="hedge" />
@ -1269,16 +1255,13 @@
<filter layer="1" minzoom="13" color="#000000" strokeWidth="4.5" color_2="#888888" strokeWidth_2="2" pathEffect_2="4_2" tag="railway" value="construction" /> <filter layer="1" minzoom="13" color="#000000" strokeWidth="4.5" color_2="#888888" strokeWidth_2="2" pathEffect_2="4_2" tag="railway" value="construction" />
<filter minzoom="13" color="#888888" strokeWidth="2" pathEffect="4_2" tag="railway" value="construction" /> <filter minzoom="13" color="#888888" strokeWidth="2" pathEffect="4_2" tag="railway" value="construction" />
<filter minzoom="15" color="#777777" strokeWidth="3" pathEffect="2_3" tag="railway" value="monorail" /> <filter minzoom="15" color="#777777" strokeWidth="3" pathEffect="2_3" tag="railway" value="monorail" />
<filter layer="-1" minzoom="15" color="#666666" strokeWidth="5" pathEffect="5_3" color_2="#cccccc" strokeWidth_2="3" tag="railway" value="funicular" /> <filter layer="-1" minzoom="15" color="#666666" strokeWidth="5" pathEffect="5_3" color_2="#cccccc" strokeWidth_2="3" tag="railway" value="funicular" />
<filter minzoom="15" color="#666666" strokeWidth="2" tag="railway" value="funicular" /> <filter minzoom="15" color="#666666" strokeWidth="2" tag="railway" value="funicular" />
<filter minzoom="15" color="#888888" strokeWidth="3" tag="railway" value="platform" /> <filter minzoom="15" color="#888888" strokeWidth="3" tag="railway" value="platform" />
<!-- aeroway --> <!-- aeroway -->
<filter tag="aeroway" value="runway" color="#bbbbcc"> <filter tag="aeroway" value="runway" color="#bbbbcc">
<filter layer="1" minzoom="13" maxzoom="13" color="#000000" strokeWidth="9" color_2="#bbbbcc" strokeWidth_2="7" cap_2="SQUARE" /> <filter layer="1" minzoom="13" maxzoom="13" color="#000000" strokeWidth="9" color_2="#bbbbcc" strokeWidth_2="7" cap_2="SQUARE" />

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources> <resources>
<string name="pref_vector_rendering">Vector renderer specific options</string> <string name="pref_vector_rendering">Vector renderer specific options</string>
<string name="pref_overlay">Overlay/underlay</string> <string name="pref_overlay">Overlay / underlay</string>
<string name="pref_raster_map">Tile map settings</string> <string name="pref_raster_map">Tile map settings</string>
<string name="pref_vector_map">Vector map settings</string> <string name="pref_vector_map">Vector map settings</string>
<string name="delete_confirmation_title">About to delete</string> <string name="delete_confirmation_title">About to delete</string>