Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e54f4ddf by Tony Chemit at 2020-12-31T09:01:59+01:00 La carto ne tolère pas le 'Port à corriger' - closes #1719 - - - - - 146c5eba by Tony Chemit at 2020-12-31T09:03:11+01:00 La dernière SNAPSHOT 8.0.3 semble instable - closes #1718 - - - - - 462cfa41 by Tony Chemit at 2020-12-31T09:11:18+01:00 Remontée des messages d'erreur serveur vers le client - closes #1637 - - - - - 5 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java - pom.xml - services/local-impl/src/main/java/fr/ird/observe/services/local/service/ReferenceServiceLocalSupport.java - toolkit/service/src/main/java/fr/ird/observe/services/service/ReferenceService.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java ===================================== @@ -101,11 +101,11 @@ public class DataSourceReferenceProvider { } public final <R extends DataDtoReference> DataDtoReferenceSet<R> getDataReferences(Class<R> referenceType) { - return dataSource.getReferenceService().loadData(referenceType); + return dataSource.getReferenceService().loadAllData(referenceType); } public final <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> getReferentialReferences(Class<R> referenceType) { - return dataSource.getReferenceService().loadReferential(referenceType); + return dataSource.getReferenceService().loadAllReferential(referenceType); } public <R extends ReferentialDtoReference> R loadOrCreateReferentialReference(Class<R> referenceType, String id) { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java ===================================== @@ -92,6 +92,9 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit List<Coordinate> coordinatesByDay = new LinkedList<>(); TripMapPoint previousPoint = null; for (TripMapPoint point : tripMapPoints) { + if (!point.isValid()) { + continue; + } Coordinate coordinate = create(point); if (previousPoint != null && !DateUtils.isSameDay(previousPoint.getTime(), point.getTime())) { // changing day ===================================== pom.xml ===================================== @@ -162,7 +162,7 @@ <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>--> <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>--> <!-- <lib.version.java4all.java-bean>0.1.2</lib.version.java4all.java-bean>--> -<!-- <lib.version.java4all.http>1.0.24</lib.version.java4all.http>--> + <lib.version.java4all.http>1.0.25</lib.version.java4all.http> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/ReferenceServiceLocalSupport.java ===================================== @@ -57,13 +57,12 @@ class ReferenceServiceLocalSupport extends ObserveServiceLocal implements Refere } @Override - public <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type) { - + public <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type) { return loadData0(type); } @Override - public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type) { + public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type) { return loadReferential0(type); } ===================================== toolkit/service/src/main/java/fr/ird/observe/services/service/ReferenceService.java ===================================== @@ -49,7 +49,7 @@ public interface ReferenceService extends ObserveService { @Get @MethodCredential(Permission.READ_DATA) - <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type); + <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type); @Get @MethodCredential(Permission.READ_REFERENTIAL) @@ -61,6 +61,6 @@ public interface ReferenceService extends ObserveService { @Get @MethodCredential(Permission.READ_REFERENTIAL) - <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type); + <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8784925f1a42b43f81a41a5b6... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8784925f1a42b43f81a41a5b6... You're receiving this email because of your account on gitlab.com.