|
@@ -26,13 +26,14 @@ import java.util.Map;
|
|
import de.tudarmstadt.informatik.hostage.R;
|
|
import de.tudarmstadt.informatik.hostage.R;
|
|
import de.tudarmstadt.informatik.hostage.logging.Record;
|
|
import de.tudarmstadt.informatik.hostage.logging.Record;
|
|
import de.tudarmstadt.informatik.hostage.logging.UglyDbHelper;
|
|
import de.tudarmstadt.informatik.hostage.logging.UglyDbHelper;
|
|
|
|
+import de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity;
|
|
|
|
|
|
import static com.google.android.gms.common.GooglePlayServicesUtil.*;
|
|
import static com.google.android.gms.common.GooglePlayServicesUtil.*;
|
|
|
|
|
|
/**
|
|
/**
|
|
* Created by Fabio Arnold on 10.02.14.
|
|
* Created by Fabio Arnold on 10.02.14.
|
|
*/
|
|
*/
|
|
-public class ThreatMapFragment extends Fragment implements GoogleMap.OnMarkerClickListener {
|
|
|
|
|
|
+public class ThreatMapFragment extends Fragment implements GoogleMap.OnInfoWindowClickListener {
|
|
private GoogleMap map = null;
|
|
private GoogleMap map = null;
|
|
private static View view = null;
|
|
private static View view = null;
|
|
|
|
|
|
@@ -51,9 +52,9 @@ public class ThreatMapFragment extends Fragment implements GoogleMap.OnMarkerCli
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public boolean onMarkerClick(Marker marker) {
|
|
|
|
|
|
+ public void onInfoWindowClick(Marker marker) {
|
|
|
|
+ MainActivity.getInstance().displayView(MainActivity.MainMenuItem.RECORDS.getValue());
|
|
Log.i("MARKER", ""+marker.getId());
|
|
Log.i("MARKER", ""+marker.getId());
|
|
- return false;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
private class Point {
|
|
private class Point {
|
|
@@ -112,7 +113,7 @@ public class ThreatMapFragment extends Fragment implements GoogleMap.OnMarkerCli
|
|
}
|
|
}
|
|
|
|
|
|
map.setMyLocationEnabled(true);
|
|
map.setMyLocationEnabled(true);
|
|
- map.setOnMarkerClickListener(this);
|
|
|
|
|
|
+ map.setOnInfoWindowClickListener(this);
|
|
|
|
|
|
LatLng tudarmstadt = new LatLng(49.86923, 8.6632768);
|
|
LatLng tudarmstadt = new LatLng(49.86923, 8.6632768);
|
|
//LatLng mapCenter = new LatLng(41.889, -87.622);
|
|
//LatLng mapCenter = new LatLng(41.889, -87.622);
|