← Back to branch summary

~opensatnav-admins/opensatnav/nice-package-rename

~opensatnav-admins/opensatnav/nice-package-rename

« back to all changes in this revision

Viewing changes to src/org/opensatnav/services/TripStatistics.java

Committer: evolvedlight
Date: 2010-08-09 19:58:34 UTC
mfrom: (146.2.29 turn-by-turn)
mto: This revision was merged to the branch mainline in revision 163.
Revision ID: steve@evolvedlight.co.uk-20100809195834-5p9tmlvitgs6rnhl

Merged with main code

files added:
res/drawable/icon_32.png

res/drawable/track.png

res/drawable/turn_left_25_white.png

res/drawable/turn_left_45_white.png

res/drawable/turn_left_90_white.png

res/drawable/turn_right_25_white.png

res/drawable/turn_right_45_white.png

res/drawable/turn_right_90_white.png

res/drawable/turn_straight_white.png

res/drawable/widgetbackground.png

res/layout/contribute_list_item.xml

res/layout/send_to_osm.xml

res/layout/widget.xml

res/values/styles.xml

res/xml/widget.xml

src/org/andnav/osm/views/overlay/OpenStreetMapViewTouchResponderOverlay.java

src/org/opensatnav/WidgetProvider.java

src/org/opensatnav/contribute

src/org/opensatnav/contribute/RouteRecorder.java

src/org/opensatnav/contribute/content

src/org/opensatnav/contribute/content/DescriptionGenerator.java

src/org/opensatnav/contribute/content/IProviderUtils.java

src/org/opensatnav/contribute/content/OSNProvider.java

src/org/opensatnav/contribute/content/ProviderUtils.java

src/org/opensatnav/contribute/content/Track.java

src/org/opensatnav/contribute/content/TrackBuffer.java

src/org/opensatnav/contribute/content/TrackPointsColumns.java

src/org/opensatnav/contribute/content/TracksColumns.java

src/org/opensatnav/contribute/content/Waypoint.aidl

src/org/opensatnav/contribute/content/Waypoint.java

src/org/opensatnav/contribute/content/WaypointsColumns.java

src/org/opensatnav/contribute/output

src/org/opensatnav/contribute/output/GPXFileWriter.java

src/org/opensatnav/contribute/output/OSMUploader.java

src/org/opensatnav/contribute/output/SendToOSMDialog.java

src/org/opensatnav/contribute/services

src/org/opensatnav/contribute/services/AbsoluteLocationListenerPolicy.java

src/org/opensatnav/contribute/services/AdaptiveLocationListenerPolicy.java

src/org/opensatnav/contribute/services/ITrackRecordingService.aidl

src/org/opensatnav/contribute/services/LocationListenerPolicy.java

src/org/opensatnav/contribute/services/PeriodicTask.java

src/org/opensatnav/contribute/services/PeriodicTaskExecuter.java

src/org/opensatnav/contribute/services/SplitManager.java

src/org/opensatnav/contribute/services/TaskExecuterManager.java

src/org/opensatnav/contribute/services/TimeSplitTask.java

src/org/opensatnav/contribute/services/TrackRecordingService.java

src/org/opensatnav/contribute/util

src/org/opensatnav/contribute/util/MyTracksUtils.java

src/org/opensatnav/contribute/util/RecordedGeoPoint.java

src/org/opensatnav/contribute/util/RecordedRouteGPXFormatter.java

src/org/opensatnav/contribute/util/RecordedWayPoint.java

src/org/opensatnav/contribute/util/StringUtils.java

src/org/opensatnav/contribute/util/UnitConversions.java

src/org/opensatnav/contribute/util/Util.java

src/org/opensatnav/contribute/util/constants

src/org/opensatnav/contribute/util/constants/ContributeConstants.java

src/org/opensatnav/contribute/util/constants/OSMConstants.java

src/org/opensatnav/services/CloudmadeRouter.java

