Use map center for nearby API

Author: Pygmalion69

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "org.nitri.opentopo"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 17
-        versionName "1.7.2"
+        versionCode 18
+        versionName "1.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/org/nitri/opentopo/MainActivity.java

@@ -4,20 +4,21 @@
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.location.Location;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+
 import net.danlew.android.joda.JodaTimeAndroid;
 
 import org.nitri.opentopo.nearby.entity.NearbyItem;
+import org.osmdroid.util.GeoPoint;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -127,8 +128,8 @@ public void addGpxDetailFragment() {
     }
 
     @Override
-    public void addNearbyFragment(Location location) {
-        NearbyFragment gpxDetailFragment = NearbyFragment.newInstance(location.getLatitude(), location.getLongitude());
+    public void addNearbyFragment(GeoPoint nearbyCenterPoint) {
+        NearbyFragment gpxDetailFragment = NearbyFragment.newInstance(nearbyCenterPoint.getLatitude(), nearbyCenterPoint.getLongitude());
         getSupportFragmentManager().beginTransaction().addToBackStack(null)
                 .replace(R.id.map_container, gpxDetailFragment, NEARBY_FRAGMENT_TAG)
                 .commit();
@@ -268,7 +269,13 @@ public void showNearbyPlace(NearbyItem nearbyItem) {
         }
     }
 
+    @Override
     public NearbyItem getSelectedNearbyPlace() {
         return mSelectedNearbyPlace;
     }
+
+    @Override
+    public void clearSelectedNearbyPlace() {
+        mSelectedNearbyPlace = null;
+    }
 }

app/src/main/java/org/nitri/opentopo/MapFragment.java

@@ -125,6 +125,7 @@ public boolean onZoom(ZoomEvent event) {
     private TextView mCopyRightView;
     private int mOverlay = OverlayHelper.OVERLAY_NONE;
     private GeoPoint mMapCenterState;
+    private int mLastNearbyAnimateToId;
 
     public MapFragment() {
         // Required empty public constructor
@@ -458,7 +459,11 @@ public void setNearbyPlace() {
 
     private void showNearbyPlace(NearbyItem nearbyPlace) {
         mOverlayHelper.setNearby(nearbyPlace);
-        animateToLatLon(nearbyPlace.getLat(), nearbyPlace.getLon());
+        if (nearbyPlace.getId() != mLastNearbyAnimateToId) {
+            // Animate only once
+            animateToLatLon(nearbyPlace.getLat(), nearbyPlace.getLon());
+            mLastNearbyAnimateToId = nearbyPlace.getId();
+        }
     }
 
     @Override
@@ -514,12 +519,21 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     mListener.addGpxDetailFragment();
                 return true;
             case R.id.action_nearby:
-                if (mListener != null)
-                    if (mCurrentLocation != null) {
-                        mListener.addNearbyFragment(mCurrentLocation);
-                    } else {
+                if (mListener != null) {
+                    mListener.clearSelectedNearbyPlace();
+                    GeoPoint nearbyCenter = null;
+                    if (mMapView != null) {
+                        nearbyCenter = (GeoPoint) mMapView.getMapCenter();
+                        mListener.addNearbyFragment(nearbyCenter);
+                    }
+                    if (nearbyCenter == null && mCurrentLocation != null) {
+                        nearbyCenter = new GeoPoint(mCurrentLocation.getLatitude(), mCurrentLocation.getLongitude());
+                        mListener.addNearbyFragment(nearbyCenter);
+                    }
+                    if (nearbyCenter == null) {
                         Toast.makeText(getActivity(), R.string.location_unknown, Toast.LENGTH_SHORT).show();
                     }
+                }
                 return true;
             case R.id.action_gpx_zoom:
                 disableFollow();
@@ -682,7 +696,7 @@ public interface OnFragmentInteractionListener {
         /**
          * Present nearby items
          */
-        void addNearbyFragment(Location location);
+        void addNearbyFragment(GeoPoint nearbyCenterPoint);
 
         /**
          * Set up navigation arrow
@@ -695,6 +709,11 @@ public interface OnFragmentInteractionListener {
          * @return NearbyItem
          */
         NearbyItem getSelectedNearbyPlace();
+
+        /**
+         * Clear selected nearby place
+         */
+        void clearSelectedNearbyPlace();
     }
 
 }

app/src/main/java/org/nitri/opentopo/NearbyFragment.java

@@ -1,21 +1,22 @@
 package org.nitri.opentopo;
 
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -93,7 +94,7 @@ public void onCreate(Bundle savedInstanceState) {
         mNearbyAdapter = new NearbyAdapter(mNearbyItems, this);
         mNearbyAdapter.setHasStableIds(true);
 
-        NearbyViewModel nearbyViewModel = ViewModelProviders.of(requireActivity()).get(NearbyViewModel.class);
+        NearbyViewModel nearbyViewModel = new ViewModelProvider(requireActivity()).get(NearbyViewModel.class);
 
         MediaWikiApi api = retrofit.create(MediaWikiApi.class);
         NearbyDao dao = NearbyDatabase.getDatabase(getActivity()).nearbyDao();