Merge pull request #88 from jabbink/feature-catchWildPokemon

Add WildPokemon to Map.getCatchablePokemon, as they are catchable

Author: Grover-c13

src/main/java/com/pokegoapi/api/map/Map.java

@@ -4,6 +4,7 @@
 import POGOProtos.Map.Fort.FortTypeOuterClass;
 import POGOProtos.Map.MapCellOuterClass;
 import POGOProtos.Map.Pokemon.MapPokemonOuterClass;
+import POGOProtos.Map.Pokemon.WildPokemonOuterClass;
 import POGOProtos.Networking.Requests.Messages.*;
 import POGOProtos.Networking.Requests.RequestTypeOuterClass;
 import POGOProtos.Networking.Responses.*;
@@ -59,12 +60,15 @@ private MapObjects getRetainedMapObject() throws LoginFailedException, RemoteSer
 	 * @return List<CatchablePokemon> at your current location
 	 */
 	public List<CatchablePokemon> getCatchablePokemon() throws LoginFailedException, RemoteServerException {
-		List<CatchablePokemon> catchablePokemons = new ArrayList<CatchablePokemon>();
+		List<CatchablePokemon> catchablePokemons = new ArrayList<>();
 		MapObjects objects = getRetainedMapObject();
 
 		for (MapPokemonOuterClass.MapPokemon mapPokemon : objects.getCatchablePokemons()) {
 			catchablePokemons.add(new CatchablePokemon(api, mapPokemon));
 		}
+		for (WildPokemonOuterClass.WildPokemon wildPokemon : objects.getWildPokemons()) {
+			catchablePokemons.add(new CatchablePokemon(api, wildPokemon));
+		}
 
 		return catchablePokemons;
 	}

src/main/java/com/pokegoapi/api/map/Pokemon/CatchablePokemon.java

@@ -2,6 +2,7 @@
 
 import POGOProtos.Enums.PokemonIdOuterClass;
 import POGOProtos.Map.Pokemon.MapPokemonOuterClass.MapPokemon;
+import POGOProtos.Map.Pokemon.WildPokemonOuterClass.WildPokemon;
 import POGOProtos.Networking.Requests.Messages.CatchPokemonMessageOuterClass;
 import POGOProtos.Networking.Requests.Messages.EncounterMessageOuterClass;
 import POGOProtos.Networking.Requests.RequestTypeOuterClass;
@@ -22,39 +23,45 @@
 public class CatchablePokemon {
 	private static final String TAG = CatchablePokemon.class.getSimpleName();
 	private final PokemonGo api;
-	private final MapPokemon proto;
+
+	@Getter
+	private final String spawnpointId;
+	@Getter
+	private final long encounterId;
+	@Getter
+	private final PokemonIdOuterClass.PokemonId pokemonId;
+	@Getter
+	private final long expirationTimestampMs;
+	@Getter
+	private final double latitude;
+	@Getter
+	private final double longitude;
 
 	@Getter
 	private boolean encountered = false;
 
 	public CatchablePokemon(PokemonGo api, MapPokemon proto) {
 		this.api = api;
-		this.proto = proto;
-	}
 
-	public String getSpawnpointId() {
-		return proto.getSpawnpointId();
+		this.spawnpointId = proto.getSpawnpointId();
+		this.encounterId = proto.getEncounterId();
+		this.pokemonId = proto.getPokemonId();
+		this.expirationTimestampMs = proto.getExpirationTimestampMs();
+		this.latitude = proto.getLatitude();
+		this.longitude = proto.getLongitude();
 	}
 
-	public long getEncounterId() {
-		return proto.getEncounterId();
-	}
-
-	public PokemonIdOuterClass.PokemonId getPokemonId() {
-		return proto.getPokemonId();
-	}
-
-	public long getExpirationTimestampMs() {
-		return proto.getExpirationTimestampMs();
-	}
+	public CatchablePokemon(PokemonGo api, WildPokemon proto) {
+		this.api = api;
 
-	public double getLatitude() {
-		return proto.getLatitude();
+		this.spawnpointId = proto.getSpawnpointId();
+		this.encounterId = proto.getEncounterId();
+		this.pokemonId = proto.getPokemonData().getPokemonId();
+		this.expirationTimestampMs = proto.getTimeTillHiddenMs();
+		this.latitude = proto.getLatitude();
+		this.longitude = proto.getLongitude();
 	}
 
-	public double getLongitude() {
-		return proto.getLongitude();
-	}
 
 	public EncounterResult encounterPokemon() throws LoginFailedException, RemoteServerException {
 		EncounterMessageOuterClass.EncounterMessage reqMsg = EncounterMessageOuterClass.EncounterMessage.newBuilder()