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

Add support for uploading exact BTS GPS locations draft #645

Closed
wants to merge 4 commits into from
Closed

Add support for uploading exact BTS GPS locations draft #645

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b47589a
#590 - adding draggable markers to map
ziem Sep 2, 2015
93b4247
Merge pull request #638 from SecUpwN/development
SecUpwN Nov 15, 2015
db922bd
Improved comment
ziem Nov 19, 2015
1ae6ce5
Fork sync
ziem Nov 19, 2015
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
79 changes: 75 additions & 4 deletions app/src/main/java/com/SecUpwN/AIMSICD/activities/MapViewerOsmDroid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
import com.SecUpwN.AIMSICD.utils.TinyDB;

import org.osmdroid.api.IProjection;
import org.osmdroid.bonuspack.overlays.MapEventsOverlay;
import org.osmdroid.bonuspack.overlays.MapEventsReceiver;
import org.osmdroid.bonuspack.overlays.Marker;
import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
import org.osmdroid.util.GeoPoint;
import org.osmdroid.views.MapView;
Expand Down Expand Up @@ -88,7 +91,7 @@
*
*/

public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenceChangeListener {
public class MapViewerOsmDroid extends BaseActivity implements OnSharedPreferenceChangeListener, MapEventsReceiver, Marker.OnMarkerDragListener, Marker.OnMarkerClickListener {

private final String TAG = "AIMSICD_MapViewer";
public static final String updateOpenCellIDMarkers = "update_opencell_markers";
Expand Down Expand Up @@ -303,7 +306,7 @@ private void setUpMapIfNeeded() {

// Sets cluster pin color
mCellTowerGridMarkerClusterer = new CellTowerGridMarkerClusterer(MapViewerOsmDroid.this);
mCellTowerGridMarkerClusterer.setIcon(((BitmapDrawable)mContext.getResources().
mCellTowerGridMarkerClusterer.setIcon(((BitmapDrawable) mContext.getResources().
getDrawable(R.drawable.ic_map_pin_orange)).getBitmap());

GpsMyLocationProvider imlp = new GpsMyLocationProvider(MapViewerOsmDroid.this.getBaseContext());
Expand All @@ -312,11 +315,13 @@ private void setUpMapIfNeeded() {
mMyLocationOverlay = new MyLocationNewOverlay(MapViewerOsmDroid.this.getBaseContext(), imlp, mMap);
mMyLocationOverlay.setDrawAccuracyEnabled(true);

MapEventsOverlay mapEventsOverlay = new MapEventsOverlay(this, this);

mMap.getOverlays().add(mCellTowerGridMarkerClusterer);
mMap.getOverlays().add(mMyLocationOverlay);
mMap.getOverlays().add(mCompassOverlay);
mMap.getOverlays().add(mScaleBarOverlay);

mMap.getOverlays().add(mapEventsOverlay);
} else {
Helpers.msgShort(this, getString(R.string.unable_to_create_map));
}
Expand Down Expand Up @@ -613,6 +618,7 @@ private void loadOcidMarkersByNetwork() {

mCellTowerGridMarkerClusterer.addAll(items);
}

public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
final String KEY_MAP_TYPE = getBaseContext().getString(R.string.pref_map_type_key);
if (key.equals(KEY_MAP_TYPE)) {
Expand All @@ -634,7 +640,6 @@ public void setRefreshActionButtonState(final boolean refreshing) {
}
}


public void onStop() {
super.onStop();
((AppAIMSICD) getApplication()).detach(this);
Expand All @@ -648,4 +653,70 @@ public void onStart() {
setRefreshActionButtonState(false);
}
}

private void loadUserDefinedCoordinates() {
// TODO: 02.09.2015 load coordinates from database
// use addUserDefinedMarkerToMap(createUserDefinedMarker(...)) to create and add markers to map
}

private void saveUserDefinedCoordinates(GeoPoint coordinates) {
// TODO: 02.09.2015 save to database
}

private void updateUserDefinedCoordinates(int coordinatesId, GeoPoint coordinates) {
// TODO: 02.09.2015 update coordinates in database
}

private Marker createUserDefinedMarker(GeoPoint geoPoint) {
Marker marker = new Marker(mMap);
marker.setPosition(geoPoint);
marker.setDraggable(true);
marker.setOnMarkerDragListener(this);
marker.setOnMarkerClickListener(this);

return marker;
}

private void addUserDefinedMarkerToMap(Marker marker) {
mMap.getOverlays().add(marker);
}

@Override
public boolean singleTapConfirmedHelper(GeoPoint geoPoint) {
return false;
}

@Override
public boolean longPressHelper(GeoPoint geoPoint) {
Log.i(TAG, "longPressHelper");
addUserDefinedMarkerToMap(createUserDefinedMarker(geoPoint));

saveUserDefinedCoordinates(geoPoint);
return true;
}

@Override
public void onMarkerDrag(Marker marker) {
Log.i(TAG, "onMarkerDrag");
}

@Override
public void onMarkerDragEnd(Marker marker) {
Log.i(TAG, "onMarkerDragEnd");
if (marker.getRelatedObject() != null) {
updateUserDefinedCoordinates((Integer) marker.getRelatedObject(), marker.getPosition());
}
}

@Override
public void onMarkerDragStart(Marker marker) {
Log.i(TAG, "onMarkerDragStart");
}

@Override
public boolean onMarkerClick(Marker marker, MapView mapView) {
Log.i(TAG, "onMarkerClick");
// TODO: 02.09.2015 show remove/delete spot dialog
return true;
}
}