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

Combine rendering styles to one, remove others

Browse source
This commit is contained in:
Victor Shcherb 2011-10-26 17:17:11 +02:00
parent b5796c02bc
commit 3d1bc725c5
11 changed files with 10 additions and 2826 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
DataExtractionOSM/src/net/osmand/osm/rendering_types.xml
View file

@ -226,6 +226,7 @@
<subtype id="16" point="true" polygon="true" tag="leisure" value="ice_rink" minzoom="15" /> <subtype id="16" point="true" polygon="true" tag="leisure" value="ice_rink" minzoom="15" />
<subtype id="17" point="true" polygon="true" tag="leisure" value="miniature_golf" minzoom="15" /> <subtype id="17" point="true" polygon="true" tag="leisure" value="miniature_golf" minzoom="15" />
<subtype id="18" point="true" polygon="true" tag="leisure" value="dance" minzoom="15" /> <subtype id="18" point="true" polygon="true" tag="leisure" value="dance" minzoom="15" />
<subtype id="19" point="true" polygon="true" tag="leisure" value="bird_hide" minzoom="15" />
</type> </type>

1326
DataExtractionOSM/src/net/osmand/render/all-purpose.render.xml
View file

File diff suppressed because it is too large Load diff

10
DataExtractionOSM/src/net/osmand/render/bicycle-all.render.xml
View file

@ -1,10 +0,0 @@
<renderer name="bicycle" depends="all-purpose (more detail)" 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="2" pathEffect="10_3" />
</line>
</renderer>

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

@ -1,10 +0,0 @@
<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="2" pathEffect="10_3" />
</line>
</renderer>

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

@ -1,74 +0,0 @@
<renderer name="car" depends="default" defaultColor="#f1eee8" defaultNightColor="#003333">
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom], textLength, ref -->
<polygon>
</polygon>
<text>
<filter minzoom="14" textSize="14" textBold="true" textWrapWidth="12" textMinDistance="20" tag="highway" value="motorway_junction"/>
</text>
<line>
<switch>
<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="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>
<!-- bridge -->
<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>
</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="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 -->
<filter minzoom="15" icon="shop_diy" tag="shop" value="electronics" /> <!-- 16 -->
<filter minzoom="15" icon="shop_supermarket" tag="shop" value="general" /> <!-- 16 -->
<filter minzoom="15" icon="shop_supermarket" tag="shop" value="supermarket" /> <!-- 16 -->
</point>
</renderer>

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

File diff suppressed because it is too large Load diff

14
DataExtractionOSM/src/net/osmand/render/hiking.render.xml
View file

@ -1,14 +0,0 @@
<renderer name="hiking" depends="default" defaultColor="#f1eee8">
<order>
<filter orderType="line">
<filter tag="countour" order="15" />
</filter>
</order>
<line>
<filter minzoom="14" color="#ff4900" strokeWidth="1" tag="contour" value="elevation" />
</line>
<text>
<filter minzoom="14" maxzoom="16" textSize="12" textOnPath="true" tag="contour"/>
</text>
</renderer>

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

@ -134,6 +134,8 @@
<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" />
<filter tag="countour" order="15" />
</group> </group>
<filter tag="" value="" order="128" orderType="1"/> <filter tag="" value="" order="128" orderType="1"/>
@ -144,6 +146,7 @@
<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>
@ -290,6 +293,7 @@
<filter minzoom="6" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="natural" value="water" textOrder="10"/> <filter minzoom="6" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="natural" value="water" textOrder="10"/>
<filter minzoom="6" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="natural" value="lake" textOrder="10"/> <filter minzoom="6" textSize="12" textColor="#6699cc" textWrapWidth="20" tag="natural" value="lake" textOrder="10"/>
<filter minzoom="13" textSize="12" textColor="#ff000000" textWrapWidth="10" tag="natural" value="wood" textOrder="10"/> <filter minzoom="13" textSize="12" textColor="#ff000000" textWrapWidth="10" tag="natural" value="wood" textOrder="10"/>
<filter minzoom="14" maxzoom="16" textSize="12" textOnPath="true" tag="contour"/>
<filter minzoom="13" textSize="12" textColor="#6699cc" textOnPath="true" tag="waterway" value="stream" textOrder="15"/> <filter minzoom="13" textSize="12" textColor="#6699cc" textOnPath="true" tag="waterway" value="stream" textOrder="15"/>
<filter minzoom="11" textSize="12" textColor="#6699cc" textOnPath="true" textMinDistance="80" tag="waterway" value="river" textOrder="10"/> <filter minzoom="11" textSize="12" textColor="#6699cc" textOnPath="true" textMinDistance="80" tag="waterway" value="river" textOrder="10"/>
@ -641,6 +645,7 @@
<filter minzoom="16" icon="shop_copyshop" tag="shop" value="copyshop" /> <filter minzoom="16" icon="shop_copyshop" tag="shop" value="copyshop" />
<filter minzoom="16" icon="shop_greengrocer" tag="shop" value="greengrocer" /> <filter minzoom="16" icon="shop_greengrocer" tag="shop" value="greengrocer" />
<filter minzoom="16" icon="shop_mobile_phone" tag="shop" value="mobile_phone" /> <filter minzoom="16" icon="shop_mobile_phone" tag="shop" value="mobile_phone" />
<filter minzoom="16" icon="bird_hide" tag="leisure" value="bird_hide" />
<filter minzoom="4" tag="place" icon="city" value="city" /> <filter minzoom="4" tag="place" icon="city" value="city" />
<filter minzoom="6" tag="place" icon="city" value="town" /> <filter minzoom="6" tag="place" icon="city" value="town" />
@ -1143,6 +1148,8 @@
<filter minzoom="14" color="#000000" strokeWidth="2" tag="highway" value="ford" /> <filter minzoom="14" color="#000000" strokeWidth="2" tag="highway" value="ford" />
<filter minzoom="14" color="#ff4900" strokeWidth="1" tag="contour" value="elevation" />
<filter minzoom="15" maxzoom="15" color="#99cccc" strokeWidth="6" color_2="#ffffff" strokeWidth_2="5" pathEffect_2="8_6" tag="highway" value="construction" /> <filter minzoom="15" maxzoom="15" color="#99cccc" strokeWidth="6" color_2="#ffffff" strokeWidth_2="5" pathEffect_2="8_6" tag="highway" value="construction" />
<filter minzoom="16" color="#99cccc" strokeWidth="8" color_2="#ffffff" strokeWidth_2="7" pathEffect_2="8_6" tag="highway" value="construction" /> <filter minzoom="16" color="#99cccc" strokeWidth="8" color_2="#ffffff" strokeWidth_2="7" pathEffect_2="8_6" tag="highway" value="construction" />

