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

Merge pull request #3945 from osmandapp/add_ruler

Browse source 
Replace the algorithm for drawing distance from center to location
This commit is contained in:
Alexey 2017-06-20 11:34:24 +03:00 committed by GitHub
commit fa15797f99
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Paint.Style; import android.graphics.Paint.Style;
import android.graphics.Path;
import android.graphics.Rect; import android.graphics.Rect;
import android.view.View; import android.view.View;
@ -20,6 +21,8 @@ import net.osmand.plus.activities.MapActivity;
import java.util.ArrayList; import java.util.ArrayList;
import gnu.trove.list.array.TIntArrayList;
public class RulerControlLayer extends OsmandMapLayer { public class RulerControlLayer extends OsmandMapLayer {
private static final int TEXT_SIZE = 14; private static final int TEXT_SIZE = 14;
@ -39,6 +42,9 @@ public class RulerControlLayer extends OsmandMapLayer {
private double cacheTileX; private double cacheTileX;
private double cacheTileY; private double cacheTileY;
private ArrayList<String> cacheDistances; private ArrayList<String> cacheDistances;
private Path distancePath;
private TIntArrayList tx;
private TIntArrayList ty;
private Bitmap centerIconDay; private Bitmap centerIconDay;
private Bitmap centerIconNight; private Bitmap centerIconNight;
@ -58,6 +64,9 @@ public class RulerControlLayer extends OsmandMapLayer {
cacheCenter = new QuadPoint(); cacheCenter = new QuadPoint();
maxRadiusInDp = mapActivity.getResources().getDimensionPixelSize(R.dimen.map_ruler_radius); maxRadiusInDp = mapActivity.getResources().getDimensionPixelSize(R.dimen.map_ruler_radius);
rightWidgetsPanel = mapActivity.findViewById(R.id.map_right_widgets_panel); rightWidgetsPanel = mapActivity.findViewById(R.id.map_right_widgets_panel);
distancePath = new Path();
tx = new TIntArrayList();
ty = new TIntArrayList();
centerIconDay = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_ruler_center_day); centerIconDay = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_ruler_center_day);
centerIconNight = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_ruler_center_night); centerIconNight = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_ruler_center_night);
@ -133,25 +142,17 @@ public class RulerControlLayer extends OsmandMapLayer {
private void drawDistance(Canvas canvas, RotatedTileBox tb, QuadPoint center, Location currentLoc) { private void drawDistance(Canvas canvas, RotatedTileBox tb, QuadPoint center, Location currentLoc) {
int currX = tb.getPixXFromLonNoRot(currentLoc.getLongitude()); int currX = tb.getPixXFromLonNoRot(currentLoc.getLongitude());
int currY = tb.getPixYFromLatNoRot(currentLoc.getLatitude()); int currY = tb.getPixYFromLatNoRot(currentLoc.getLatitude());
int width = tb.getPixWidth(); distancePath.reset();
int height = tb.getPixHeight(); tx.clear();
ty.clear();
if (currX < 0 || currY < 0 || currX > width || currY > height) { tx.add(currX);
float x = (currX + center.x) / 2; ty.add(currY);
float y = (currY + center.y) / 2; tx.add((int) center.x);
ty.add((int) center.y);
while (true) { calculatePath(tb, tx, ty, distancePath);
if (x < 0 || y < 0 || x > width || y > height) { canvas.drawPath(distancePath, lineAttrs.paint);
currX = (int) x;
currY = (int) y;
} else {
break;
}
x = (x + center.x) / 2;
y = (y + center.y) / 2;
}
}
canvas.drawLine(currX, currY, center.x, center.y, lineAttrs.paint);
} }
private void updateData(RotatedTileBox tb, QuadPoint center) { private void updateData(RotatedTileBox tb, QuadPoint center) {