extract theme assets to vtm-themes project

This commit is contained in:
Hannes Janetzek
2014-02-23 12:35:44 +01:00
parent ff83629054
commit f193921432
39 changed files with 91 additions and 83 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 343 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 728 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 834 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 893 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 849 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1,712 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<rendertheme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
map-background="#fffcfa" version="1" xmlns="http://mapsforge.org/renderTheme"
xsi:schemaLocation="http://mapsforge.org/renderTheme ../renderTheme.xsd"> <!-- fdfdfc"> -->
<style-text name="road" fill="#101010" font-size="16" k="name" priority="2"
stroke="#eeeeee" stroke-width="2.0" />
<style-text name="major-road" fill="#101010" font-size="16" font-style="bold"
k="name" priority="1" stroke="#eeeeee" stroke-width="2.0" />
<!-- <style-area name="residential" fill="#e0dfde" fade="10"/> -->
<style-area name="residential" fade="10" fill="#e8e7e3" />
<style-area name="railway|industrial" fade="10" fill="#e6e3e5" />
<!-- "#f0fae7" mint green -->
<!-- <style-area name="farmland" fill="#fff8bf" fade="11" /> -->
<!-- <style-area name="farmland" fill="#f1ebb2" fade="11" /> -->
<style-area name="farmland" fade="11" fill="#e7dab5" />
<!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
<!-- <style-area name="forest|wood" fill="#ebefe5" fade="7" blend="11"
blend-fill="#cee0bc"/> d3dec8 -->
<style-area name="forest|wood" blend="10" blend-fill="#9ac56e" fade="7" fill="#d1dbc7" />
<!-- grass|meadow|garden|grassland|scrub -->
<style-area name="greens" fade="10" fill="#c9dc91" />
<!-- <style-area name="greens" fill="#d2e5ce" fade="10" /> -->
<!-- marsh|wetland|nature_reserve -->
<style-area name="greens2" fade="12" fill="#deecb9" />
<!-- park|common|green|cemetery|golf_course|dog_park -->
<style-area name="park" fade="11" fill="#a3ca7b" />
<!-- de:Kleingartengebiet -->
<style-area name="allotments" fade="12" fill="#efeae0" />
<!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
<style-area name="quarry" fade="10" fill="#ddddcc" />
<style-area name="military" fade="10" fill="#eeedea" />
<style-line name="residential" stroke="#ffffff" width="1.3" />
<style-line name="residential:bridge" cap="square" from="residential" />
<!-- when inheriting another style with 'from' then 'witdth' is meant relative
to the parent -->
<style-line name="pedestrian" from="residential" width="-0.4" />
<style-line name="pedestrian:bridge" cap="square" from="pedestrian" />
<style-line name="highway:z11" stroke="#fcba5a" width="1.8" />
<!-- <style-line name="highway:z11:bridge" from="highway:z11" cap="butt"
/> -->
<style-line name="trunk_link" cap="butt" stroke="#fee16e" width="1.3" />
<style-line name="trunk" stroke="#fedb52" width="1.6" />
<style-line name="primary:z11" stroke="#fdeb05" width="1.5" />
<style-line name="secondary:z11" from="primary:z11" width="-0.1" />
<style-line name="tertiary" from="residential" stroke="#fefefa" width="0.2" />
<style-line name="construction" stroke="#e0e0e0" width="1.2" />
<style-line name="highway-service" from="residential" width="-0.6" />
<!-- track|footway|path|cycleway -->
<style-line name="footway" cap="butt" fix="true" stipple="4"
stipple-stroke="#d35c48" stipple-width="0.6" stroke="#aaffffff" width="1.8" />
<style-line name="highway:cycleway" from="footway" stipple-stroke="#4040ee"
width="0.1" />
<style-line name="highway:track" from="footway" stipple="4" stipple-stroke="#a39b68"
width="0.1" />
<style-line name="highway:path" from="footway" stipple="4" stipple-stroke="#837b58"
width="0.1" />
<!-- <style-line name="footway:z16" from="footway" width="-0.95" fixed="false"
fade="-1"/> -->
<style-line name="footway:z17" stroke="#faf8f5" width="0.3" />
<!-- de: ein Weg der für Reiter vorgeshen ist.. -->
<style-line name="bridleway" cap="butt" from="footway" stipple-stroke="#837b58"
stroke="#d3cb98" width="0.1" />
<style-line name="steps" cap="butt" fix="true" stipple="2" stipple-stroke="#be6253"
stipple-width="1.0" stroke="#aaffffff" width="4.2" />
<style-line name="water:outline" cap="butt" fix="true" stroke="#a4bbcc"
width="1.0" />
<style-line name="water" cap="butt" stroke="#afc5e3" width="1.0" />
<!-- <style-area name="water" fill="#97b7e5" /> -->
<style-area name="water" fill="#afc5e3" />
<!-- no-go area boundary -->
<style-line name="fence" cap="butt" fix="true" stroke="#444444" width="1.2" />
<style-line name="aeroway:runway" cap="butt" stroke="#c8ccbe" width="1.8" />
<!-- <style-line name="building" stroke="#c9c3c1" width="1.0" fix="true"
cap="butt" fade="15"/> -->
<!--
<style-line name="building" stroke="#d0cec8" width="1.0" fix="true"
cap="butt" fade="15"/>
<style-area name="building" fill="#e9e6e3" fade="15"/>
-->
<style-line name="building" cap="butt" fade="15" fix="true" stroke="#b7b6b3"
width="1.0" />
<!-- <style-area name="building" fill="#eae8e6" fade="15"/> -->
<style-area name="building" fade="15" fill="#f2f0eb" />
<!-- ways -->
<m e="way">
<!-- landuse base -->
<m k="landuse">
<m v="industrial|railway">
<use-area name="railway|industrial" />
</m>
<m v="school">
<!-- <area fill="#cdabde" /> -->
<area fade="15" fill="#cdbbca" />
<line cap="butt" fade="15" fix="true" stroke="#9aabae" width="1.0" />
</m>
<m v="hospital">
<area fill="#e6e4c5" />
</m>
<m v="parking">
<area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
</m>
<m v="cemetery">
<use-area name="park" />
</m>
<m v="park">
<use-area name="park" />
</m>
<!-- Heideland, keep below forest -->
<m v="sand" zoom-min="11">
<area fade="11" fill="#fffad1" />
</m>
<m v="wood">
<use-area name="forest|wood" />
</m>
<m v="pitch">
<area fill="#f4f4de" />
<line cap="butt" fix="true" stroke="#d9d9a3" width="1.0" />
</m>
<m v="swimming_pool">
<area fill="#d4ebfc" stroke="#6060ff" stroke-width="0.2" />
</m>
</m>
<m k="water">
<use-area name="water" />
<!-- <use-line name="water:outline"/> -->
</m>
<!-- waterways -->
<m k="waterway">
<m k="type" v="ditch|drain">
<use-line name="water" fix="true" width="0.1" />
</m>
<m k="type" v="canal">
<use-line name="water" width="-0.2" />
</m>
<m k="type" v="stream">
<use-line name="water" fix="true" width="0.2" />
</m>
<m k="type" v="river">
<m zoom-min="12">
<use-line name="water" width="0.3" />
</m>
<m zoom-max="11">
<use-line name="water" fade="7" fix="true" width="0.3" />
</m>
</m>
</m>
<!-- outline 0 -->
<style-outline name="glow" blur="1.0" stroke="#000000" width="0.2" />
<style-outline name="0" stroke="#44000000" width="0.1" />
<!-- tunnel -->
<m k="tunnel" v="yes" zoom-min="11">
<!-- highway tunnels -->
<m zoom-min="16">
<m v="steps">
<use-line name="steps" />
<!-- <use-outline name="0"/> -->
</m>
<!--
<m v="track|footway|path|cycleway" zoom-min="16">
<use-line name="footway:z16"/>
</m>
-->
</m>
<m zoom-min="14">
<m v="footway">
<use-line name="footway" />
</m>
<m v="cycleway">
<use-line name="highway:cycleway" />
</m>
<m v="track">
<use-line name="highway:track" />
</m>
<m v="path">
<use-line name="highway:path" />
</m>
<m v="bridleway">
<use-line name="bridleway" />
</m>
<m v="construction">
<use-line name="construction" />
<use-outline name="0" />
</m>
<m v="service">
<m k="service" v="~|parking_aisle">
<use-line name="highway-service" />
<use-outline name="0" />
</m>
</m>
</m>
<m v="trunk_link|motorway_link">
<use-line name="trunk_link" />
<use-outline name="0" />
<use-text name="major-road" />
</m>
<m zoom-min="13">
<m v="byway|pedestrian">
<use-line name="pedestrian" />
<use-outline name="0" />
<use-text name="road" />
</m>
<m v="residential|road|unclassified|living_street">
<use-line name="residential" />
<use-outline name="0" />
<use-text name="road" />
</m>
</m>
<m v="tertiary|secondary_link">
<use-line name="tertiary" />
<use-outline name="0" />
<use-text name="road" />
</m>
<m v="secondary|primary_link">
<use-line name="secondary:z11" />
<use-outline name="0" />
<use-text name="major-road" />
</m>
<m v="primary">
<use-line name="primary:z11" />
<use-outline name="0" />
<use-text name="major-road" />
</m>
<m v="trunk">
<use-line name="trunk" blur="0.3" />
<use-outline name="0" />
<!-- <use-outline name="glow"/> -->
<use-text name="major-road" />
</m>
<m v="motorway">
<use-line name="highway:z11" blur="0.3" />
<use-outline name="0" />
<!-- <use-outline name="glow"/> -->
<use-text name="major-road" />
</m>
<!-- railway tunnel -->
<m k="railway">
<!--
<m k="railway" v="tram|subway|light_rail|narrow_gauge">
<line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
</m>
-->
<m k="railway" v="rail">
<line cap="butt" fix="true" stroke="#aa888888" width="0.9" />
</m>
</m>
</m> <!-- end tunnel -->
<!-- platform cores -->
<m k="highway|railway|public_transport" v="platform">
<m closed="yes">
<area fill="#dbdbc9" />
</m>
<m closed="no">
<line stroke="#dbdbc9" width="0.3" />
</m>
</m>
<!-- runways areas -->
<m k="aeroway">
<m closed="yes" v="aerodrome">
<area fill="#e8ecde" />
</m>
<!-- A place where planes are parked -->
<m v="apron">
<area fill="#f0f0f0" />
</m>
<!-- TODO taxiway, helipad, runway -->
</m>
<!-- turning circles -->
<!--
<m k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
fill="#707070" />
</m>
-->
<!-- building -->
<m k="building">
<m zoom-max="16" zoom-min="14">
<use-area name="building" fade="14" />
<use-line name="building" fade="14" />
<!--
<line stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/>
<area fill="#e9e6e3" fade="15" />
-->
</m>
<m zoom-min="17">
<caption fill="#4040ff" font-size="10" font-style="bold" k="name" stroke="#ffffff"
stroke-width="2.0" />
<caption fill="#606060" font-size="10" font-style="bold" k="addr:housenumber"
stroke="#ffffff" stroke-width="2.0" />
</m>
</m>
<!-- outline 1 - 4 -->
<style-outline name="1" stroke="#aa807040" width="0.1" />
<style-outline name="2" stroke="#c0c0c0" width="0.1" />
<style-outline name="primary" stroke="#aa7f7700" width="0.1" />
<style-outline name="motorway" stroke="#aa805f2e" width="0.1" />
<m zoom-max="10">
<m v="main">
<!-- <line cap="butt" fade="5" fix="true" stroke="#e2cf5d" width="1.5" /> -->
<line cap="butt" fade="8" fix="true" stroke="#c6c5a2" width="1.3" />
</m>
<m v="motorway">
<line cap="butt" fade="6" fix="true" stroke="#deb683" width="1.5" />
</m>
<!-- <m k="class" v="-main|motorway">
<line cap="butt" fix="true" stroke="#00ff00" width="1.8" />
</m>
-->
</m>
<m zoom-min="11">
<m zoom-min="14">
<m v="footway">
<use-line name="footway" />
</m>
<m v="cycleway">
<use-line name="highway:cycleway" />
</m>
<m v="track">
<use-line name="highway:track" />
</m>
<m v="path">
<use-line name="highway:path" />
</m>
<m v="bridleway">
<use-line name="bridleway" />
</m>
<m v="construction">
<use-line name="construction" />
<use-outline name="1" />
</m>
<m v="service">
<m k="service" v="-|parking_aisle">
<use-line name="highway-service" />
<use-outline name="1" />
</m>
<m k="service" v="parking_aisle" zoom-min="16">
<use-line name="highway-service" width="-0.4" />
<use-outline name="1" />
</m>
</m>
</m>
<m v="trunk_link|motorway_link">
<use-line name="trunk_link" />
<use-outline name="motorway" />
<use-text name="major-road" />
</m>
<m zoom-min="13">
<m v="byway|pedestrian">
<use-line name="residential" width="-0.4" />
<use-outline name="1" />
<use-text name="road" />
</m>
<m v="street|street_limited">
<use-line name="residential" />
<use-outline name="1" />
<use-text name="road" />
</m>
</m>
<m v="tertiary|secondary_link">
<use-line name="tertiary" />
<use-outline name="1" />
<use-text name="road" />
</m>
<m v="secondary|primary_link">
<!-- <line stroke="#fff939" width="1.6" /> -->
<use-line name="secondary:z11" />
<use-outline name="primary" />
<use-text name="major-road" />
</m>
<m v="main">
<use-line name="primary:z11" />
<use-outline name="primary" />
<use-text name="major-road" />
</m>
<m v="trunk">
<use-line name="trunk" />
<use-outline name="motorway" />
<use-text name="major-road" />
</m>
<m v="motorway">
<use-line name="highway:z11" />
<use-outline name="motorway" />
<use-text name="major-road" />
</m>
<m k="bridge" v="yes">
<style-outline name="bridge" stroke="#aa202020" width="0.08" />
<m zoom-min="16">
<m v="steps">
<use-line name="steps" />
<!-- <use-outline name="bridge"/> -->
</m>
</m>
<m v="track|footway|path|cycleway" zoom-min="15">
<use-line name="footway:z17" cap="butt" />
<use-outline name="bridge" />
</m>
<m zoom-min="14">
<m v="footway">
<use-line name="footway" />
</m>
<m v="cycleway">
<use-line name="highway:cycleway" />
</m>
<m v="track">
<use-line name="highway:track" />
</m>
<m v="path">
<use-line name="highway:path" />
</m>
<m v="bridleway">
<use-line name="bridleway" />
</m>
<m v="construction">
<use-line name="construction" cap="square" />
<use-outline name="bridge" />
</m>
<m v="service">
<use-line name="highway-service" cap="square" />
<use-outline name="bridge" />
</m>
</m>
<m v="byway|pedestrian">
<use-line name="pedestrian:bridge" />
<use-outline name="bridge" />
<use-text name="road" />
</m>
<m v="street|street_limited">
<use-line name="residential:bridge" />
<use-outline name="bridge" />
<use-text name="road" />
</m>
<m v="main">
<use-line name="primary:z11" cap="square" />
<use-outline name="bridge" />
<use-text name="major-road" />
</m>
<m v="motorway">
<use-line name="highway:z11" cap="square" />
<use-outline name="bridge" />
<use-text name="major-road" />
</m>
</m> <!-- end bridge=yes -->
</m> <!-- end zoom-min=11 -->
<!-- runways cores -->
<m k="aeroway">
<m v="runway">
<use-line name="aeroway:runway" />
</m>
<m v="taxiway">
<use-line name="aeroway:runway" width="-0.8" />
</m>
</m>
<!-- man_made features -->
<!--
<m k="man_made" v="pier">
<m closed="no">
<line stroke="#d0d0d0" width="0.4" cap="butt" />
<line stroke="#e4e4e4" width="0.3" cap="butt" />
</m>
<m closed="yes">
<area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
</m>
</m>
-->
<!-- barriers -->
<m k="barrier">
<!--
<m v="fence|wall|city_wall" zoom-min="15"> <line
stroke="#909090" width="0.1" cap="butt" /> </m>
-->
<m v="retaining_wall" zoom-min="15">
<line cap="butt" fix="true" stroke="#888888" width="1.1" />
</m>
</m>
<!-- non-physical routes -->
<!--
<m k="route" v="ferry"> <line stroke="#707070" width="0.3"
stroke-dasharray="15,10" cap="butt" /> </m>
-->
<!-- aerial ways -->
<!--
<m k="aerialway"> <line stroke="#202020" width="0.4"
cap="butt" /> <m k="aerialway" v="cable_car"> <lineSymbol
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>
-->
<!-- railway (no tunnel) -->
<m k="road" zoom-min="12">
<m k="railway" v="station">
<area fill="#dbdbc9" stroke="#707070" stroke-width="0.3" />
</m>
<!-- railway bridge casings -->
<m zoom-min="14">
<m k="bridge" v="yes|true">
<m k="railway" v="tram">
<line cap="butt" fix="true" stroke="#777777" width="0.9" />
</m>
<m k="railway" v="subway|light_rail|narrow_gauge">
<line cap="butt" fix="true" stroke="#777777" width="0.9" />
</m>
<m k="railway" v="rail">
<line cap="butt" fix="true" stroke="#777777" width="0.9" />
</m>
</m>
</m>
<!-- railway casings and cores -->
<m k="railway" v="tram" zoom-min="15">
<line fix="true" stroke="#887766" width="1.0" />
</m>
<m k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14">
<line cap="butt" fix="true" stroke="#a0a0a0" width="0.9" />
</m>
<m k="class" v="major_rail" zoom-max="13">
<line cap="butt" fade="12" fix="true" stroke="#ddaa9988" width="1.0" />
</m>
<m k="class" v="major_rail" zoom-min="14">
<line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#ffffff"
stipple-width="0.8" stroke="#aaa6a4" width="2.0" />
</m>
<!--
<m k="railway" v="rail" zoom-max="14" zoom-min="13">
<line stroke="#8888aa" width="0.6" cap="butt"
fix="true" />
</m>
-->
<!--
<m k="railway" v="rail" zoom-max="13" zoom-min="11">
<line stroke="#bbbbcc" width="0.8" cap="butt" fix="true" />
</m>
-->
<!-- whatever railway:spur means ... -->
<m k="railway" v="disused|spur|abandoned|preserved">
<line cap="butt" fade="12" fix="true" stroke="#cccccc" width="0.8" />
</m>
</m>
<!-- non-physical boundaries -->
<!--
<m k="boundary"> <m k="boundary" v="national_park">
<line stroke="#4ef94b" width="0.25" stroke-dasharray="15, 5, 5, 5"
/>
-->
<m k="boundary" v="national_park">
<area fill="#d7e6b0" />
</m>
<m k="admin" v="yes">
<m k="admin_level">
<m k="admin_level" v="4">
<line cap="butt" fix="true" stroke="#afa0dd" width="1.0" />
</m>
<m k="admin_level" v="3">
<line cap="butt" fix="true" stroke="#0000ff" width="0.95" />
</m>
<m k="admin_level" v="2">
<line cap="butt" fix="true" stroke="#808080" width="1.0" />
<!-- stipple-width="1.0" stipple="4" stipple-stroke="#606060"/> -->
</m>
</m>
</m>
<m k="debug" v="area">
<line cap="butt" fix="true" stroke="#ff0000" width="1.2" />
<area fill="#880000ff" />
<caption fill="#ff0000" font-size="15" k="name" stroke="#444444"
stroke-width="2.0" />
</m>
<m k="debug" v="way">
<line cap="butt" fix="true" stroke="#00ffff" width="1.5" />
<caption fill="#00ffff" font-size="15" k="name" stroke="#444444"
stroke-width="2.0" />
</m>
<m k="debug" v="box">
<line cap="butt" fix="true" stroke="#000000" width="1.5" />
</m>
</m>
<m e="node">
<!-- barrier -->
<m k="barrier" v="bollard">
<circle fill="#909090" r="1.5" />
</m>
<m k="debug">
<caption fill="#0000ff" font-size="16" k="name" />
</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" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
width="2.0" /> </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>
-->
<!-- place -->
<m k="place_label">
<m v="suburb" zoom-max="14">
<caption fill="#606060" font-size="17" font-style="italic" k="name"
priority="4" stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="village" zoom-max="14">
<caption fill="#2020cc" font-size="17" k="name" priority="3" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m v="island" zoom-min="10">
<caption fill="#000000" font-size="20" font-style="bold" k="name"
priority="1" stroke="#ffffff" stroke-width="2.0" />
</m>
<m v="town">
<caption fill="#000000" font-size="19" k="name" priority="2" stroke="#ffffff"
stroke-width="2.0" />
</m>
<m v="city">
<caption fill="#000000" font-size="20" k="name" priority="1" stroke="#ffffff"
stroke-width="2.0" />
</m>
</m>
<m k="country_label">
<caption fill="#000000" font-size="20" font-style="bold" k="name" priority="0"
stroke="#ffffff" stroke-width="2.0" />
</m>
<!-- railway -->
<m k="railway">
<m v="station" zoom-min="14">
<circle fill="#ec2d2d" r="6" 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>
<m v="halt|tram_stop" zoom-min="17">
<circle fill="#ec2d2d" r="4" 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" />
-->
</m>
</m>
<!-- aeroway -->
<m k="aeroway">
<m k="aeroway" v="helipad" zoom-min="17">
<symbol src="jar:symbols/helipad.png" />
</m>
<m k="aeroway" v="aerodrome|airport" zoom-max="13">
<symbol src="jar:symbols/airport.png" />
</m>
</m>
<m k="building_label" zoom-min="14">
<caption fill="#1d2e6f" font-size="14" style="italic" k="name" priority="20"
stroke="#9daeef" stroke-width="0.8" />
</m>
</m>
</rendertheme>

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

