Map Interface refactoring ( to-merge branch) #745
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adding preferences logic to the maps implementation to automatically configure them.
added maps implementations settings screen.
updated branch to maintain compatibility with the updates introduced in upstream master. fixed draw, and survey markers display. updated package layout, and renamed proxy mission components.
updated branch to maintain compatibility with the updates introduced in upstream master. fixed draw, and survey markers display. updated package layout, and renamed proxy mission components. fixed numeric bug in conversion from Coord2D object to LatLng, and GeoPoint objects.
…into drone_refactor_osm
updated app settings structure: moved map preferences and tts speech preference under user interface, and moved flight data under the advanced section. updated map provider preferences architecture. moved some of the preference key to the 'xml/preferences_key.xml'. They show there as string resources, therefore acting as global constant value available both from the xml file as well as the java code.
started implementation of open street map provider preferences implementation.
Conflicts: Android/AndroidManifest.xml
arthurbenemann
added a commit
that referenced
this pull request
May 6, 2014
Map Interface refactoring, support for OSM
m4gr3d
added a commit
to m4gr3d/droidplanner
that referenced
this pull request
May 15, 2014
…nn/osm"" This reverts commit f69a484. Conflicts: Android/AndroidManifest.xml Android/src/org/droidplanner/android/activities/EditorActivity.java Android/src/org/droidplanner/android/mission/item/markers/MissionItemGenericMarkerSource.java Android/src/org/droidplanner/android/proxy/mission/item/MissionItemProxy.java Android/src/org/droidplanner/android/proxy/mission/item/markers/TakeoffMarkerInfo.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just getting #740 up-to date with master for a merge.