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

Fix bugs

Browse source
This commit is contained in:
Victor Shcherb 2013-06-06 01:17:10 +02:00
parent f3db838e37
commit b00da5c5dd
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -140,9 +140,9 @@ public class OsmandApplication extends Application implements ClientContext {
uiHandler = new Handler(); uiHandler = new Handler();
rendererRegistry = new RendererRegistry(); rendererRegistry = new RendererRegistry();
targetPointsHelper = new TargetPointsHelper(this); targetPointsHelper = new TargetPointsHelper(this);
if(!osmandSettings.FOLLOW_THE_ROUTE.get()) { // if(!osmandSettings.FOLLOW_THE_ROUTE.get()) {
targetPointsHelper.clearPointToNavigate(false); // targetPointsHelper.clearPointToNavigate(false);
} // }
checkPrefferedLocale(); checkPrefferedLocale();
startApplication(); startApplication();

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

@ -183,7 +183,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public void updatePhotoInformation(double lat, double lon, double rot) throws IOException { public void updatePhotoInformation(double lat, double lon, Location loc, double rot) throws IOException {
try { try {
Class exClass = Class.forName("android.media.ExifInterface"); Class exClass = Class.forName("android.media.ExifInterface");
@ -197,9 +197,19 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
setAttribute.invoke(exInstance,"GPSLongitudeRef", lon > 0?"E" : "W"); setAttribute.invoke(exInstance,"GPSLongitudeRef", lon > 0?"E" : "W");
if(!Double.isNaN(rot)){ if(!Double.isNaN(rot)){
setAttribute.invoke(exInstance,"GPSImgDirectionRef", "T"); setAttribute.invoke(exInstance,"GPSImgDirectionRef", "T");
String rotString = (int) (rot * 100.0) + "/100"; while(rot < 0) { rot += 360; }
while(rot > 360) { rot -= 360; }
int abs = (int) (Math.abs(rot) * 100.0);
String rotString = abs/100f+"";
setAttribute.invoke(exInstance,"GPSImgDirection", rotString); setAttribute.invoke(exInstance,"GPSImgDirection", rotString);
} }
if(loc != null && loc.hasAltitude()){
double alt = loc.getAltitude();
String altString = (int) (Math.abs(alt) * 100.0) + "/100";
System.err.println(altString);
setAttribute.invoke(exInstance,"GPSAltitude", altString);
setAttribute.invoke(exInstance,"GPSAltitudeRef", alt < 0 ? "1" : "0");
}
Method saveAttributes = exClass.getMethod("saveAttributes", Method saveAttributes = exClass.getMethod("saveAttributes",
new Class[] {} ); new Class[] {} );
saveAttributes.invoke(exInstance); saveAttributes.invoke(exInstance);
@ -857,10 +867,11 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
r.lat = l.getLatitude(); r.lat = l.getLatitude();
r.lon = l.getLongitude(); r.lon = l.getLongitude();
Float heading = app.getLocationProvider().getHeading(); Float heading = app.getLocationProvider().getHeading();
Location loc = app.getLocationProvider().getLastKnownLocation();
if(lastTakingPhoto != null && lastTakingPhoto.getName().equals(f.getName()) && heading != null) { if(lastTakingPhoto != null && lastTakingPhoto.getName().equals(f.getName()) && heading != null) {
float rot = heading.floatValue(); float rot = heading.floatValue();
try { try {
r.updatePhotoInformation(r.lat, r.lon, rot == 0 ? Double.NaN : rot); r.updatePhotoInformation(r.lat, r.lon, loc, rot == 0 ? Double.NaN : rot);
} catch (IOException e) { } catch (IOException e) {
log.error("Error updating EXIF information " + e.getMessage(), e); log.error("Error updating EXIF information " + e.getMessage(), e);
} }