Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #612 from krabaey/feature-import-gpx

Browse source 
Feature to import gpx file
This commit is contained in:
vshcherb 2014-04-26 17:13:59 +02:00
commit 2f673b15a0
2 changed files with 79 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/AndroidManifest.xml
View file

@ -68,6 +68,16 @@
<category android:name="android.intent.category.CAR_DOCK" /> <category android:name="android.intent.category.CAR_DOCK" />
<category android:name="android.intent.category.DESK_DOCK" /> <category android:name="android.intent.category.DESK_DOCK" />
</intent-filter> </intent-filter>
<!-- android matches non-greedy : http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i-->
<!-- mimeType&host are both needed or you will either have unwanted matching or no match when needed -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.gpx"/>
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.gpx"/>
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.gpx"/>
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.gpx"/>
</intent-filter>
<receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver"> <receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.CAMERA_BUTTON" /> <action android:name="android.intent.action.CAMERA_BUTTON" />

72
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -1,6 +1,7 @@
package net.osmand.plus.activities; package net.osmand.plus.activities;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@ -19,6 +20,9 @@ import net.osmand.map.MapTileDownloader.DownloadRequest;
import net.osmand.map.MapTileDownloader.IMapDownloaderCallback; import net.osmand.map.MapTileDownloader.IMapDownloaderCallback;
import net.osmand.plus.ApplicationMode; import net.osmand.plus.ApplicationMode;
import net.osmand.plus.BusyIndicator; import net.osmand.plus.BusyIndicator;
import net.osmand.plus.GPXUtilities;
import net.osmand.plus.GPXUtilities.GPXFile;
import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.OsmAndConstants; import net.osmand.plus.OsmAndConstants;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
@ -49,6 +53,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.media.AudioManager; import android.media.AudioManager;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
@ -237,7 +242,11 @@ public class MapActivity extends AccessibleActivity {
return l; return l;
} }
@Override
protected void onNewIntent(final Intent intent)
{
setIntent(intent);
}
@Override @Override
protected void onResume() { protected void onResume() {
@ -318,6 +327,22 @@ public class MapActivity extends AccessibleActivity {
mapViewTrackingUtilities.setMapLinkedToLocation(false); mapViewTrackingUtilities.setMapLinkedToLocation(false);
} }
final Intent intent = getIntent();
if (intent != null)
{
if (Intent.ACTION_VIEW.equals(intent.getAction()))
{
if (intent.getData() != null)
{
final Uri data = intent.getData();
if ("file".equalsIgnoreCase(data.getScheme()))
{
showImportedGpx(data.getPath());
}
}
}
}
View progress = mapLayers.getMapInfoLayer().getProgressBar(); View progress = mapLayers.getMapInfoLayer().getProgressBar();
if (progress != null) { if (progress != null) {
app.getResourceManager().setBusyIndicator(new BusyIndicator(this, progress)); app.getResourceManager().setBusyIndicator(new BusyIndicator(this, progress));
@ -641,7 +666,7 @@ public class MapActivity extends AccessibleActivity {
} }
} }
} }
public MapActivityActions getMapActions() { public MapActivityActions getMapActions() {
return mapActions; return mapActions;
} }
@ -666,7 +691,48 @@ public class MapActivity extends AccessibleActivity {
public void refreshMap() { public void refreshMap() {
getMapView().refreshMap(); getMapView().refreshMap();
} }
private void showImportedGpx(final String gpxFile)
{
new AsyncTask<Void, Void, GPXFile>()
{
ProgressDialog progress = null;
@Override
protected void onPreExecute()
{
progress = ProgressDialog.show(MapActivity.this, getString(R.string.loading), getString(R.string.loading_data));
}
@Override
protected GPXFile doInBackground(Void... nothing)
{
return GPXUtilities.loadGPXFile(getMyApplication(), new File(gpxFile));
}
@Override
protected void onPostExecute(GPXFile result)
{
progress.dismiss();
if (result != null)
{
if (result.warning != null)
{
AccessibleToast.makeText(MapActivity.this, result.warning, Toast.LENGTH_LONG).show();
}
else
{
getMyApplication().setGpxFileToDisplay(result, true);
final WptPt moveTo = result.findPointToShow();
if (moveTo != null)
{
mapView.getAnimatedDraggingThread().startMoving(moveTo.lat, moveTo.lon, mapView.getZoom(), true);
}
mapView.refreshMap();
}
}
}
}.execute();
}
} }