diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityKeyListener.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityKeyListener.java index 08004ec9ab..e218272c13 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityKeyListener.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityKeyListener.java @@ -53,7 +53,11 @@ public class MapActivityKeyListener implements KeyEvent.Callback { uiHandler.sendMessageDelayed(msg, LONG_KEYPRESS_DELAY); } return true; - } else if (settings.USE_VOLUME_BUTTONS_AS_ZOOM.get()) { + } else if (mapScrollHelper.isAvailableKeyCode(keyCode)) { + return mapScrollHelper.onKeyDown(keyCode, event); + } + + if (settings.USE_VOLUME_BUTTONS_AS_ZOOM.get()) { if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) { mapActivity.changeZoom(-1); return true; @@ -61,10 +65,6 @@ public class MapActivityKeyListener implements KeyEvent.Callback { mapActivity.changeZoom(1); return true; } - } else if (settings.EXTERNAL_INPUT_DEVICE.get() != NO_EXTERNAL_DEVICE) { - return true; - } else if (mapScrollHelper.isScrollingDirectionKeyCode(keyCode)) { - return mapScrollHelper.onKeyDown(keyCode, event); } return app.getAidlApi().onKeyEvent(event); } @@ -94,6 +94,8 @@ public class MapActivityKeyListener implements KeyEvent.Callback { mapActivity.getMapViewTrackingUtilities().backToLocationImpl(); } else if (keyCode == KeyEvent.KEYCODE_D) { mapActivity.getMapViewTrackingUtilities().switchRotateMapMode(); + } else if (mapScrollHelper.isAvailableKeyCode(keyCode)) { + return mapScrollHelper.onKeyUp(keyCode, event); } else if (settings.EXTERNAL_INPUT_DEVICE.get() == PARROT_EXTERNAL_DEVICE) { // Parrot device has only dpad left and right if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) { @@ -118,8 +120,6 @@ public class MapActivityKeyListener implements KeyEvent.Callback { mapActivity.startActivity(intent); return true; } - } else if (mapScrollHelper.isScrollingDirectionKeyCode(keyCode)) { - return mapScrollHelper.onKeyUp(keyCode, event); } else if (settings.EXTERNAL_INPUT_DEVICE.get() == GENERIC_EXTERNAL_DEVICE) { if (keyCode == KeyEvent.KEYCODE_MINUS) { mapActivity.changeZoom(-1); diff --git a/OsmAnd/src/net/osmand/plus/helpers/ScrollHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ScrollHelper.java index 8fd43c49c2..37da378f6d 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/ScrollHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/ScrollHelper.java @@ -3,12 +3,16 @@ package net.osmand.plus.helpers; import android.view.KeyEvent; import net.osmand.plus.OsmandApplication; +import net.osmand.plus.settings.backend.OsmandSettings; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import static net.osmand.plus.settings.backend.OsmandSettings.PARROT_EXTERNAL_DEVICE; +import static net.osmand.plus.settings.backend.OsmandSettings.WUNDERLINQ_EXTERNAL_DEVICE; + public class ScrollHelper { private final static int LONG_PRESS_TIME_MS = 250; @@ -135,8 +139,21 @@ public class ScrollHelper { this.onScrollEventListener = onScrollEventListener; } - public boolean isScrollingDirectionKeyCode(int keyCode) { - return availableDirections.containsKey(keyCode); + public boolean isAvailableKeyCode(int keyCode) { + return availableDirections.containsKey(keyCode) + && !isOverrideBySelectedExternalDevice(keyCode); + } + + public boolean isOverrideBySelectedExternalDevice(int keyCode) { + OsmandSettings settings = app.getSettings(); + + if (settings.EXTERNAL_INPUT_DEVICE.get() == PARROT_EXTERNAL_DEVICE) { + return keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT; + + } else if (settings.EXTERNAL_INPUT_DEVICE.get() == WUNDERLINQ_EXTERNAL_DEVICE) { + return keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_DOWN; + } + return false; } public List getLastDirections() { diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java index af4d599afa..2de8070b58 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java @@ -2,6 +2,7 @@ package net.osmand.plus.measurementtool; import android.util.Pair; +import net.osmand.AndroidUtils; import net.osmand.GPXUtilities.GPXFile; import net.osmand.GPXUtilities.TrkSegment; import net.osmand.GPXUtilities.WptPt; @@ -1115,16 +1116,26 @@ public class MeasurementEditingContext implements IRouteSettingsListener { } public boolean isInMultiProfileMode() { - if (lastCalculationMode == CalculationMode.NEXT_SEGMENT) { - return true; - } Set profiles = new HashSet<>(); - for (RoadSegmentData segmentData : roadSegmentData.values()) { - String profile = segmentData.getAppMode().getStringKey(); - if (!DEFAULT_APP_MODE.getStringKey().equals(profile)) { - profiles.add(profile); + List allSegments = new ArrayList<>(); + allSegments.addAll(beforeSegments); + allSegments.addAll(afterSegments); + for (TrkSegment segment : allSegments) { + List points = segment.points; + if (Algorithms.isEmpty(points)) { + continue; + } + for (int i = 0; i < points.size() / 2 + 1; i++) { + WptPt left = points.get(i); + int rightIdx = points.size() - 1 - i; + WptPt right = points.get(rightIdx); + if (!left.isGap() && i + 1 < points.size()) { + profiles.add(left.getProfileType()); + } + if (!right.isGap() && rightIdx + 1 < points.size()) { + profiles.add(right.getProfileType()); + } if (profiles.size() >= 2) { - lastCalculationMode = NEXT_SEGMENT; return true; } } diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java index ab98990d36..aed7a2f315 100644 --- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java +++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java @@ -4,15 +4,10 @@ import android.graphics.Canvas; import android.graphics.Path; import android.util.Pair; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import net.osmand.Location; import net.osmand.data.RotatedTileBox; import net.osmand.util.MapAlgorithms; import net.osmand.util.MapUtils; -import net.osmand.plus.views.layers.geometry.MultiProfileGeometryWay.GeometryMultiProfileWayStyle; - import java.util.ArrayList; import java.util.Collections; @@ -20,6 +15,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import gnu.trove.list.array.TByteArrayList; public abstract class GeometryWay> { @@ -176,7 +173,7 @@ public abstract class GeometryWay { @@ -140,27 +141,40 @@ public class MultiProfileGeometryWay extends GeometryWay points = roadSegmentData.getPoints(); + if (points.get(0).getLatitude() != start.getLatitude() && points.get(0).getLongitude() != start.getLongitude()) { + routePoints.add(new LatLon(start.lat, start.lon)); + } for (WptPt routePt : roadSegmentData.getPoints()) { routePoints.add(new LatLon(routePt.lat, routePt.lon)); } + int lastIdx = routePoints.size() - 1; + if (routePoints.get(lastIdx).getLatitude() != end.getLatitude() + && routePoints.get(lastIdx).getLongitude() != end.getLongitude()) { + routePoints.add(new LatLon(end.lat, end.lon)); + } } return routePoints; } @Override - protected boolean shouldAddLocation(RotatedTileBox tileBox, double leftLon, double rightLon, + protected boolean shouldAddLocation(TByteArrayList simplification, double leftLon, double rightLon, double bottomLat, double topLat, GeometryWayProvider provider, int currLocationIdx) { - float currX = tileBox.getPixXFromLatLon(provider.getLatitude(currLocationIdx), provider.getLongitude(currLocationIdx)); - float currY = tileBox.getPixYFromLatLon(provider.getLatitude(currLocationIdx), provider.getLongitude(currLocationIdx)); - if (tileBox.containsPoint(currX, currY, getContext().circleSize)) { - return true; - } else if (currLocationIdx + 1 >= provider.getSize()) { - return false; + double currLat = provider.getLatitude(currLocationIdx); + double currLon = provider.getLongitude(currLocationIdx); + + int nextIdx = currLocationIdx; + for (int i = nextIdx + 1; i < simplification.size(); i++) { + if (simplification.getQuick(i) == 1) { + nextIdx = i; + } } - float nextX = tileBox.getPixXFromLatLon(provider.getLatitude(currLocationIdx + 1), provider.getLongitude(currLocationIdx + 1)); - float nextY = tileBox.getPixXFromLatLon(provider.getLatitude(currLocationIdx + 1), provider.getLongitude(currLocationIdx + 1)); - return tileBox.containsPoint(nextX, nextY, getContext().circleSize); + + double nextLat = provider.getLatitude(nextIdx); + double nextLon = provider.getLongitude(nextIdx); + return Math.min(currLon, nextLon) < rightLon && Math.max(currLon, nextLon) > leftLon + && Math.min(currLat, nextLat) < topLat && Math.max(currLat, nextLat) > bottomLat; } private boolean segmentDataChanged(Map, RoadSegmentData> other) { diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/MultiProfileGeometryWayContext.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/MultiProfileGeometryWayContext.java index d6ef3cfa72..0edb3bf67f 100644 --- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/MultiProfileGeometryWayContext.java +++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/MultiProfileGeometryWayContext.java @@ -31,7 +31,7 @@ public class MultiProfileGeometryWayContext extends GeometryWayContext { private RenderingLineAttributes multiProfileAttrs; - private Bitmap pointIcon; + private final Bitmap pointIcon; private final Map profileIconsBitmapCache; public MultiProfileGeometryWayContext(Context ctx, UiUtilities iconsCache, float density) { @@ -41,6 +41,7 @@ public class MultiProfileGeometryWayContext extends GeometryWayContext { minIconMargin = density * 30; circleSize = density * 70; pointIconSize = density * 22f; + pointIcon = createPointIcon(); } public void updatePaints(boolean nightMode, @NonNull RenderingLineAttributes multiProfileAttrs) { @@ -48,29 +49,6 @@ public class MultiProfileGeometryWayContext extends GeometryWayContext { super.updatePaints(nightMode, multiProfileAttrs); } - @Override - protected void recreateBitmaps() { - float density = getDensity(); - float outerRadius = density * 11f; - float centerRadius = density * 10.5f; - float innerRadius = density * 6.5f; - float centerXY = pointIconSize / 2; - - pointIcon = Bitmap.createBitmap((int) pointIconSize, (int) pointIconSize, Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(pointIcon); - Paint paint = new Paint(); - paint.setStyle(Paint.Style.FILL); - - paint.setColor(Color.BLACK); - canvas.drawCircle(centerXY, centerXY, outerRadius, paint); - - paint.setColor(Color.WHITE); - canvas.drawCircle(centerXY, centerXY, centerRadius, paint); - - paint.setColor(Algorithms.parseColor(pointColorHex)); - canvas.drawCircle(centerXY, centerXY, innerRadius, paint); - } - @NonNull public Bitmap getProfileIconBitmap(@DrawableRes int iconRes, @ColorInt int color) { String key = iconRes + "_" + color; @@ -94,6 +72,30 @@ public class MultiProfileGeometryWayContext extends GeometryWayContext { return bitmap; } + private Bitmap createPointIcon() { + float density = getDensity(); + float outerRadius = density * 11f; + float centerRadius = density * 10.5f; + float innerRadius = density * 6.5f; + float centerXY = pointIconSize / 2; + + Bitmap bitmap = Bitmap.createBitmap((int) pointIconSize, (int) pointIconSize, Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(bitmap); + Paint paint = new Paint(); + paint.setStyle(Paint.Style.FILL); + + paint.setColor(Color.BLACK); + canvas.drawCircle(centerXY, centerXY, outerRadius, paint); + + paint.setColor(Color.WHITE); + canvas.drawCircle(centerXY, centerXY, centerRadius, paint); + + paint.setColor(Algorithms.parseColor(pointColorHex)); + canvas.drawCircle(centerXY, centerXY, innerRadius, paint); + + return bitmap; + } + @NonNull public Bitmap getPointIcon() { return pointIcon;