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

fix rendering

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@531 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-09-28 09:22:50 +00:00
parent e4b2442521
commit 99b96ab7c0
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DataExtractionOSM/src/net/osmand/ToDoConstants.java
View file

@ -23,6 +23,9 @@ public class ToDoConstants {
// _18. Fix loading map data in rotated mode (check properly boundaries) +/- // _18. Fix loading map data in rotated mode (check properly boundaries) +/-
// _30. About screen // _30. About screen
/// PROFILE AND REVIEW Rendering !!!
// - Review Ref on the road on low zooms
// not required // not required
// ! 81. Add some objects to POI category (1) to add them into OSM 2) to help navigation) // ! 81. Add some objects to POI category (1) to add them into OSM 2) to help navigation)
// highway (?), traffic_calming (?), barrier(?), military(?-), landuse (?), office(?), man_made(?), power(?), // highway (?), traffic_calming (?), barrier(?), military(?-), landuse (?), office(?), man_made(?), power(?),

4
DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java
View file

@ -640,8 +640,8 @@ public class MapRenderingTypes {
register(1, "aeroway", "aerodrome", AEROWAY, 1, POLYGON_WITH_CENTER_TYPE, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$ register(1, "aeroway", "aerodrome", AEROWAY, 1, POLYGON_WITH_CENTER_TYPE, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
register("aeroway", "terminal", AEROWAY, 2, POLYGON_WITH_CENTER_TYPE, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$ register("aeroway", "terminal", AEROWAY, 2, POLYGON_WITH_CENTER_TYPE, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
register(1, "aeroway", "helipad", AEROWAY, 3, POLYGON_WITH_CENTER_TYPE, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$ register(1, "aeroway", "helipad", AEROWAY, 3, POLYGON_WITH_CENTER_TYPE, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
register("aeroway", "runway", AEROWAY, 7, POLYLINE_TYPE); //$NON-NLS-1$ //$NON-NLS-2$ register(1, "aeroway", "runway", AEROWAY, 7, POLYLINE_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
register("aeroway", "taxiway", AEROWAY, 8, POLYLINE_TYPE); //$NON-NLS-1$ //$NON-NLS-2$ register(1, "aeroway", "taxiway", AEROWAY, 8, POLYLINE_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
register(1, "aeroway", "apron", AEROWAY, 9, POLYGON_TYPE); //$NON-NLS-1$ //$NON-NLS-2$ register(1, "aeroway", "apron", AEROWAY, 9, POLYGON_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
register(1, "aeroway", "airport", AEROWAY, 10, POLYGON_WITH_CENTER_TYPE, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$ register(1, "aeroway", "airport", AEROWAY, 10, POLYGON_WITH_CENTER_TYPE, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
register("aeroway", "gate", AEROWAY, 12, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$ register("aeroway", "gate", AEROWAY, 12, POINT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$

23
OsmAnd/src/net/osmand/render/OsmandRenderer.java
View file

@ -184,10 +184,10 @@ public class OsmandRenderer {
p.setColor(color); p.setColor(color);
p.setShader(shader); p.setShader(shader);
p.setShadowLayer(shadowLayer, 0, 0, shadowColor); p.setShadowLayer(shadowLayer, 0, 0, shadowColor);
p.setStrokeWidth(strokeWidth);
p.setStrokeCap(cap);
if (!fillArea) { if (!fillArea) {
p.setStrokeCap(cap);
p.setPathEffect(pathEffect); p.setPathEffect(pathEffect);
p.setStrokeWidth(strokeWidth);
} }
} }
@ -558,7 +558,6 @@ public class OsmandRenderer {
rc.second.emptyLine(); rc.second.emptyLine();
rc.main.color = Color.rgb(245, 245, 245); rc.main.color = Color.rgb(245, 245, 245);
PolygonRenderer.renderPolygon(rc, zoom, type, subtype, this); PolygonRenderer.renderPolygon(rc, zoom, type, subtype, this);
if(!rc.main.fillArea){ if(!rc.main.fillArea){
return null; return null;
@ -1446,27 +1445,27 @@ public class OsmandRenderer {
} }
} }
break; break;
case 12: {
if (zoom >= 10) {
textColor = 0xFF000000;
textSize = 9;
}
}
break;
case 7: { case 7: {
wrapWidth = 20; wrapWidth = 20;
if (zoom >= 9 && zoom < 11) { if (zoom >= 9 && zoom < 11) {
textColor = 0xFF000000; textColor = 0xFF000000;
textSize = 8; textSize = 8;
} else if (zoom >= 13 && zoom < 14) { } else if (zoom >= 11 && zoom < 14) {
textColor = 0xFF000000; textColor = 0xFF000000;
textSize = 10; textSize = 11;
} else if (zoom >= 14) { } else if (zoom >= 14) {
textColor = 0xFF777777; textColor = 0xFF777777;
textSize = 13; textSize = 13;
} }
} }
break; break;
case 12: {
if (zoom >= 10) {
textColor = 0xFF000000;
textSize = 9;
}
}
break;
case 6: { case 6: {
wrapWidth = 20; wrapWidth = 20;
textColor = 0xFF000000; textColor = 0xFF000000;