karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Merge import changes.

Browse Source
This commit is contained in:
Sandor Dornbush
2011-02-16 07:42:25 -08:00
parent 9be9127ad1
commit 2a4a0d38e3
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java
+19 -12
View File
@@ -229,7 +229,10 @@ public class GpxImporter extends DefaultHandler {
@Override @Override
public void endElement(String uri, String localName, String name) public void endElement(String uri, String localName, String name)
throws SAXException { throws SAXException {
if (!isInTrackElement) { return; } if (!isInTrackElement) {
content = null;
return;
}
// process these elements only as sub-elements of track // process these elements only as sub-elements of track
if (localName.equals(TAG_TRACK_POINT)) { if (localName.equals(TAG_TRACK_POINT)) {
@@ -360,6 +363,10 @@ public class GpxImporter extends DefaultHandler {
*/ */
private void onTrackPointElementEnd() throws SAXException { private void onTrackPointElementEnd() throws SAXException {
if (MyTracksUtils.isValidLocation(location)) { if (MyTracksUtils.isValidLocation(location)) {
if (statsBuilder == null) {
// first point did not have a time, start stats builder without it
statsBuilder = new TripStatisticsBuilder(0);
}
statsBuilder.addLocation(location, location.getTime()); statsBuilder.addLocation(location, location.getTime());
// insert in db // insert in db
@@ -455,18 +462,18 @@ public class GpxImporter extends DefaultHandler {
// check for negative time change // check for negative time change
if (timeDifference < 0) { if (timeDifference < 0) {
String msg = createErrorMessage("Found negative time change."); Log.w(MyTracksConstants.TAG, "Found negative time change.");
throw new SAXException(msg); } else {
}
// We don't have a speed and bearing in GPX, make something up from // We don't have a speed and bearing in GPX, make something up from
// the last two points. // the last two points.
// TODO GPS points tend to have some inherent imprecision, // TODO GPS points tend to have some inherent imprecision,
// speed and bearing will likely be off, so the statistics for things like // speed and bearing will likely be off, so the statistics for things like
// max speed will also be off. // max speed will also be off.
float speed = location.distanceTo(lastLocation) * 1000.0f / timeDifference; float speed = location.distanceTo(lastLocation) * 1000.0f / timeDifference;
location.setSpeed(speed); location.setSpeed(speed);
location.setBearing(lastSegmentLocation.bearingTo(location)); location.setBearing(lastSegmentLocation.bearingTo(location));
}
} }
// Fill in the time // Fill in the time