Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
279bbfa9
by Tony Chemit at 2022-10-05T18:53:32+02:00
-
d3e701ad
by Tony Chemit at 2022-10-06T10:40:01+02:00
-
73d58173
by Tony Chemit at 2022-10-06T10:41:19+02:00
-
29da365c
by Tony Chemit at 2022-10-06T10:41:19+02:00
-
4d26083f
by Tony Chemit at 2022-10-06T11:12:45+02:00
-
10885143
by Tony Chemit at 2022-10-06T11:32:17+02:00
-
4526b9cf
by Tony Chemit at 2022-10-06T11:33:07+02:00
8 changed files:
- core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/ObservedSystemInterceptor.java
- core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/TransmittingBuoyTypeInterceptor.java
- core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java
- + core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_74-common.sql
- + core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_81-common.sql
- core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties
- model/src/main/resources/fixtures/global.properties
- src/site/markdown/avdth/referential.md
Changes:
| ... | ... | @@ -58,58 +58,24 @@ public class ObservedSystemInterceptor extends ReferentialInterceptor<ObservedSy |
| 58 | 58 | * From avdth code to observe code.
|
| 59 | 59 | */
|
| 60 | 60 | public static final Map<String, String> CODE_MAPPING = ImmutableMap.<String, String>builder()
|
| 61 | - .put("0", "0")
|
|
| 62 | 61 | .put("10", "18")
|
| 63 | 62 | .put("11", "23")
|
| 64 | 63 | .put("12", "24")
|
| 65 | 64 | .put("13", "25")
|
| 66 | 65 | .put("14", "26")
|
| 67 | - .put("20", "20")
|
|
| 68 | 66 | .put("21", "20")
|
| 69 | 67 | .put("22", "20")
|
| 70 | 68 | .put("23", "20")
|
| 71 | 69 | .put("24", "20")
|
| 72 | 70 | .put("25", "20")
|
| 73 | 71 | .put("26", "17")
|
| 74 | - .put("27", "27")
|
|
| 75 | - .put("28", "28")
|
|
| 76 | 72 | .put("29", "31")
|
| 77 | 73 | .put("30", "4")
|
| 78 | 74 | .put("31", "4")
|
| 79 | - .put("32", "32")
|
|
| 80 | - .put("33", "33")
|
|
| 81 | - .put("34", "34")
|
|
| 82 | - .put("35", "35")
|
|
| 83 | - .put("36", "36")
|
|
| 84 | - .put("37", "37")
|
|
| 85 | - .put("38", "38")
|
|
| 86 | - .put("40", "40")
|
|
| 87 | - .put("41", "41")
|
|
| 88 | - .put("42", "42")
|
|
| 89 | - .put("43", "43")
|
|
| 90 | - .put("50", "50")
|
|
| 91 | 75 | .put("51", "11")
|
| 92 | 76 | .put("52", "10")
|
| 93 | - .put("53", "53")
|
|
| 94 | 77 | .put("60", "12")
|
| 95 | 78 | .put("61", "13")
|
| 96 | - .put("62", "62")
|
|
| 97 | - .put("70", "70")
|
|
| 98 | - .put("71", "71")
|
|
| 99 | - .put("72", "72")
|
|
| 100 | - .put("73", "73")
|
|
| 101 | - .put("80", "80")
|
|
| 102 | - .put("81", "7")
|
|
| 103 | - .put("90", "90")
|
|
| 104 | - .put("91", "91")
|
|
| 105 | - .put("92", "92")
|
|
| 106 | - .put("93", "93")
|
|
| 107 | - .put("94", "94")
|
|
| 108 | - .put("95", "95")
|
|
| 109 | - .put("96", "96")
|
|
| 110 | - .put("97", "97")
|
|
| 111 | - .put("98", "98")
|
|
| 112 | - .put("99", "99")
|
|
| 113 | 79 | .build();
|
| 114 | 80 | /**
|
| 115 | 81 | * Internal cache of created entities, keep it static to reuse if for more than one import...
|
| ... | ... | @@ -170,7 +136,7 @@ public class ObservedSystemInterceptor extends ReferentialInterceptor<ObservedSy |
| 170 | 136 | |
| 171 | 137 | @Override
|
| 172 | 138 | protected ObservedSystem read(Map<String, ObservedSystem> existingIndex, String code) {
|
| 173 | - String realCode = CODE_MAPPING.get(code);
|
|
| 139 | + String realCode = CODE_MAPPING.getOrDefault(code, code);
|
|
| 174 | 140 | ObservedSystem entity = super.read(existingIndex, realCode);
|
| 175 | 141 | entity.setCode(code);
|
| 176 | 142 | return entity;
|
| ... | ... | @@ -41,7 +41,6 @@ import java.sql.ResultSet; |
| 41 | 41 | import java.sql.SQLException;
|
| 42 | 42 | import java.util.List;
|
| 43 | 43 | import java.util.Map;
|
| 44 | -import java.util.Objects;
|
|
| 45 | 44 | |
| 46 | 45 | /**
|
| 47 | 46 | * Created on 22/05/2021.
|
| ... | ... | @@ -54,16 +53,6 @@ public class TransmittingBuoyTypeInterceptor extends ReferentialInterceptor<Tran |
| 54 | 53 | * From avdth to observe code.
|
| 55 | 54 | */
|
| 56 | 55 | public static final Map<String, String> CODE_MAPPING = ImmutableMap.<String, String>builder()
|
| 57 | - .put("1", "1")
|
|
| 58 | - .put("2", "2")
|
|
| 59 | - .put("3", "3")
|
|
| 60 | - .put("4", "4")
|
|
| 61 | - .put("5", "5")
|
|
| 62 | - .put("6", "6")
|
|
| 63 | - .put("7", "7")
|
|
| 64 | - .put("8", "8")
|
|
| 65 | - .put("9", "9")
|
|
| 66 | - .put("10", "10")
|
|
| 67 | 56 | .put("11", "90")
|
| 68 | 57 | .put("12", "21")
|
| 69 | 58 | .put("13", "22")
|
| ... | ... | @@ -94,10 +83,7 @@ public class TransmittingBuoyTypeInterceptor extends ReferentialInterceptor<Tran |
| 94 | 83 | .put("38", "71")
|
| 95 | 84 | .put("39", "3")
|
| 96 | 85 | .put("40", "91")
|
| 97 | - .put("91", "91")
|
|
| 98 | 86 | .put("98", "99")
|
| 99 | - .put("99", "99")
|
|
| 100 | - .put("999", "999")
|
|
| 101 | 87 | .build();
|
| 102 | 88 | |
| 103 | 89 | @SuppressWarnings("SpellCheckingInspection")
|
| ... | ... | @@ -113,6 +99,7 @@ public class TransmittingBuoyTypeInterceptor extends ReferentialInterceptor<Tran |
| 113 | 99 | */
|
| 114 | 100 | public TransmittingBuoyTypeTable() {
|
| 115 | 101 | super(1);
|
| 102 | + |
|
| 116 | 103 | }
|
| 117 | 104 | |
| 118 | 105 | @Override
|
| ... | ... | @@ -152,8 +139,8 @@ public class TransmittingBuoyTypeInterceptor extends ReferentialInterceptor<Tran |
| 152 | 139 | |
| 153 | 140 | @Override
|
| 154 | 141 | protected TransmittingBuoyType read(Map<String, TransmittingBuoyType> existingIndex, String code) {
|
| 155 | - String realCode = CODE_MAPPING.get(code);
|
|
| 156 | - TransmittingBuoyType entity = super.read(existingIndex, Objects.requireNonNull(realCode));
|
|
| 142 | + String realCode = CODE_MAPPING.getOrDefault(code, code);
|
|
| 143 | + TransmittingBuoyType entity = super.read(existingIndex, realCode);
|
|
| 157 | 144 | entity.setCode(code);
|
| 158 | 145 | return entity;
|
| 159 | 146 | }
|
| ... | ... | @@ -215,7 +215,7 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe |
| 215 | 215 | private void addObservedSystem(MigrationVersionResourceExecutor executor) {
|
| 216 | 216 | Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT CODE FROM ps_common.ObservedSystem", resultSet -> resultSet.getString(1)));
|
| 217 | 217 | Set<String> newCodes = new LinkedHashSet<>();
|
| 218 | - Stream.of("110").forEach(code -> {
|
|
| 218 | + Stream.of("74", "81", "110").forEach(code -> {
|
|
| 219 | 219 | if (!existingCodes.contains(code)) {
|
| 220 | 220 | executor.addScript("96", "add_referential_ps_common_ObservedSystem_" + code);
|
| 221 | 221 | newCodes.add(code);
|
| 1 | +---
|
|
| 2 | +-- #%L
|
|
| 3 | +-- ObServe Core :: Persistence :: Resources
|
|
| 4 | +-- %%
|
|
| 5 | +-- Copyright (C) 2008 - 2022 IRD, Ultreia.io
|
|
| 6 | +-- %%
|
|
| 7 | +-- This program is free software: you can redistribute it and/or modify
|
|
| 8 | +-- it under the terms of the GNU General Public License as
|
|
| 9 | +-- published by the Free Software Foundation, either version 3 of the
|
|
| 10 | +-- License, or (at your option) any later version.
|
|
| 11 | +--
|
|
| 12 | +-- This program is distributed in the hope that it will be useful,
|
|
| 13 | +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
| 14 | +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
| 15 | +-- GNU General Public License for more details.
|
|
| 16 | +--
|
|
| 17 | +-- You should have received a copy of the GNU General Public
|
|
| 18 | +-- License along with this program. If not, see
|
|
| 19 | +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
|
|
| 20 | +-- #L%
|
|
| 21 | +---
|
|
| 22 | +INSERT INTO ps_common.observedsystem(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, schooltype, allowobservation, allowlogbook) VALUES ('fr.ird.referential.ps.common.ObservedSystem#${REFERENTIAL_PREFIX}74', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '74', null, null, FALSE, 1, 'Billfish', 'Poisson à rostre', 'Billfish TODO', null, null, null, null, null, '${SchoolType_2}', FALSE, TRUE); |
| 1 | +---
|
|
| 2 | +-- #%L
|
|
| 3 | +-- ObServe Core :: Persistence :: Resources
|
|
| 4 | +-- %%
|
|
| 5 | +-- Copyright (C) 2008 - 2022 IRD, Ultreia.io
|
|
| 6 | +-- %%
|
|
| 7 | +-- This program is free software: you can redistribute it and/or modify
|
|
| 8 | +-- it under the terms of the GNU General Public License as
|
|
| 9 | +-- published by the Free Software Foundation, either version 3 of the
|
|
| 10 | +-- License, or (at your option) any later version.
|
|
| 11 | +--
|
|
| 12 | +-- This program is distributed in the hope that it will be useful,
|
|
| 13 | +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
| 14 | +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
| 15 | +-- GNU General Public License for more details.
|
|
| 16 | +--
|
|
| 17 | +-- You should have received a copy of the GNU General Public
|
|
| 18 | +-- License along with this program. If not, see
|
|
| 19 | +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
|
|
| 20 | +-- #L%
|
|
| 21 | +---
|
|
| 22 | +INSERT INTO ps_common.observedsystem(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, schooltype, allowobservation, allowlogbook) VALUES ('fr.ird.referential.ps.common.ObservedSystem#${REFERENTIAL_PREFIX}81', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '81', null, null, FALSE, 1, 'Carrion', 'Charogne', 'Carrion TODO', null, null, null, null, null, '${SchoolType_0}', FALSE, TRUE); |
| ... | ... | @@ -79,7 +79,7 @@ ps_common.acquisitionStatus=9 |
| 79 | 79 | ps_common.objectMaterial=91
|
| 80 | 80 | ps_common.objectMaterialType=5
|
| 81 | 81 | ps_common.objectOperation=12
|
| 82 | -ps_common.observedSystem=64
|
|
| 82 | +ps_common.observedSystem=66
|
|
| 83 | 83 | ps_common.program=17
|
| 84 | 84 | ps_common.reasonForNoFishing=16
|
| 85 | 85 | ps_common.reasonForNullSet=10
|
| ... | ... | @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=66 |
| 25 | 25 | ENTITIES_LIMIT_SIZE=100
|
| 26 | 26 | # fr.ird.observe.services.service.referential.ReferentialService
|
| 27 | 27 | # fr.ird.observe.services.local.service.referential.DifferentialModelTest
|
| 28 | -REFERENTIAL_COUNT=4090 |
|
| 28 | +REFERENTIAL_COUNT=4092 |
| ... | ... | @@ -12,11 +12,11 @@ Dans **ObServe**, cela est remplacé par un identifiant de type chaine de caract |
| 12 | 12 | |
| 13 | 13 | Le mapping sur la position est réalisé ainsi :
|
| 14 | 14 | |
| 15 | -|**Position dans AVDTH**| **Position dans ObServe**|
|
|
| 16 | -|:--- | :--- |
|
|
| 17 | -|1 | B |
|
|
| 18 | -|2 | T |
|
|
| 19 | -|3 | A |
|
|
| 15 | +| **Position dans AVDTH** | **Position dans ObServe** |
|
|
| 16 | +|:------------------------|:--------------------------|
|
|
| 17 | +| 1 | B |
|
|
| 18 | +| 2 | T |
|
|
| 19 | +| 3 | A |
|
|
| 20 | 20 | |
| 21 | 21 | ### REF_SPECIES
|
| 22 | 22 | |
| ... | ... | @@ -24,107 +24,107 @@ Mapping espèce |
| 24 | 24 | |
| 25 | 25 | On transpose les codes espèce AVDTH (**ESPECE.C_ESP**) en **Species.faoCode**
|
| 26 | 26 | |
| 27 | -| **ESPECE.C_ESP** | **Species.faoCode** | note |
|
|
| 28 | -|:-----------------|:--------------------|:----------------------|
|
|
| 29 | -| 8 | TUN | |
|
|
| 30 | -| 9 | TUN | |
|
|
| 31 | -| 34 | BUM | |
|
|
| 32 | -| 40 | TUS | |
|
|
| 33 | -| 43 | LTA | //FIXME Should be RAV |
|
|
| 34 | -| 99 | XXX* | |
|
|
| 35 | -| 701 | PIL | |
|
|
| 36 | -| 702 | CLP | |
|
|
| 37 | -| 703 | JAX | |
|
|
| 38 | -| 704 | PAX | |
|
|
| 39 | -| 705 | ANE | |
|
|
| 40 | -| 706 | CLP | |
|
|
| 41 | -| 707 | BOG | |
|
|
| 42 | -| 708 | CLP | |
|
|
| 43 | -| 709 | MZZ | |
|
|
| 44 | -| 801 | YFT | |
|
|
| 45 | -| 802 | SKJ | |
|
|
| 46 | -| 803 | BET | |
|
|
| 47 | -| 804 | ALB | |
|
|
| 48 | -| 805 | LTA | |
|
|
| 49 | -| 806 | FRI | |
|
|
| 50 | -| 807 | SKH | |
|
|
| 51 | -| 809 | TUN | |
|
|
| 52 | -| 810 | KAW | |
|
|
| 53 | -| 811 | LOT | |
|
|
| 54 | -| 843 | LTA | |
|
|
| 55 | -| 899 | XXX* | |
|
|
| 27 | +| **ESPECE.C_ESP** | **Species.faoCode** |
|
|
| 28 | +|:-----------------|:--------------------|
|
|
| 29 | +| 8 | TUN |
|
|
| 30 | +| 9 | TUN |
|
|
| 31 | +| 34 | BUM |
|
|
| 32 | +| 40 | TUS |
|
|
| 33 | +| 43 | RVA* |
|
|
| 34 | +| 99 | XXX* |
|
|
| 35 | +| 701 | PIL |
|
|
| 36 | +| 702 | CLP |
|
|
| 37 | +| 703 | JAX |
|
|
| 38 | +| 704 | PAX |
|
|
| 39 | +| 705 | ANE |
|
|
| 40 | +| 706 | CLP |
|
|
| 41 | +| 707 | BOG |
|
|
| 42 | +| 708 | CLP |
|
|
| 43 | +| 709 | MZZ |
|
|
| 44 | +| 801 | YFT |
|
|
| 45 | +| 802 | SKJ |
|
|
| 46 | +| 803 | BET |
|
|
| 47 | +| 804 | ALB |
|
|
| 48 | +| 805 | LTA |
|
|
| 49 | +| 806 | FRI |
|
|
| 50 | +| 807 | SKH |
|
|
| 51 | +| 809 | TUN |
|
|
| 52 | +| 810 | KAW |
|
|
| 53 | +| 811 | LOT |
|
|
| 54 | +| 843 | RAV* |
|
|
| 55 | +| 899 | XXX* |
|
|
| 56 | 56 | |
| 57 | 57 | ### REF_SPECIES_2 (pour les catégories de poids)
|
| 58 | 58 | |
| 59 | 59 | Pour calculer les différentes catégories de poids, on effectue une translation
|
| 60 | 60 | sur les codes espèces AVDTH
|
| 61 | 61 | |
| 62 | -|**ESPECE.C_ESP**| **ESPECE.C_ESP**| note |
|
|
| 63 | -|:--- | :--- | :--- |
|
|
| 64 | -| 8 | 41 | |
|
|
| 65 | -| 9 | 41 | |
|
|
| 66 | -| 16 | 310 | //FIXME add BIP Bonito oriental |
|
|
| 67 | -| 19 | 23 | //FIXME add BOP Palomette |
|
|
| 68 | -| 21 | 23 | //FIXME add SSM Thazard atlantique, Maquereau espagnol |
|
|
| 69 | -| 22 | 23 | //FIXME add KGM Thazard serra |
|
|
| 70 | -| 24 | 23 | //FIXME add CER Thazard franc |
|
|
| 71 | -| 25 | 23 | //FIXME add COM Thazard rayé (Indo-Pacifique) |
|
|
| 72 | -| 34 | 23 | //FIXME add BLZ Makaire bleu Indo-Pacifique |
|
|
| 73 | -| 40 | 23 | //FIXME add BGT Grand thonidés |
|
|
| 74 | -| 43 | 5 | // FIXME add RAV |
|
|
| 75 | -| 99 | 41 | |
|
|
| 76 | -| 701 | 41 | //FIXME Add Appat species ? |
|
|
| 77 | -| 702 | 41 | //FIXME Add Appat species ? |
|
|
| 78 | -| 703 | 41 | //FIXME Add Appat species ? |
|
|
| 79 | -| 704 | 41 | //FIXME Add Appat species ? |
|
|
| 80 | -| 705 | 41 | //FIXME Add Appat species ? |
|
|
| 81 | -| 706 | 5 | //FIXME Add Appat species ? |
|
|
| 82 | -| 707 | 41 | //FIXME Add Appat species ? |
|
|
| 83 | -| 708 | 41 | //FIXME Add Appat species ? |
|
|
| 84 | -| 709 | 41 | //FIXME Add Appat species ? |
|
|
| 85 | -| 801 | 1 | |
|
|
| 86 | -| 802 | 2 | |
|
|
| 87 | -| 803 | 3 | |
|
|
| 88 | -| 804 | 4 | |
|
|
| 89 | -| 805 | 5 | |
|
|
| 90 | -| 806 | 6 | |
|
|
| 91 | -| 809 | 41 | |
|
|
| 92 | -| 807 | 7 | |
|
|
| 93 | -| 810 | 10 | |
|
|
| 94 | -| 811 | 11 | |
|
|
| 95 | -| 817 | 17 | |
|
|
| 96 | -| 818 | 18 | |
|
|
| 97 | -| 820 | 20 | |
|
|
| 98 | -| 829 | 29 | |
|
|
| 99 | -| 830 | 30 | |
|
|
| 100 | -| 831 | 31 | |
|
|
| 101 | -| 832 | 32 | |
|
|
| 102 | -| 833 | 33 | |
|
|
| 103 | -| 834 | 34 | |
|
|
| 104 | -| 835 | 35 | |
|
|
| 105 | -| 836 | 36 | |
|
|
| 106 | -| 837 | 37 | |
|
|
| 107 | -| 838 | 38 | |
|
|
| 108 | -| 839 | 39 | |
|
|
| 109 | -| 843 | 5 | |
|
|
| 110 | -| 844 | 44 | |
|
|
| 111 | -| 845 | 45 | |
|
|
| 112 | -| 846 | 46 | |
|
|
| 113 | -| 847 | 47 | |
|
|
| 114 | -| 848 | 48 | |
|
|
| 115 | -| 849 | 49 | |
|
|
| 116 | -| 850 | 50 | |
|
|
| 117 | -| 851 | 51 | |
|
|
| 118 | -| 852 | 52 | |
|
|
| 119 | -| 853 | 53 | |
|
|
| 120 | -| 854 | 54 | |
|
|
| 121 | -| 855 | 55 | |
|
|
| 122 | -| 856 | 56 | |
|
|
| 123 | -| 857 | 57 | |
|
|
| 124 | -| 858 | 58 | |
|
|
| 125 | -| 899 | 41 | |
|
|
| 126 | -| 1042 | 41 | //FIXME Remove this ACC Grémille |
|
|
| 127 | -| 7066 | 312 | |
|
|
| 62 | +| **ESPECE.C_ESP** | **ESPECE.C_ESP** | note |
|
|
| 63 | +|:-----------------|:-----------------|:---------------------------------------------------------|
|
|
| 64 | +| 8 | 41 | |
|
|
| 65 | +| 9 | 41 | |
|
|
| 66 | +| 16 | 310 | //FIXME add BIP Bonito oriental |
|
|
| 67 | +| 19 | 23 | //FIXME add BOP Palomette |
|
|
| 68 | +| 21 | 23 | //FIXME add SSM Thazard atlantique, Maquereau espagnol |
|
|
| 69 | +| 22 | 23 | //FIXME add KGM Thazard serra |
|
|
| 70 | +| 24 | 23 | //FIXME add CER Thazard franc |
|
|
| 71 | +| 25 | 23 | //FIXME add COM Thazard rayé (Indo-Pacifique) |
|
|
| 72 | +| 34 | 23 | //FIXME add BLZ Makaire bleu Indo-Pacifique |
|
|
| 73 | +| 40 | 23 | //FIXME add BGT Grand thonidés |
|
|
| 74 | +| 43 | 5 | // FIXME add RAV |
|
|
| 75 | +| 99 | 41 | |
|
|
| 76 | +| 701 | 41 | //FIXME Add Appat species ? |
|
|
| 77 | +| 702 | 41 | //FIXME Add Appat species ? |
|
|
| 78 | +| 703 | 41 | //FIXME Add Appat species ? |
|
|
| 79 | +| 704 | 41 | //FIXME Add Appat species ? |
|
|
| 80 | +| 705 | 41 | //FIXME Add Appat species ? |
|
|
| 81 | +| 706 | 5 | //FIXME Add Appat species ? |
|
|
| 82 | +| 707 | 41 | //FIXME Add Appat species ? |
|
|
| 83 | +| 708 | 41 | //FIXME Add Appat species ? |
|
|
| 84 | +| 709 | 41 | //FIXME Add Appat species ? |
|
|
| 85 | +| 801 | 1 | |
|
|
| 86 | +| 802 | 2 | |
|
|
| 87 | +| 803 | 3 | |
|
|
| 88 | +| 804 | 4 | |
|
|
| 89 | +| 805 | 5 | |
|
|
| 90 | +| 806 | 6 | |
|
|
| 91 | +| 809 | 41 | |
|
|
| 92 | +| 807 | 7 | |
|
|
| 93 | +| 810 | 10 | |
|
|
| 94 | +| 811 | 11 | |
|
|
| 95 | +| 817 | 17 | |
|
|
| 96 | +| 818 | 18 | |
|
|
| 97 | +| 820 | 20 | |
|
|
| 98 | +| 829 | 29 | |
|
|
| 99 | +| 830 | 30 | |
|
|
| 100 | +| 831 | 31 | |
|
|
| 101 | +| 832 | 32 | |
|
|
| 102 | +| 833 | 33 | |
|
|
| 103 | +| 834 | 34 | |
|
|
| 104 | +| 835 | 35 | |
|
|
| 105 | +| 836 | 36 | |
|
|
| 106 | +| 837 | 37 | |
|
|
| 107 | +| 838 | 38 | |
|
|
| 108 | +| 839 | 39 | |
|
|
| 109 | +| 843 | 5 | |
|
|
| 110 | +| 844 | 44 | |
|
|
| 111 | +| 845 | 45 | |
|
|
| 112 | +| 846 | 46 | |
|
|
| 113 | +| 847 | 47 | |
|
|
| 114 | +| 848 | 48 | |
|
|
| 115 | +| 849 | 49 | |
|
|
| 116 | +| 850 | 50 | |
|
|
| 117 | +| 851 | 51 | |
|
|
| 118 | +| 852 | 52 | |
|
|
| 119 | +| 853 | 53 | |
|
|
| 120 | +| 854 | 54 | |
|
|
| 121 | +| 855 | 55 | |
|
|
| 122 | +| 856 | 56 | |
|
|
| 123 | +| 857 | 57 | |
|
|
| 124 | +| 858 | 58 | |
|
|
| 125 | +| 899 | 41 | |
|
|
| 126 | +| 1042 | 41 | //FIXME Remove this ACC Grémille |
|
|
| 127 | +| 7066 | 312 | |
|
|
| 128 | 128 | |
| 129 | 129 | ### REF_SIZE_MEASURE_TYPE
|
| 130 | 130 | |
| ... | ... | @@ -138,45 +138,106 @@ Mapping type de mesure de taille |
| 138 | 138 | |
| 139 | 139 | Mapping systèmes observés
|
| 140 | 140 | |
| 141 | -TODO
|
|
| 141 | +Pour transposer certains codes **ACT_ASSOC.C_ASSOC** en code **ps_common.ObservedSystem.code**, les autres codes sont ceux d'ObServe.
|
|
| 142 | + |
|
| 143 | +| **ACT_ASSOC.C_ASSOC** | **ps_common.ObservedSystem.code** |
|
|
| 144 | +|:----------------------|:----------------------------------|
|
|
| 145 | +| 10 | 18 |
|
|
| 146 | +| 11 | 23 |
|
|
| 147 | +| 12 | 24 |
|
|
| 148 | +| 13 | 25 |
|
|
| 149 | +| 14 | 26 |
|
|
| 150 | +| 21 | 20 |
|
|
| 151 | +| 22 | 20 |
|
|
| 152 | +| 23 | 20 |
|
|
| 153 | +| 24 | 20 |
|
|
| 154 | +| 25 | 20 |
|
|
| 155 | +| 26 | 17 |
|
|
| 156 | +| 29 | 31 |
|
|
| 157 | +| 30 | 4 |
|
|
| 158 | +| 31 | 4 |
|
|
| 159 | +| 51 | 11 |
|
|
| 160 | +| 52 | 10 |
|
|
| 161 | +| 60 | 12 |
|
|
| 162 | +| 61 | 13 |
|
|
| 163 | + |
|
| 164 | +### REF_TRANSMITTING_BUOY
|
|
| 165 | + |
|
| 166 | +Mapping TransmittingBuoy
|
|
| 167 | + |
|
| 168 | +Pour transposer certains codes **TYPE_BALISE.C_TYP_BALISE** en code **ps_common.TransmittingBuoy.code**, les autres codes sont ceux d'ObServe.
|
|
| 169 | + |
|
| 170 | +| **TYPE_BALISE.C_TYP_BALISE** | **ps_common.ObservedSystem.code** |
|
|
| 171 | +|:-----------------------------|:----------------------------------|
|
|
| 172 | +| 11 | 90 |
|
|
| 173 | +| 12 | 21 |
|
|
| 174 | +| 13 | 22 |
|
|
| 175 | +| 14 | 23 |
|
|
| 176 | +| 15 | 24 |
|
|
| 177 | +| 16 | 25 |
|
|
| 178 | +| 17 | 26 |
|
|
| 179 | +| 18 | 27 |
|
|
| 180 | +| 19 | 28 |
|
|
| 181 | +| 20 | 41 |
|
|
| 182 | +| 21 | 42 |
|
|
| 183 | +| 22 | 43 |
|
|
| 184 | +| 23 | 44 |
|
|
| 185 | +| 24 | 45 |
|
|
| 186 | +| 25 | 46 |
|
|
| 187 | +| 26 | 47 |
|
|
| 188 | +| 27 | 100 |
|
|
| 189 | +| 28 | 61 |
|
|
| 190 | +| 29 | 62 |
|
|
| 191 | +| 30 | 63 |
|
|
| 192 | +| 31 | 64 |
|
|
| 193 | +| 32 | 65 |
|
|
| 194 | +| 33 | 66 |
|
|
| 195 | +| 34 | 67 |
|
|
| 196 | +| 35 | 68 |
|
|
| 197 | +| 36 | 69 |
|
|
| 198 | +| 37 | 70 |
|
|
| 199 | +| 38 | 71 |
|
|
| 200 | +| 39 | 3 |
|
|
| 201 | +| 40 | 91 |
|
|
| 202 | +| 98 | 99 |
|
|
| 142 | 203 | |
| 143 | 204 | ### REF_VESSEL_ACTIVITY_TYPE
|
| 144 | 205 | |
| 145 | 206 | Mapping type d'activité
|
| 146 | 207 | |
| 147 | -|**ACTIVITY.C_OPERA**| **ps_common.VesselActivity.code** |
|
|
| 148 | -|:--- |:----------------------------------|
|
|
| 149 | -| 0 | 6 (1) |
|
|
| 150 | -| 1 | 6 (1) |
|
|
| 151 | -| 2 | 6 (1) |
|
|
| 152 | -| 14 | 6 (1) (3) |
|
|
| 153 | -| 3 | 2 |
|
|
| 154 | -| 4 | 1 |
|
|
| 155 | -| 5 | 13 (2) |
|
|
| 156 | -| 6 | 13 (2) |
|
|
| 157 | -| 22 | 13 (2) |
|
|
| 158 | -| 23 | 13 (2) |
|
|
| 159 | -| 24 | 13 (2) |
|
|
| 160 | -| 25 | 13 (2) |
|
|
| 161 | -| 26 | 13 (2) |
|
|
| 162 | -| 29 | 13 (2) |
|
|
| 163 | -| 30 | 13 (2) |
|
|
| 164 | -| 31 | 13 (2) |
|
|
| 165 | -| 32 | 13 (2) |
|
|
| 166 | -| 33 | 13 (2) |
|
|
| 167 | -| 34 | 13 (2) |
|
|
| 168 | -| 7 | 22 |
|
|
| 169 | -| 8 | 10 |
|
|
| 170 | -| 9 | 23 |
|
|
| 171 | -| 10 | 24 |
|
|
| 172 | -| 11 | 25 |
|
|
| 173 | -| 12 | 26 |
|
|
| 174 | -| 13 | 27 |
|
|
| 175 | -| 15 | 0 |
|
|
| 176 | -| 19 | 29 |
|
|
| 177 | -| 20 | 30 |
|
|
| 178 | -| 35 | 31 |
|
|
| 179 | -| 36 | 99 **FIXME** |
|
|
| 208 | +| **ACTIVITY.C_OPERA** | **ps_common.VesselActivity.code** |
|
|
| 209 | +|:---------------------|:----------------------------------|
|
|
| 210 | +| 0 | 6 (1) |
|
|
| 211 | +| 1 | 6 (1) |
|
|
| 212 | +| 2 | 6 (1) |
|
|
| 213 | +| 14 | 6 (1) (3) |
|
|
| 214 | +| 3 | 2 |
|
|
| 215 | +| 4 | 1 |
|
|
| 216 | +| 5 | 13 (2) |
|
|
| 217 | +| 6 | 13 (2) |
|
|
| 218 | +| 22 | 13 (2) |
|
|
| 219 | +| 23 | 13 (2) |
|
|
| 220 | +| 24 | 13 (2) |
|
|
| 221 | +| 25 | 13 (2) |
|
|
| 222 | +| 26 | 13 (2) |
|
|
| 223 | +| 29 | 13 (2) |
|
|
| 224 | +| 30 | 13 (2) |
|
|
| 225 | +| 31 | 13 (2) |
|
|
| 226 | +| 32 | 13 (2) |
|
|
| 227 | +| 33 | 13 (2) |
|
|
| 228 | +| 34 | 13 (2) |
|
|
| 229 | +| 7 | 22 |
|
|
| 230 | +| 8 | 10 |
|
|
| 231 | +| 9 | 23 |
|
|
| 232 | +| 10 | 24 |
|
|
| 233 | +| 11 | 25 |
|
|
| 234 | +| 12 | 26 |
|
|
| 235 | +| 13 | 27 |
|
|
| 236 | +| 15 | 0 |
|
|
| 237 | +| 19 | 29 |
|
|
| 238 | +| 20 | 30 |
|
|
| 239 | +| 35 | 31 |
|
|
| 240 | +| 36 | 99 **FIXME** |
|
|
| 180 | 241 | |
| 181 | 242 | 1. **Seule une activité de code 6 permet la création de captures**.
|
| 182 | 243 | 2. **Seule une activité de code 13 permet la création de DCP**.
|
| ... | ... | @@ -186,11 +247,11 @@ Mapping type d'activité |
| 186 | 247 | |
| 187 | 248 | Mapping type de banc
|
| 188 | 249 | |
| 189 | -|**ACTIVITY.C_TBANC**| **ps_common.SchoolType.code**|
|
|
| 190 | -|:--- | :--- |
|
|
| 191 | -| 1 | 1 |
|
|
| 192 | -| 2 | 2 |
|
|
| 193 | -| 3 | 0 |
|
|
| 250 | +| **ACTIVITY.C_TBANC** | **ps_common.SchoolType.code** |
|
|
| 251 | +|:---------------------|:------------------------------|
|
|
| 252 | +| 1 | 1 |
|
|
| 253 | +| 2 | 2 |
|
|
| 254 | +| 3 | 0 |
|
|
| 194 | 255 | |
| 195 | 256 | ### REF_CATCH_WEIGHT_CATEGORY
|
| 196 | 257 | |
| ... | ... | @@ -218,28 +279,28 @@ Mapping conformité d'échantillonnage de cuve |
| 218 | 279 | |
| 219 | 280 | À partir de **CUVE.C_DEST**, on déduit **ps_logbook.WellSamplingConformity.code**
|
| 220 | 281 | |
| 221 | -|**CUVE.C_DEST**| **WellSamplingConformity.code**|
|
|
| 222 | -|:--- | :--- |
|
|
| 223 | -| 1 | 9 |
|
|
| 224 | -| 2 | 9 |
|
|
| 225 | -| 3 | 9 |
|
|
| 226 | -| 4 | 9 |
|
|
| 227 | -| 5 | 9 |
|
|
| 228 | -| 6 | 9 |
|
|
| 229 | -| 7 | 9 |
|
|
| 230 | -| 8 | 9 |
|
|
| 231 | -| 9 | 9 |
|
|
| 232 | -| 10 | 1 |
|
|
| 233 | -| 11 | 1 |
|
|
| 234 | -| 12 | 1 |
|
|
| 235 | -| 13 | 1 |
|
|
| 236 | -| 14 | 1 |
|
|
| 237 | -| 15 | 1 |
|
|
| 238 | -| 16 | 1 |
|
|
| 239 | -| 17 | 1 |
|
|
| 240 | -| 20 | 2 |
|
|
| 241 | -| 21 | 2 |
|
|
| 242 | -| 22 | 2 |
|
|
| 282 | +| **CUVE.C_DEST** | **WellSamplingConformity.code** |
|
|
| 283 | +|:------------------|:--------------------------------|
|
|
| 284 | +| 1 | 9 |
|
|
| 285 | +| 2 | 9 |
|
|
| 286 | +| 3 | 9 |
|
|
| 287 | +| 4 | 9 |
|
|
| 288 | +| 5 | 9 |
|
|
| 289 | +| 6 | 9 |
|
|
| 290 | +| 7 | 9 |
|
|
| 291 | +| 8 | 9 |
|
|
| 292 | +| 9 | 9 |
|
|
| 293 | +| 10 | 1 |
|
|
| 294 | +| 11 | 1 |
|
|
| 295 | +| 12 | 1 |
|
|
| 296 | +| 13 | 1 |
|
|
| 297 | +| 14 | 1 |
|
|
| 298 | +| 15 | 1 |
|
|
| 299 | +| 16 | 1 |
|
|
| 300 | +| 17 | 1 |
|
|
| 301 | +| 20 | 2 |
|
|
| 302 | +| 21 | 2 |
|
|
| 303 | +| 22 | 2 |
|
|
| 243 | 304 | |
| 244 | 305 | ### REF_WELL_SAMPLING_STATUS
|
| 245 | 306 | |
| ... | ... | @@ -247,28 +308,28 @@ Mapping status d'échantillonnage de cuve |
| 247 | 308 | |
| 248 | 309 | À partir de **CUVE_DEST**, on déduit **ps_logbook.WellSamplingStatus.code**
|
| 249 | 310 | |
| 250 | -|**CUVE.C_DEST**| **WellSamplingStatus.code** |
|
|
| 251 | -|:--- | :--- |
|
|
| 252 | -| 1 | 9 |
|
|
| 253 | -| 2 | 9 |
|
|
| 254 | -| 3 | 9 |
|
|
| 255 | -| 4 | 9 |
|
|
| 256 | -| 5 | 9 |
|
|
| 257 | -| 6 | 9 |
|
|
| 258 | -| 7 | 9 |
|
|
| 259 | -| 8 | 9 |
|
|
| 260 | -| 9 | 9 |
|
|
| 261 | -| 10 | 1 |
|
|
| 262 | -| 11 | 2 |
|
|
| 263 | -| 12 | 3 |
|
|
| 264 | -| 13 | 4 |
|
|
| 265 | -| 14 | 5 |
|
|
| 266 | -| 15 | 6 |
|
|
| 267 | -| 16 | 7 |
|
|
| 268 | -| 17 | 8 |
|
|
| 269 | -| 20 | 10 |
|
|
| 270 | -| 21 | 11 |
|
|
| 271 | -| 22 | 12 |
|
|
| 311 | +| **CUVE.C_DEST** | **WellSamplingStatus.code** |
|
|
| 312 | +|:----------------|:-----------------------------|
|
|
| 313 | +| 1 | 9 |
|
|
| 314 | +| 2 | 9 |
|
|
| 315 | +| 3 | 9 |
|
|
| 316 | +| 4 | 9 |
|
|
| 317 | +| 5 | 9 |
|
|
| 318 | +| 6 | 9 |
|
|
| 319 | +| 7 | 9 |
|
|
| 320 | +| 8 | 9 |
|
|
| 321 | +| 9 | 9 |
|
|
| 322 | +| 10 | 1 |
|
|
| 323 | +| 11 | 2 |
|
|
| 324 | +| 12 | 3 |
|
|
| 325 | +| 13 | 4 |
|
|
| 326 | +| 14 | 5 |
|
|
| 327 | +| 15 | 6 |
|
|
| 328 | +| 16 | 7 |
|
|
| 329 | +| 17 | 8 |
|
|
| 330 | +| 20 | 10 |
|
|
| 331 | +| 21 | 11 |
|
|
| 332 | +| 22 | 12 |
|
|
| 272 | 333 | |
| 273 | 334 | ### REF_WELL_SAMPLE_WEIGHT_CATEGORY
|
| 274 | 335 |