Search range of Gyms and PokéStops equals search range for Pokémon (#215)

* - Implemented radial boxing of Gym and PokéStop scanning. Gyms and PokeStops now fit into the default search range!
- Fixed regression of getPokeStops() not setting setLocation() beforehand (no issue tho because it's called after getGyms() in MainActivity -- so location was known to the API anyways)

* - Render okeStops a bit smaller than Pokemon

Author: kyr0

app/src/main/java/com/omkarmoghe/pokemap/controllers/net/NianticManager.java

@@ -338,7 +338,9 @@ public void run() {
                     if (mPokemonGo != null) {
 
                         Thread.sleep(33);
-                        EventBus.getDefault().post(new PokestopsEvent(mPokemonGo.getMap().getMapObjects().getPokestops()));
+                        mPokemonGo.setLocation(lat, longitude, alt);
+                        Thread.sleep(33);
+                        EventBus.getDefault().post(new PokestopsEvent(mPokemonGo.getMap().getMapObjects().getPokestops(), lat, longitude));
                     }
 
                 } catch (LoginFailedException e) {
@@ -370,7 +372,7 @@ public void run() {
                     Thread.sleep(33);
                     mPokemonGo.setLocation(latitude, longitude, alt);
                     Thread.sleep(33);
-                    EventBus.getDefault().post(new GymsEvent(mPokemonGo.getMap().getMapObjects().getGyms()));
+                    EventBus.getDefault().post(new GymsEvent(mPokemonGo.getMap().getMapObjects().getGyms(), latitude, longitude));
                 }
 
             } catch (LoginFailedException e) {

app/src/main/java/com/omkarmoghe/pokemap/models/events/GymsEvent.java

@@ -10,9 +10,13 @@
 public class GymsEvent implements IEvent {
 
     private Collection<FortDataOuterClass.FortData> gyms;
+    private double lat;
+    private double longitude;
 
-    public GymsEvent(Collection<FortDataOuterClass.FortData> gyms) {
+    public GymsEvent(Collection<FortDataOuterClass.FortData> gyms, double lat, double longitude) {
         this.gyms = gyms;
+        this.lat = lat;
+        this.longitude = longitude;
     }
 
     public Collection<FortDataOuterClass.FortData> getGyms() {
@@ -22,4 +26,20 @@ public Collection<FortDataOuterClass.FortData> getGyms() {
     public void setGyms(Collection<FortDataOuterClass.FortData> gyms) {
         this.gyms = gyms;
     }
+
+    public double getLatitude() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
 }

app/src/main/java/com/omkarmoghe/pokemap/models/events/PokestopsEvent.java

@@ -10,9 +10,13 @@
 public class PokestopsEvent implements IEvent {
 
     private Collection<Pokestop> pokestops;
+    private double lat;
+    private double longitude;
 
-    public PokestopsEvent(Collection<Pokestop> pokestops) {
+    public PokestopsEvent(Collection<Pokestop> pokestops, double lat, double longitude) {
         this.pokestops = pokestops;
+        this.lat = lat;
+        this.longitude = longitude;
     }
 
     public Collection<Pokestop> getPokestops() {
@@ -22,4 +26,20 @@ public Collection<Pokestop> getPokestops() {
     public void setPokestops(Collection<Pokestop> pokestops) {
         this.pokestops = pokestops;
     }
+
+    public double getLatitude() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
 }

app/src/main/java/com/omkarmoghe/pokemap/views/map/MapWrapperFragment.java

@@ -354,17 +354,37 @@ public void onFetch(Bitmap  bitmap) {
         }
     }
 
-    private void setPokestopsMarkers(final Collection<Pokestop> pokestops) {
+    private float getDistanceInMeters(double lat1, double lon1, double lat2, double lon2) {
+
+        Location loc1 = new Location("");
+        loc1.setLatitude(lat1);
+        loc1.setLongitude(lon1);
+
+        Location loc2 = new Location("");
+        loc2.setLatitude(lat2);
+        loc2.setLongitude(lon2);
+
+        return loc1.distanceTo(loc2);
+    }
+
+    private void setPokestopsMarkers(final PokestopsEvent event) {
         if (mGoogleMap != null) {
 
             int markerSize = getResources().getDimensionPixelSize(R.dimen.pokestop_marker);
+            Collection<Pokestop> pokestops = event.getPokestops();
 
             if(pokestops != null && mPref.getShowPokestops()) {
                 Set<String> markerKeys = pokestopsList.keySet();
 
                 for (final Pokestop pokestop : pokestops) {
 
-                    if (!markerKeys.contains(pokestop.getId())) {
+                    // radial boxing
+                    float distanceFromCenterInMeters = getDistanceInMeters(
+                        event.getLatitude(), event.getLongitude(),
+                        pokestop.getLatitude(), pokestop.getLongitude()
+                    );
+
+                    if (!markerKeys.contains(pokestop.getId()) && distanceFromCenterInMeters <= 370) {
 
                             RemoteImageLoader.load(
                             pokestop.hasLurePokemon() ? lurePokeStopImageUrl : pokeStopImageUrl,
@@ -397,18 +417,25 @@ public void onFetch(Bitmap bitmap) {
         }
     }
 
-    private void setGymsMarkers(final Collection<FortDataOuterClass.FortData> gyms){
+    private void setGymsMarkers(final GymsEvent event){
         if (mGoogleMap != null) {
 
             int markerSize = getResources().getDimensionPixelSize(R.dimen.gym_marker);
+            Collection<FortDataOuterClass.FortData> gyms = event.getGyms();
 
             if(gyms != null && mPref.getShowGyms()) {
 
                 Set<String> markerKeys = gymsList.keySet();
 
                 for (final FortDataOuterClass.FortData gym : gyms) {
 
-                    if (!markerKeys.contains(gym.getId())) {
+                    // radial boxing
+                    float distanceFromCenterInMeters = getDistanceInMeters(
+                            event.getLatitude(), event.getLongitude(),
+                            gym.getLatitude(), gym.getLongitude()
+                    );
+
+                    if (!markerKeys.contains(gym.getId()) && distanceFromCenterInMeters <= 370) {
 
                         RemoteImageLoader.load(
                             gymTeamImageUrls.get(gym.getOwnedByTeam().getNumber()),
@@ -552,7 +579,7 @@ public void onEvent(ClearMapEvent event) {
      */
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEvent(PokestopsEvent event) {
-        setPokestopsMarkers(event.getPokestops());
+        setPokestopsMarkers(event);
     }
 
     /**
@@ -563,7 +590,7 @@ public void onEvent(PokestopsEvent event) {
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEvent(GymsEvent event) {
 
-        setGymsMarkers(event.getGyms());
+        setGymsMarkers(event);
     }
 
     private void clearCatchedPokemonCircle() {

app/src/main/res/values/dimens.xml

@@ -5,7 +5,7 @@
     <dimen name="fab_margin">16dp</dimen>
 
     <dimen name="pokemon_marker">36dp</dimen>
-    <dimen name="pokestop_marker">36dp</dimen>
+    <dimen name="pokestop_marker">24dp</dimen>
     <dimen name="gym_marker">36dp</dimen>
     <dimen name="pokemon_to_show_icon_size">48dip</dimen>
     <dimen name="pokemon_to_show_icon_margin_left">8dip</dimen>