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

small performance improvement

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@714 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-11-28 14:02:55 +00:00
parent 41106d0cea
commit 11bdabcb84
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -687,7 +687,7 @@ public class OsmandRenderer {
Path path = null; Path path = null;
rc.main.emptyArea(); rc.main.emptyArea();
rc.second.emptyLine(); rc.second.emptyLine();
rc.main.color = Color.rgb(245, 245, 245); // rc.main.color = Color.rgb(245, 245, 245);
boolean rendered = render.renderPolygon(pair.tag, pair.value, zoom, rc, this); boolean rendered = render.renderPolygon(pair.tag, pair.value, zoom, rc, this);
if(!rendered){ if(!rendered){
@ -709,8 +709,6 @@ public class OsmandRenderer {
} }
if (path != null && len > 0) { if (path != null && len > 0) {
xText /= len;
yText /= len;
rc.main.updatePaint(paint); rc.main.updatePaint(paint);
canvas.drawPath(path, paint); canvas.drawPath(path, paint);
@ -723,6 +721,8 @@ public class OsmandRenderer {
rc.clearText(); rc.clearText();
name = render.renderObjectText(name, pair.tag, pair.value, rc, false); name = render.renderObjectText(name, pair.tag, pair.value, rc, false);
if (rc.textSize > 0 && name != null) { if (rc.textSize > 0 && name != null) {
xText /= len;
yText /= len;
TextDrawInfo info = new TextDrawInfo(name); TextDrawInfo info = new TextDrawInfo(name);
info.fillProperties(rc, xText, yText); info.fillProperties(rc, xText, yText);
rc.textToDraw.add(info); rc.textToDraw.add(info);
@ -781,24 +781,24 @@ public class OsmandRenderer {
private void drawPolyline(BinaryMapDataObject obj, Canvas canvas, RenderingContext rc, int type, int subtype, int wholeType) { private void drawPolyline(BinaryMapDataObject obj, Canvas canvas, RenderingContext rc, int type, int subtype, int wholeType) {
rc.main.emptyLine();
rc.second.emptyLine();
rc.third.emptyLine();
rc.adds = null;
TagValuePair pair = obj.getMapIndex().decodeType(type, subtype); TagValuePair pair = obj.getMapIndex().decodeType(type, subtype);
if(render == null || pair == null){ if(render == null || pair == null){
return; return;
} }
int layer = MapRenderingTypes.getNegativeWayLayer(wholeType);
boolean res = render.renderPolyline(pair.tag, pair.value, rc.zoom, rc, this, layer);
if(rc.main.strokeWidth == 0 || !res){
return;
}
int length = obj.getPointsLength(); int length = obj.getPointsLength();
if(length < 2){ if(length < 2){
return; return;
} }
if("highway".equals(pair.tag) && rc.zoom >= 16 && MapRenderingTypes.isOneWayWay(obj.getHighwayAttributes())){ //$NON-NLS-1$ int layer = MapRenderingTypes.getNegativeWayLayer(wholeType);
rc.main.emptyLine();
rc.second.emptyLine();
rc.third.emptyLine();
rc.adds = null;
boolean res = render.renderPolyline(pair.tag, pair.value, rc.zoom, rc, this, layer);
if(rc.main.strokeWidth == 0 || !res){
return;
}
if(rc.zoom >= 16 && "highway".equals(pair.tag) && MapRenderingTypes.isOneWayWay(obj.getHighwayAttributes())){ //$NON-NLS-1$
rc.adds = PolylineRenderer.getOneWayProperties(); rc.adds = PolylineRenderer.getOneWayProperties();
} }

3
OsmAnd/src/net/osmand/render/RendererLayer.java
View file

@ -58,7 +58,8 @@ public class RendererLayer implements OsmandMapLayer {
pixRect.set(0, 0, view.getWidth(), view.getHeight()); pixRect.set(0, 0, view.getWidth(), view.getHeight());
updateRotatedTileBox(); updateRotatedTileBox();
if(resourceManager.updateRenderedMapNeeded(rotatedTileBox)){ if(resourceManager.updateRenderedMapNeeded(rotatedTileBox)){
pixRect.set(-view.getWidth(), -view.getHeight() / 2, 2 * view.getWidth(), 3 * view.getHeight() / 2); // pixRect.set(-view.getWidth(), -view.getHeight() / 2, 2 * view.getWidth(), 3 * view.getHeight() / 2);
pixRect.set(-view.getWidth()/3, -view.getHeight() / 4, 4 * view.getWidth() /3, 5 * view.getHeight() / 4);
updateRotatedTileBox(); updateRotatedTileBox();
resourceManager.updateRendererMap(rotatedTileBox); resourceManager.updateRendererMap(rotatedTileBox);
} }