updates themes:

- nicer amenity area color
- add osmarender symbols
- use 'extrusion' layer styles
- keep meadow and conservation below residential
- fade wood on zoomlevel 8
This commit is contained in:
Hannes Janetzek 2013-09-30 01:43:29 +02:00
parent 5367fe4537
commit 8ab84c4e85
4 changed files with 1724 additions and 1380 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

File diff suppressed because it is too large Load Diff

View File

@ -2,10 +2,72 @@
<rendertheme xmlns="http://opensciencemap.org/rendertheme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://opensciencemap.org/rendertheme ../../rendertheme.xsd" version="1" map-background="#050508">
<style-text id="road" k="name" font-style="bold" font-size="18" stroke="#606050"
fill="#eeffee" stroke-width="2.5" />
<style-text id="major-road" k="name" font-style="bold" font-size="19" fill="#e2cf5d"
stroke="#101010" stroke-width="2.5" />
<atlas img="styles/osmarender.png">
<rect id="airport" pos="226 38 24 24" />
<rect id="alpine_hut" pos="198 41 26 21" />
<rect id="atm" pos="279 2 14 16" />
<rect id="bakery" pos="305 46 22 16" />
<rect id="bank" pos="395 43 19 19" />
<rect id="bench" pos="213 29 8 10" />
<rect id="bicycle_rental" pos="295 2 13 16" />
<rect id="bus" pos="130 32 23 9" />
<rect id="bus_sta" pos="36 30 31 32" />
<rect id="cable_car" pos="2 2 29 26" />
<rect id="cafe" pos="216 2 14 14" />
<rect id="campSite" pos="329 42 20 20" />
<rect id="cave_entrance" pos="297 23 16 10" />
<rect id="chair_lift" pos="130 2 13 28" />
<rect id="church" pos="61 9 9 19" />
<rect id="cinema" pos="145 8 16 22" />
<rect id="drinking_water" pos="416 43 19 19" />
<rect id="fastfood" pos="351 42 20 20" />
<rect id="firebrigade" pos="130 43 36 19" />
<rect id="florist" pos="342 24 12 16" />
<rect id="fountain" pos="500 46 10 16" />
<rect id="gondola" pos="252 38 21 24" />
<rect id="helipad" pos="69 31 31 31" />
<rect id="hospital" pos="437 43 19 19" />
<rect id="hostel" pos="168 44 28 18" />
<rect id="hotel" pos="93 11 18 17" />
<rect id="information" pos="458 43 19 19" />
<rect id="kindergarten" pos="184 2 14 19" />
<rect id="library" pos="372 22 9 18" />
<rect id="mosque" pos="248 2 17 15" />
<rect id="oneway" pos="275 38 25 7" />
<rect id="parking" pos="373 42 20 20" />
<rect id="peak" pos="267 9 9 8" />
<rect id="petrolStation" pos="263 19 14 17" />
<rect id="pharmacy" pos="479 43 19 19" />
<rect id="playground" pos="223 18 18 18" />
<rect id="postbox" pos="232 2 14 14" />
<rect id="postoffice" pos="172 23 19 19" />
<rect id="pub" pos="326 26 14 14" />
<rect id="railway-crossing" pos="275 47 28 15" />
<rect id="railway-crossing-small" pos="155 32 15 9" />
<rect id="recycling" pos="72 11 19 18" />
<rect id="restaurant" pos="356 28 14 12" />
<rect id="school" pos="200 2 14 19" />
<rect id="shelter" pos="33 4 26 24" />
<rect id="soccer-borderless" pos="102 30 26 32" />
<rect id="supermarket" pos="193 23 18 16" />
<rect id="synagogue" pos="113 11 15 17" />
<rect id="telephone" pos="383 21 7 19" />
<rect id="tennis" pos="2 30 32 32" />
<rect id="theatre" pos="243 19 18 17" />
<rect id="toilets" pos="163 2 19 19" />
<rect id="traffic_signal" pos="392 21 7 19" />
<rect id="tree" pos="145 2 4 4" />
<rect id="university" pos="302 35 19 9" />
<rect id="viewpoint" pos="279 20 16 16" />
<rect id="vulcan" pos="315 25 9 8" />
<rect id="windmill" pos="310 2 13 19" />
</atlas>
<style-text id="caption-small-blue" caption="true" dy="12" k="name" style="bold" size="16" fill="#4040ff"
stroke="#ffffff" stroke-width="2.0" />
<style-text id="road" k="name" style="bold" size="18" stroke="#606050" fill="#eeffee" stroke-width="2.5" />
<style-text id="major-road" k="name" style="bold" size="19" fill="#ffef7d" stroke="#624f00" stroke-width="2.5" />
<style-area id="residential" fill="#ff0000" fade="10" />
@ -56,8 +118,7 @@
<!-- track|footway|path|cycleway -->
<style-line id="footway" stroke="#c1bcb6" width="1.2" cap="butt" fix="true" />
<style-line id="footway:z16" use="footway" width="-1.0" fix="false"
fade="-1" />
<style-line id="footway:z16" use="footway" width="-1.0" fix="false" fade="-1" />
<style-line id="footway:z17" stroke="#faf8f5" width="0.3" />
<!-- de: ein Weg der für Reiter vorgeshen ist.. -->
@ -71,12 +132,12 @@
<!-- no-go area boundary -->
<style-line id="fence" stroke="#444444" width="1.2" fix="true" cap="butt" />
<style-line id="aeroway:runway" stroke="#008888" width="1.8" cap="butt"
blur="0.7" />
<style-line id="aeroway:runway" stroke="#008888" width="1.8" cap="butt" blur="0.7" />
<style-line id="building" stroke="#dd888888" width="1.5" fix="true" cap="butt" />
<style-area id="building" fill="#ee202020" fade="15" />
<!-- ways -->
<m e="way">
@ -178,9 +239,11 @@
<!-- amenity -->
<m k="amenity">
<m v="kindergarten|school|college|university" zoom-min="14">
<area fill="#cdabde" stroke="#b094bf" stroke-width="0.2" />
<area fill="#524459" stroke="#b094bf" stroke-width="0.2" />
</m>
<m v="hospital">
<area fill="#716553" />
</m>
<m v="parking" zoom-min="14">
<area fill="#444434" stroke="#d4d4d4" stroke-width="0.2" />
</m>
@ -282,7 +345,7 @@
<line use="water" width="-0.1" />
</m>
<style-outline id="river" width="1.0" stroke="#456799" blur="1.0" />
<outline-layer id="river" width="1.0" stroke="#456799" blur="1.0" />
<m k="waterway" v="river" closed="no">
<m zoom-min="12">
@ -346,7 +409,7 @@
<!-- outline 0 -->
<style-outline id="0" stroke="#44000000" width="0.1" />
<outline-layer id="0" stroke="#44000000" width="0.1" />
<!-- tunnel -->
<m k="tunnel" v="yes|true" zoom-min="11">
<!-- highway tunnels -->
@ -489,26 +552,26 @@
<!-- <line stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/>
<area fill="#e9e6e3" fade="15" /> -->
</m>
<m zoom-min="17">
<extrusion side-color="#cc707070" top-color="#cc707070" line-color="#50ff00ff" />
</m>
<!-- <m zoom-min="17">
<caption k="name" font-style="bold" font-size="10" fill="#4040ff"
<caption k="name" style="bold" size="10" fill="#4040ff"
stroke="#ffffff" stroke-width="2.0" />
<caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060"
<caption k="addr:housenumber" style="bold" size="10" fill="#606060"
stroke="#ffffff" stroke-width="2.0" />
</m> -->
</m>
<!-- outline 1 - 4 -->
<style-outline id="glow3" stroke="#ddffffff" width="0.8" blur="0.5"
fade="13" />
<!-- > <style-outline id="glow" stroke="#ee909090" width="0.8" blur="0.5" fade="14"/> -->
<style-outline id="glow2" width="1.0" stroke="#ffffff" blur="1.0"
fade="13" />
<style-outline id="1" stroke="#dd000000" width="-0.3" fade="14" />
<!-- <style-outline id="1" stroke="#404030"/> -->
<style-outline id="2" stroke="#c0c0c0" />
<style-outline id="primary" stroke="#7f7700" width="0.025" />
<style-outline id="motorway" stroke="#805f2e" width="0.025" />
<outline-layer id="glow3" stroke="#ddffffff" width="0.8" blur="0.5" fade="13" />
<!-- > <outline-layer id="glow" stroke="#ee909090" width="0.8" blur="0.5" fade="14"/> -->
<outline-layer id="glow2" width="1.0" stroke="#ffffff" blur="1.0" fade="13" />
<outline-layer id="1" stroke="#dd000000" width="-0.3" fade="14" />
<!-- <outline-layer id="1" stroke="#404030"/> -->
<outline-layer id="2" stroke="#c0c0c0" />
<outline-layer id="primary" stroke="#7f7700" width="0.025" />
<outline-layer id="motorway" stroke="#805f2e" width="0.025" />
<!-- highway -->
@ -680,7 +743,7 @@
<m k="bridge" v="yes|true|viaduct|suspension">
<m k="area" v="~|no|false">
<style-outline id="bridge" stroke="#aa202020" width="0.08" />
<outline-layer id="bridge" stroke="#aa202020" width="0.08" />
<m zoom-min="15">
<m v="steps">
@ -775,7 +838,7 @@
</m>
<m zoom-min="13" v="pedestrian|service|unclassified|residential|road|living_street">
<area fill="#ffffff" />
<area fill="#aaffffff" />
<line stroke="#d0d0d0" width="1.0" fix="true" cap="butt" />
</m>
@ -831,8 +894,8 @@
src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/cable_car.png"
/> </m> <m k="aerialway" v="chair_lift"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png"
/> </m> <m k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png"
/> </m> <m zoom-min="14"> <text k="name" font-style="bold"
font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </m>
/> </m> <m zoom-min="14"> <text k="name" style="bold"
size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </m>
</m> -->
@ -875,8 +938,7 @@
</m>
<m k="railway" v="rail|turntable" zoom-min="16">
<line stroke="#ddaa9988" width="1.0" cap="butt" fix="true" fade="12"
stipple="1" />
<line stroke="#ddaa9988" width="1.0" cap="butt" fix="true" fade="12" stipple="1" />
</m>
<!-- <m k="railway" v="rail" zoom-max="14" zoom-min="13">
@ -931,94 +993,351 @@
<!-- historic -->
<!-- <m k="historic" v="ruins" zoom-min="17">
<caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0"
<caption k="name" style="bold" size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0"
/>
</m> -->
<!-- place -->
<m k="place" v="locality" zoom-min="17">
<caption k="name" font-style="bold" font-size="10" fill="#000000" stroke="#ffffff"
stroke-width="2.0" />
<caption k="name" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
</m>
<m k="debug" v="area">
<line stroke="#ff0000" width="1.2" fix="true" cap="butt" />
<area fill="#880000ff" />
<caption k="name" font-size="15" fill="#ff0000" stroke="#444444"
stroke-width="2.0" />
<caption k="name" size="15" fill="#ff0000" stroke="#444444" stroke-width="2.0" />
</m>
<m k="debug" v="way">
<line stroke="#00ffff" width="1.5" fix="true" cap="butt" />
<caption k="name" font-size="15" fill="#00ffff" stroke="#444444"
stroke-width="2.0" />
<caption k="name" size="15" fill="#00ffff" stroke="#444444" stroke-width="2.0" />
</m>
<m k="debug" v="box">
<line stroke="#dedeae" width="1.5" fix="true" cap="butt" />
</m>
</m>
<m e="node">
<!-- barrier -->
<!-- <m e="node">
barrier
<m k="barrier" v="bollard">
<circle r="1.5" fill="#909090" />
<circle r="1.5" fill="#909090" />
</m>
<m k="debug">
<caption k="name" font-size="16" fill="#fefece" />
<caption k="name" size="16" fill="#fefece" />
</m>
highway
<m k="highway"> <m k="highway" v="turning_circle">
<circle r="1.4" scale-radius="true" fill="#ffffff" /> </m> </m>
historic
<m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
width="1.5" /> <m zoom-min="17"> <caption
k="name" dy="-10" style="bold" size="10" fill="#4040ff" stroke="#ffffff"
width="2.0" /> </m> </m>
house numbers
<m k="addr:housenumber" zoom-min="18"> <caption
k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff"
width="2.0" /> </m>
place
<m k="place">
<m v="suburb|town|village">
<caption k="name" size="20" fill="#eeeeee" stroke="#000020"
stroke-width="4.0" priority="2" />
</m>
<m v="island" zoom-min="10">
<caption k="name" style="bold" size="20" fill="#ffffff" stroke="#ffffff"
stroke-width="1.0" priority="1" />
</m>
<m v="city">
<caption k="name" style="bold" size="22" fill="#ffffff" stroke="#002020"
stroke-width="4.0" priority="1" />
</m>
<m v="country">
<caption k="name" size="22" fill="#ffffff" stroke="#000000"
stroke-width="2.0" priority="0" />
</m>
</m>
<!-- highway -->
<!-- <m k="highway"> <m k="highway" v="turning_circle">
<circle r="1.4" scale-radius="true" fill="#ffffff" /> </m> </m> -->
railway
<m k="railway">
<m v="station" zoom-min="14">
<circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
<caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d"
stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="halt|tram_stop" zoom-min="17">
<circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
<caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d"
stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
<!-- historic -->
<!-- <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
width="1.5" /> <m zoom-min="17"> <caption
k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
width="2.0" /> </m> </m> -->
<m k="natural" v="tree" zoom-min="15">
<circle r="10"/>
</m>
</m> -->
<!-- house numbers -->
<!-- <m k="addr:housenumber" zoom-min="18"> <caption
k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff"
width="2.0" /> </m> -->
<m e="node">
<m k="aeroway">
<m k="aeroway" v="helipad" zoom-min="17">
<symbol src="helipad" />
</m>
<m k="aeroway" v="aerodrome|airport" zoom-max="13">
<symbol src="airport" />
</m>
</m>
<m k="amenity">
<m select="first">
<m v="atm" zoom-min="17">
<symbol src="atm" />
</m>
<m v="bank" zoom-min="17">
<symbol src="bank" />
</m>
<m v="bench" zoom-min="17">
<symbol src="bench" />
</m>
<m v="bicycle_rental" zoom-min="17">
<symbol src="bicycle_rental" />
</m>
<m v="bus_station" zoom-min="17">
<symbol src="bus_sta" />
</m>
<m v="cafe" zoom-min="17">
<symbol src="cafe" />
</m>
<m v="cinema" zoom-min="17">
<symbol src="cinema" />
</m>
<m v="drinking_water" zoom-min="17">
<symbol src="drinking_water" />
</m>
<m v="fast_food" zoom-min="17">
<symbol src="fastfood" />
</m>
<m v="fire_station" zoom-min="17">
<symbol src="firebrigade" />
</m>
<m v="fountain" zoom-min="17">
<symbol src="fountain" />
</m>
<m v="fuel" zoom-min="17">
<symbol src="petrolStation" />
</m>
<m v="hospital" zoom-min="15">
<symbol src="hospital" />
</m>
<m v="kindergarten" zoom-min="17">
<symbol src="kindergarten" />
</m>
<m v="library" zoom-min="17">
<symbol src="library" />
</m>
<m v="parking" zoom-min="17">
<symbol src="parking" />
</m>
<m v="pharmacy" zoom-min="17">
<symbol src="pharmacy" />
</m>
<m v="place_of_worship" zoom-min="17">
<m k="denomination|religion" v="jewish">
<symbol src="synagogue" />
</m>
<m k="denomination|religion" v="muslim|moslem">
<symbol src="mosque" />
</m>
<m k="denomination|religion" v="christian">
<symbol src="church" />
</m>
</m>
<m v="post_box" zoom-min="17">
<symbol src="postbox" />
</m>
<m v="post_office" zoom-min="17">
<symbol src="postoffice" />
</m>
<m v="pub|bar" zoom-min="17">
<symbol src="pub" />
</m>
<m v="recycling" zoom-min="17">
<symbol src="recycling" />
</m>
<m v="restaurant" zoom-min="17">
<symbol src="restaurant" />
</m>
<m v="school" zoom-min="17">
<symbol src="school" />
</m>
<m v="shelter" zoom-min="17">
<symbol src="shelter" />
</m>
<m v="telephone" zoom-min="17">
<symbol src="telephone" />
</m>
<m v="theatre" zoom-min="17">
<symbol src="theatre" />
</m>
<m v="toilets" zoom-min="17">
<symbol src="toilets" />
</m>
<m v="university|college" zoom-min="17">
<symbol src="university" />
</m>
</m>
<m zoom-min="17">
<text use="caption-small-blue" />
</m>
</m>
<m k="barrier" v="bollard">
<circle radius="1.5" fill="#707070" />
</m>
<m k="highway">
<m k="highway" v="bus_stop" zoom-min="16">
<symbol src="bus" />
</m>
<m k="highway" v="traffic_signals" zoom-min="17">
<symbol src="traffic_signal" />
</m>
<m k="highway" v="turning_circle">
<circle radius="1.4" scale-radius="true" fill="#ffffff" />
</m>
</m>
<!-- place -->
<m k="place">
<m v="suburb|town|village">
<caption k="name" font-size="20" fill="#eeeeee" stroke="#000020"
stroke-width="4.0" priority="2" />
<m k="historic">
<circle radius="3" fill="#4040ff" stroke="#606060" width="1.5" />
<m zoom-min="17">
<text use="caption-small-blue" />
</m>
</m>
<m k="addr:housenumber" zoom-min="18">
<caption k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff" stroke-width="2.0" />
</m>
<m k="leisure" v="playground" zoom-min="17">
<symbol src="playground" />
</m>
<m k="man_made" v="windmill" zoom-min="17">
<symbol src="windmill" />
</m>
<m k="natural">
<m select="first">
<m v="cave_entrance" zoom-min="15">
<symbol src="cave_entrance" />
</m>
<m v="peak" zoom-min="12">
<symbol src="peak" />
<caption k="ele" dy="20" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="tree" zoom-min="16">
<symbol src="tree" />
</m>
<m v="volcano" zoom-min="12">
<symbol src="vulcan" />
</m>
</m>
<m zoom-min="17">
<caption k="name" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
<m k="place" firt="true">
<m v="hamlet" zoom-min="13">
<caption k="name" style="bold" size="13" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="suburb|town|village" zoom-min="10">
<caption k="name" style="bold" size="15" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="island" zoom-min="10">
<caption k="name" font-style="bold" font-size="20" fill="#ffffff" stroke="#ffffff"
stroke-width="1.0" priority="1" />
<caption k="name" style="bold" size="20" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="city">
<caption k="name" font-style="bold" font-size="22" fill="#ffffff" stroke="#002020"
stroke-width="4.0" priority="1" />
<m v="city" zoom-max="14">
<caption k="name" style="bold" size="25" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="country">
<caption k="name" font-size="22" fill="#ffffff" stroke="#000000"
stroke-width="2.0" priority="0" />
<m v="country" zoom-max="6">
<caption k="name" style="bold" size="25" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
<!-- railway -->
<m k="railway">
<m v="station" zoom-min="14">
<circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
<!-- <caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d"
stroke="#ffffff" stroke-width="2.0" /> -->
<m k="railway" v="crossing" zoom-min="16">
<symbol src="railway-crossing-small" />
</m>
<m v="halt|tram_stop" zoom-min="17">
<!-- in Bremen this is also used for crossings between tram-lines and roads... -->
<m k="railway" v="level_crossing" zoom-min="14">
<symbol src="railway-crossing" />
</m>
<m k="railway" v="station" zoom-min="14">
<circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
<caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
</m>
<m k="railway" v="halt|tram_stop" zoom-min="15">
<circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
<!-- <caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d"
stroke="#ffffff" stroke-width="2.0" /> -->
<caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
<m k="shop">
<m v="bakery" zoom-min="17">
<symbol src="bakery" />
</m>
<m v="florist" zoom-min="17">
<symbol src="florist" />
</m>
<m v="supermarket|organic" zoom-min="17">
<symbol src="supermarket" />
</m>
<m zoom-min="17">
<text use="caption-small-blue" />
</m>
</m>
<m k="tourism">
<m v="alpine_hut" zoom-min="16">
<symbol src="alpine_hut" />
</m>
<m v="camp_site" zoom-min="17">
<symbol src="campSite" />
</m>
<m v="hostel" zoom-min="17">
<symbol src="hostel" />
</m>
<m v="hotel" zoom-min="17">
<symbol src="hotel" />
</m>
<m v="information" zoom-min="17">
<symbol src="information" />
</m>
<m v="viewpoint" zoom-min="15">
<symbol src="viewpoint" />
</m>
<m zoom-min="17">
<text use="caption-small-blue" />
</m>
</m>
</m>
</rendertheme>