From f57d2cd264eb5aa69a53f808f28650a7f41c1759 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Mon, 27 May 2019 14:03:10 +0300
Subject: [PATCH] Style ,issues

---
 .../nearby/mvp/fragments/NearbyMapFragment.java | 17 ++++++-----------
 .../NearbyParentFragmentPresenter.java          |  5 ++++-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
index f2fe6073d..14d80fea5 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
@@ -144,7 +144,6 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
             }
             return false;
         });
-        //viewsAreReadyCallback.nearbyFragmentAndMapViewReady();
     }
 
     @Override
@@ -155,8 +154,7 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
 
     @Override
     public MapView setupMapView(Bundle savedInstanceState) {
-        Log.d("deneme1","setupMapView");
-        Timber.d("setupMapView called");
+        Timber.d("setting up map view");
         boolean isDarkTheme = applicationKvStore.getBoolean("theme", false);
         MapboxMapOptions options = new MapboxMapOptions()
                 .compassGravity(Gravity.BOTTOM | Gravity.LEFT)
@@ -211,13 +209,13 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
                         bookmarkLocationDao.getAllBookmarksLocations());
         mapboxMap.clear();
         // TODO: set search latlang here
+        // TODO: arrange camera positions according to all other parameters
         CameraPosition cameraPosition = new CameraPosition.Builder().target
                 (LocationUtils.commonsLatLngToMapBoxLatLng(curLatLng)).build();
         mapboxMap.setCameraPosition(cameraPosition);
         /*mapboxMap.animateCamera(CameraUpdateFactory
                 .newCameraPosition(cameraPosition), 1000);*/
         // TODO: set position depening to botom sheet position heere
-        // We are trying to find nearby places around our custom searched area, thus custom parameter is nonnull
         addNearbyMarkersToMapBoxMap(customBaseMarkerOptions);
         // Re-enable mapbox gestures on custom location markers load
         mapboxMap.getUiSettings().setAllGesturesEnabled(true);
@@ -226,8 +224,9 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
 
     @Override
     public void updateMapToTrackPosition(LatLng curLatLng) {
-        Log.d("deneme1","updateMapToTrackPosition");
+        Timber.d("updates map cuyrrent location marker to track user location");
         addCurrentLocationMarker(curLatLng);
+        // TODO change camera target here depending to several parameters
 
     }
 
@@ -247,7 +246,6 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
      */
     @Override
     public void addCurrentLocationMarker(LatLng curLatLng) {
-        Log.d("deneme1","addCurrentLocationMarker");
         Timber.d("addCurrentLocationMarker is called");
 
         Icon icon = IconFactory.getInstance(getContext()).fromResource(R.drawable.current_location_marker);
@@ -256,8 +254,6 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
                 .position(new com.mapbox.mapboxsdk.geometry.LatLng(curLatLng.getLatitude(), curLatLng.getLongitude()));
         currentLocationMarkerOptions.setIcon(icon); // Set custom icon
 
-        Marker currentLocationMarker = mapboxMap.addMarker(currentLocationMarkerOptions);
-
         List<com.mapbox.mapboxsdk.geometry.LatLng> circle = createCircleArray(curLatLng.getLatitude(), curLatLng.getLongitude(),
                 curLatLng.getAccuracy() * 2, 100);
 
@@ -403,14 +399,13 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment implements N
     }
 
     /**
-     * Means that views are set in presenter
+     * Means that views are set in presenter to reference variables
      * @param viewsAreReadyCallback
      */
     @Override
     public void viewsAreSet(NearbyParentFragmentContract.ViewsAreReadyCallback viewsAreReadyCallback) {
-        Log.d("deneme1","viewsAreSet");
+        Timber.d("Views are set");
         this.viewsAreReadyCallback = viewsAreReadyCallback;
-
         this.viewsAreReadyCallback.nearbyFragmentAndMapViewReady();
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java
index e4d403a6c..ea89a1e33 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyParentFragmentPresenter.java
@@ -159,10 +159,13 @@ public class NearbyParentFragmentPresenter
                 || locationChangeType.equals(MAP_UPDATED)) {
             nearbyParentFragmentView.populatePlaces(lastLocation, lastLocation);
             // TODO add a search location here
+            // TODO dont forget map updated state after an wikidata item is updated
 
-        } else {
+        } else { // Means location changed slightly, ie user is walking or driving.
             nearbyMapFragmentView.updateMapToTrackPosition(curLatLng);
         }
+
+        // TODO: update camera angle accordingly here, 1- search this area mode, 2- following current location, 3- list sheet expanded, 4- landcaped
     }
 
     /**