37
DataExtractionOSM/src/net/osmand/render/pedestrian-all.render.xml
View file

@ -1,37 +0,0 @@
<renderer name="pedestrian" depends="all-purpose (more detail)" defaultColor="#f1eee8" defaultNightColor="#003333">
<order>
<filter orderType="line">
<filter tag="highway" value="pedestrian" order="60" />
<filter tag="highway" value="living_street" order="47" />
<filter tag="highway" value="track" order="50" />
<filter tag="highway" value="path" order="48" />
<filter tag="highway" value="cycleway" order="45" />
<filter tag="highway" value="byway" order="62" />
<filter tag="highway" value="footway" order="65" />
<filter tag="highway" value="steps" order="66" />
<filter tag="highway" value="bridleway" order="59" />
</filter>
</order>
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom], textLength, ref -->
<polygon>
</polygon>
<text>
</text>
<line>
<filter tag="highway" value="track" minzoom="14" color="#996600" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="path" minzoom="14" color="#000000" strokeWidth="2" pathEffect="10_3" />
<filter nightMode="true" tag="highway" value="path" minzoom="14" color="#787878" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="cycleway" minzoom="14" color="#0000ff" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="byway" minzoom="14" color="#ffcc00" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="footway" minzoom="14" color="#fa8073" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="steps" minzoom="14" color="#fa8073" strokeWidth="4" pathEffect="1_2" />
<filter tag="highway" value="bridleway" minzoom="14" color="#00ff00" strokeWidth="2" pathEffect="10_3" />
</line>
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom] -->
<point>
</point>
</renderer>

37
DataExtractionOSM/src/net/osmand/render/pedestrian.render.xml
View file

@ -1,37 +0,0 @@
<renderer name="pedestrian" depends="default" defaultColor="#f1eee8" defaultNightColor="#003333">
<order>
<filter orderType="line">
<filter tag="highway" value="pedestrian" order="60" />
<filter tag="highway" value="living_street" order="47" />
<filter tag="highway" value="track" order="50" />
<filter tag="highway" value="path" order="48" />
<filter tag="highway" value="cycleway" order="45" />
<filter tag="highway" value="byway" order="62" />
<filter tag="highway" value="footway" order="65" />
<filter tag="highway" value="steps" order="66" />
<filter tag="highway" value="bridleway" order="59" />
</filter>
</order>
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom], textLength, ref -->
<polygon>
</polygon>
<text>
</text>
<line>
<filter tag="highway" value="track" minzoom="14" color="#996600" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="path" minzoom="14" color="#000000" strokeWidth="2" pathEffect="10_3" />
<filter nightMode="true" tag="highway" value="path" minzoom="14" color="#787878" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="cycleway" minzoom="14" color="#0000ff" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="byway" minzoom="14" color="#ffcc00" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="footway" minzoom="14" color="#fa8073" strokeWidth="2" pathEffect="10_3" />
<filter tag="highway" value="steps" minzoom="14" color="#fa8073" strokeWidth="4" pathEffect="1_2" />
<filter tag="highway" value="bridleway" minzoom="14" color="#00ff00" strokeWidth="2" pathEffect="10_3" />
</line>
<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom] -->
<point>
</point>
</renderer>

BIN
OsmAnd/res/drawable/h_bird_hide.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 489 B