Merge pull request #23 from pulkit4tech/JSON_parsing

#21 : Parsing JSON data using GSON

app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java

@@ -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;
@@ -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;
 
-    // My Location
+    // My location
     private LocationData myLocationData;
 
     @Override
@@ -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();
@@ -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();
     }
 }

app/src/main/java/com/pulkit4tech/privy/data/json/Location.java

@@ -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 +
+                '}';
+    }
+}

app/src/main/java/com/pulkit4tech/privy/data/json/LocationData.java

@@ -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 +
+                '}';
+    }
+}

app/src/main/java/com/pulkit4tech/privy/data/json/MarkerData.java

@@ -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 + '\'' +
+                '}';
+    }
+}

app/src/main/java/com/pulkit4tech/privy/data/json/PrivyPost.java

@@ -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;
+    }
+}