- rename MapRenderer to TileManager and refactor

- move overlay renderer to own package
- slight TouchHandler improvements, not start rotation when scaling
This commit is contained in:
Hannes Janetzek
2012-10-20 00:50:32 +02:00
parent 98246fe50b
commit 78aac5f019
20 changed files with 243 additions and 160 deletions

View File

@@ -497,7 +497,7 @@
<!-- highway -->
<rule e="way" k="highway" v="*">
<rule e="way" k="*" v="*" zoom-min="5" zoom-max="10">
<rule e="way" k="*" v="*" zoom-min="3" zoom-max="10">
<rule e="way" k="area" v="~|no|false">
<rule e="way" k="*" v="secondary|primary_link" zoom-min="9">
<line stroke="#f2df6d" width="1.3" cap="butt" fixed="true" fade="9"/>
@@ -516,7 +516,7 @@
</rule>
<rule e="way" k="*" v="motorway">
<line stroke="#eec693" width="1.5" cap="butt" fixed="true" fade="5"/>
<line stroke="#eec693" width="1.5" cap="butt" fixed="true" fade="3"/>
</rule>
</rule>
</rule>
@@ -853,7 +853,9 @@
<!-- <rule e="way" k="boundary" v="*"> <rule e="way" k="boundary" v="national_park">
<line stroke="#4ef94b" width="0.25" stroke-dasharray="15, 5, 5, 5"
/> -->
<rule e="way" k="boundary" v="national_park">
<area fill="#d7e6b0"/>
</rule>
<!--<rule e="way" k="boundary" v="administrative"> -->
<rule e="way" k="admin_level" v="*">
<!-- <rule e="way" k="admin_level" v="11"> <line stroke="#f9574b" width="0.1"
@@ -868,13 +870,13 @@
/> </rule> <rule e="way" k="admin_level" v="5"> <line stroke="#f9574b" width="0.15"
fixed="true" cap="butt" /> </rule> -->
<rule e="way" k="admin_level" v="4">
<line stroke="#8f80dd" width="0.9" fixed="true" cap="butt" />
<line stroke="#afa0dd" width="0.9" fixed="true" cap="butt" />
</rule>
<rule e="way" k="admin_level" v="3">
<line stroke="#0000ff" width="0.95" fixed="true" cap="butt" />
</rule>
<rule e="way" k="admin_level" v="2">
<line stroke="#a0a0a0" width="0.95" fixed="true" cap="butt" />
<line stroke="#808080" width="1.15" fixed="true" cap="butt" />
</rule>
<rule e="way" k="admin_level" v="1">
<line stroke="#ff0000" width="0.95" fixed="true" cap="butt" />
@@ -947,11 +949,11 @@
stroke="#ffffff" stroke-width="2.0" />
</rule>
<rule e="node" k="*" v="city">
<caption k="name" font-style="bold" font-size="20" fill="#000000"
<caption k="name" font-size="19" fill="#000000"
stroke="#ffffff" stroke-width="2.0" />
</rule>
<rule e="node" k="*" v="country">
<caption k="name" font-size="20" fill="#000000"
<caption k="name" font-style="bold" font-size="20" fill="#000000"
stroke="#ffffff" stroke-width="2.0" />
</rule>
</rule>