Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 57c96eff by Tony Chemit at 2022-12-05T22:18:50+01:00 AVDTH - Mise à jour de la documentation - - - - - 2 changed files: - src/site/markdown/avdth/logbook.md - src/site/markdown/avdth/referential.md Changes: ===================================== src/site/markdown/avdth/logbook.md ===================================== @@ -16,43 +16,43 @@ La table est déversée dans plusieurs tables : * **FloatingObject** * **TransmittingBuoy** -|n° | nom | destination |note | -|:--- | :--- | :--- |:--- | -| ACTIVITE_01 | C_BAT | Route.topiaId | | -| ACTIVITE_02 | D_DBQ | Route.topiaId | | -| ACTIVITE_03 | D_ACT | Route.date | | -| ACTIVITE_04 | N_ACT | Activity.number | | -| ACTIVITE_05 | H_ACT | Activity.time | [1](#n_0_1) | -| ACTIVITE_06 | M_ACT | Activity.time | [1](#n_0_1) | -| ACTIVITE_07 | C_OCEA | Not used | | -| ACTIVITE_08 | Q_ACT | Signe de latitude et longitude | [2](#n_0_2) | -| ACTIVITE_09 | V_LAT | Activity.latitude | [2](#n_0_2) | -| ACTIVITE_10 | V_LON | Activity.longitude | [2](#n_0_2) | -| ACTIVITE_11 | V_TMER | Route.timeAtSea | [3](#n_0_3) | -| ACTIVITE_12 | V_TPEC | Route.fishingTime | [3](#n_0_3) | -| ACTIVITE_13 | C_OPERA | Activity.vesselActivity | [4](#n_0_4) | -| ACTIVITE_14 | V_NB_OP | Activity.setCount | | -| ACTIVITE_15 | C_TBANC | Activity.schoolType | [5](#n_0_5) | -| ACTIVITE_16 | F_DON_ORG | Activity.originalDataModified | [6](#n_0_6) | -| ACTIVITE_17 | F_POS_COR | Activity.positionCorrected | [7](#n_0_7) | -| ACTIVITE_18 | F_POS_VMS_D | Activity.vmsDivergent | [8](#n_0_8) | -| ACTIVITE_19 | F_CUVE_C | Not used | | -| ACTIVITE_20 | F_OBS | Not used | | -| ACTIVITE_21 | F_EXPERT | Not used | | -| ACTIVITE_22 | V_POIDS_CAP | Activity.totalWeight | | -| ACTIVITE_23 | V_TEMP_S | Activity.seaSurfaceTemperature | | -| ACTIVITE_24 | V_COUR_DIR | Activity.currentDirection | | -| ACTIVITE_25 | V_COUR_VIT | Activity.currentSpeed | | -| ACTIVITE_26 | V_VENT_DIR | Activity.windDirection | | -| ACTIVITE_27 | V_VENT_VIT | Activity.wind | [9](#n_0_9) | -| ACTIVITE_28 | C_TYP_OBJET | | [10](#n_0_10)| -| ACTIVITE_29 | F_DCP_ECO | ??? | | -| ACTIVITE_30 | F_PROP_BALISE | ??? | | -| ACTIVITE_31 | C_TYP_BALISE | | [10](#n_0_10)| -| ACTIVITE_32 | V_ID_BALISE | TransmittingBuoy.code | | -| ACTIVITE_33 | V_POIDS_ESTIM_DCP | FloatingObject.comment | [11](#n_0_11)| -| ACTIVITE_34 | L_COM_A | Activity.comment | | -| ACTIVITE_35 | C_Z_FPA | Activity.fpaZone | [12](#n_0_12)| +| n° | nom | destination | note | +|:------------|:------------------|:-------------------------------------------|:--------------| +| ACTIVITE_01 | C_BAT | Route.topiaId | | +| ACTIVITE_02 | D_DBQ | Route.topiaId | | +| ACTIVITE_03 | D_ACT | Route.date | | +| ACTIVITE_04 | N_ACT | Activity.number | | +| ACTIVITE_05 | H_ACT | Activity.time | [1](#n_0_1) | +| ACTIVITE_06 | M_ACT | Activity.time | [1](#n_0_1) | +| ACTIVITE_07 | C_OCEA | Not used | | +| ACTIVITE_08 | Q_ACT | Signe de latitude et longitude | [2](#n_0_2) | +| ACTIVITE_09 | V_LAT | Activity.latitude | [2](#n_0_2) | +| ACTIVITE_10 | V_LON | Activity.longitude | [2](#n_0_2) | +| ACTIVITE_11 | V_TMER | Route.timeAtSea | [3](#n_0_3) | +| ACTIVITE_12 | V_TPEC | Route.fishingTime | [3](#n_0_3) | +| ACTIVITE_13 | C_OPERA | Activity.vesselActivity | [4](#n_0_4) | +| ACTIVITE_14 | V_NB_OP | Activity.setCount | | +| ACTIVITE_15 | C_TBANC | Activity.schoolType | [5](#n_0_5) | +| ACTIVITE_16 | F_DON_ORG | Activity.originalDataModified | [6](#n_0_6) | +| ACTIVITE_17 | F_POS_COR | Activity.positionCorrected | [7](#n_0_7) | +| ACTIVITE_18 | F_POS_VMS_D | Activity.vmsDivergent | [8](#n_0_8) | +| ACTIVITE_19 | F_CUVE_C | Not used | | +| ACTIVITE_20 | F_OBS | Not used | | +| ACTIVITE_21 | F_EXPERT | Not used | | +| ACTIVITE_22 | V_POIDS_CAP | Activity.totalWeight | | +| ACTIVITE_23 | V_TEMP_S | Activity.seaSurfaceTemperature | | +| ACTIVITE_24 | V_COUR_DIR | Activity.currentDirection | | +| ACTIVITE_25 | V_COUR_VIT | Activity.currentSpeed | | +| ACTIVITE_26 | V_VENT_DIR | Activity.windDirection | | +| ACTIVITE_27 | V_VENT_VIT | Activity.wind | [9](#n_0_9) | +| ACTIVITE_28 | C_TYP_OBJET | | [10](#n_0_10) | +| ACTIVITE_29 | F_DCP_ECO | ??? | | +| ACTIVITE_30 | F_PROP_BALISE | TransmittingBuoy.transmittingBuoyOwnerShip | [10](#n_0_10) | +| ACTIVITE_31 | C_TYP_BALISE | | [10](#n_0_10) | +| ACTIVITE_32 | V_ID_BALISE | TransmittingBuoy.code | | +| ACTIVITE_33 | V_POIDS_ESTIM_DCP | FloatingObject.comment | [11](#n_0_11) | +| ACTIVITE_34 | L_COM_A | Activity.comment | | +| ACTIVITE_35 | C_Z_FPA | Activity.fpaZone | [12](#n_0_12) | * Note 1 @@ -111,21 +111,23 @@ On ajoute un DCP uniquement pour une activité avec **vesselActivity.code == 13* Provient d'une translation de **ACTIVITE.C_OPERA** vers **ps_common.ObjectOperation.code** -| ACTIVITE.C_OPERA | ps_common.ObjectOperation.code | -| :--- | :--- | -|5 | 1 | -|6 | 4 | -|22 | 4 | -|23 | 1 | -|24 | 4 | -|25 | 2 | -|26 | 2 | -|29 | 2 | -|30 | 2 | -|31 | 8 | -|32 | 8 | -|33 | 11 | -|34 | 4 | +| ACTIVITE.C_OPERA | ps_common.ObjectOperation.code | +|:-----------------|:-------------------------------| +| 5 | 1 | +| 6 | 4 | +| 22 | 4 | +| 23 | 1 | +| 24 | 4 | +| 25 | 2 | +| 26 | 2 | +| 29 | 2 | +| 30 | 2 | +| 31 | 8 | +| 32 | 8 | +| 33 | 11 | +| 34 | 4 | +| 40 | 11 | +| 41 | 11 | * ```FloatingObject.floatingObjectPart``` @@ -133,21 +135,23 @@ Pour calculer les matériaux du DCP, on doit d'abord définir les deux valeurs * ```whenArriving``` * ```whenLeaving``` -| ACTIVITE.C_OPERA | whenArriving | whenLeaving | -| :--- | :--- | :--- | -|5 | | TRUE | -|6 | TRUE | | -|22 | TRUE | | -|23 | | TRUE | -|24 | TRUE | | -|25 | TRUE | | -|26 | TRUE | | -|29 | TRUE | | -|30 | TRUE | | -|31 | TRUE | TRUE | -|32 | TRUE | TRUE | -|33 | TRUE | | -|34 | TRUE | | +| ACTIVITE.C_OPERA | whenArriving | whenLeaving | +|:-----------------|:-------------|:------------| +| 5 | | TRUE | +| 6 | TRUE | | +| 22 | TRUE | | +| 23 | | TRUE | +| 24 | TRUE | | +| 25 | TRUE | | +| 26 | TRUE | | +| 29 | TRUE | | +| 30 | TRUE | | +| 31 | TRUE | TRUE | +| 32 | TRUE | TRUE | +| 33 | TRUE | | +| 34 | TRUE | | +| 40 | TRUE | | +| 41 | TRUE | | * Calcul des matériaux à utiliser @@ -207,12 +211,12 @@ if ("999".equals(typeObjectCode)) { Pour le **simple mapping** on utilise la translation : -| ACTIVITE.C_TYP_OBJET | ps_common.ObjectMaterial.code | note | -| :--- | :--- | :---| -|1 | fr.ird.referential.ps.common.ObjectMaterial#0#0.46 | 1-2 AFAD | -|2 | fr.ird.referential.ps.common.ObjectMaterial#0#0.2 | 1-1 DFAD | -|3 | fr.ird.referential.ps.common.ObjectMaterial#0#0.50 | 2 LOG | -|9 | fr.ird.referential.ps.common.ObjectMaterial#0#1.3 | FOB | +| ACTIVITE.C_TYP_OBJET | ps_common.ObjectMaterial.code | note | +|:---------------------|:---------------------------------------------------|:---------| +| 1 | fr.ird.referential.ps.common.ObjectMaterial#0#0.46 | 1-2 AFAD | +| 2 | fr.ird.referential.ps.common.ObjectMaterial#0#0.2 | 1-1 DFAD | +| 3 | fr.ird.referential.ps.common.ObjectMaterial#0#0.50 | 2 LOG | +| 9 | fr.ird.referential.ps.common.ObjectMaterial#0#1.3 | FOB | * ```FloatingObject.transmittingBuoy``` @@ -221,23 +225,29 @@ Soit ```baliseId``` (**ACTIVITE.V_ID_BALISE**) (à placer dans **TransmittingBuo Soit ```transmittingBuoyOperation``` (translation de **ACTIVITE.C_OPERA**) -| ACTIVITE.C_OPERA | ps_common.TransmittingBuoyOperation.code | -| :--- | :--- | -5 | 3 | -6 | 2 | -23 | 3 | -24 | 2 | -25 | 3 | -26 | 2 | -29 | 1 | -32 | 3 | -33 | 4 | -34 | 2 | +| ACTIVITE.C_OPERA | ps_common.TransmittingBuoyOperation.code | +|:-----------------|:-----------------------------------------| +| 5 | 3 | +| 6 | 2 | +| 23 | 3 | +| 24 | 2 | +| 25 | 3 | +| 26 | 2 | +| 29 | 1 | +| 32 | 3 | +| 33 | 4 | +| 34 | 2 | +| 40 | 4 | +| 41 | 5 | Soit ```transmittingBuoyType``` (translation de **ACTIVITE.C_TYP_BALISE**) Voir mapping [REF_TRANSMITTING_BUOY](./referential.html#REF_TRANSMITTING_BUOY) +Soit ```transmittingBuoyOwnerShip``` (translation de **ACTIVITE.F_PROP_BALISE**) + +Voir mapping [REF_TRANSMITTING_BUOY_OWNER_SHIP](./referential.html#REF_TRANSMITTING_BUOY_OWNER_SHIP) + **Attention: cette règle n'est plus appliquée!** ** On remplace par 999 si non trouvé** @@ -264,7 +274,7 @@ return observedSystem.get(observedSystemCode); avec ```OBSERVED_SYSTEM_CODE_MAPPING``` | ACTIVITE.C_TYP_OBJET | ps_common.ObservedSystem.code | -| :--- | :--- | +|:---------------------|:------------------------------| | 1 | 20 | | 2 | 20 | | 3 | 20 | @@ -277,14 +287,14 @@ avec ```OBSERVED_SYSTEM_CODE_MAPPING``` ### Table ACT_ASSOC -|n° | nom | destination |note | -|:--- | :--- | :--- |:--- | -| ACT_ASSOC_01 | C_BAT | Activity_ObservedSystem.activity | [1](#n_1_1)| -| ACT_ASSOC_02 | D_DBQ | Activity_ObservedSystem.activity | [1](#n_1_1)| -| ACT_ASSOC_03 | D_ACT | Activity_ObservedSystem.activity | [1](#n_1_1)| -| ACT_ASSOC_04 | N_ACT | Activity_ObservedSystem.activity | [1](#n_1_1)| -| ACT_ASSOC_05 | N_ASSOC | Not used | | -| ACT_ASSOC_06 | C_ASSOC | Activity_ObservedSystem.ObservedSystem | [2](#n_1_2)| +| n° | nom | destination | note | +|:-------------|:--------|:---------------------------------------|:------------| +| ACT_ASSOC_01 | C_BAT | Activity_ObservedSystem.activity | [1](#n_1_1) | +| ACT_ASSOC_02 | D_DBQ | Activity_ObservedSystem.activity | [1](#n_1_1) | +| ACT_ASSOC_03 | D_ACT | Activity_ObservedSystem.activity | [1](#n_1_1) | +| ACT_ASSOC_04 | N_ACT | Activity_ObservedSystem.activity | [1](#n_1_1) | +| ACT_ASSOC_05 | N_ASSOC | Not used | | +| ACT_ASSOC_06 | C_ASSOC | Activity_ObservedSystem.ObservedSystem | [2](#n_1_2) | * Note 1 ### <a name="n_1_1"></a> @@ -296,16 +306,16 @@ Voir mapping [REF_OBSERVED_SYSTEM](./referential.html#REF_OBSERVED_SYSTEM) ### Table CAPT_ELEM -|n° | nom | destination |note | -|:--- | :--- | :--- |:--- | -| CAPT_ELEM_01 | C_BAT | Catch.activity | [1](#n_2_1)| -| CAPT_ELEM_02 | D_DBQ | Catch.activity | [1](#n_2_1)| -| CAPT_ELEM_03 | D_ACT | Catch.activity | [1](#n_2_1)| -| CAPT_ELEM_04 | N_ACT | Catch.activity | [1](#n_2_1)| -| CAPT_ELEM_05 | N_CAPT | Catch.homeId | | -| CAPT_ELEM_06 | C_ESP | Catch.species | [2](#n_2_2)| -| CAPT_ELEM_07 | C_CAT_T | Catch.weightCategory | [3](#n_2_3)| -| CAPT_ELEM_08 | V_POIDS_CAPT | Catch.weight | | +| n° | nom | destination | note | +|:-------------|:-------------|:---------------------|:------------| +| CAPT_ELEM_01 | C_BAT | Catch.activity | [1](#n_2_1) | +| CAPT_ELEM_02 | D_DBQ | Catch.activity | [1](#n_2_1) | +| CAPT_ELEM_03 | D_ACT | Catch.activity | [1](#n_2_1) | +| CAPT_ELEM_04 | N_ACT | Catch.activity | [1](#n_2_1) | +| CAPT_ELEM_05 | N_CAPT | Catch.homeId | | +| CAPT_ELEM_06 | C_ESP | Catch.species | [2](#n_2_2) | +| CAPT_ELEM_07 | C_CAT_T | Catch.weightCategory | [3](#n_2_3) | +| CAPT_ELEM_08 | V_POIDS_CAPT | Catch.weight | | * Note 1 ### <a name="n_2_1"></a> @@ -323,13 +333,13 @@ Voir mapping [REF_CATCH_WEIGHT_CATEGORY](./referential.html#REF_CATCH_WEIGHT_CAT Cette table représente la définition des cuves sur une marée et est déversée dans la table **WellPlan**. -|n° | nom | destination |note | -|:--- | :--- | :--- |:--- | -| CUVE_01 | C_BAT | WellPlan.trip | [1](#n_3_1)| -| CUVE_02 | D_DBQ | WellPlan.trip | [1](#n_3_1)| -| CUVE_03 | N_CUVE | WellPlan.well | [2](#n_3_2)| -| CUVE_04 | F_POS_CUVE | WellPlan.well | [2](#n_3_2)| -| CUVE_05 | C_DEST | WellPlan.wellSamplingConformity et wellSamplingStatus | [3](#n_3_3)| +| n° | nom | destination | note | +|:--------|:-----------|:------------------------------------------------------|:------------| +| CUVE_01 | C_BAT | WellPlan.trip | [1](#n_3_1) | +| CUVE_02 | D_DBQ | WellPlan.trip | [1](#n_3_1) | +| CUVE_03 | N_CUVE | WellPlan.well | [2](#n_3_2) | +| CUVE_04 | F_POS_CUVE | WellPlan.well | [2](#n_3_2) | +| CUVE_05 | C_DEST | WellPlan.wellSamplingConformity et wellSamplingStatus | [3](#n_3_3) | * Note 1 ### <a name="n_3_1"></a> @@ -353,19 +363,19 @@ Voir mapping [REF_WELL_SAMPLING_CONFORMITY](./referential.html#REF_WELL_SAMPLING Cette table définit le plan de cuve et est déversée dans la table **WellPlan**. -|n° | nom | destination |note | -|:--- | :--- | :--- |:--- | -| CUVE_CALEE_01 | C_BAT | WellPlan.topiaId | [1](#n_4_1)| -| CUVE_CALEE_02 | D_DBQ | WellPlan.topiaId | [1](#n_4_1)| -| CUVE_CALEE_03 | N_CUVE | WellPlan.topiaId | [1](#n_4_1)| -| CUVE_CALEE_04 | F_POS_CUVE | WellPlan.topiaId | [1](#n_4_1)| -| CUVE_CALEE_05 | N_CALESP | ??? | | -| CUVE_CALEE_06 | D_ACT | Activity.topiaId | [2](#n_4_2)| -| CUVE_CALEE_07 | N_ACT | Activity.topiaId | [2](#n_4_2)| -| CUVE_CALEE_08 | C_ESP | WellPlan.species | [3](#n_4_3)| -| CUVE_CALEE_09 | C_CAT_POIDS | WellPlan.weightCategory | [4](#n_4_4)| -| CUVE_CALEE_10 | V_POIDS | WellPlan.weight | | -| CUVE_CALEE_11 | V_NB | Not Used | | +| n° | nom | destination | note | +|:--------------|:------------|:------------------------|:------------| +| CUVE_CALEE_01 | C_BAT | WellPlan.topiaId | [1](#n_4_1) | +| CUVE_CALEE_02 | D_DBQ | WellPlan.topiaId | [1](#n_4_1) | +| CUVE_CALEE_03 | N_CUVE | WellPlan.topiaId | [1](#n_4_1) | +| CUVE_CALEE_04 | F_POS_CUVE | WellPlan.topiaId | [1](#n_4_1) | +| CUVE_CALEE_05 | N_CALESP | ??? | | +| CUVE_CALEE_06 | D_ACT | Activity.topiaId | [2](#n_4_2) | +| CUVE_CALEE_07 | N_ACT | Activity.topiaId | [2](#n_4_2) | +| CUVE_CALEE_08 | C_ESP | WellPlan.species | [3](#n_4_3) | +| CUVE_CALEE_09 | C_CAT_POIDS | WellPlan.weightCategory | [4](#n_4_4) | +| CUVE_CALEE_10 | V_POIDS | WellPlan.weight | | +| CUVE_CALEE_11 | V_NB | Not Used | | * Note 1 ### <a name="n_4_1"></a> ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -167,39 +167,51 @@ Mapping TransmittingBuoy Pour transposer certains codes **TYPE_BALISE.C_TYP_BALISE** en code **ps_common.TransmittingBuoy.code**, les autres codes sont ceux d'ObServe. -| **TYPE_BALISE.C_TYP_BALISE** | **ps_common.ObservedSystem.code** | -|:-----------------------------|:----------------------------------| -| 11 | 90 | -| 12 | 21 | -| 13 | 22 | -| 14 | 23 | -| 15 | 24 | -| 16 | 25 | -| 17 | 26 | -| 18 | 27 | -| 19 | 28 | -| 20 | 41 | -| 21 | 42 | -| 22 | 43 | -| 23 | 44 | -| 24 | 45 | -| 25 | 46 | -| 26 | 47 | -| 27 | 100 | -| 28 | 61 | -| 29 | 62 | -| 30 | 63 | -| 31 | 64 | -| 32 | 65 | -| 33 | 66 | -| 34 | 67 | -| 35 | 68 | -| 36 | 69 | -| 37 | 70 | -| 38 | 71 | -| 39 | 3 | -| 40 | 91 | -| 98 | 99 | +| **TYPE_BALISE.C_TYP_BALISE** | **ps_common.TransmittingBuoyType.code** | +|:-----------------------------|:-----------------------------------------| +| 11 | 90 | +| 12 | 21 | +| 13 | 22 | +| 14 | 23 | +| 15 | 24 | +| 16 | 25 | +| 17 | 26 | +| 18 | 27 | +| 19 | 28 | +| 20 | 41 | +| 21 | 42 | +| 22 | 43 | +| 23 | 44 | +| 24 | 45 | +| 25 | 46 | +| 26 | 47 | +| 27 | 100 | +| 28 | 61 | +| 29 | 62 | +| 30 | 63 | +| 31 | 64 | +| 32 | 65 | +| 33 | 66 | +| 34 | 67 | +| 35 | 68 | +| 36 | 69 | +| 37 | 70 | +| 38 | 71 | +| 39 | 3 | +| 40 | 91 | +| 98 | 99 | + + +### REF_TRANSMITTING_BUOY_OWNER_SHIP + +Mapping TransmittingBuoyOwnerShip + +Pour transposer certains codes **ACTIVITE.F_PROP_BALISE** en code **ps_common.TransmittingBuoyOwnerShip.code**. + +| **ACTIVITE.F_PROP_BALISE** | **ps_common.TransmittingBuoyOwnerShip.code** | +|:---------------------------|:---------------------------------------------| +| 1 | 0 | +| 2 | 3 | ### REF_VESSEL_ACTIVITY_TYPE @@ -226,6 +238,8 @@ Mapping type d'activité | 32 | 13 (2) | | 33 | 13 (2) | | 34 | 13 (2) | +| 40 | 13 (2) | +| 41 | 13 (2) | | 7 | 22 | | 8 | 10 | | 9 | 23 | View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/57c96effa36303db3e54949ace... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/57c96effa36303db3e54949ace... You're receiving this email because of your account on gitlab.com.