Skip to content

Commit

Permalink
updated and fixed api response
Browse files Browse the repository at this point in the history
  • Loading branch information
@shadman-sakib
shadman-sakib committed Dec 13, 2019
1 parent 6c99498 commit ff77048
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 40 deletions.
23 changes: 12 additions & 11 deletions app/src/main/java/barikoi/barikoilocation/library/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@
import barikoi.barikoilocation.GeoCode.PlaceGeoCodeListener;
import barikoi.barikoilocation.NearbyPlace.NearbyPlaceAPI;
import barikoi.barikoilocation.NearbyPlace.NearbyPlaceListener;
import barikoi.barikoilocation.PlaceModels.GeoCodePlaceModel;
import barikoi.barikoilocation.PlaceModels.NearbyPlacesByCategoryPlaceModel;
import barikoi.barikoilocation.PlaceModels.NearbyPlacesModel;
import barikoi.barikoilocation.PlaceModels.ReverseGeoPlaceModel;
import barikoi.barikoilocation.PlaceModels.SearchAutoCompletePlaceModel;
import barikoi.barikoilocation.PlaceModels.GeoCodePlace;
import barikoi.barikoilocation.PlaceModels.NearbyPlace;
import barikoi.barikoilocation.PlaceModels.ReverseGeoPlace;
import barikoi.barikoilocation.ReverseGeo.ReverseGeoAPI;
import barikoi.barikoilocation.ReverseGeo.ReverseGeoAPIListener;
import barikoi.barikoilocation.PlaceModels.Place;
Expand All @@ -42,14 +40,14 @@ protected void onCreate(Bundle savedInstanceState) {
searchAutocompleteFragment =(SearchAutocompleteFragment)getSupportFragmentManager().findFragmentById(R.id.place_autocomplete_fragment);
searchAutocompleteFragment.setPlaceSelectionListener(new SearchAutocompleteFragment.PlaceSelectionListener() {
@Override
public void onPlaceSelected(SearchAutoCompletePlaceModel place) {
public void onPlaceSelected(GeoCodePlace place) {
Toast.makeText(MainActivity.this, ""+place.getAddress(), Toast.LENGTH_SHORT).show();
Log.d("MainActivity",""+place.getAddress());
}

@Override
public void onFailure(String error) {

Toast.makeText(MainActivity.this, error, Toast.LENGTH_SHORT).show();
}
});
reverseGeo.setOnClickListener(new View.OnClickListener() {
Expand All @@ -59,15 +57,16 @@ public void onClick(View view) {
.setLatLng(Double.parseDouble(lat.getText().toString()),Double.parseDouble(lon.getText().toString()))
.build()
.getAddress(new ReverseGeoAPIListener() {

@Override
public void reversedAddress(ReverseGeoPlaceModel place) {
public void reversedAddress(ReverseGeoPlace place) {
Toast.makeText(MainActivity.this, ""+place.getAddress(), Toast.LENGTH_SHORT).show();
Log.d("ReverseGeoPlace",""+place.getAddress());
}

@Override
public void onFailure(String message) {

Toast.makeText(MainActivity.this, message, Toast.LENGTH_SHORT).show();
}
});
}
Expand All @@ -83,10 +82,11 @@ public void onClick(View view) {
.build()
.generateNearbyPlaceListByType(new NearbyPlaceListener() {
@Override
public void onPlaceListReceivedByCategory(ArrayList<NearbyPlacesByCategoryPlaceModel> places) {
public void onPlaceListReceived(ArrayList<NearbyPlace> places) {
Toast.makeText(MainActivity.this, ""+places.get(0).getAddress(), Toast.LENGTH_SHORT).show();
Log.d("Nearby",""+places.size());
}

@Override
public void onFailure(String message) {
Toast.makeText(MainActivity.this, "Error: "+message, Toast.LENGTH_SHORT).show();
Expand All @@ -101,8 +101,9 @@ public void onClick(View view) {
.idOrCode(geo.getText().toString())
.build()
.generateList(new PlaceGeoCodeListener() {

@Override
public void onGeoCodePlace(GeoCodePlaceModel place) {
public void onGeoCodePlace(GeoCodePlace place) {
Toast.makeText(MainActivity.this, ""+place.getAddress(), Toast.LENGTH_SHORT).show();
Log.d("onGeoCodePlace",""+place.getAddress());
}
Expand Down
2 changes: 1 addition & 1 deletion barikoilocation/src/main/java/barikoi/barikoilocation/Api.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
public class Api {

public static final String url_base="https://barikoi.xyz/v1/";
public static final String reverseString =url_base+"api/search/reverse/geocode/"+BarikoiAPI.getAccessToken()+"/place";
public static final String reverseString =url_base+"api/search/reverse/"+BarikoiAPI.getAccessToken()+"/geocode";
public static final String autoCompleteString =url_base+"api/search/autocomplete/"+BarikoiAPI.getAccessToken()+"/place";
public static final String geoCodeString =url_base+"api/search/geocode/"+BarikoiAPI.getAccessToken()+"/place/";
public static final String nearbyPlacesString =url_base+"api/search/nearby/"+BarikoiAPI.getAccessToken()+"/";
Expand Down
15 changes: 12 additions & 3 deletions barikoilocation/src/main/java/barikoi/barikoilocation/GeoCode/GeoCodeAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,18 @@ public void generateList(PlaceGeoCodeListener placeGeoCodeListener) {
Api.geoCodeString +this.idOrCode,
(String response) -> {
try {
JSONObject data = new JSONArray(response).getJSONObject(0);
GeoCodePlace place = JsonUtils.getGeoCodePlace(data);
placeGeoCodeListener.onGeoCodePlace(place);
JSONObject data = new JSONObject(response);
if(data.has("status")) {
if (data.getInt("status") == 200) {
GeoCodePlace place = JsonUtils.getGeoCodePlace(data.getJSONObject("place"));
placeGeoCodeListener.onGeoCodePlace(place);
}else{
placeGeoCodeListener.onFailure(data.getString("message"));
}
}else{
placeGeoCodeListener.onFailure(data.getString("message"));
}

} catch (JSONException e) {
placeGeoCodeListener.onFailure(JsonUtils.logError(TAG,response));
}
Expand Down
6 changes: 3 additions & 3 deletions barikoilocation/src/main/java/barikoi/barikoilocation/JsonUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static ArrayList<SearchAutoCompletePlace> getSearchAutoCompletePlaces(JSO
for (int i = 0; i < placearray.length(); i++) {
JSONObject report = placearray.getJSONObject(i);
String id = report.has("id")? report.getString("id"):"";
String address =report.has("Address")? report.getString("Address"):"";
String address =report.has("address")? report.getString("address"):"";
String code = report.has("uCode")?report.getString("uCode"):"";
String area=report.has("area")? report.getString("area"):"";

Expand All @@ -96,7 +96,7 @@ public static GeoCodePlace getGeoCodePlace(JSONObject jsonObject){
try{
String lon = jsonObject.has("longitude")? jsonObject.getString("longitude"):"";
String lat = jsonObject.has("latitude")?jsonObject.getString("latitude"):"";
String address =jsonObject.has("Address")? jsonObject.getString("Address"):"";
String address =jsonObject.has("address")? jsonObject.getString("address"):"";
String code = jsonObject.has("uCode")?jsonObject.getString("uCode"):"";
String area=jsonObject.has("area")? jsonObject.getString("area"):"";
String city=jsonObject.has("city")? jsonObject.getString("city"):"";
Expand Down Expand Up @@ -134,7 +134,7 @@ public static ReverseGeoPlace getReverseGeoPlace(JSONObject jsonObject){
try{
double distance_within_meters = jsonObject.has("distance_within_meters")?jsonObject.getDouble("distance_within_meters"):0.0;
String id = jsonObject.has("id")?jsonObject.getString("id"):"";
String address =jsonObject.has("Address")? jsonObject.getString("Address"):"";
String address =jsonObject.has("address")? jsonObject.getString("address"):"";
String area=jsonObject.has("area")? jsonObject.getString("area"):"";
String city=jsonObject.has("city")? jsonObject.getString("city"):"";

Expand Down
23 changes: 15 additions & 8 deletions barikoilocation/src/main/java/barikoi/barikoilocation/NearbyPlace/NearbyPlaceAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,22 @@ public void generateNearbyPlaceList(NearbyPlaceListener nearbyPlaceListener){
(String response) -> {
try {
JSONObject data=new JSONObject(response);
JSONArray placearray = data.getJSONArray("Place");
if(data.has("status")) {
if (data.getInt("status") == 200) {
JSONArray placearray = data.getJSONArray("Place");

if (placearray.length() == 0) {
Log.d(TAG,"No places Found");
nearbyPlaceListener.onFailure("No places Found");
} else {
ArrayList<NearbyPlace> searchPlaces = JsonUtils.getNearbyPlace(placearray);
nearbyPlaceListener.onPlaceListReceived(searchPlaces);
}
}else{
nearbyPlaceListener.onFailure(data.getString("message"));
}
}else nearbyPlaceListener.onFailure(data.getString("message"));

if (placearray.length() == 0) {
Log.d(TAG,"No places Found");
nearbyPlaceListener.onFailure("No places Found");
} else {
ArrayList<NearbyPlace> searchPlaces = JsonUtils.getNearbyPlace(placearray);
nearbyPlaceListener.onPlaceListReceived(searchPlaces);
}

} catch (JSONException e) {
nearbyPlaceListener.onFailure(JsonUtils.logError(TAG,response));
Expand Down
20 changes: 14 additions & 6 deletions barikoilocation/src/main/java/barikoi/barikoilocation/ReverseGeo/ReverseGeoAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,21 @@ public void onResponse(String response) {
}
}
try {
JSONObject place= new JSONObject(response).getJSONArray("Place").getJSONObject(0);
ReverseGeoPlace p=JsonUtils.getReverseGeoPlace(place);
if(p!=null && reverseGeoAPIListener !=null ) reverseGeoAPIListener.reversedAddress(p);
else {
Log.d(TAG,"ReverseGeo Listener is null");
reverseGeoAPIListener.onFailure("ReverseGeo Listener is null");
JSONObject responsejson=new JSONObject(response);
if(responsejson.has("status")){
if(responsejson.getInt("status")==200){
JSONObject place= responsejson.getJSONObject("place");
ReverseGeoPlace p=JsonUtils.getReverseGeoPlace(place);
if(p!=null && reverseGeoAPIListener !=null ) reverseGeoAPIListener.reversedAddress(p);
else {
Log.d(TAG,"ReverseGeo Listener is null");
reverseGeoAPIListener.onFailure("ReverseGeo Listener has not been implemented");
}
}else{
reverseGeoAPIListener.onFailure(responsejson.getString("message"));
}
}

} catch (JSONException e) {
reverseGeoAPIListener.onFailure(JsonUtils.logError(TAG,response));
}
Expand Down
23 changes: 15 additions & 8 deletions ...ation/src/main/java/barikoi/barikoilocation/SearchAutoComplete/SearchAutoCompleteAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,22 @@ public void generateList(SearchAutoCompleteListener searchAutoCompleteListener)
(String response) -> {
try {
JSONObject data = new JSONObject(response);
JSONArray placearray = data.getJSONArray("places");
if(data.has("status")){
if(data.getInt("status")==200){
JSONArray placearray = data.getJSONArray("places");

if (placearray.length() == 0) {
Log.d(TAG,"Place Not Found");
searchAutoCompleteListener.onFailure(JsonUtils.logError(TAG,response));
} else {
ArrayList<SearchAutoCompletePlace> searchPlaces = JsonUtils.getSearchAutoCompletePlaces(placearray);
searchAutoCompleteListener.onPlaceListReceived(searchPlaces);
}
}else{
searchAutoCompleteListener.onFailure(data.getString("message"));
}
}else searchAutoCompleteListener.onFailure(data.getString("message"));

if (placearray.length() == 0) {
Log.d(TAG,"Place Not Found");
searchAutoCompleteListener.onFailure(JsonUtils.logError(TAG,response));
} else {
ArrayList<SearchAutoCompletePlace> searchPlaces = JsonUtils.getSearchAutoCompletePlaces(placearray);
searchAutoCompleteListener.onPlaceListReceived(searchPlaces);
}
} catch (JSONException e) {
searchAutoCompleteListener.onFailure(JsonUtils.logError(TAG,response));
}
Expand Down

0 comments on commit ff77048

Please sign in to comment.