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.

Sign up for GitHub

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

#25 : Removing bug while adding markers #26

Merged
merged 1 commit into from
Jan 9, 2017
Merged

#25 : Removing bug while adding markers #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class PrivyMapsActivity extends ActionBarActivity implements OnMapReadyCa
private GoogleMap mMap;
private Context mContext;
private CameraPosition MY_LOCATION_CAMERA_POS;
private HashMap<Integer,MarkerData> universalMarkers;
private HashMap<String,MarkerData> universalMarkers;

// My location
private LocationData myLocationData;
Expand All @@ -44,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_privy_maps);

mContext = this;
universalMarkers = new HashMap<>();

// Obtain the SupportMapFragment and get notified when the map is ready to be used.
SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
Expand Down Expand Up @@ -172,7 +173,6 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
}

private void markNearbyPrivys(LatLng myLocation){
universalMarkers = new HashMap<>();
new RequestData(mContext,mMap,universalMarkers,myLocation).getMarkerData();
}
}
15 changes: 9 additions & 6 deletions app/src/main/java/com/pulkit4tech/privy/utilities/RequestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.android.volley.toolbox.StringRequest;
import com.android.volley.toolbox.Volley;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.model.BitmapDescriptor;
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.MarkerOptions;
Expand Down Expand Up @@ -43,9 +45,9 @@ public class RequestData {
private String PLACE = "place";
private String NEARBY = "nearbysearch";
private String TYPE = "json";
private HashMap<Integer, MarkerData> hm;
private HashMap<String, MarkerData> hm;

public RequestData(Context mContext, GoogleMap mMap, HashMap<Integer, MarkerData> universalMarkerHashMap, LatLng myLocation) {
public RequestData(Context mContext, GoogleMap mMap, HashMap<String, MarkerData> universalMarkerHashMap, LatLng myLocation) {
this.myLocation = myLocation;
this.mContext = mContext;
this.mMap = mMap;
Expand Down Expand Up @@ -84,16 +86,17 @@ public void onResponse(String response) {
private void addMarkers(PrivyPost post) {
for (MarkerData data : post.getResults()) {
Log.d(DEBUG, data.toString());
Marker temp = mMap.addMarker(new MarkerOptions().position(new LatLng(data.getGeometry().getLocation().getLat(), data.getGeometry().getLocation().getLng())).title(data.getName()));
hm.put(temp.hashCode(), data);
BitmapDescriptor bitmapDescriptor = BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_AZURE);
Marker temp = mMap.addMarker(new MarkerOptions().position(new LatLng(data.getGeometry().getLocation().getLat(), data.getGeometry().getLocation().getLng())).title(data.getName()).icon(bitmapDescriptor));
hm.put(temp.getId(), data);
}

mMap.setOnMarkerClickListener(new GoogleMap.OnMarkerClickListener() {
@Override
public boolean onMarkerClick(Marker marker) {
//testing
if (hm.containsKey(marker.hashCode()))
Toast.makeText(mContext, hm.get(marker.hashCode()).getName(), Toast.LENGTH_SHORT).show();
if (hm.containsKey(marker.getId()))
makeToast(mContext, hm.get(marker.getId()).getName());
else
marker.remove();
return false;
Expand Down