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

Refactor code

Browse source
This commit is contained in:
Alexander Sytnyk 2017-06-09 16:03:12 +03:00
parent cc6baf0d1d
commit 7df45dfba1
1 changed files with 111 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

191
OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java
View file

@ -8,8 +8,6 @@ import android.graphics.DashPathEffect;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Paint.Style; import android.graphics.Paint.Style;
import android.graphics.Rect; import android.graphics.Rect;
import android.text.TextPaint;
import android.util.DisplayMetrics;
import net.osmand.Location; import net.osmand.Location;
import net.osmand.data.QuadPoint; import net.osmand.data.QuadPoint;
@ -19,7 +17,6 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings.RulerMode; import net.osmand.plus.OsmandSettings.RulerMode;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.AndroidUiHelper;
import java.util.ArrayList; import java.util.ArrayList;
@ -28,22 +25,24 @@ public class RulerControlLayer extends OsmandMapLayer {
private static final int TEXT_SIZE = 14; private static final int TEXT_SIZE = 14;
private final MapActivity mapActivity; private final MapActivity mapActivity;
private OsmandApplication app; private OsmandApplication app;
private boolean portrait; private OsmandMapTileView view;
private int maxRadius;
private TextSide textSide;
private int maxRadiusInDp;
private float maxRadius;
private int radius; private int radius;
private double roundedDist;
private QuadPoint cacheCenter;
private int cacheZoom; private int cacheZoom;
private int height;
private int halfMaxSide;
private double cacheTileX; private double cacheTileX;
private double cacheTileY; private double cacheTileY;
private int cacheCenterY;
private ArrayList<String> cacheDistances; private ArrayList<String> cacheDistances;
private Bitmap centerIcon; private Bitmap centerIcon;
private Paint bitmapPaint; private Paint bitmapPaint;
private Paint distancePaint; private Paint distancePaint;
private Paint circlePaint; private RenderingLineAttributes attrs;
private Paint shadowPaint;
private TextPaint textPaint;
public RulerControlLayer(MapActivity mapActivity) { public RulerControlLayer(MapActivity mapActivity) {
this.mapActivity = mapActivity; this.mapActivity = mapActivity;
@ -52,18 +51,13 @@ public class RulerControlLayer extends OsmandMapLayer {
@Override @Override
public void initLayer(OsmandMapTileView view) { public void initLayer(OsmandMapTileView view) {
app = mapActivity.getMyApplication(); app = mapActivity.getMyApplication();
portrait = AndroidUiHelper.isOrientationPortrait(mapActivity); this.view = view;
cacheDistances = new ArrayList<>(); cacheDistances = new ArrayList<>();
maxRadius = mapActivity.getResources().getDimensionPixelSize(R.dimen.map_ruler_radius); cacheCenter = new QuadPoint();
maxRadiusInDp = mapActivity.getResources().getDimensionPixelSize(R.dimen.map_ruler_radius);
centerIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_ruler_center); centerIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_ruler_center);
DisplayMetrics displayMetrics = new DisplayMetrics();
mapActivity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
height = displayMetrics.heightPixels;
int width = displayMetrics.widthPixels;
halfMaxSide = (int) ((width > height ? width : height) / 2.2);
bitmapPaint = new Paint(); bitmapPaint = new Paint();
bitmapPaint.setAntiAlias(true); bitmapPaint.setAntiAlias(true);
bitmapPaint.setDither(true); bitmapPaint.setDither(true);
@ -75,26 +69,19 @@ public class RulerControlLayer extends OsmandMapLayer {
distancePaint.setStrokeWidth(10); distancePaint.setStrokeWidth(10);
distancePaint.setPathEffect(new DashPathEffect(new float[]{10, 10}, 0)); distancePaint.setPathEffect(new DashPathEffect(new float[]{10, 10}, 0));
circlePaint = new Paint(); attrs = new RenderingLineAttributes("rulerCircle");
circlePaint.setAntiAlias(true); attrs.paint.setStrokeWidth(2);
circlePaint.setStyle(Style.STROKE); attrs.paint2.setTextSize(TEXT_SIZE * mapActivity.getResources().getDisplayMetrics().density);
circlePaint.setStrokeWidth(2); attrs.paint2.setStyle(Style.FILL_AND_STROKE);
attrs.shadowPaint.setTextSize(TEXT_SIZE * mapActivity.getResources().getDisplayMetrics().density);
shadowPaint = new Paint(); attrs.shadowPaint.setStrokeWidth(6);
shadowPaint.setAntiAlias(true); attrs.shadowPaint.setColor(Color.WHITE);
shadowPaint.setStyle(Style.STROKE);
shadowPaint.setStrokeWidth(6);
shadowPaint.setTextSize(TEXT_SIZE * mapActivity.getResources().getDisplayMetrics().density);
shadowPaint.setColor(Color.WHITE);
textPaint = new TextPaint();
textPaint.setAntiAlias(true);
textPaint.setTextSize(TEXT_SIZE * mapActivity.getResources().getDisplayMetrics().density);
} }
@Override @Override
public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) { public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings settings) {
if (mapActivity.getMapLayers().getMapWidgetRegistry().isVisible("ruler")) { if (mapActivity.getMapLayers().getMapWidgetRegistry().isVisible("ruler")) {
attrs.updatePaints(view, settings, tb);
final QuadPoint center = tb.getCenterPixelPoint(); final QuadPoint center = tb.getCenterPixelPoint();
final RulerMode mode = app.getSettings().RULER_MODE.get(); final RulerMode mode = app.getSettings().RULER_MODE.get();
@ -105,7 +92,7 @@ public class RulerControlLayer extends OsmandMapLayer {
drawDistance(canvas, tb, center, currentLoc); drawDistance(canvas, tb, center, currentLoc);
} }
} else if (mode == RulerMode.SECOND) { } else if (mode == RulerMode.SECOND) {
updateData(tb); updateData(tb, center);
for (int i = 1; i <= cacheDistances.size(); i++) { for (int i = 1; i <= cacheDistances.size(); i++) {
drawCircle(canvas, tb, i, center); drawCircle(canvas, tb, i, center);
} }
@ -126,64 +113,108 @@ public class RulerControlLayer extends OsmandMapLayer {
canvas.drawLine(currentLocX, currentLocY, center.x, center.y, distancePaint); canvas.drawLine(currentLocX, currentLocY, center.x, center.y, distancePaint);
} }
private void updateData(RotatedTileBox tb, QuadPoint center) {
if (tb.getPixHeight() > 0 && tb.getPixWidth() > 0 && maxRadiusInDp > 0) {
if (cacheCenter.y != center.y || cacheCenter.x != center.x) {
cacheCenter = center;
updateCenter(tb, center);
}
boolean move = tb.getZoom() != cacheZoom || Math.abs(tb.getCenterTileX() - cacheTileX) > 1 ||
Math.abs(tb.getCenterTileY() - cacheTileY) > 1;
if (!mapActivity.getMapView().isZooming() && move) {
cacheZoom = tb.getZoom();
cacheTileX = tb.getCenterTileX();
cacheTileY = tb.getCenterTileY();
cacheDistances.clear();
updateDistance(tb);
}
}
}
private void updateCenter(RotatedTileBox tb, QuadPoint center) {
float topDist = center.y;
float bottomDist = tb.getPixHeight() - center.y;
float leftDist = center.x;
float rightDist = tb.getPixWidth() - center.x;
float maxVertical = topDist >= bottomDist ? topDist : bottomDist;
float maxHorizontal = rightDist >= leftDist ? rightDist : leftDist;
if (maxVertical >= maxHorizontal) {
maxRadius = maxVertical;
if (topDist >= bottomDist) {
textSide = TextSide.TOP;
} else {
textSide = TextSide.BOTTOM;
}
} else {
maxRadius = maxHorizontal;
if (rightDist >= leftDist) {
textSide = TextSide.RIGHT;
} else {
textSide = TextSide.LEFT;
}
}
if (radius != 0) {
updateText();
}
}
private void updateDistance(RotatedTileBox tb) {
final double dist = tb.getDistance(0, tb.getPixHeight() / 2, tb.getPixWidth(), tb.getPixHeight() / 2);
double pixDensity = tb.getPixWidth() / dist;
roundedDist = OsmAndFormatter.calculateRoundedDist(maxRadiusInDp / pixDensity, app);
radius = (int) (pixDensity * roundedDist);
updateText();
}
private void updateText() {
double maxCircleRadius = maxRadius;
int i = 1;
while ((maxCircleRadius -= radius) > 0) {
cacheDistances.add(OsmAndFormatter
.getFormattedDistance((float) roundedDist * i++, app, false).replaceAll(" ", ""));
}
}
private void drawCircle(Canvas canvas, RotatedTileBox tb, int circleNumber, QuadPoint center) { private void drawCircle(Canvas canvas, RotatedTileBox tb, int circleNumber, QuadPoint center) {
Rect bounds = new Rect(); Rect bounds = new Rect();
String text = cacheDistances.get(circleNumber - 1); String text = cacheDistances.get(circleNumber - 1);
textPaint.getTextBounds(text, 0, text.length(), bounds); attrs.paint2.getTextBounds(text, 0, text.length(), bounds);
float left; float x = 0;
float bottom; float y = 0;
if (portrait) { if (textSide == TextSide.TOP) {
left = center.x - bounds.width() / 2; x = center.x - bounds.width() / 2;
bottom = center.y - radius * circleNumber + bounds.height() / 2; y = center.y - radius * circleNumber + bounds.height() / 2;
} else { } else if (textSide == TextSide.RIGHT) {
left = center.x + radius * circleNumber - bounds.width() / 2; x = center.x + radius * circleNumber - bounds.width() / 2;
bottom = center.y + bounds.height() / 2; y = center.y + bounds.height() / 2;
} else if (textSide == TextSide.BOTTOM) {
x = center.x - bounds.width() / 2;
y = center.y + radius * circleNumber + bounds.height() / 2;
} else if (textSide == TextSide.LEFT) {
x = center.x - radius * circleNumber - bounds.width() / 2;
y = center.y + bounds.height() / 2;
} }
if (!mapActivity.getMapView().isZooming()) { if (!mapActivity.getMapView().isZooming()) {
canvas.rotate(-tb.getRotate(), center.x, center.y); canvas.rotate(-tb.getRotate(), center.x, center.y);
canvas.drawCircle(center.x, center.y, radius * circleNumber, shadowPaint); canvas.drawCircle(center.x, center.y, radius * circleNumber, attrs.shadowPaint);
canvas.drawCircle(center.x, center.y, radius * circleNumber, circlePaint); canvas.drawCircle(center.x, center.y, radius * circleNumber, attrs.paint);
canvas.drawText(text, left, bottom, shadowPaint); canvas.drawText(text, x, y, attrs.shadowPaint);
canvas.drawText(text, left, bottom, textPaint); canvas.drawText(text, x, y, attrs.paint2);
canvas.rotate(tb.getRotate(), center.x, center.y); canvas.rotate(tb.getRotate(), center.x, center.y);
} }
} }
private void updateData(RotatedTileBox tb) { private enum TextSide {
boolean centerChange = cacheCenterY != tb.getCenterPixelY(); TOP,
boolean move = tb.getZoom() != cacheZoom || Math.abs(tb.getCenterTileX() - cacheTileX) > 1 || BOTTOM,
Math.abs(tb.getCenterTileY() - cacheTileY) > 1 || centerChange; LEFT,
RIGHT
if (!mapActivity.getMapView().isZooming() && move && tb.getPixWidth() > 0 && maxRadius > 0) {
cacheZoom = tb.getZoom();
cacheTileX = tb.getCenterTileX();
cacheTileY = tb.getCenterTileY();
cacheCenterY = tb.getCenterPixelY();
cacheDistances.clear();
final double dist = tb.getDistance(0, tb.getPixHeight() / 2, tb.getPixWidth(), tb.getPixHeight() / 2);
double pixDensity = tb.getPixWidth() / dist;
double roundedDist =
OsmAndFormatter.calculateRoundedDist(maxRadius / pixDensity, app);
radius = (int) (pixDensity * roundedDist);
int maxHeightOfCircles;
int i = 1;
if (portrait && cacheCenterY > height / 2) {
maxHeightOfCircles = cacheCenterY;
} else {
maxHeightOfCircles = halfMaxSide;
}
while ((maxHeightOfCircles -= radius) > 0) {
cacheDistances.add(OsmAndFormatter.getFormattedDistance((float) roundedDist * i++,
app, false).replaceAll(" ", ""));
}
}
} }
@Override @Override