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.

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

SRTM data #860

Merged
merged 67 commits into from
Jul 7, 2014
Merged

SRTM data #860

merged 67 commits into from
Jul 7, 2014

Conversation

arthurbenemann
Copy link
Member

Merging the SRTM branch into main code.

I refactored the branch to only include changes that are related to SRTM. For now it will not add anything on the UI side, and will not be exposed to the user.But having the library in place means that we can soon start doing things like terrain following.

Conflicts:
	Android/src/org/droidplanner/android/utils/file/DirectoryPath.java
Conflicts:
	DroidPlanner/AndroidManifest.xml
Conflicts:
	DroidPlanner/src/com/droidplanner/dialogs/ElevationDialog.java
Conflicts:
	DroidPlanner/src/com/droidplanner/activitys/PlanningActivity.java
	DroidPlanner/src/com/droidplanner/dialogs/ElevationDialog.java
Conflicts:
	DroidPlanner/src/com/droidplanner/helpers/geoTools/GeoTools.java
	DroidPlanner/src/com/droidplanner/polygon/GridBuilder.java
Conflicts:
	Android/src/org/droidplanner/android/dialogs/ElevationDialog.java
	Android/src/org/droidplanner/android/widgets/graph/ChartScaleHandler.java
	Android/src/org/droidplanner/android/widgets/graph/series/ChartSeries.java
	Android/src/org/droidplanner/android/widgets/graph/series/DynamicSeries.java
	Android/src/org/droidplanner/android/widgets/graph/series/StaticSeries.java
arthurbenemann added a commit that referenced this pull request Jul 7, 2014
@arthurbenemann arthurbenemann merged commit db69312 into DroidPlanner:master Jul 7, 2014
@arthurbenemann arthurbenemann deleted the SRTM_rebased branch July 7, 2014 18:46
@arthurbenemann arthurbenemann mentioned this pull request Jul 7, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant