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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-12-25 17:07:09 +01:00
commit 9050c49664
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -1156,8 +1156,13 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
// camera focus type
autofocus = true;
//parameters.setGpsLatitude(lat);
//parameters.setGpsLongitude(lon);
parameters.removeGpsData();
String locProvider = mapActivity.getMapViewTrackingUtilities().getLocationProvider();
if (!Algorithms.isEmpty(locProvider)) {
parameters.setGpsLatitude(lat);
parameters.setGpsLongitude(lon);
parameters.setGpsProcessingMethod(locProvider.toUpperCase());
}
switch (AV_CAMERA_FOCUS_TYPE.get()) {
case AV_CAMERA_FOCUS_HIPERFOCAL:
parameters.setFocusMode(Parameters.FOCUS_MODE_FIXED);

8
OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
View file

@ -42,6 +42,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
private boolean routePlanningMode;
private boolean showViewAngle = false;
private boolean isUserZoomed = false;
private String locationProvider;
public MapViewTrackingUtilities(OsmandApplication app){
this.app = app;
@ -73,7 +74,11 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
mapView.setMapLocationListener(this);
}
}
public String getLocationProvider() {
return locationProvider;
}
@Override
public void updateCompassValue(float val) {
if (mapView != null) {
@ -104,6 +109,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
@Override
public void updateLocation(Location location) {
showViewAngle = false;
locationProvider = location.getProvider();
if (mapView != null) {
RotatedTileBox tb = mapView.getCurrentRotatedTileBox();
if (isMapLinkedToLocation() && location != null) {