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

Merge pull request #90 from seeebek/niceRoads

Browse source 
Nice roads
This commit is contained in:
vshcherb 2011-10-11 13:47:41 -07:00
commit e63ddc9d51
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -881,7 +881,7 @@
<case tag="highway" value="motorway_link" color="#a58dff" />
<case tag="highway" value="trunk" color="#ffaf80" />
<case tag="highway" value="trunk_link" color="#ffaf80" />
<filter cap="ROUND">
<filter shadowColor="#464646" shadowRadius="1" cap="ROUND">
<filter minzoom="5" maxzoom="9" strokeWidth="5" />
<filter minzoom="10" maxzoom="10" strokeWidth="6" />
<filter minzoom="11" maxzoom="11" strokeWidth="7" />
@ -893,7 +893,7 @@
<switch>
<case tag="highway" value="primary" />
<case tag="highway" value="primary_link" />
<filter color="#eb989a" cap="ROUND">
<filter color="#eb989a" shadowColor="#464646" shadowRadius="1" cap="ROUND">
<filter minzoom="7" maxzoom="9" strokeWidth="4" />
<filter minzoom="10" maxzoom="10" strokeWidth="5" />
<filter minzoom="11" maxzoom="11" strokeWidth="6" />
@ -905,7 +905,7 @@
<switch>
<case tag="highway" value="secondary" />
<case tag="highway" value="secondary_link" />
<filter color="#fdd6a4" color_2="#fdd6a4" shadowColor="#464646" shadowRadius="1" cap="ROUND" >
<filter color="#fdd6a4" color_2="#fdd6a4" shadowColor="#464646" shadowRadius="1" cap="ROUND">
<filter minzoom="9" maxzoom="9" strokeWidth="3" />
<filter minzoom="10" maxzoom="10" strokeWidth="4" />
<filter minzoom="11" maxzoom="11" strokeWidth="5" />

18
OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java
View file

@ -358,9 +358,12 @@ public class OsmandRenderer {
for (int k = 0; k < keys.length; k++) {
if(repeat == true && shadowarray[shadownum] != k && shadowarray[shadownum] != -1 && keys[k] < 58){
continue;
}
if(repeat == true && shadowarray[shadownum] == k){
shadownum++;
continue;
}
TIntArrayList list = orderMap.get(keys[k]);
@ -388,7 +391,7 @@ public class OsmandRenderer {
if(keys[k] > 57 && repeat == false && shadow > 1){
shadow = 0;
shadownum = 0;
k = shadowarray[0];
k = shadowarray[0]-1;
repeat = true;
}
}
@ -928,7 +931,7 @@ public class OsmandRenderer {
// no shadow
if(shadow == 0){
paint.setShadowLayer(0, 0, 0, 0);
paint.clearShadowLayer();
canvas.drawPath(path, paint);
}
@ -942,15 +945,18 @@ public class OsmandRenderer {
if(paint.getPathEffect() == null) paint.setColor(0xffffffff);
canvas.drawPath(path, paint);
}
else if(shadow == 2) canvas.drawPath(path, paint);
// option shadow = 3 with solid border
if(shadow == 3 && shadowRadius > 0){
paint.setShadowLayer(0, 0, 0, 0);
if(paint.getPathEffect() == null){
paint.clearShadowLayer();
paint.setStrokeWidth(paint.getStrokeWidth() + 2);
if(paint.getPathEffect() == null) paint.setColor(0xffbababa);
paint.setColor(0xffbababa);
}
canvas.drawPath(path, paint);
}
else if(shadow == 3) canvas.drawPath(path, paint);
//check for shadow and save index in array
if(shadowRadius > 0 && shadow > 1){