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

Fix all other renderers

Browse source
This commit is contained in:
Victor Shcherb 2011-07-03 01:00:00 +02:00
parent 33c5e00f4e
commit 0019501c95
5 changed files with 69 additions and 1169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DataExtractionOSM/src/net/osmand/render/bicycle.render.xml
View file

@ -1,10 +1,10 @@
<renderer name="bicycle" depends="default" defaultColor="#f1eee8">
<renderer name="bicycle" depends="default" defaultColor="#f1eee8" defaultNightColor="#003333">
<order>
<filter orderType="line">
<filter tag="highway" value="cycleway" order="59" />
</filter>
</order>
<line>
<filter tag="highway" value="cycleway" minzoom="14" color="#0000ff" strokeWidth="3" pathEffect="10_3" />
<filter tag="highway" value="cycleway" minzoom="14" color="#0000ff" strokeWidth="2" pathEffect="10_3" />
</line>
</renderer>

168
DataExtractionOSM/src/net/osmand/render/car.render.xml
View file

@ -1,155 +1,67 @@
<renderer name="car" depends="default" defaultColor="#f1eee8">
<renderer name="car" depends="default" defaultColor="#f1eee8" defaultNightColor="#003333">
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom], textLength, ref -->
<polygon>
</polygon>
<text>
<!-- Highway text -->
<filter minzoom="16" textSize="15" textOnPath="true" tag="highway" value="motorway" />
<filter minzoom="16" textSize="15" textOnPath="true" tag="highway" value="motorway_link" />
<switch>
<case tag="highway" value="trunk" />
<case tag="highway" value="trunk_link" />
<case tag="highway" value="primary" />
<case tag="highway" value="primary_link" />
<case tag="highway" value="secondary" />
<case tag="highway" value="secondary_link" />
<filter>
<filter minzoom="13" maxzoom="13" textSize="13" textOnPath="true" />
<filter minzoom="14" maxzoom="14" textSize="14" textOnPath="true" />
<filter minzoom="15" maxzoom="16" textSize="14" textOnPath="true" />
<filter minzoom="17" textSize="16" textOnPath="true" />
</filter>
</switch>
<switch>
<case tag="highway" value="tertiary" />
<case tag="highway" value="tertiary_link" />
<case tag="highway" value="residential" />
<case tag="highway" value="service" />
<case tag="highway" value="unclassified" />
<case tag="highway" value="road" />
<filter>
<filter minzoom="15" maxzoom="16" textSize="14" textOnPath="true" />
<filter minzoom="17" textSize="15" textOnPath="true" />
</filter>
</switch>
<filter minzoom="16" textSize="12" textOnPath="true">
<filter tag="highway" value="track" />
<filter tag="highway" value="path" />
<filter tag="highway" value="living_street" />
<filter tag="highway" value="pedestrian" />
<filter tag="highway" value="cycleway" />
<filter tag="highway" value="byway" />
<filter tag="highway" value="footway" />
<filter tag="highway" value="steps" />
<filter tag="highway" value="bridleway" />
<filter tag="highway" value="services" />
<filter tag="highway" value="ford" />
<filter tag="highway" value="construction" />
<filter tag="highway" value="proposed" />
</filter>
<filter minzoom="15" textSize="13" textColor="#777777" textHaloRadius="1" tag="place" value="village" />
<filter minzoom="15" textSize="13" textColor="#777777" textHaloRadius="1" tag="place" value="hamlet" />
<filter minzoom="16" textSize="13" textColor="#777777" textHaloRadius="1" tag="place" value="locality" />
</text>
<line>
<switch>
<case tag="highway" value="motorway" color="#809bc0" />
<case tag="highway" value="motorway_link" color="#809bc0" />
<case tag="highway" value="trunk" color="#a8daa8" />
<case tag="highway" value="trunk_link" color="#a8daa8" />
<case tag="highway" value="primary" color="#eb989a"/>
<case tag="highway" value="primary_link" color="#eb989a"/>
<case tag="highway" value="secondary" color="#fdd6a4"/>
<case tag="highway" value="secondary_link" color="#fdd6a4"/>
<case tag="highway" value="tertiary" color="#fefeb3" shadowColor="#bababa" shadowRadius="1"/>
<case tag="highway" value="tertiary_link" color="#fefeb3" shadowColor="#bababa" shadowRadius="1"/>
<case nightMode="false" color="#ffffff" color_2="#ffffff" shadowColor="#464646"/>
<case nightMode="true" color="#9F9F9F" color_2="#9F9F9F" shadowColor="#666666"/>
<!-- ZM
<switch>
<case tag="highway" value="residential" />
<case tag="highway" value="unclassified" />
<case tag="highway" value="road" />
<filter color="#ffffff" shadowColor="#464646" shadowRadius="1">
<filter minzoom="12" maxzoom="12" strokeWidth="3" />
<filter minzoom="13" maxzoom="13" strokeWidth="4" />
</filter>
</switch> -->
<switch>
<case tag="highway" value="tertiary" color="#fefeb3" color_2="#fefeb3" shadowColor="#bababa" />
<case tag="highway" value="tertiary_link" color="#fefeb3" color_2="#fefeb3" shadowColor="#bababa" />
<case tag="highway" value="residential" />
<case tag="highway" value="unclassified" />
<case tag="highway" value="road"/>
<filter>
<switch>
<case layer="-1" pathEffect="4_4" />
<case /> <!-- all other cases -->
<filter>
<filter minzoom="13" maxzoom="14" strokeWidth="10" />
<filter minzoom="15" maxzoom="15" strokeWidth="12" />
<filter minzoom="16" maxzoom="16" strokeWidth="14" />
<filter minzoom="17" maxzoom="17" strokeWidth="16" />
<filter minzoom="14" maxzoom="14" strokeWidth="6" shadowRadius="1"/>
<filter minzoom="15" maxzoom="15" strokeWidth="8" shadowRadius="1"/>
<filter minzoom="16" maxzoom="16" strokeWidth="10" />
<!-- radius 0 to avoid showing many black lines -->
<filter minzoom="17" maxzoom="17" strokeWidth="13" />
<filter minzoom="18" strokeWidth="18" />
</filter>
</switch>
</filter>
</switch>
<switch>
<case tag="highway" value="motorway" color_2="#809bc0" />
<case tag="highway" value="motorway_link" color_2="#809bc0" />
<case tag="highway" value="trunk" color_2="#a8daa8" />
<case tag="highway" value="trunk_link" color_2="#a8daa8" />
<case tag="highway" value="primary" color_2="#eb989a"/>
<case tag="highway" value="primary_link" color_2="#eb989a"/>
<case tag="highway" value="secondary" color_2="#fdd6a4"/>
<case tag="highway" value="secondary_link" color_2="#fdd6a4"/>
<case tag="highway" value="tertiary" color_2="#fefeb3" shadowColor="#bababa" shadowRadius="1"/>
<case tag="highway" value="tertiary_link" color_2="#fefeb3" shadowColor="#bababa" shadowRadius="1"/>
<!-- bridge -->
<filter layer="1" color="#000000" cap_2="SQUARE">
<filter minzoom="15" maxzoom="15" strokeWidth="14" strokeWidth_2="12" />
<filter minzoom="16" maxzoom="16" strokeWidth="16" strokeWidth_2="14" />
<filter minzoom="17" maxzoom="17" strokeWidth="18" strokeWidth_2="16" />
<filter minzoom="18" strokeWidth="20" strokeWidth_2="18" />
</filter>
</switch>
<switch>
<case tag="highway" value="residential" color="#ffffff" shadowColor="#c2c2c2" color_2="#ffffff" />
<case tag="highway" value="service" color="#ffffff" shadowColor="#c2c2c2" color_2="#ffffff" />
<case tag="highway" value="unclassified" color="#ffffff" shadowColor="#c2c2c2" color_2="#ffffff" />
<case tag="highway" value="road" color="#ffffff" shadowColor="#c2c2c2" color_2="#ffffff" />
<case tag="highway" value="living_street" color="#ffffff" shadowColor="#c2c2c2" color_2="#ffffff" />
<case tag="highway" value="pedestrian" color="#ececec" shadowColor="#b0b0b0" color_2="#ececec"/>
<filter shadowRadius="1">
<switch>
<case layer="-1" pathEffect="4_4" />
<case /> <!-- all other cases -->
<filter>
<filter minzoom="14" maxzoom="14" strokeWidth="7" />
<filter minzoom="15" maxzoom="15" strokeWidth="9" />
<filter minzoom="16" maxzoom="16" strokeWidth="11" />
<filter minzoom="17" maxzoom="17" strokeWidth="14" />
<filter minzoom="18" strokeWidth="17" />
</filter>
</switch>
<!-- bridge -->
<filter layer="1" color="#000000" cap_2="SQUARE">
<filter minzoom="15" maxzoom="15" strokeWidth="11" strokeWidth_2="9" />
<filter minzoom="16" maxzoom="16" strokeWidth="13" strokeWidth_2="11" />
<filter minzoom="17" maxzoom="17" strokeWidth="16" strokeWidth_2="14" />
<filter minzoom="18" strokeWidth="19" strokeWidth_2="17" />
<switch>
<case nightMode="false" color="#000000" />
<case nightMode="true" color="#ffffff" />
<filter layer="1" cap_2="SQUARE" >
<filter minzoom="13" maxzoom="14" strokeWidth="8" strokeWidth_2="6" />
<filter minzoom="15" maxzoom="15" strokeWidth="10" strokeWidth_2="8" />
<filter minzoom="16" maxzoom="16" strokeWidth="12" strokeWidth_2="10" />
<filter minzoom="17" maxzoom="17" strokeWidth="15" strokeWidth_2="13" />
<filter minzoom="18" strokeWidth="20" strokeWidth_2="18" />
</filter>
</switch>
</filter>
</switch>
</switch>
<filter minzoom="15" maxzoom="15" color="#99cccc" strokeWidth="8" color_2="#ffffff" strokeWidth_2="7" pathEffect_2="8_6" tag="highway"
value="construction" />
<filter minzoom="16" color="#99cccc" strokeWidth="11" color_2="#ffffff" strokeWidth_2="9" pathEffect_2="8_6" tag="highway" value="construction" />
<filter minzoom="15" maxzoom="15" color="#99cccc" strokeWidth="8" color_2="#ffffff" strokeWidth_2="7" pathEffect_2="8_6" tag="highway"
value="proposed" />
<filter minzoom="16" color="#99cccc" strokeWidth="11" color_2="#ffffff" strokeWidth_2="9" pathEffect_2="8_6" tag="highway" value="proposed" />
</line>
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom] -->
<point>
<filter minzoom="16" icon="traffic_light" tag="highway" value="traffic_signals" /> <!-- Default value: 17 -->
<filter minzoom="16" icon="atm" tag="amenity" value="atm" /> <!-- 17 -->
<filter minzoom="15" icon="shop_bakery" tag="shop" value="bakery" /> <!-- 17 -->
<filter minzoom="15" icon="shop_butcher" tag="shop" value="butcher" /> <!-- 17 -->
<filter minzoom="16" icon="shop_butcher" tag="shop" value="butcher" /> <!-- 17 -->
<filter minzoom="15" icon="shop_clothes" tag="shop" value="clothes" /> <!-- 16 -->
<filter minzoom="15" icon="shop_clothes" tag="shop" value="fashion" /> <!-- 16 -->
<filter minzoom="15" icon="shop_convenience" tag="shop" value="convenience" /> <!-- 17 -->

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

