tomasz
/
urban-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed old converters, android query invocation and migrated to 

retrofit.
master
Tomasz Półgrabia 2016-10-03 22:45:48 +02:00
parent a2da39c4e2
commit c78ebe9614
9 changed files with 81 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java
View File

@ -10,6 +10,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pl.tpolgrabia.googleutils.callback.PlacesCallback;
import pl.tpolgrabia.googleutils.dto.GooglePlacePhoto;
import pl.tpolgrabia.googleutils.dto.GooglePlaceResponse;
import pl.tpolgrabia.googleutils.dto.GooglePlaceResult;
import pl.tpolgrabia.googleutils.utils.PlacesUtils;
import pl.tpolgrabia.urbanexplorer.AppConstants;
@ -54,7 +55,7 @@ public class GooglePlacesWorker extends AsyncTask<GooglePlacesRequest, Integer,
lg.debug("Excuting param {}", param);
Location location = param.getLocation();
Response<List<GooglePlaceResult>> placesResponse = null;
Response<GooglePlaceResponse> placesResponse = null;
try {
placesResponse = placesUtils.fetchNearbyPlaces(
location.getLatitude(),
@ -63,9 +64,9 @@ public class GooglePlacesWorker extends AsyncTask<GooglePlacesRequest, Integer,
param.getSearchItemType(),
param.getPageToken());
if (placesResponse.code() == HttpStatus.SC_OK) {
if (placesResponse != null && placesResponse.code() == HttpStatus.SC_OK) {
GooglePlacesResponse response = new GooglePlacesResponse();
response.setPlaces(placesResponse.body());
response.setPlaces(placesResponse.body().getResults());
result.add(response);
}

8
googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java
View File

@ -1,25 +1,23 @@
package pl.tpolgrabia.googleutils;
import pl.tpolgrabia.googleutils.dto.GooglePlaceResult;
import pl.tpolgrabia.googleutils.dto.GooglePlaceResponse;
import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.Query;
import java.util.List;
/**
* Created by tpolgrabia on 02.10.16.
*/
public interface GooglePlacesService {
@GET("nearbysearch/json")
Call<List<GooglePlaceResult>> fetchNearbyPlacesFirst(
Call<GooglePlaceResponse> fetchNearbyPlacesFirst(
@Query("key") String apiKey,
@Query("location") String location,
@Query("radius") Double radius,
@Query("type") String type);
@GET("nearbysearch/json")
Call<List<GooglePlaceResult>> fetchNearbyPlacesNext(
Call<GooglePlaceResponse> fetchNearbyPlacesNext(
@Query("key") String apiKey,
@Query("location") String location,
@Query("radius") Double radius,

141
googleutils/src/main/java/pl/tpolgrabia/googleutils/converter/GooglePlaceConverter.java
View File

@ -1,141 +0,0 @@
package pl.tpolgrabia.googleutils.converter;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pl.tpolgrabia.googleutils.dto.*;
import java.util.ArrayList;
import java.util.List;
/**
* Created by tpolgrabia on 28.09.16.
*/
public class GooglePlaceConverter {
private static final Logger lg = LoggerFactory.getLogger(GooglePlaceConverter.class);
public static GooglePlaceResult convertToPlaceResult(JSONObject object) {
lg.trace("Place result object: {}", object);
if (object == null) {
return null;
}
GooglePlaceResult dto = new GooglePlaceResult();
dto.setGeometry(convertToPlaceGeometry(object.optJSONObject("geometry")));
dto.setIcon(object.optString("icon"));
dto.setId(object.optString("id"));
dto.setName(object.optString("name"));
dto.setPhotos(convertToPlacePhotos(object.optJSONArray("photos")));
dto.setPlaceId(object.optString("place_id"));
dto.setRating(object.optDouble("rating"));
dto.setReference(object.optString("reference"));
dto.setScope(object.optString("scope"));
dto.setTypes(convertToStringList(object.optJSONArray("types")));
dto.setVicinity(object.optString("vicinity"));
return dto;
}
private static List<String> convertToStringList(JSONArray stringArray) {
lg.trace("String array: {}", stringArray);
if (stringArray == null) {
return null;
}
int n = stringArray.length();
List<String> ret = new ArrayList<>(n);
for (int i = 0; i < n; i++) {
ret.add(stringArray.optString(i));
}
return ret;
}
private static List<GooglePlacePhoto> convertToPlacePhotos(JSONArray jphotos) {
lg.trace("Place photos: {}", jphotos);
if (jphotos == null) {
return null;
}
int n = jphotos.length();
List<GooglePlacePhoto> photos = new ArrayList<>(n);
for (int i = 0; i < n; i++) {
photos.add(convertToPlacePhoto(jphotos.optJSONObject(i)));
}
return photos;
}
private static GooglePlacePhoto convertToPlacePhoto(JSONObject jphoto) {
lg.trace("Place photo: {}", jphoto);
if (jphoto == null) {
return null;
}
GooglePlacePhoto photo = new GooglePlacePhoto();
photo.setHeight(jphoto.optLong("height"));
photo.setWidth(jphoto.optLong("width"));
photo.setPhotoReference(jphoto.optString("photo_reference"));
photo.setHtmlAttributions(convertToStringList(jphoto.optJSONArray("html_attributions")));
return photo;
}
private static GooglePlaceGeometry convertToPlaceGeometry(JSONObject jgeometry) {
lg.trace("Place geometry: {}", jgeometry);
if (jgeometry == null) {
return null;
}
GooglePlaceGeometry geometry = new GooglePlaceGeometry();
geometry.setLocation(convertToPlaceLocation(jgeometry.optJSONObject("location")));
geometry.setViewport(convertToPlaceViewport(jgeometry.optJSONObject("viewport")));
return geometry;
}
private static GooglePlaceViewport convertToPlaceViewport(JSONObject jviewport) {
lg.trace("Place viewport: {}", jviewport);
if (jviewport == null) {
return null;
}
GooglePlaceViewport viewport = new GooglePlaceViewport();
viewport.setNorthEast(convertToPlaceLocation(jviewport.optJSONObject("northeast")));
viewport.setSouthWest(convertToPlaceLocation(jviewport.optJSONObject("southwest")));
return viewport;
}
private static GooglePlaceLocation convertToPlaceLocation(JSONObject jlocation) {
lg.trace("Place location: {}", jlocation);
if (jlocation == null) {
return null;
}
GooglePlaceLocation location = new GooglePlaceLocation();
location.setLatitude(jlocation.optDouble("lat"));
location.setLongitude(jlocation.optDouble("lng"));
return location;
}
public static List<GooglePlaceResult> convertToPlaceResults(JSONArray jresults) {
lg.trace("Place results: {}", jresults);
if (jresults == null) {
return null;
}
List<GooglePlaceResult> results = new ArrayList<>();
int n = jresults.length();
for (int i = 0; i < n; i++) {
results.add(convertToPlaceResult(jresults.optJSONObject(i)));
}
return results;
}
}

4
googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceLocation.java
View File

@ -1,10 +1,14 @@
package pl.tpolgrabia.googleutils.dto;
import com.google.gson.annotations.SerializedName;
/**
* Created by tpolgrabia on 28.09.16.
*/
public class GooglePlaceLocation {
@SerializedName("lat")
private Double latitude;
@SerializedName("lng")
private Double longitude;
public Double getLatitude() {

4
googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhoto.java
View File

@ -1,5 +1,7 @@
package pl.tpolgrabia.googleutils.dto;
import com.google.gson.annotations.SerializedName;
import java.util.List;
/**
@ -7,7 +9,9 @@ import java.util.List;
*/
public class GooglePlacePhoto {
private Long height;
@SerializedName("html_attributions")
private List<String> htmlAttributions;
@SerializedName("photo_reference")
private String photoReference;
private Long width;

49
googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResponse.java Normal file
View File

@ -0,0 +1,49 @@
package pl.tpolgrabia.googleutils.dto;
import com.google.gson.annotations.SerializedName;
import java.util.List;
/**
* Created by tpolgrabia on 03.10.16.
*/
public class GooglePlaceResponse {
@SerializedName("html_attributions")
private List<String> htmlAttributions;
@SerializedName("next_page_token")
private String nextPageToken;
private List<GooglePlaceResult> results;
public List<String> getHtmlAttributions() {
return htmlAttributions;
}
public void setHtmlAttributions(List<String> htmlAttributions) {
this.htmlAttributions = htmlAttributions;
}
public String getNextPageToken() {
return nextPageToken;
}
public void setNextPageToken(String nextPageToken) {
this.nextPageToken = nextPageToken;
}
public List<GooglePlaceResult> getResults() {
return results;
}
public void setResults(List<GooglePlaceResult> results) {
this.results = results;
}
@Override
public String toString() {
return "GooglePlaceResponse{" +
"htmlAttributions=" + htmlAttributions +
", nextPageToken='" + nextPageToken + '\'' +
", results='" + results + '\'' +
'}';
}
}

3
googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResult.java
View File

@ -1,5 +1,7 @@
package pl.tpolgrabia.googleutils.dto;
import com.google.gson.annotations.SerializedName;
import java.util.List;
/**
@ -11,6 +13,7 @@ public class GooglePlaceResult {
private String id;
private String name;
private List<GooglePlacePhoto> photos;
@SerializedName("place_id")
private String placeId;
private Double rating;
private String reference;

4
googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceViewport.java
View File

@ -1,10 +1,14 @@
package pl.tpolgrabia.googleutils.dto;
import com.google.gson.annotations.SerializedName;
/**
* Created by tpolgrabia on 28.09.16.
*/
public class GooglePlaceViewport {
@SerializedName("northeast")
private GooglePlaceLocation northEast;
@SerializedName("southwest")
private GooglePlaceLocation southWest;
public GooglePlaceLocation getNorthEast() {

21
googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java
View File

@ -8,13 +8,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pl.tpolgrabia.googleutils.GooglePlacesService;
import pl.tpolgrabia.googleutils.constants.GooglePlacesConstants;
import pl.tpolgrabia.googleutils.dto.GooglePlaceResult;
import pl.tpolgrabia.googleutils.dto.GooglePlaceResponse;
import retrofit2.Response;
import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory;
import java.io.IOException;
import java.util.List;
/**
* Created by tpolgrabia on 27.09.16.
@ -33,11 +32,11 @@ public class PlacesUtils {
this.aq = new AQuery(ctx);
}
public Response<List<GooglePlaceResult>> fetchNearbyPlaces(Double latitude,
Double longitude,
Double searchRadius,
String searchItemType,
String pageToken) throws IOException {
public Response<GooglePlaceResponse> fetchNearbyPlaces(Double latitude,
Double longitude,
Double searchRadius,
String searchItemType,
String pageToken) throws IOException {
if (latitude == null) {
throw new IllegalArgumentException("Latitude cannot be null");
@ -64,10 +63,10 @@ public class PlacesUtils {
return pageToken != null ?
retrofit.create(GooglePlacesService.class).fetchNearbyPlacesNext(apiKey,
latitude + "," + longitude,
searchRadius,
searchItemType,
pageToken).execute()
latitude + "," + longitude,
searchRadius,
searchItemType,
pageToken).execute()
: retrofit.create(GooglePlacesService.class).fetchNearbyPlacesFirst(apiKey,
latitude + "," + longitude,
searchRadius,