Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
e54f4ddf
by Tony Chemit at 2020-12-31T09:01:59+01:00
-
146c5eba
by Tony Chemit at 2020-12-31T09:03:11+01:00
-
462cfa41
by Tony Chemit at 2020-12-31T09:11:18+01:00
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:
| ... | ... | @@ -101,11 +101,11 @@ public class DataSourceReferenceProvider { |
| 101 | 101 |
}
|
| 102 | 102 |
|
| 103 | 103 |
public final <R extends DataDtoReference> DataDtoReferenceSet<R> getDataReferences(Class<R> referenceType) {
|
| 104 |
- return dataSource.getReferenceService().loadData(referenceType);
|
|
| 104 |
+ return dataSource.getReferenceService().loadAllData(referenceType);
|
|
| 105 | 105 |
}
|
| 106 | 106 |
|
| 107 | 107 |
public final <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> getReferentialReferences(Class<R> referenceType) {
|
| 108 |
- return dataSource.getReferenceService().loadReferential(referenceType);
|
|
| 108 |
+ return dataSource.getReferenceService().loadAllReferential(referenceType);
|
|
| 109 | 109 |
}
|
| 110 | 110 |
|
| 111 | 111 |
public <R extends ReferentialDtoReference> R loadOrCreateReferentialReference(Class<R> referenceType, String id) {
|
| ... | ... | @@ -92,6 +92,9 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit |
| 92 | 92 |
List<Coordinate> coordinatesByDay = new LinkedList<>();
|
| 93 | 93 |
TripMapPoint previousPoint = null;
|
| 94 | 94 |
for (TripMapPoint point : tripMapPoints) {
|
| 95 |
+ if (!point.isValid()) {
|
|
| 96 |
+ continue;
|
|
| 97 |
+ }
|
|
| 95 | 98 |
Coordinate coordinate = create(point);
|
| 96 | 99 |
if (previousPoint != null && !DateUtils.isSameDay(previousPoint.getTime(), point.getTime())) {
|
| 97 | 100 |
// changing day
|
| ... | ... | @@ -162,7 +162,7 @@ |
| 162 | 162 |
<!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>-->
|
| 163 | 163 |
<!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
|
| 164 | 164 |
<!-- <lib.version.java4all.java-bean>0.1.2</lib.version.java4all.java-bean>-->
|
| 165 |
-<!-- <lib.version.java4all.http>1.0.24</lib.version.java4all.http>-->
|
|
| 165 |
+ <lib.version.java4all.http>1.0.25</lib.version.java4all.http>
|
|
| 166 | 166 |
|
| 167 | 167 |
<!-- license header configuration -->
|
| 168 | 168 |
<license.licenseName>gpl_v3</license.licenseName>
|
| ... | ... | @@ -57,13 +57,12 @@ class ReferenceServiceLocalSupport extends ObserveServiceLocal implements Refere |
| 57 | 57 |
}
|
| 58 | 58 |
|
| 59 | 59 |
@Override
|
| 60 |
- public <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type) {
|
|
| 61 |
- |
|
| 60 |
+ public <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type) {
|
|
| 62 | 61 |
return loadData0(type);
|
| 63 | 62 |
}
|
| 64 | 63 |
|
| 65 | 64 |
@Override
|
| 66 |
- public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type) {
|
|
| 65 |
+ public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type) {
|
|
| 67 | 66 |
return loadReferential0(type);
|
| 68 | 67 |
}
|
| 69 | 68 |
|
| ... | ... | @@ -49,7 +49,7 @@ public interface ReferenceService extends ObserveService { |
| 49 | 49 |
|
| 50 | 50 |
@Get
|
| 51 | 51 |
@MethodCredential(Permission.READ_DATA)
|
| 52 |
- <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type);
|
|
| 52 |
+ <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type);
|
|
| 53 | 53 |
|
| 54 | 54 |
@Get
|
| 55 | 55 |
@MethodCredential(Permission.READ_REFERENTIAL)
|
| ... | ... | @@ -61,6 +61,6 @@ public interface ReferenceService extends ObserveService { |
| 61 | 61 |
|
| 62 | 62 |
@Get
|
| 63 | 63 |
@MethodCredential(Permission.READ_REFERENTIAL)
|
| 64 |
- <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type);
|
|
| 64 |
+ <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type);
|
|
| 65 | 65 |
|
| 66 | 66 |
}
|