xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unix line delimiters

Browse Source
This commit is contained in:
Hannes Janetzek 2012-11-03 23:38:31 +01:00
parent 807e5c4f30
commit 7dd171dc24
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/oscim/theme/osmarender/tronrender.xml
View File

@ -508,7 +508,26 @@
<!-- highway --> <!-- highway -->
<rule e="way" k="highway" v="*"> <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="5">
<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"/>
</rule> -->
<rule e="way" k="*" v="route_primary" zoom-min="3">
<line stroke="#f2df6d" width="1.4" cap="butt" fixed="true" fade="3"/>
</rule>
<!-- <rule e="way" k="*" v="route_trunk" zoom-min="3">
<line stroke="#fed6a3" width="1.4" cap="butt" fixed="true" fade="3"/>
</rule>
-->
<rule e="way" k="*" v="route_motorway|route_trunk">
<line stroke="#eec693" width="1.5" cap="butt" fixed="true" fade="3"/>
</rule>
</rule>
</rule>
<rule e="way" k="*" v="*" zoom-min="6" zoom-max="10">
<rule e="way" k="area" v="~|no|false"> <rule e="way" k="area" v="~|no|false">
<rule e="way" k="*" v="secondary|primary_link" zoom-min="9"> <rule e="way" k="*" v="secondary|primary_link" zoom-min="9">
<line stroke="#ddf2df6d" width="1.8" cap="butt" fixed="true" fade="9"/> <line stroke="#ddf2df6d" width="1.8" cap="butt" fixed="true" fade="9"/>

3
src/org/oscim/view/MapView.java
View File

@ -457,6 +457,9 @@ public class MapView extends RelativeLayout {
throw new IllegalArgumentException("render theme must not be null"); throw new IllegalArgumentException("render theme must not be null");
} }
if (internalRenderTheme.name() == mRenderTheme)
return true;
boolean ret = setRenderTheme((Theme) internalRenderTheme); boolean ret = setRenderTheme((Theme) internalRenderTheme);
if (ret) { if (ret) {
mRenderTheme = internalRenderTheme.name(); mRenderTheme = internalRenderTheme.name();