Implementation of ClickableWay for solitary ways (piste / dirtbike / mtb) #21714

RZR-UA · 2025-01-13T08:48:55Z

No description provided.

RZR-UA · 2025-01-13T08:50:12Z

https://github.com/osmandapp/OsmAnd-Issues/issues/2846

Chumva · 2025-01-20T14:53:39Z

OsmAnd/src/net/osmand/plus/views/layers/MapSelectionHelper.java

@@ -106,10 +108,13 @@ public class MapSelectionHelper {
 	private Map<LatLon, BackgroundType> touchedFullMapObjects = new HashMap<>();
 	private Map<LatLon, BackgroundType> touchedSmallMapObjects = new HashMap<>();

+	private ClickableWayHelper clickableWayHelper;


Chumva · 2025-01-20T14:54:11Z

OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java

@@ -1365,4 +1365,25 @@ public static String splitAndClearRepeats(String ref, String symbol) {
 		return res;
 	}

+	public static String sanitizeFileName(String fileName) {
+		return fileName


wont replaceAll be shorter & still readable?

Chumva · 2025-01-20T15:09:19Z

OsmAnd/src/net/osmand/plus/views/layers/MapSelectionHelper.java

+							if (isOsmRoute && !isDerivedGpxSelected) {
 								NetworkRouteSelectorFilter routeFilter = createRouteFilter();
 								if (!Algorithms.isEmpty(routeFilter.typeFilter)) {
 									addOsmRoute(result, tileBox, point, routeFilter);
-									isRouteGpxSelected = true;
+									isDerivedGpxSelected = true;
 								}
+							} else if (isClickableWay && !isDerivedGpxSelected) {
+								isDerivedGpxSelected = addClickableWayV2(result, obfMapObject, tags);
+							} else if (isTravelGpx && !isDerivedGpxSelected) {
+								isDerivedGpxSelected = addTravelGpx(result, tags.get(ROUTE_ID), null);
 							}
-							boolean isTravelGpx = app.getTravelHelper().isTravelGpxTags(tags);
-							if (isTravelGpx && !isRouteGpxSelected) {
-								isRouteGpxSelected = addTravelGpx(result, tags.get(ROUTE_ID), null);
-							}


review conditions, simplify if possible, and at least try to move check for !isDerivedGpxSelected to upper level

Chumva · 2025-01-20T15:16:39Z

OsmAnd/src/net/osmand/plus/views/layers/MapSelectionHelper.java

+	private boolean addClickableWayV1(@NonNull MapSelectionResult result, @NonNull RenderedObject renderedObject) {
+		ClickableWay clickableWay = clickableWayHelper.loadClickableWayV1(result.pointLatLon, renderedObject);
+		if (clickableWay != null && isUniqueClickableWay(result.selectedObjects, clickableWay)) {
+			result.selectedObjects.put(clickableWay, clickableWayHelper.getContextMenuProvider());
+			return true;
+		}
+		return false;
+	}
+
+	private boolean addClickableWayV2(@NonNull MapSelectionResult result, @NonNull ObfMapObject obfMapObject,
+									  @NonNull Map<String, String> tags) {
+		ClickableWay clickableWay = clickableWayHelper.loadClickableWayV2(result.pointLatLon, obfMapObject, tags);
+		if (clickableWay != null && isUniqueClickableWay(result.selectedObjects, clickableWay)) {
+			result.selectedObjects.put(clickableWay, clickableWayHelper.getContextMenuProvider());
+			return true;
+		}
+		return false;
+	}


There is the same part, can we combine similar code? Also, do we always need to specify versions?

Chumva · 2025-01-20T15:19:54Z

OsmAnd/src/net/osmand/plus/views/layers/MapSelectionHelper.java

+		return false;
+	}
+
+	private boolean isUniqueGpxFileName(Map<Object, IContextMenuProvider> selectedObjects, String gpxFileName) {


annotations

Chumva · 2025-01-20T15:31:39Z

OsmAnd/src/net/osmand/plus/track/clickable/ClickableWayMenuActivator.java

+
+import java.util.List;
+
+public class ClickableWayMenuActivator implements ContextMenuLayer.IContextMenuProvider {


ClickableWayMenuProvider ?

Chumva · 2025-01-20T15:33:11Z

OsmAnd/src/net/osmand/plus/track/clickable/ClickableWay.java

+        return bbox;
+    }
+
+    public GpxFile getGpxFile() {


nonnull annotations

Chumva · 2025-01-20T15:47:38Z

OsmAnd/src/net/osmand/plus/track/clickable/ClickableWayMenuActivator.java

+        if (object instanceof ClickableWay that) {
+            MapActivity mapActivity = view.getMapActivity();
+            if (mapActivity != null) {
+                (new ClickableWayAsyncTask(mapActivity, that, readHeights, openAsGpxFile))


Better add task cancelling similar to NetworkRouteSelectionLayer, probably routesCache we also can add here similar to NetworkRouteSelectionLayer

Chumva · 2025-01-20T16:19:05Z

OsmAnd/src/net/osmand/plus/track/clickable/ClickableWayHelper.java

+        List<WptPt> waypoints = loader.loadHeightDataAsWaypoints(clickableWay.getOsmId(), clickableWay.getBbox());
+        if (!Algorithms.isEmpty(waypoints)
+                && !Algorithms.isEmpty(clickableWay.getGpxFile().getTracks())
+                && !Algorithms.isEmpty(clickableWay.getGpxFile().getTracks().get(0).getSegments())) {
+            clickableWay.getGpxFile().getTracks().get(0).getSegments().get(0).setPoints(waypoints);


If we replace existing points from RenderedObject and ObfMapObject with points from RouteDataObject, will there be any issues if the points count is wrong?

RZR-UA added 7 commits January 9, 2025 15:34

Add skel classes for proto of ClickableWay feature

933bcfc

Support ClickableWay for v1, polish isClickableWay

aee346d

Split V1/V2 methods and implement calcSearchRadius

20ea52a

Add skel of GpxFile with activity, name, tags

1ce52ec

Merge branch 'master' into rzr-select-way

51db28b

Implement public Algorithms.sanitizeFileName()

2981f13

Implement save/open GpxFile, refresh TODO list

fb6e58c

RZR-UA added 3 commits January 13, 2025 09:58

Merge branch 'master' into rzr-select-way

e376691

Fix awkward "X (X)" when name == ref (rendering)

4a301a7

Implement gpxColors by difficulty/scale tags

ef1731f

RZR-UA force-pushed the rzr-select-way branch 2 times, most recently from 45fe60e to 625b96f Compare January 13, 2025 14:09

Add isUniqueClickableWay(), refactor previous code

9923629

RZR-UA force-pushed the rzr-select-way branch from 625b96f to 9923629 Compare January 14, 2025 09:37

RZR-UA added 4 commits January 14, 2025 12:12

Merge branch 'master' into rzr-select-way

56a9dc2

Draft ClickableWayReaderTask async task, refactor

9eefc8e

Merge branch 'master' into rzr-select-way

c56c4a1

Avoid useless error log

9d10303

RZR-UA force-pushed the rzr-select-way branch from a182ccd to 6c2c5de Compare January 15, 2025 15:14

Simplify/refactor ClickableWay structure

285209c

RZR-UA force-pushed the rzr-select-way branch from 6c2c5de to 285209c Compare January 15, 2025 15:15

RZR-UA added 3 commits January 15, 2025 16:25

Migrate to OsmAnd-shared in NetworkRouteSelector

338c133

Refactor naming of ClickableWay classes

c93de76

Draft HeightDataLoader for ClickableWay (backend)

8a7cea9

RZR-UA force-pushed the rzr-select-way branch from 0f21547 to 8a7cea9 Compare January 15, 2025 20:09

RZR-UA added 3 commits January 16, 2025 11:00

Merge branch 'master' into rzr-select-way

f7231de

Merge branch 'master' into rzr-select-way

51e0216

Apply loadHeightDataAsWaypoints to clickableWay

3f66cc9

RZR-UA requested a review from Chumva January 16, 2025 11:55

RZR-UA changed the title ~~[draft] Implementation of ClickableWay for solitary ways (piste / dirtbike / mtb)~~ Implementation of ClickableWay for solitary ways (piste / dirtbike / mtb) Jan 16, 2025

RZR-UA marked this pull request as ready for review January 16, 2025 11:55

RZR-UA added 3 commits January 16, 2025 13:13

Fix potential NPE in readHeightData()

15ac702

Merge branch 'master' into rzr-select-way

2591ab2

Merge branch 'master' into rzr-select-way

066c86b

Chumva reviewed Jan 20, 2025

View reviewed changes

OsmAnd/src/net/osmand/plus/track/clickable/ClickableWay.java

return bbox;

}

public GpxFile getGpxFile() {

Copy link

Member

Chumva Jan 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nonnull annotations

Chumva reviewed Jan 20, 2025

View reviewed changes

Chumva requested review from ivanPyrohivskyi and alex-osm January 20, 2025 16:25

Merge branch 'master' into rzr-select-way

a70018f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implementation of ClickableWay for solitary ways (piste / dirtbike / mtb) #21714

Implementation of ClickableWay for solitary ways (piste / dirtbike / mtb) #21714

RZR-UA commented Jan 13, 2025

RZR-UA commented Jan 13, 2025

Chumva Jan 20, 2025

Chumva Jan 20, 2025

Chumva Jan 20, 2025 •

edited

Loading

Chumva Jan 20, 2025 •

edited

Loading

Chumva Jan 20, 2025

Chumva Jan 20, 2025

Chumva Jan 20, 2025

Chumva Jan 20, 2025 •

edited

Loading

Chumva Jan 20, 2025


		import java.util.List;

		public class ClickableWayMenuActivator implements ContextMenuLayer.IContextMenuProvider {

Implementation of ClickableWay for solitary ways (piste / dirtbike / mtb) #21714

Are you sure you want to change the base?

Implementation of ClickableWay for solitary ways (piste / dirtbike / mtb) #21714

Conversation

RZR-UA commented Jan 13, 2025

RZR-UA commented Jan 13, 2025

Chumva Jan 20, 2025

Choose a reason for hiding this comment

Chumva Jan 20, 2025

Choose a reason for hiding this comment

Chumva Jan 20, 2025 • edited Loading

Choose a reason for hiding this comment

Chumva Jan 20, 2025 • edited Loading

Choose a reason for hiding this comment

Chumva Jan 20, 2025

Choose a reason for hiding this comment

Chumva Jan 20, 2025

Choose a reason for hiding this comment

Chumva Jan 20, 2025

Choose a reason for hiding this comment

Chumva Jan 20, 2025 • edited Loading

Choose a reason for hiding this comment

Chumva Jan 20, 2025

Choose a reason for hiding this comment

Chumva Jan 20, 2025 •

edited

Loading

Chumva Jan 20, 2025 •

edited

Loading

Chumva Jan 20, 2025 •

edited

Loading