View File

@@ -1,8 +1,6 @@
apply plugin: 'java'
apply plugin: 'maven'
dependencies {
compile 'org.slf4j:slf4j-api:1.7.6'
compile 'com.google.code.findbugs:annotations:2.0.1'

View File

@@ -1,95 +0,0 @@
<atlas img="maki.png">
<rect name="airfield" pos="1 105 24 24" />
<rect name="airport" pos="1 79 24 24" />
<rect name="alcohol-shop" pos="27 105 24 24" />
<rect name="america-football" pos="1 53 24 24" />
<rect name="art-gallery" pos="27 79 24 24" />
<rect name="bank" pos="53 105 24 24" />
<rect name="bar" pos="1 27 24 24" />
<rect name="baseball" pos="27 53 24 24" />
<rect name="basketball" pos="53 79 24 24" />
<rect name="beer" pos="79 105 24 24" />
<rect name="bicycle" pos="1 1 24 24" />
<rect name="building" pos="27 27 24 24" />
<rect name="bus" pos="53 53 24 24" />
<rect name="cafe" pos="79 79 24 24" />
<rect name="campsite" pos="105 105 24 24" />
<rect name="cemetery" pos="27 1 24 24" />
<rect name="cinema" pos="53 27 24 24" />
<rect name="circle" pos="105 79 24 24" />
<rect name="circle-stroked" pos="79 53 24 24" />
<rect name="city" pos="131 105 24 24" />
<rect name="college" pos="53 1 24 24" />
<rect name="commercial" pos="79 27 24 24" />
<rect name="cricket" pos="105 53 24 24" />
<rect name="cross" pos="131 79 24 24" />
<rect name="dam" pos="157 105 24 24" />
<rect name="danger" pos="79 1 24 24" />
<rect name="disability" pos="105 27 24 24" />
<rect name="embassy" pos="131 53 24 24" />
<rect name="emergency-telephone" pos="157 79 24 24" />
<rect name="farm" pos="183 105 24 24" />
<rect name="fast-food" pos="105 1 24 24" />
<rect name="ferry" pos="131 27 24 24" />
<rect name="fire-station" pos="157 53 24 24" />
<rect name="fuel" pos="183 79 24 24" />
<rect name="garden" pos="209 105 24 24" />
<rect name="golf" pos="131 1 24 24" />
<rect name="grocery" pos="157 27 24 24" />
<rect name="harbor" pos="183 53 24 24" />
<rect name="heliport" pos="209 79 24 24" />
<rect name="hospital" pos="235 105 24 24" />
<rect name="industrial" pos="157 1 24 24" />
<rect name="land-use" pos="183 27 24 24" />
<rect name="library" pos="209 53 24 24" />
<rect name="lodging" pos="235 79 24 24" />
<rect name="logging" pos="261 105 24 24" />
<rect name="marker" pos="209 27 24 24" />
<rect name="marker-stroked" pos="183 1 24 24" />
<rect name="monument" pos="235 53 24 24" />
<rect name="museum" pos="261 79 24 24" />
<rect name="music" pos="287 105 24 24" />
<rect name="oil-well" pos="209 1 24 24" />
<rect name="park" pos="235 27 24 24" />
<rect name="park2" pos="261 53 24 24" />
<rect name="parking" pos="313 105 24 24" />
<rect name="parking-garage" pos="287 79 24 24" />
<rect name="pharmacy" pos="235 1 24 24" />
<rect name="pitch" pos="261 27 24 24" />
<rect name="place-of-worship" pos="287 53 24 24" />
<rect name="police" pos="313 79 24 24" />
<rect name="post" pos="339 105 24 24" />
<rect name="prison" pos="261 1 24 24" />
<rect name="rail" pos="339 79 24 24" />
<rect name="rail-above" pos="287 27 24 24" />
<rect name="rail-underground" pos="313 53 24 24" />
<rect name="religious-christian" pos="365 105 24 24" />
<rect name="religious-jewish" pos="287 1 24 24" />
<rect name="religious-muslim" pos="313 27 24 24" />
<rect name="restaurant" pos="339 53 24 24" />
<rect name="roadblock" pos="365 79 24 24" />
<rect name="school" pos="391 105 24 24" />
<rect name="shop" pos="313 1 24 24" />
<rect name="skiing" pos="339 27 24 24" />
<rect name="slaughterhouse" pos="365 53 24 24" />
<rect name="soccer" pos="391 79 24 24" />
<rect name="square" pos="339 1 24 24" />
<rect name="square-stroked" pos="417 105 24 24" />
<rect name="star" pos="391 53 24 24" />
<rect name="star-stroked" pos="365 27 24 24" />
<rect name="swimming" pos="417 79 24 24" />
<rect name="telephone" pos="443 105 24 24" />
<rect name="tennis" pos="365 1 24 24" />
<rect name="theatre" pos="391 27 24 24" />
<rect name="toilets" pos="417 53 24 24" />
<rect name="town" pos="469 105 24 24" />
<rect name="town-hall" pos="443 79 24 24" />
<rect name="triangle" pos="417 27 24 24" />
<rect name="triangle-stroked" pos="391 1 24 24" />
<rect name="village" pos="443 53 24 24" />
<rect name="warehouse" pos="469 79 24 24" />
<rect name="waste-basket" pos="417 1 24 24" />
<rect name="water" pos="443 27 24 24" />
<rect name="wetland" pos="469 53 24 24" />
<rect name="zoo" pos="443 1 24 24" />
</atlas>

View File

@@ -1,43 +0,0 @@
<atlas img="osm.png">
<rect name="airport" pos="67 107 16 16" />
<rect name="atm" pos="1 19 16 16" />
<rect name="bar" pos="1 103 20 20" />
<rect name="cafe" pos="23 41 16 16" />
<rect name="camping" pos="45 63 16 16" />
<rect name="city" pos="117 42 10 10" />
<rect name="department_store" pos="67 89 16 16" />
<rect name="fast_food" pos="85 107 16 16" />
<rect name="florist" pos="1 1 16 16" />
<rect name="food_bar" pos="85 89 16 16" />
<rect name="food_drinkingtap" pos="1 81 20 20" />
<rect name="hostel" pos="23 103 20 20" />
<rect name="hotel" pos="1 59 20 20" />
<rect name="information" pos="103 107 16 16" />
<rect name="library" pos="23 81 20 20" />
<rect name="museum" pos="103 89 16 16" />
<rect name="parking" pos="67 71 16 16" />
<rect name="pharmacy" pos="85 71 16 16" />
<rect name="place_of_worship" pos="103 71 16 16" />
<rect name="playground" pos="45 103 20 20" />
<rect name="police" pos="19 19 16 16" />
<rect name="pub" pos="19 1 16 16" />
<rect name="rental_bicycle" pos="1 37 20 20" />
<rect name="restaurant" pos="41 41 16 16" />
<rect name="school" pos="37 23 16 16" />
<rect name="shop_bakery" pos="37 5 16 16" />
<rect name="shop_butcher" pos="63 53 16 16" />
<rect name="shop_clothes" pos="81 53 16 16" />
<rect name="shop_convenience" pos="99 53 16 16" />
<rect name="shop_diy" pos="59 35 16 16" />
<rect name="shop_hairdresser" pos="77 35 16 16" />
<rect name="shop_supermarket" pos="95 35 16 16" />
<rect name="shopping_bicycle" pos="55 17 16 16" />
<rect name="telephone" pos="73 17 16 16" />
<rect name="theatre" pos="23 59 20 20" />
<rect name="toilets" pos="45 81 20 20" />
<rect name="town" pos="55 4 11 11" />
<rect name="view_point" pos="91 17 16 16" />
<rect name="volcano" pos="68 7 9 8" />
<rect name="windmill" pos="117 54 10 15" />
</atlas>

View File

@@ -29,7 +29,7 @@ import org.oscim.layers.tile.vector.OsmTileLayer;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.renderer.MapRenderer;
import org.oscim.theme.IRenderTheme;
import org.oscim.theme.InternalRenderTheme;
import org.oscim.theme.ThemeFile;
import org.oscim.theme.ThemeLoader;
import org.oscim.tiling.TileSource;
import org.oscim.utils.async.AsyncExecutor;
@@ -146,7 +146,7 @@ public abstract class Map {
* Utility function to set theme of base vector-layer and
* use map background color from theme.
*/
public void setTheme(InternalRenderTheme theme) {
public void setTheme(ThemeFile theme) {
if (mBaseLayer == null) {
log.error("No base layer set");
throw new IllegalStateException();

View File

@@ -30,7 +30,7 @@ import org.oscim.backend.AssetAdapter;
* An ExternalRenderTheme allows for customizing the rendering style of the map
* via an XML file.
*/
public class ExternalRenderTheme implements Theme {
public class ExternalRenderTheme implements ThemeFile {
private static final long serialVersionUID = 1L;
private final long mFileModificationDate;

View File

@@ -1,46 +0,0 @@
/*
* Copyright 2010, 2011, 2012 mapsforge.org
* Copyright 2013 Hannes Janetzek
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.theme;
import java.io.InputStream;
import org.oscim.backend.AssetAdapter;
/**
* Enumeration of all internal rendering themes.
*/
public enum InternalRenderTheme implements Theme {
DEFAULT("styles/default.xml"),
TRONRENDER("styles/tronrender.xml"),
TRON2("styles/newtron.xml"),
MAPNIK("styles/carto.xml"),
OSMARENDER("styles/osmarender.xml");
private final String mPath;
private InternalRenderTheme(String path) {
mPath = path;
}
@Override
public InputStream getRenderThemeAsStream() {
return AssetAdapter.g.openFileAsStream(mPath);
//InternalRenderTheme.class.getResourceAsStream(mPath);
}
}

View File

@@ -21,7 +21,7 @@ import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.Serializable;
public interface Theme extends Serializable {
public interface ThemeFile extends Serializable {
/**
* @return an InputStream to read the render theme data from.
* @throws FileNotFoundException

View File

@@ -29,16 +29,6 @@ import org.slf4j.LoggerFactory;
public class ThemeLoader {
static final Logger log = LoggerFactory.getLogger(ThemeLoader.class);
/**
* Load internal theme, see {@link InternalRenderTheme}.
*
* @param internalRenderTheme ...
* @return ...
*/
public static IRenderTheme load(InternalRenderTheme internalRenderTheme) {
return load((Theme) internalRenderTheme);
}
/**
* Load theme from XML file.
*
@@ -50,7 +40,7 @@ public class ThemeLoader {
return load(new ExternalRenderTheme(renderThemePath));
}
public static IRenderTheme load(Theme theme) {
public static IRenderTheme load(ThemeFile theme) {
InputStream inputStream = null;
try {