This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit e61c50ecc5a3d589688875423f42090fc0b2b672 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 19 09:48:19 2016 +0100 Ne pas ajouter les points sur les ports si leur coordoonées ne sont pas renseignées (See #7925) --- .../java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java index 685d261..99fc5a5 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java @@ -89,7 +89,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< // add departure harbours Harbour departureHarbour = tripSeine.getDepartureHarbour(); - if (departureHarbour != null) { + if (departureHarbour != null && departureHarbour.getLatitude() != null && departureHarbour.getLongitude() != null) { TripMapPoint departurePoint = new TripMapPoint(); departurePoint.setTime(tripSeine.getStartDate()); departurePoint.setLatitude(departureHarbour.getLatitude()); @@ -104,7 +104,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< // add landing harbours Harbour landingHarbour = tripSeine.getLandingHarbour(); - if (landingHarbour != null) { + if (landingHarbour != null && landingHarbour.getLatitude() != null && landingHarbour.getLongitude() != null) { TripMapPoint landingPoint = new TripMapPoint(); landingPoint.setTime(tripSeine.getEndDate()); landingPoint.setLatitude(landingHarbour.getLatitude()); @@ -336,10 +336,10 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< public static Date find(TopiaContextImplementor context, String tripId) throws TopiaException { String sql = "SELECT max(r.date)" + - " FROM observe_seine.route r" + - " WHERE r.trip = ?"; + " FROM observe_seine.route r" + + " WHERE r.trip = ?"; - TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); + TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); return request.findSingleResult(context); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.