[Git][ultreiaio/ird-observe][develop] Précisions sur les déductions AVDTH ASSOC vers FloatingObject et ObjectMaterial - Closes #2802 - Observe-commits

13 Nov 2023


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
0698ab90 by Tony Chemit at 2023-11-13T12:50:00+01:00
Précisions sur les déductions AVDTH ASSOC vers FloatingObject et ObjectMaterial - Closes #2802

- - - - -


4 changed files:

- core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
- core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java
- src/site/markdown/avdth/logbook.md
- src/site/markdown/avdth/referential.md


Changes:

=====================================
core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
=====================================
@@ -131,6 +131,7 @@ public class ImportReferentialContext {
     private ObjectMaterial objectMaterialANLOG;
     private ObjectMaterial objectMaterialHALOG;
     private ObjectMaterial objectMaterialVNLOG;
+    private ObjectMaterial objectMaterialCarrion;
     private ObservedSystem observedSystem0;
     private SpeciesCache speciesCache;
     private ObservedSystem observedSystem20;
@@ -225,6 +226,7 @@ public class ImportReferentialContext {
         transmittingBuoyType98 = transmittingBuoyType.get("98");
         objectMaterialFOB = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#1.3");
         objectMaterialNLOG = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.51");
+        objectMaterialCarrion = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.57");
         objectMaterialDFAD = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.2");
         objectMaterialALOG = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.59");
         objectMaterialAFAD = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.46");
@@ -328,6 +330,10 @@ public class ImportReferentialContext {
         return objectMaterialNLOG;
     }
 
+    public ObjectMaterial getObjectMaterialCarrion() {
+        return objectMaterialCarrion;
+    }
+
     public ObjectMaterial getObjectMaterialDFAD() {
         return objectMaterialDFAD;
     }


=====================================
core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java
=====================================
@@ -207,7 +207,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> {
     /**
      * Observed system from {@code ACT_ASSOC} which can create a Floating object.
      */
-    public static final Set<String> OBSERVED_SYTEM_CODES_WITH_DCP = Set.of("20", "21", "22", "23", "24", "25");
+    public static final Set<String> OBSERVED_SYTEM_CODES_WITH_DCP = Set.of("20", "21", "22", "23", "24", "25", "81");
     /**
      * We need to remove thoses observed system at the end when writing them to activity.
      * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2548">issue 2548</a>
@@ -323,6 +323,10 @@ public class FloatingObjectReader extends DataReader<FloatingObject> {
         if (observedSystem != null) {
             activity.addObservedSystem(observedSystem);
         }
+        // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2802
+        if (observedSystemCodes.contains("81")) {
+            activity.addObservedSystem(dataContext.getObservedSystem20());
+        }
 
         boolean addBuoyFromObservedSystem = addFloatingObjectMaterials(dataContext,
                                                                        resultSet,
@@ -380,12 +384,12 @@ public class FloatingObjectReader extends DataReader<FloatingObject> {
             addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialFOB(), whenArriving, whenLeaving, entity);
             addDefaultObjectMaterialOnUnknownObjectType = false;
         } else if (observedSystemCodes.contains("21")) {
-            // add ObjectMaterial 2-1 NLOG
-            addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialNLOG(), whenArriving, whenLeaving, entity);
+            // add ObjectMaterial 2-1-1 VNLOG
+            addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialVNLOG(), whenArriving, whenLeaving, entity);
             addDefaultObjectMaterialOnUnknownObjectType = false;
         } else if (observedSystemCodes.contains("22")) {
-            // add ObjectMaterial 2-1 NLOG + 1-1 DFAD
-            addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialNLOG(), whenArriving, whenLeaving, entity);
+            // add ObjectMaterial 2-1-1 VNLOG + 1-1 DFAD
+            addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialVNLOG(), whenArriving, whenLeaving, entity);
             addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialDFAD(), whenArriving, whenLeaving, entity);
             addDefaultObjectMaterialOnUnknownObjectType = false;
             addBuoyFromObservedSystem = true;
@@ -394,8 +398,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> {
             addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialALOG(), whenArriving, whenLeaving, entity);
             addDefaultObjectMaterialOnUnknownObjectType = false;
         } else if (observedSystemCodes.contains("24")) {
-            // add ObjectMaterial 2-2 ALOG + 1-1 DFAD
-            addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialALOG(), whenArriving, whenLeaving, entity);
+            // add ObjectMaterial 1-1 DFAD
             addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialDFAD(), whenArriving, whenLeaving, entity);
             addDefaultObjectMaterialOnUnknownObjectType = false;
             addBuoyFromObservedSystem = true;
@@ -403,6 +406,10 @@ public class FloatingObjectReader extends DataReader<FloatingObject> {
             // add ObjectMaterial 1-2 AFAD
             addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialAFAD(), whenArriving, whenLeaving, entity);
             addDefaultObjectMaterialOnUnknownObjectType = false;
+        } else if (observedSystemCodes.contains("81")) {
+            // add ObjectMaterial 2-1-2-1 Carrion
+            addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialCarrion(), whenArriving, whenLeaving, entity);
+            addDefaultObjectMaterialOnUnknownObjectType = false;
         }
         if (floatingObjectExistsInAvdth) {
             // simple mapping


=====================================
src/site/markdown/avdth/logbook.md
=====================================
@@ -138,7 +138,7 @@ Dans **AVDTH**, il existe trois notions à considéder :
 
 1. ```ACTIVITE.C_TYP_OBJET``` donne le type de DCP (la valeur ```NULL``` ou ```999``` indique pas de DCP déclaré dans **AVDTH**)
 2. ```ACTIVITE.C_TYP_BALISE``` donne le type de balise (la valeur ```NULL``` ou ```999``` indique pas de bouée délcarée dans **AVDTH**)
-3. Les valeurs ```20,21,22,23,24,25``` de la table ```ACT_ASSOC.C_ASSOC``` permettent de définir aussi un DCP (et de renseigner les matériaux associés)
+3. Les valeurs ```20,21,22,23,24,25,81``` de la table ```ACT_ASSOC.C_ASSOC``` permettent de définir aussi un DCP (et de renseigner les matériaux associés)
 
 On va alors interdire l'ajout d'un DCP, si aucune des trois notions précédentes n'est satisfaite, en clair on ne peut pas ajouté un DPC si :
 
@@ -249,11 +249,12 @@ tableau suivant :
 | ACT_ASSOC.C_ASSOC | ObjectMaterial |
 |:------------------|:---------------|
 | 20                | FOB            |
-| 21                | NLOG           |
-| 22 [1](#n_6_1)    | NLOG + DFAD    |
+| 21                | VNLOG          |
+| 22 [1](#n_6_1)    | VNLOG + DFAD   |
 | 23                | ALOG           |
-| 24 [1](#n_6_1)    | ALOG DFAD      |
+| 24 [1](#n_6_1)    | DFAD           |
 | 25                | AFAD           |
+| 81                | Carrion        |
 
 * Note 1 <a name="n_6_1"></a>
 


=====================================
src/site/markdown/avdth/referential.md
=====================================
@@ -184,7 +184,7 @@ Pour transposer tous les codes **ACT_ASSOC.C_ASSOC** en code **ps_common.Observe
 | 73                    | 73                                |
 | 74                    | 74                                |
 | 80                    | 80                                |
-| 81                    | 81                                |
+| 81                    | 81 + 20                           |
 | 90                    | 90                                |
 | 91                    | 91                                |
 | 92                    | 92                                |



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0698ab90d0d70c21c34fe07daf...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0698ab90d0d70c21c34fe07daf...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop] Précisions sur les déductions AVDTH ASSOC vers FloatingObject et ObjectMaterial - Closes #2802

Tony CHEMIT (＠tchemit)

tags

participants (1)