Author: fdesbois Date: 2012-09-05 18:25:45 +0200 (Wed, 05 Sep 2012) New Revision: 532 Url: http://forge.codelutin.com/repositories/revision/sammoa/532 Log: refs #1412 : little improvement for location time on audio reading Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlights.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-05 16:05:45 UTC (rev 531) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-05 16:25:45 UTC (rev 532) @@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory; import java.io.File; +import java.util.Date; import java.util.List; /** @@ -86,25 +87,19 @@ GeoPoint result; - DateTime previousTime = TransectFlights.getStartTime(currentTransect, routes); + DateTime startTime = Dates.toDateTime(getAudioReader().getRecordingDate()); - int position = (int) getAudioReader().getPosition() / 1000; + long position = getAudioReader().getPosition(); if (logger.isDebugEnabled()) { - logger.debug(String.format("Get location after previousTime %1$tH:%1$tM:%1$tS.%1$tL (audio position = %2$d)", - previousTime.toDate(), + logger.debug(String.format("Get location after startTime %1$tH:%1$tM:%1$tS.%1$tL (audio position = %2$d)", + startTime.toDate(), position) ); } - DateTime newTime; - if (position > 0) { - newTime = previousTime.plusSeconds(position); + DateTime newTime = startTime.plus(position).withMillisOfSecond(0); - } else { - newTime = new DateTime(previousTime); - } - if (logger.isDebugEnabled()) { logger.debug(String.format("Get location at newTime %1$tH:%1$tM:%1$tS.%1$tL", newTime.toDate()) @@ -185,8 +180,8 @@ if (file.exists()) { - DateTime startTime = TransectFlights.getStartTime(currentTransect, routes); - audioReader.load(file, startTime.toDate()); + Date startTime = TransectFlights.getStartTime(currentTransect, routes); + audioReader.load(file, startTime); } } } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlights.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlights.java 2012-09-05 16:05:45 UTC (rev 531) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlights.java 2012-09-05 16:25:45 UTC (rev 532) @@ -27,7 +27,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.Sets; -import org.joda.time.DateTime; import org.nuiton.validator.bean.list.BeanListValidator; import java.util.Date; @@ -53,14 +52,14 @@ * @param routes Collection of routes * @return the transectFlight start time */ - public static DateTime getStartTime(TransectFlight transectFlight, Iterable<Route> routes) { + public static Date getStartTime(TransectFlight transectFlight, Iterable<Route> routes) { Date result = FluentIterable .from(routes) .filter(Routes.withTransectFlight(transectFlight)) .first() .transform(Routes.toDate()) .get(); - return Dates.toDateTime(result); + return result; } public static Set<ObserverPosition> toObserverPositions(Iterable<TransectFlight> transectFlights) {