@ -637,7 +637,9 @@
<!-- man made -->
<filter minzoom="16" color="#bca9a9" tag="building" />
<filter nightMode="true" minzoom="16" color="#560000" tag="building" />
<filter minzoom="16" color="#dddddd" tag="building" value="garages" />
<filter nightMode="true" minzoom="16" color="#560000" tag="building" value="garages" />
<!-- leisure -->
<switch>
@ -683,6 +685,7 @@
<filter minzoom="16" color="#bca9a9" tag="amenity" value="library" />
<filter minzoom="16" nightMode="true" color="#560000" tag="amenity" value="library" />
<filter minzoom="15" color="#f0f0d8" color_2="#d4a89e" strokeWidth_2="1" tag="amenity" value="university" />
<filter minzoom="15" nightMode="true" color="#66004B" color_2="#d4a89e" strokeWidth_2="1" tag="amenity" value="university" />
<filter minzoom="15" color="#f6eeb7" tag="amenity" value="parking" />
<filter minzoom="15" nightMode="true" color="#66004B" tag="amenity" value="parking" />
<filter minzoom="15" color="#f6eeb7" tag="amenity" value="bicycle_parking" />
@ -826,6 +829,7 @@
<case tag="highway" value="secondary" />
<case tag="highway" value="secondary_link" />
<filter color="#fdd6a4">
<!-- SW 3 -->
<filter minzoom="9" maxzoom="9" strokeWidth="2" />
<filter minzoom="10" maxzoom="10" strokeWidth="4" />
<filter minzoom="11" maxzoom="11" strokeWidth="5" />

1060
DataExtractionOSM/src/net/osmand/render/hm.render.xml
View file

File diff suppressed because it is too large Load diff

2
OsmAnd/src/net/osmand/plus/render/BaseOsmandRender.java
View file

@ -210,7 +210,7 @@ public class BaseOsmandRender implements RenderingRuleVisitor {
return true;
}
for (BaseOsmandRender d : dependRenderers) {
if (d.isObjectVisibleImpl(tag, val, zoom, type, nightMode)) {
if (d.isObjectVisible(tag, val, zoom, type, nightMode)) {
return true;
}
}