Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 08b08fdc by Tony CHEMIT at 2017-09-14T15:48:36Z Tranductions du référentiel Wind (See #875) - - - - - 8 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_9.java - persistence/src/main/resources/db/migration/6.904/02_move_wind_referential-H2.sql - persistence/src/main/resources/db/migration/6.904/02_move_wind_referential-PG.sql - + persistence/src/main/resources/db/migration/6.904/03_wind_i18n-common.sql - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java - test/src/main/resources/db/6.904/dataForTestLongline.sql.gz - test/src/main/resources/db/6.904/dataForTestSeine.sql.gz - test/src/main/resources/db/6.904/referentiel.sql.gz Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_9.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_9.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_9.java @@ -46,6 +46,7 @@ public abstract class DataSourceMigrationForVersion_7_0_RC_9 extends AbstractObs addScript("01", "rename_longline_obs", queries); addScript("02", "move_wind_referential", queries); + addScript("03", "wind_i18n", queries); } ===================================== persistence/src/main/resources/db/migration/6.904/02_move_wind_referential-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.904/02_move_wind_referential-H2.sql +++ b/persistence/src/main/resources/db/migration/6.904/02_move_wind_referential-H2.sql @@ -1,3 +1,24 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- UPDATE OBSERVE_SEINE.Wind SET TOPIAID = replace(TOPIAID, '.seine', ''); UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET TYPE = replace(TYPE, '.seine.Wind', '.Wind'); ===================================== persistence/src/main/resources/db/migration/6.904/02_move_wind_referential-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.904/02_move_wind_referential-PG.sql +++ b/persistence/src/main/resources/db/migration/6.904/02_move_wind_referential-PG.sql @@ -1,3 +1,24 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- UPDATE OBSERVE_SEINE.Wind SET TOPIAID = replace(TOPIAID, '.seine', ''); ALTER TABLE OBSERVE_SEINE.Wind SET SCHEMA OBSERVE_COMMON; UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET TYPE = replace(TYPE, '.seine.Wind', '.Wind'); ===================================== persistence/src/main/resources/db/migration/6.904/03_wind_i18n-common.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/6.904/03_wind_i18n-common.sql @@ -0,0 +1,37 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- + +UPDATE Observe_common.Wind SET LABEL2='Calme (Calme)', LABEL1='Calm', LABEL3='Calma (Despejado)' WHERE CODE='0'; +UPDATE Observe_common.Wind SET LABEL2='Très légère brise (Calme, ridée)', LABEL1='Light air',LABEL3='Ventolina (Pequeñas olas, pero sin espuma)' WHERE CODE='1'; +UPDATE Observe_common.Wind SET LABEL2='Légère brise (Belle, vaguelettes)', LABEL1='Light breeze', LABEL3='Flojito (Crestas de apariencia vítrea, sin romper)' WHERE CODE='2'; +UPDATE Observe_common.Wind SET LABEL2='Petite brise (Peu agitée, vaguelettes surmontées de moutons)', LABEL1='Gentle breeze', LABEL3='Flojo (Pequeñas olas, crestas rompientes.)' WHERE CODE='3'; +UPDATE Observe_common.Wind SET LABEL2='Jolie brise (Agitée, patites vagues, nombreux moutons)', LABEL1='Moderate breeze', LABEL3='Bonancible (Borreguillos numerosos, olas cada vez más largas)' WHERE CODE='4'; +UPDATE Observe_common.Wind SET LABEL2='Bonne brise (Forte, vagues moyennes écumeuses)', LABEL1='Fresh breeze', LABEL3='Fresquito (Olas medianas y alargadas, borreguillos muy abundantes)' WHERE CODE='5'; +UPDATE Observe_common.Wind SET LABEL2='Vent frais (Très forte, grosses vagues très écumeuses)', LABEL1='Strong breeze', LABEL3='Fresco (Comienzan a formarse olas grandes, crestas rompientes, espuma)' WHERE CODE='6'; +UPDATE Observe_common.Wind SET LABEL2='Fort coup de vent (Enorme, visibilité se réduisant avec l''augmentation de l''écume)', LABEL1='Strong/severe gale', LABEL3='Temporal fuerte (Olas muy grandes, rompientes. Visibilidad mermada)' WHERE CODE='9'; +UPDATE Observe_common.Wind SET LABEL2='Coup de vent (Très grosse, trainées décumes bien nettes)', LABEL1='Gale, fresh gale', LABEL3='Temporal (Grandes olas rompientes, franjas de espuma)' WHERE CODE='8'; +UPDATE Observe_common.Wind SET LABEL2='Grand frais (Grosse, formation de trainées décumes)', LABEL1='High wind, moderate gale, near gale', LABEL3='Frescachón (Mar gruesa, con espuma arrastrada en dirección del viento)' WHERE CODE='7'; +UPDATE Observe_common.Wind SET LABEL2='Tempête (Très grosses lames, visibilité réduite)', LABEL1='Storm, whole gale', LABEL3='Temporal duro (Olas muy gruesas con crestas empenachadas. Superficie del mar blanca)' WHERE CODE='10'; +UPDATE Observe_common.Wind SET LABEL2='Violente tempête (Lames exceptionnellement hautes, visibilité très réduite)', LABEL1='Violent storm', LABEL3='Temporal muy duro (Olas excepcionalmente grandes, mar completamente blanca, visibilidad muy reducida)' WHERE CODE='11'; +UPDATE Observe_common.Wind SET LABEL2='Ouragan (Mer blanche, air plein d''écume, visibilité nulle)', LABEL1='Hurricane force', LABEL3='Temporal huracanado (Olas excepcionalmente grandes, mar blanca, visibilidad nula)' WHERE CODE='12'; +UPDATE OBSERVE_COMMON.Wind SET TOPIAVERSION = TOPIAVERSION +1; +UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHERE TYPE ='fr.ird.observe.entities.referentiel.Wind'; ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java +++ b/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java @@ -195,7 +195,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { assertValidateResult(result, SensorTypeDto.class, 3); assertValidateResult(result, TransmittingBuoyTypeDto.class, 3); assertValidateResult(result, SpeciesFateDto.class, 3); - assertValidateResult(result, WindDto.class, 3); + assertValidateResult(result, WindDto.class, 1); assertValidateResult(result, SpeciesStatusDto.class, 3); assertValidateResult(result, VesselActivityLonglineDto.class, 1); assertValidateResult(result, ObjectMaterialDto.class, 10); ===================================== test/src/main/resources/db/6.904/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.904/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.904/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/6.904/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.904/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.904/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/6.904/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.904/referentiel.sql.gz and b/test/src/main/resources/db/6.904/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/08b08fdcb874ae53ab7fb6862355... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/08b08fdcb874ae53ab7fb6862355... You're receiving this email because of your account on gitlab.com.