From f28895a1360fec1c2b4aadd3d26dc073881a4368 Mon Sep 17 00:00:00 2001 From: vshcherb Date: Wed, 28 May 2014 18:36:05 +0200 Subject: [PATCH] Fix small issues --- OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java | 3 ++- .../src/net/osmand/plus/osmo/OsMoPositionLayer.java | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java index 150eb1e48e..240da69429 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java @@ -60,7 +60,8 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener { private void connectDeviceImpl(OsMoDevice d) { d.enabled = true; d.active = true; - if(!service.getMyGroupTrackerId().equals(d.getTrackerId())) { + String mid = service.getMyGroupTrackerId(); + if(mid == null || !mid.equals(d.getTrackerId())) { tracker.startTrackingId(d); } } diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPositionLayer.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPositionLayer.java index 5a16612ea2..a9ba676e11 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPositionLayer.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPositionLayer.java @@ -36,7 +36,7 @@ public class OsMoPositionLayer extends OsmandMapLayer implements ContextMenuLaye private Paint pointAltUI; private Paint point; private OsMoPlugin plugin; - private final static float startZoom = 10; + private final static float startZoom = 7; public OsMoPositionLayer(MapActivity map, OsMoPlugin plugin) { this.map = map; @@ -55,9 +55,9 @@ public class OsMoPositionLayer extends OsmandMapLayer implements ContextMenuLaye pointAltUI.setStyle(Style.FILL); point = new Paint(); - point.setColor(Color.GRAY); + point.setColor(Color.DKGRAY); point.setAntiAlias(true); - point.setStyle(Style.STROKE); + point.setStyle(Style.FILL_AND_STROKE); } public Collection getTrackingDevices() { @@ -83,15 +83,16 @@ public class OsMoPositionLayer extends OsmandMapLayer implements ContextMenuLaye @Override public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings nightMode) { - final int r = getRadiusPoi(tb); + final int r = getRadiusPoi(tb) * 3 / 4; for (OsMoDevice t : getTrackingDevices()) { Location l = t.getLastLocation(); if (l != null) { int x = (int) tb.getPixXFromLatLon(l.getLatitude(), l.getLongitude()); int y = (int) tb.getPixYFromLatLon(l.getLatitude(), l.getLongitude()); + pointAltUI.setColor(t.getColor()); - canvas.drawCircle(x, y, r, pointAltUI); - canvas.drawCircle(x, y, r, point); + canvas.drawCircle(x, y, r , point); + canvas.drawCircle(x, y, r - 2, pointAltUI); } } }