src/org/opensatnav/services/routing

src/org/opensatnav/services/routing/CloudmadeXMLHandler.java

src/org/opensatnav/services/routing/Route.java

src/org/opensatnav/services/routing/RouteInstruction.java

src/org/opensatnav/services/routing/RouteInstructionPrompt.java

src/org/opensatnav/services/routing/RouteInstructionTurn.java

src/org/opensatnav/services/routing/RouteInstructionsService.java

src/org/opensatnav/services/routing/TTSSpeaker.java

src/org/opensatnav/services/routing/overlay

src/org/opensatnav/services/routing/overlay/NavigationHUD.java

src/org/opensatnav/services/routing/overlay/RouteOverlay.java

src/org/opensatnav/services/routing/util

src/org/opensatnav/services/routing/util/DistancePoint.java

src/org/opensatnav/stats

src/org/opensatnav/stats/DoubleBuffer.java

src/org/opensatnav/stats/ExtremityMonitor.java

src/org/opensatnav/stats/TripStatistics.java

src/org/opensatnav/stats/TripStatisticsData.aidl

src/org/opensatnav/stats/TripStatisticsData.java

files removed:
src/org/anddev

src/org/anddev/openstreetmap

src/org/anddev/openstreetmap/contributor

src/org/anddev/openstreetmap/contributor/util

src/org/anddev/openstreetmap/contributor/util/OSMUploader.java

src/org/anddev/openstreetmap/contributor/util/RecordedGeoPoint.java

src/org/anddev/openstreetmap/contributor/util/RecordedRouteGPXFormatter.java

src/org/anddev/openstreetmap/contributor/util/RecordedWayPoint.java

src/org/anddev/openstreetmap/contributor/util/RouteRecorder.java

src/org/anddev/openstreetmap/contributor/util/Util.java

src/org/anddev/openstreetmap/contributor/util/constants

src/org/anddev/openstreetmap/contributor/util/constants/Constants.java

src/org/anddev/openstreetmap/contributor/util/constants/OSMConstants.java

src/org/andnav/osm/views/overlay/OpenStreetMapViewOldTraceOverlay.java

src/org/opensatnav/TraceRecorderService.java

files modified:
.bzrignore

AndroidManifest.xml

build.xml

res/layout/contribute.xml

res/values/strings.xml

src/com/hlidskialf/android/preference/SeekBarPreference.java

src/org/andnav/osm/util/GeoPoint.java

src/org/andnav/osm/views/OpenStreetMapView.java

src/org/andnav/osm/views/controller/OpenStreetMapViewController.java

src/org/andnav/osm/views/overlay/OpenStreetMapViewRouteOverlay.java

src/org/andnav/osm/views/overlay/OpenStreetMapViewTraceOverlay.java

src/org/andnav/osm/views/util/LRUMapTileCache.java

src/org/opensatnav/ChooseLocationActivity.java

src/org/opensatnav/ContributeActivity.java

src/org/opensatnav/GetDirectionsActivity.java

src/org/opensatnav/OpenSatNavConstants.java

src/org/opensatnav/SatNavActivity.java

src/org/opensatnav/TripStatisticsController.java

src/org/opensatnav/TripStatisticsService.java

src/org/opensatnav/services/LocationHandler.java

src/org/opensatnav/services/NominatimGeoCoder.java

src/org/opensatnav/services/Router.java

src/org/opensatnav/services/TripStatistics.java

src/org/opensatnav/services/YOURSRouter.java

Show diffs side-by-side

added added

removed removed

src/org/opensatnav/services/TripStatistics.java

5

5

import java.util.Collection;

6

6

7

7

import org.andnav.osm.views.util.Util;

8

import org.opensatnav.TripStatisticsController;

8

9

import org.opensatnav.util.FormatHelper;

9

10

10

import android.content.Context;

11

11

import android.location.Location;

12

12

Older »