From ad24c55bc456bd3673770d26c2e2d8bd41dfc053 Mon Sep 17 00:00:00 2001
From: "arthur.valin" <arthur.valin@etu.uca.fr>
Date: Fri, 24 Mar 2023 17:21:24 +0100
Subject: [PATCH] Misc

---
 .../java/uca/baptistearthur/geocaching/ui/fragment/Map.kt    | 2 +-
 .../baptistearthur/geocaching/ui/overlay/AddMarkerOverlay.kt | 3 +--
 .../geocaching/ui/overlay/NewRoadtripOverlay.kt              | 5 +++--
 .../uca/baptistearthur/geocaching/ui/overlay/PlaceMarker.kt  | 5 ++++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/Map.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/Map.kt
index 5f299b6..efe44e3 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/Map.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/Map.kt
@@ -70,7 +70,7 @@ class Map : Fragment() {
         map.setTileSource(TileSourceFactory.MAPNIK);
         spinner = view.findViewById(R.id.mapLoading);
         spinner.visibility=View.VISIBLE;
-        map.minZoomLevel = 10.0
+        map.minZoomLevel = 4.0
         map.controller.setZoom(21.0);
         if (ContextCompat.checkSelfPermission(requireActivity(), ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             requestPermissionLauncher.launch(ACCESS_FINE_LOCATION)
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/AddMarkerOverlay.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/AddMarkerOverlay.kt
index 426cb06..63c4a38 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/AddMarkerOverlay.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/AddMarkerOverlay.kt
@@ -27,7 +27,6 @@ class AddMarkerOverlay(val roadManager: RoadManager) : Overlay() {
             locations.add(loc)
             val marker = PlaceMarker(mapView, locations, this)
             marker.position = loc
-            marker.title = "Step " + locations.size
             mapView.overlays.add(marker)
             computeRoad(mapView)
             addNewRoadtripOverlay(mapView);
@@ -51,7 +50,7 @@ class AddMarkerOverlay(val roadManager: RoadManager) : Overlay() {
 
     fun addNewRoadtripOverlay(mapView: MapView){
         if (locations.size > 1) {
-            mapView.overlays.add(NewRoadtripOverlay())
+            mapView.overlays.add(NewRoadtripOverlay(locations))
         }else{
             mapView.overlays.remove(mapView.overlays.find { it is NewRoadtripOverlay})
         }
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/NewRoadtripOverlay.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/NewRoadtripOverlay.kt
index 429b989..92d7629 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/NewRoadtripOverlay.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/NewRoadtripOverlay.kt
@@ -14,7 +14,7 @@ import org.osmdroid.views.overlay.Overlay
 import uca.baptistearthur.geocaching.R
 
 
-class NewRoadtripOverlay() : Overlay() {
+class NewRoadtripOverlay(val points: Collection<GeoPoint>) : Overlay() {
 
     private var circleRectF=RectF()
 
@@ -49,7 +49,8 @@ class NewRoadtripOverlay() : Overlay() {
 
     override fun onSingleTapConfirmed(e: MotionEvent?, mapView: MapView?) =
         if (e != null && circleRectF.contains(e.x, e.y)) {
-            Log.d("GeoRoad", "CONFIRM")
+            // TODO: Sauvegarder le trajet (dans la variable points).
+            Log.d("GeoRoad", "CONFIRM : "+points.size)
             true
         }else{
             false
diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/PlaceMarker.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/PlaceMarker.kt
index d932ff3..617590d 100644
--- a/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/PlaceMarker.kt
+++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/overlay/PlaceMarker.kt
@@ -6,9 +6,12 @@ import org.osmdroid.bonuspack.routing.RoadManager
 import org.osmdroid.util.GeoPoint
 import org.osmdroid.views.MapView
 import org.osmdroid.views.overlay.Marker
+import org.osmdroid.views.overlay.infowindow.InfoWindow
 
 class PlaceMarker(val mapView: MapView, val locations: MutableSet<GeoPoint>, val parent : AddMarkerOverlay) : Marker(mapView) {
-
+    override fun getTitle(): String {
+        return "Step " + (locations.indexOf(this.position)+1)
+    }
     override fun onLongPress(e: MotionEvent?, mapView: MapView?): Boolean {
         if(mapView!=null && this.hitTest(e, mapView)) {
             locations.remove(this.position)