Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#21 : Parsing JSON data using GSON #23

Merged
merged 1 commit into from
Jan 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
import com.google.android.gms.maps.SupportMapFragment;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.MarkerOptions;
import com.pulkit4tech.privy.data.LocationData;
import com.pulkit4tech.privy.data.json.MarkerData;
import com.pulkit4tech.privy.utilities.LocationServices;
import com.pulkit4tech.privy.utilities.RequestData;

import java.util.HashMap;

import static com.pulkit4tech.privy.constants.Constants.DEBUG;
import static com.pulkit4tech.privy.constants.Constants.CAMERA_ANIMATION_DURATION;
import static com.pulkit4tech.privy.constants.Constants.MY_PERMISSIONS_REQUEST_FINE_LOCATIONS;
Expand All @@ -31,10 +32,10 @@ public class PrivyMapsActivity extends ActionBarActivity implements OnMapReadyCa

private GoogleMap mMap;
private Context mContext;
private Marker myLocationMarker;
private CameraPosition MY_LOCATION_CAMERA_POS;
private HashMap<Integer,MarkerData> universalMarkers;
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


// My Location
// My location
private LocationData myLocationData;

@Override
Expand Down Expand Up @@ -113,20 +114,13 @@ private void getMyCurrentLocation(){
myLocationData = locationService.getCurrentLocation();
if(myLocationData!=null) {

// checking for previous marker and if present, replacing it with new marker
if (myLocationMarker != null) {
myLocationMarker.remove();
}

MY_LOCATION_CAMERA_POS = new CameraPosition.Builder()
.target(myLocationData.getLatLng())
.zoom(15.0f)
.bearing(0)
.tilt(25)
.build();

myLocationMarker = mMap.addMarker(new MarkerOptions().position(myLocationData.getLatLng()).title("My Location"));

//animate camera
moveCameraToMyLocation();
addMarkers();
Expand Down Expand Up @@ -178,6 +172,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
}

private void markNearbyPrivys(LatLng myLocation){
new RequestData(mContext,mMap,myLocation).getMarkerData();
universalMarkers = new HashMap<>();
new RequestData(mContext,mMap,universalMarkers,myLocation).getMarkerData();
}
}
22 changes: 0 additions & 22 deletions app/src/main/java/com/pulkit4tech/privy/data/MarkerData.java

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/java/com/pulkit4tech/privy/data/PrivyPost.java

This file was deleted.

30 changes: 30 additions & 0 deletions app/src/main/java/com/pulkit4tech/privy/data/json/Location.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.pulkit4tech.privy.data.json;

public class Location {
private double lat;
private double lng;

public double getLat() {
return lat;
}

public void setLat(double lat) {
this.lat = lat;
}

public double getLng() {
return lng;
}

public void setLng(double lng) {
this.lng = lng;
}

@Override
public String toString() {
return "Location{" +
"lat=" + lat +
", lng=" + lng +
'}';
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.pulkit4tech.privy.data.json;

public class LocationData {
private Location location;

public void setLocation(Location location) {
this.location = location;
}

public Location getLocation() {
return location;
}

@Override
public String toString() {
return "LocationData{" +
"location=" + location +
'}';
}
}
96 changes: 96 additions & 0 deletions app/src/main/java/com/pulkit4tech/privy/data/json/MarkerData.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package com.pulkit4tech.privy.data.json;

import com.google.gson.annotations.SerializedName;

import java.util.List;

public class MarkerData {
private LocationData geometry;

@SerializedName("icon")
private String icon_url;
private String id;
private String name;
private String place_id;
private String scope;
private List<String> types;
private String vicinity;

public LocationData getGeometry() {
return geometry;
}

public void setGeometry(LocationData geometry) {
this.geometry = geometry;
}

public String getIconurl() {
return icon_url;
}

public void setIconurl(String icon_url) {
this.icon_url = icon_url;
}

public String getId() {
return id;
}

public void setId(String id) {
this.id = id;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getPlaceid() {
return place_id;
}

public void setPlaceid(String place_id) {
this.place_id = place_id;
}

public String getScope() {
return scope;
}

public void setScope(String scope) {
this.scope = scope;
}

public List<String> getTypes() {
return types;
}

public void setTypes(List<String> types) {
this.types = types;
}

public String getVicinity() {
return vicinity;
}

public void setVicinity(String vicinity) {
this.vicinity = vicinity;
}

@Override
public String toString() {
return "MarkerData{" +
"geometry=" + geometry +
", icon_url='" + icon_url + '\'' +
", id='" + id + '\'' +
", name='" + name + '\'' +
", place_id='" + place_id + '\'' +
", scope='" + scope + '\'' +
", types=" + types +
", vicinity='" + vicinity + '\'' +
'}';
}
}
42 changes: 42 additions & 0 deletions app/src/main/java/com/pulkit4tech/privy/data/json/PrivyPost.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.pulkit4tech.privy.data.json;

import java.util.List;

public class PrivyPost {
private List<String> html_attributions;
private List<MarkerData> results;
private String status;

public List<String> getHtmlattributions() {
return html_attributions;
}

public void setHtmlattributions(List<String> html_attributions) {
this.html_attributions = html_attributions;
}

public List<MarkerData> getResults() {
return results;
}

@Override
public String toString() {
return "PrivyPost{" +
"html_attributions=" + html_attributions +
", results=" + results +
", status='" + status + '\'' +
'}';
}

public void setResults(List<MarkerData> results) {
this.results = results;
}

public String getStatus() {
return status;
}

public void setStatus(String status) {
this.status = status;
}
}
Loading