| ... |
... |
@@ -149,13 +149,13 @@ public class ImportReferentialContext { |
|
149
|
149
|
speciesCache = referential.getSpeciesCache();
|
|
150
|
150
|
speciesCache.init(Maps.uniqueIndex(referential.getSpecies(), Species::getFaoCode));
|
|
151
|
151
|
|
|
152
|
|
- Map<String, SizeMeasureType> sizeMeasureType = Maps.uniqueIndex(referential.getSizeMeasureType(), SizeMeasureType::getCode);
|
|
153
|
|
- sizeMeasureTypeFL = sizeMeasureType.get("FL");
|
|
154
|
|
- sizeMeasureTypeDL = sizeMeasureType.get("DL");
|
|
|
152
|
+ Map<String, SizeMeasureType> sizeMeasureType = Maps.uniqueIndex(referential.getSizeMeasureType(), SizeMeasureType::getId);
|
|
|
153
|
+ sizeMeasureTypeFL = sizeMeasureType.get("fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336"); // FL
|
|
|
154
|
+ sizeMeasureTypeDL = sizeMeasureType.get("fr.ird.referential.common.SizeMeasureType#1433499466774#0.529249255312607"); // PD1
|
|
155
|
155
|
|
|
156
|
|
- Map<String, DataQuality> dataQuality = Maps.uniqueIndex(referential.getDataQuality(), DataQuality::getCode);
|
|
157
|
|
- dataQualityA = dataQuality.get("A");
|
|
158
|
|
- dataQualityE = dataQuality.get("E");
|
|
|
156
|
+ Map<String, DataQuality> dataQuality = Maps.uniqueIndex(referential.getDataQuality(), DataQuality::getId);
|
|
|
157
|
+ dataQualityA = dataQuality.get("fr.ird.referential.common.DataQuality#0#1"); // A
|
|
|
158
|
+ dataQualityE = dataQuality.get("fr.ird.referential.common.DataQuality#0#5"); // E
|
|
159
|
159
|
|
|
160
|
160
|
// trip
|
|
161
|
161
|
Map<String, Ocean> ocean = Maps.uniqueIndex(referential.getOcean(), Ocean::getId);
|
| ... |
... |
@@ -172,9 +172,9 @@ public class ImportReferentialContext { |
|
172
|
172
|
vessel = Maps.uniqueIndex(referential.getVessel(), Vessel::getCode);
|
|
173
|
173
|
wellContentStatus = Maps.uniqueIndex(referential.getWellContentStatus(), WellContentStatus::getCode);
|
|
174
|
174
|
|
|
175
|
|
- Map<String, AcquisitionStatus> acquisitionStatus = Maps.uniqueIndex(referential.getAcquisitionStatus(), AcquisitionStatus::getCode);
|
|
176
|
|
- acquisitionStatus1 = acquisitionStatus.get("1");
|
|
177
|
|
- acquisitionStatus99 = acquisitionStatus.get("99");
|
|
|
175
|
+ Map<String, AcquisitionStatus> acquisitionStatus = Maps.uniqueIndex(referential.getAcquisitionStatus(), AcquisitionStatus::getId);
|
|
|
176
|
+ acquisitionStatus1 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001"); // 1
|
|
|
177
|
+ acquisitionStatus99 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999"); //99
|
|
178
|
178
|
// landing
|
|
179
|
179
|
landingCategories = Maps.uniqueIndex(referential.getWeightCategory(), WeightCategory::getCode);
|
|
180
|
180
|
|