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

Show the distance between the fingers in each ruler mode; Draw the first or second mode of the ruler only if the widget is visible (check in Analyze on map)

Browse source
This commit is contained in:
Alexander Sytnyk 2017-06-15 18:48:16 +03:00
parent 7db024957e
commit be357ef06a
2 changed files with 60 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ 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.Rect; import android.graphics.Rect;
import android.view.View;
import net.osmand.Location; import net.osmand.Location;
import net.osmand.data.QuadPoint; import net.osmand.data.QuadPoint;
@ -25,6 +26,7 @@ public class RulerControlLayer extends OsmandMapLayer {
private final MapActivity mapActivity; private final MapActivity mapActivity;
private OsmandApplication app; private OsmandApplication app;
private OsmandMapTileView view; private OsmandMapTileView view;
private View rightWidgetsPanel;
private TextSide textSide; private TextSide textSide;
private int maxRadiusInDp; private int maxRadiusInDp;
@ -55,6 +57,7 @@ public class RulerControlLayer extends OsmandMapLayer {
cacheDistances = new ArrayList<>(); cacheDistances = new ArrayList<>();
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);
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);
@ -78,28 +81,28 @@ public class RulerControlLayer extends OsmandMapLayer {
@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") &&
rightWidgetsPanel.getVisibility() == View.VISIBLE) {
lineAttrs.updatePaints(view, settings, tb); lineAttrs.updatePaints(view, settings, tb);
circleAttrs.updatePaints(view, settings, tb); circleAttrs.updatePaints(view, settings, tb);
circleAttrs.paint2.setStyle(Style.FILL); circleAttrs.paint2.setStyle(Style.FILL);
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();
if (mode == RulerMode.FIRST) {
if (view.isMultiTouch()) { if (view.isMultiTouch()) {
float x1 = view.getFirstTouchPointX(); float x1 = view.getFirstTouchPointX();
float y1 = view.getFirstTouchPointY(); float y1 = view.getFirstTouchPointY();
float x2 = view.getSecondTouchPointX(); float x2 = view.getSecondTouchPointX();
float y2 = view.getSecondTouchPointY(); float y2 = view.getSecondTouchPointY();
drawFingerDistance(canvas, tb, center, x1, y1, x2, y2); drawFingerDistance(canvas, tb, center, x1, y1, x2, y2);
} else { } else if (mode == RulerMode.FIRST) {
drawCenterIcon(canvas, tb, center, settings.isNightMode()); drawCenterIcon(canvas, tb, center, settings.isNightMode());
Location currentLoc = app.getLocationProvider().getLastKnownLocation(); Location currentLoc = app.getLocationProvider().getLastKnownLocation();
if (currentLoc != null) { if (currentLoc != null) {
drawDistance(canvas, tb, center, currentLoc); drawDistance(canvas, tb, center, currentLoc);
} }
} }
} else if (mode == RulerMode.SECOND) { if (mode == RulerMode.SECOND) {
drawCenterIcon(canvas, tb, center, settings.isNightMode()); drawCenterIcon(canvas, tb, center, settings.isNightMode());
updateData(tb, center); updateData(tb, center);
for (int i = 1; i <= cacheDistances.size(); i++) { for (int i = 1; i <= cacheDistances.size(); i++) {
@ -191,6 +194,7 @@ public class RulerControlLayer extends OsmandMapLayer {
} }
private void drawCircle(Canvas canvas, RotatedTileBox tb, int circleNumber, QuadPoint center) { private void drawCircle(Canvas canvas, RotatedTileBox tb, int circleNumber, QuadPoint center) {
if (!mapActivity.getMapView().isZooming()) {
Rect bounds = new Rect(); Rect bounds = new Rect();
String text = cacheDistances.get(circleNumber - 1); String text = cacheDistances.get(circleNumber - 1);
circleAttrs.paint2.getTextBounds(text, 0, text.length(), bounds); circleAttrs.paint2.getTextBounds(text, 0, text.length(), bounds);
@ -214,7 +218,6 @@ public class RulerControlLayer extends OsmandMapLayer {
y2 = center.y + bounds.height() / 2; y2 = center.y + bounds.height() / 2;
} }
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, circleAttrs.shadowPaint); canvas.drawCircle(center.x, center.y, radius * circleNumber, circleAttrs.shadowPaint);
canvas.drawCircle(center.x, center.y, radius * circleNumber, circleAttrs.paint); canvas.drawCircle(center.x, center.y, radius * circleNumber, circleAttrs.paint);

12
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -190,12 +190,8 @@ public class MapInfoWidgetsFactory {
@Override @Override
public boolean updateInfo(DrawSettings drawSettings) { public boolean updateInfo(DrawSettings drawSettings) {
RulerMode mode = map.getMyApplication().getSettings().RULER_MODE.get(); RulerMode mode = map.getMyApplication().getSettings().RULER_MODE.get();
if (mode == RulerMode.FIRST) {
Location currentLoc = map.getMyApplication().getLocationProvider().getLastKnownLocation();
LatLon centerLoc = map.getMapLocation();
OsmandMapTileView view = map.getMapView(); OsmandMapTileView view = map.getMapView();
if (view.isMultiTouch()) { if (view.isMultiTouch()) {
if (needNewLatLon) { if (needNewLatLon) {
float x1 = view.getFirstTouchPointX(); float x1 = view.getFirstTouchPointX();
@ -208,15 +204,19 @@ public class MapInfoWidgetsFactory {
secondFinger.getLatitude(), secondFinger.getLongitude()); secondFinger.getLatitude(), secondFinger.getLongitude());
needNewLatLon = false; needNewLatLon = false;
} }
} else if (currentLoc != null && centerLoc != null) { } else if (mode == RulerMode.FIRST) {
Location currentLoc = map.getMyApplication().getLocationProvider().getLastKnownLocation();
LatLon centerLoc = map.getMapLocation();
if (currentLoc != null && centerLoc != null) {
setDistanceText(currentLoc.getLatitude(), currentLoc.getLongitude(), setDistanceText(currentLoc.getLatitude(), currentLoc.getLongitude(),
centerLoc.getLatitude(), centerLoc.getLongitude()); centerLoc.getLatitude(), centerLoc.getLongitude());
needNewLatLon = true; needNewLatLon = true;
}
} else { } else {
setText(title, null); setText(title, null);
needNewLatLon = true; needNewLatLon = true;
} }
}
if (mode != cacheMode) { if (mode != cacheMode) {
cacheMode = mode; cacheMode = mode;
setRulerControlIcon(this, mode); setRulerControlIcon(this, mode);