- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Pushed new tag v9.1.5
by Tony CHEMIT (＠tchemit) June 25, 2023

June 25, 2023

Tony CHEMIT pushed new tag v9.1.5 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.1.5 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.1.5] 2 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.1.5' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) June 25, 2023

June 25, 2023

Tony CHEMIT pushed to branch release/9.1.5 at ultreiaio / ird-observe Commits: d110393a by Tony Chemit at 2023-06-25T17:23:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.5' with non-snapshot versions[skip ci] - - - - - 6cbabd10 by Tony Chemit at 2023-06-25T17:58:34+02:00 Fix license (using https) - - - - - 30 changed files: - client/LICENSE.txt - client/configuration/LICENSE.txt - client/configuration/pom.xml - client/core/LICENSE.txt - client/core/pom.xml - client/datasource/LICENSE.txt - client/datasource/actions/LICENSE.txt - client/datasource/actions/pom.xml - client/datasource/editor/LICENSE.txt - client/datasource/editor/api-test/LICENSE.txt - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/LICENSE.txt - client/datasource/editor/api/pom.xml - client/datasource/editor/common/LICENSE.txt - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/LICENSE.txt - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/LICENSE.txt - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/LICENSE.txt - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/LICENSE.txt - client/runner/pom.xml - client/runner/src/main/assembly/dist/scripts/postgresql/drop-postgis.sql - core/LICENSE.txt - core/api/LICENSE.txt - core/api/dto-consolidation/LICENSE.txt The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ff9765a057c174a9d573615f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ff9765a057c174a9d573615f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 30 commits: [jgitflow-maven-plugin]updating poms for 9.1.5-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) June 25, 2023

June 25, 2023

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 0cb3ca2f by Tony Chemit at 2023-06-01T17:54:47+02:00 [jgitflow-maven-plugin]updating poms for 9.1.5-SNAPSHOT development[skip ci] - - - - - 69c463a1 by Tony Chemit at 2023-06-01T20:30:18+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 9a2a8d2a by Tony Chemit at 2023-06-01T20:30:20+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - c85a2bf2 by Tony Chemit at 2023-06-01T20:30:23+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - addd51e3 by Tony Chemit at 2023-06-15T13:08:48+02:00 update pom and license (now we are talking with https :)) - - - - - 5d5cca7e by Tony Chemit at 2023-06-15T13:08:48+02:00 Le rôle saisisseur ne fonctionne pas - Closes #2724 - - - - - 01b968bc by Tony Chemit at 2023-06-15T13:08:48+02:00 Une erreur de validation sur ps_localMarket.SurveyPart.proportion - Closes #2727 - - - - - 5ec8ffb7 by Tony Chemit at 2023-06-15T13:08:48+02:00 Borne max de poids sur le formulaire Lots de faux-poisson - Closes #2719 - - - - - 8626ffaa by Tony Chemit at 2023-06-15T15:24:16+02:00 Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée corrigée' n'est pas cochée - Closes #2720 - - - - - acdb679d by Tony Chemit at 2023-06-15T15:24:16+02:00 Affichage des types date sur l'UI de synchro avancée de référentiel - Closes #2713 - - - - - 786fb3a1 by Tony Chemit at 2023-06-15T15:24:16+02:00 Pour les champs du modèle de persistance de type date, forcer le type réel via la tag value idoine - Closes #2728 - - - - - ab3d59a2 by Tony Chemit at 2023-06-15T15:34:25+02:00 En PS / Logbook / Activité, la direction du vent se trouve dans le modèle de données mais pas sur le formulaire - Closes #2730 - - - - - 32d05ea7 by Tony Chemit at 2023-06-15T17:25:39+02:00 En PS / logbook / Activité, la validation sur les heures / numéro d'incrémant n'est pas correcte - Closes #2731 - - - - - c82c0251 by Tony Chemit at 2023-06-15T18:29:54+02:00 Update decorator API - - - - - aadad786 by Tony Chemit at 2023-06-15T18:35:53+02:00 Sur PS / Logbook / Echantillon, améliorer le défilement de la liste de saisie des fréquences de taille - Closes #2733 - - - - - a057723b by Tony Chemit at 2023-06-15T19:49:00+02:00 Sur PS / Logbook / Echantillon et Plan de cuves, afficher le ne numéro d'activité dans la liste déroulante des activités - Closes #2732 - - - - - ff48a8d8 by Tony Chemit at 2023-06-19T14:24:51+02:00 Le fichier de configuration du serveur n'est pas consistent - Closes #2735 - - - - - b927d0be by Tony Chemit at 2023-06-19T14:53:49+02:00 Ne pas regénérer le fichier de configuration des logs sur le serveur si celui contient déjà la bonne version - Closes #2736 - - - - - b4350d1d by Tony Chemit at 2023-06-25T11:03:58+02:00 Modification d'un libellé sur Capture logbook - Closes #2741 - - - - - c0053ac4 by Tony Chemit at 2023-06-25T11:10:08+02:00 update pom - - - - - 630b5a95 by Tony Chemit at 2023-06-25T14:06:40+02:00 Rendre visible les heures de début et de fin de chaque sous-échantillon et faciliter leur saisie - Closes #2718 - - - - - 6fcb7656 by Tony Chemit at 2023-06-25T14:06:40+02:00 Fix AutoService usage - - - - - 4e00782a by Tony Chemit at 2023-06-25T14:06:40+02:00 Toolkit persistence : be able to extract a attribute tag value from the tag values store - - - - - 3be9296e by Tony Chemit at 2023-06-25T14:06:40+02:00 Toolkit api : add method to transform a dto type into a persistence type - - - - - 383d4b79 by Tony Chemit at 2023-06-25T14:06:40+02:00 Client - add table renderer for date types. - - - - - ead78f21 by Tony Chemit at 2023-06-25T17:19:52+02:00 Amélioration des triggers postgis - Closes #2745 - - - - - ff9765a0 by Tony Chemit at 2023-06-25T17:22:38+02:00 Update changelog for v.9.1.5 [skip CI] - - - - - d110393a by Tony Chemit at 2023-06-25T17:23:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.5' with non-snapshot versions[skip ci] - - - - - 6cbabd10 by Tony Chemit at 2023-06-25T17:58:34+02:00 Fix license (using https) - - - - - c33e078c by Tony Chemit at 2023-06-25T17:59:11+02:00 [jgitflow-maven-plugin]merging 'release/9.1.5' into 'master' - - - - - 30 changed files: - CHANGELOG.md - LICENSE.txt - client/LICENSE.txt - client/configuration/LICENSE.txt - client/configuration/pom.xml - client/core/LICENSE.txt - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/LICENSE.txt - client/datasource/actions/LICENSE.txt - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java - client/datasource/editor/LICENSE.txt - client/datasource/editor/api-test/LICENSE.txt - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/LICENSE.txt - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/EditableTable.java - client/datasource/editor/common/LICENSE.txt - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/LICENSE.txt - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/predicates/CheckTripLogbookAvailability.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/predicates/CheckTripObservationsAvailability.java - client/datasource/editor/pom.xml - client/datasource/editor/ps/LICENSE.txt - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d196e001c595ae37d5d0adcf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d196e001c595ae37d5d0adcf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.1.5' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) June 25, 2023

June 25, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d110393a by Tony Chemit at 2023-06-25T17:23:27+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.5' with non-snapshot versions[skip ci] - - - - - 6cbabd10 by Tony Chemit at 2023-06-25T17:58:34+02:00 Fix license (using https) - - - - - c33e078c by Tony Chemit at 2023-06-25T17:59:11+02:00 [jgitflow-maven-plugin]merging 'release/9.1.5' into 'master' - - - - - e0053ea1 by Tony Chemit at 2023-06-25T17:59:18+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 43a9a5d8 by Tony Chemit at 2023-06-25T17:59:19+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 2dc2704b by Tony Chemit at 2023-06-25T17:59:21+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 30 changed files: - client/LICENSE.txt - client/configuration/LICENSE.txt - client/core/LICENSE.txt - client/datasource/LICENSE.txt - client/datasource/actions/LICENSE.txt - client/datasource/editor/LICENSE.txt - client/datasource/editor/api-test/LICENSE.txt - client/datasource/editor/api/LICENSE.txt - client/datasource/editor/common/LICENSE.txt - client/datasource/editor/ll/LICENSE.txt - client/datasource/editor/ps/LICENSE.txt - client/datasource/editor/spi/LICENSE.txt - client/runner/LICENSE.txt - client/runner/src/main/assembly/dist/scripts/postgresql/drop-postgis.sql - core/LICENSE.txt - core/api/LICENSE.txt - core/api/dto-consolidation/LICENSE.txt - core/api/dto-decoration/LICENSE.txt - core/api/dto-validation/LICENSE.txt - core/api/dto/LICENSE.txt - core/api/services/LICENSE.txt - core/api/tree/LICENSE.txt - core/api/validation/LICENSE.txt - core/persistence/LICENSE.txt - core/persistence/avdth/LICENSE.txt - core/persistence/consolidation/LICENSE.txt - core/persistence/decoration/LICENSE.txt - core/persistence/java/LICENSE.txt - core/persistence/migration/LICENSE.txt - core/persistence/report/LICENSE.txt The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7b51f26e365a2dfdfbb38e88… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7b51f26e365a2dfdfbb38e88… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.1.6-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) June 25, 2023

June 25, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7b51f26e by Tony Chemit at 2023-06-25T17:23:02+02:00 [jgitflow-maven-plugin]updating poms for 9.1.6-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7b51f26e365a2dfdfbb38e882… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7b51f26e365a2dfdfbb38e882… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.1.5
by Tony CHEMIT (＠tchemit) June 25, 2023

June 25, 2023

Tony CHEMIT pushed new branch release/9.1.5 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.1.5 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.1.5 [skip CI]
by Tony CHEMIT (＠tchemit) June 25, 2023

June 25, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ff9765a0 by Tony Chemit at 2023-06-25T17:22:38+02:00 Update changelog for v.9.1.5 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,34 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-06-01 17:39. + * Last generated at 2023-06-25 17:21. + +## Version [9.1.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/268) + +**Closed at 2023-06-25.** + +### Download +* [Client (observe-9.1.5-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.1.5.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.1.5-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + + +### Issues + * [[Type::Anomalie 2713]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2713) **Affichage des types date sur l'UI de synchro avancée de référentiel** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2718]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2718) **Rendre visible les heures de début et de fin de chaque sous-échantillon et faciliter leur saisie** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2724]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2724) **Le rôle saisisseur ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2727]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2727) **Une erreur de validation sur ps_localMarket.SurveyPart.proportion** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2730]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2730) **En PS / Logbook / Activité, la direction du vent se trouve dans le modèle de données mais pas sur le formulaire** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2731]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2731) **En PS / logbook / Activité, la validation sur les heures / numéro d'incrémant n'est pas correcte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2733]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2733) **Sur PS / Logbook / Echantillon, améliorer le défilement de la liste de saisie des fréquences de taille** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2735]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2735) **Le fichier de configuration du serveur n'est pas consistent** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2719]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2719) **Borne max de poids sur le formulaire Lots de faux-poisson** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2720]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2720) **Le champs 'position d'origine' pourrait être désactivé si la case 'Donnée corrigée' n'est pas cochée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2728]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2728) **Pour les champs du modèle de persistance de type date, forcer le type réel via la tag value idoine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2732]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2732) **Sur PS / Logbook / Echantillon et Plan de cuves, afficher le ne numéro d'activité dans la liste déroulante des activités** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2736]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2736) **Ne pas regénérer le fichier de configuration des logs sur le serveur si celui contient déjà la bonne version** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2741]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2741) **Modification d'un libellé sur Capture logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2745]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2745) **Amélioration des triggers postgis** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.1.4](https://gitlab.com/ultreiaio/ird-observe/-/milestones/267) @@ -12,7 +39,6 @@ * [Serveur (observe-9.1.4.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.1.4-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[Type::Anomalie 2705]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2705) **Les résultats des utilisations d'un référentiel peuvent être améliorés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Anomalie 2709]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2709) **Assistant sauvegarde qui ne zippe pas les bases** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ff9765a057c174a9d573615fd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ff9765a057c174a9d573615fd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Amélioration des triggers postgis - Closes #2745
by Tony CHEMIT (＠tchemit) June 25, 2023

June 25, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ead78f21 by Tony Chemit at 2023-06-25T17:19:52+02:00 Amélioration des triggers postgis - Closes #2745 - - - - - 5 changed files: - + client/runner/src/main/assembly/dist/scripts/postgresql/drop-postgis.sql - client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_0_create-postgis-functions.sql - client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_1_create-postgis-referential.sql - client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_2_create-postgis-ps.sql - client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_3_create-postgis-ll.sql Changes: ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/drop-postgis.sql ===================================== @@ -0,0 +1,17 @@ +ALTER table common.Harbour DROP COLUMN the_geom CASCADE; +ALTER TABLE ps_observation.activity DROP COLUMN the_geom CASCADE; +ALTER TABLE ps_observation.transmittingbuoy DROP COLUMN the_geom CASCADE; +ALTER TABLE ps_logbook.activity DROP COLUMN the_geom CASCADE; +ALTER TABLE ps_logbook.activity DROP COLUMN the_geom_original CASCADE; +ALTER TABLE ps_logbook.transmittingbuoy DROP COLUMN the_geom CASCADE; +ALTER TABLE ll_observation.activity DROP COLUMN the_geom CASCADE; +ALTER TABLE ll_observation.set DROP COLUMN the_geom_settingstart CASCADE; +ALTER TABLE ll_observation.set DROP COLUMN the_geom_settingend CASCADE; +ALTER TABLE ll_observation.set DROP COLUMN the_geom_haulingstart CASCADE; +ALTER TABLE ll_observation.set DROP COLUMN the_geom_haulingend CASCADE; +ALTER TABLE ll_logbook.activity DROP COLUMN the_geom CASCADE; +ALTER TABLE ll_logbook.set DROP COLUMN the_geom_settingstart CASCADE; +ALTER TABLE ll_logbook.set DROP COLUMN the_geom_settingend CASCADE; +ALTER TABLE ll_logbook.set DROP COLUMN the_geom_haulingstart CASCADE; +ALTER TABLE ll_logbook.set DROP COLUMN the_geom_haulingend CASCADE; +ALTER TABLE ll_landing.landing DROP COLUMN the_geom CASCADE; ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_0_create-postgis-functions.sql ===================================== @@ -41,7 +41,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - latitude % and longitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.latitude, NEW.longitude; - NEW.the_geom := ST_SetSRID(ST_MakePoint(NEW.longitude, NEW.latitude), 4326); + NEW.the_geom := ST_SetSRID(ST_MakePoint(NEW.longitude::double precision, NEW.latitude::double precision), 4326); RAISE NOTICE 'Computed for %.% % latitude % and longitude %, the_geom %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.latitude, NEW.longitude, NEW.the_geom; RETURN NEW; END @@ -69,7 +69,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - latitudeOriginal % and longitudeOriginal %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.latitudeOriginal, NEW.longitudeOriginal; - NEW.the_geom_original := ST_SetSRID(ST_MakePoint(NEW.longitudeOriginal, NEW.latitudeOriginal), 4326); + NEW.the_geom_original := ST_SetSRID(ST_MakePoint(NEW.longitudeOriginal::double precision, NEW.latitudeOriginal::double precision), 4326); RAISE NOTICE 'Computed for %.% % latitudeOriginal % and longitudeOriginal %, the_geom_original %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.latitudeOriginal, NEW.longitudeOriginal, NEW.the_geom_original; RETURN NEW; END @@ -98,7 +98,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - settingStartLatitude % and settingStartLongitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.settingStartLatitude, NEW.settingStartLongitude; - NEW.the_geom_settingStart := ST_SetSRID(ST_MakePoint(NEW.settingStartLongitude, NEW.settingStartLatitude), 4326); + NEW.the_geom_settingStart := ST_SetSRID(ST_MakePoint(NEW.settingStartLongitude::double precision, NEW.settingStartLatitude::double precision), 4326); RAISE NOTICE 'Computed for %.% % settingStartLatitude % and settingStartLongitude %, the_geom_settingStart %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.settingStartLatitude, NEW.settingStartLongitude, NEW.the_geom_settingStart; RETURN NEW; END @@ -126,7 +126,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - settingEndLatitude % and settingEndLongitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.settingEndLatitude, NEW.settingEndLongitude; - NEW.the_geom_settingEnd := ST_SetSRID(ST_MakePoint(NEW.settingEndLongitude, NEW.settingEndLatitude), 4326); + NEW.the_geom_settingEnd := ST_SetSRID(ST_MakePoint(NEW.settingEndLongitude::double precision, NEW.settingEndLatitude::double precision), 4326); RAISE NOTICE 'Computed for %.% % settingEndLatitude % and settingEndLongitude %, the_geom_settingEnd %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.settingEndLatitude, NEW.settingEndLongitude, NEW.the_geom_settingEnd; RETURN NEW; END @@ -154,7 +154,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - haulingStartLatitude % and haulingStartLongitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.haulingStartLatitude, NEW.haulingStartLongitude; - NEW.the_geom_haulingStart := ST_SetSRID(ST_MakePoint(NEW.haulingStartLongitude, NEW.haulingStartLatitude), 4326); + NEW.the_geom_haulingStart := ST_SetSRID(ST_MakePoint(NEW.haulingStartLongitude::double precision, NEW.haulingStartLatitude::double precision), 4326); RAISE NOTICE 'Computed for %.% % haulingStartLatitude % and haulingStartLongitude %, the_geom_haulingStart %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.haulingStartLatitude, NEW.haulingStartLongitude, NEW.the_geom_haulingStart; RETURN NEW; END @@ -182,7 +182,7 @@ BEGIN return NEW; END IF; RAISE NOTICE 'Will compute the_geom for %.% % - haulingEndLatitude % and haulingEndLongitude %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.haulingEndLatitude, NEW.haulingEndLongitude; - NEW.the_geom_haulingEnd := ST_SetSRID(ST_MakePoint(NEW.haulingEndLongitude, NEW.haulingEndLatitude), 4326); + NEW.the_geom_haulingEnd := ST_SetSRID(ST_MakePoint(NEW.haulingEndLongitude::double precision, NEW.haulingEndLatitude::double precision), 4326); RAISE NOTICE 'Computed for %.% % haulingEndLatitude % and haulingEndLongitude %, the_geom_haulingEnd %', TG_TABLE_SCHEMA, TG_TABLE_NAME, NEW.topiaId, NEW.haulingEndLatitude, NEW.haulingEndLongitude, NEW.the_geom_haulingEnd; RETURN NEW; END ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_1_create-postgis-referential.sql ===================================== @@ -19,9 +19,8 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- - -SELECT AddGeometryColumn('common', 'harbour', 'the_geom', 4326, 'POINT', 2); +ALTER TABLE common.harbour ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_harbour_gist ON common.harbour USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_common_harbour_the_geom ON common.harbour; CREATE TRIGGER tr_sync_common_harbour_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON common.harbour FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE common.harbour SET the_geom = ST_SetSRID(ST_MakePoint(longitude,latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE common.harbour SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision,latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_2_create-postgis-ps.sql ===================================== @@ -20,33 +20,33 @@ -- #L% --- -SELECT AddGeometryColumn('ps_observation', 'activity', 'the_geom', 4326, 'POINT', 2); +ALTER TABLE ps_observation.activity ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_observation_activity_gist ON ps_observation.activity USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ps_observation_activity_the_geom ON ps_observation.activity; CREATE TRIGGER tr_sync_ps_observation_activity_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ps_observation.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ps_observation.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude,latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ps_observation.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision,latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; -SELECT AddGeometryColumn('ps_observation', 'transmittingbuoy', 'the_geom', 4326, 'POINT', 2); +ALTER TABLE ps_observation.transmittingbuoy ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_observation_transmittingbuoy_gist ON ps_observation.TransmittingBuoy USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ps_observation_transmittingbuoy_the_geom ON ps_observation.TransmittingBuoy; CREATE TRIGGER tr_sync_ps_observation_transmittingbuoy_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ps_observation.TransmittingBuoy FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ps_observation.TransmittingBuoy SET the_geom = ST_SetSRID(ST_MakePoint(longitude, latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ps_observation.TransmittingBuoy SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision, latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; -SELECT AddGeometryColumn('ps_logbook' ,'activity', 'the_geom', 4326, 'POINT', 2); +ALTER TABLE ps_logbook.activity ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_logbook_activity_gist ON ps_logbook.activity USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ps_logbook_activity_the_geom ON ps_logbook.activity; CREATE TRIGGER tr_sync_ps_logbook_activity_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ps_logbook.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ps_logbook.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude,latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ps_logbook.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision,latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; -SELECT AddGeometryColumn('ps_logbook','activity', 'the_geom_original', 4326, 'POINT', 2); +ALTER TABLE ps_logbook.activity ADD COLUMN the_geom_original geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_logbook_activity_original_gist ON ps_logbook.activity USING GIST (the_geom_original); DROP TRIGGER IF EXISTS tr_sync_ps_logbook_activity_the_geom_original ON ps_logbook.activity; CREATE TRIGGER tr_sync_ps_logbook_activity_the_geom_original BEFORE INSERT OR UPDATE OF latitudeOriginal, longitudeOriginal ON ps_logbook.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_original(); -UPDATE ps_logbook.activity SET the_geom_original = ST_SetSRID(ST_MakePoint(latitudeOriginal, longitudeOriginal), 4326) WHERE latitudeOriginal IS NOT NULL AND longitudeOriginal IS NOT NULL AND the_geom_original IS NULL; +UPDATE ps_logbook.activity SET the_geom_original = ST_SetSRID(ST_MakePoint(latitudeOriginal::double precision, longitudeOriginal::double precision), 4326) WHERE latitudeOriginal IS NOT NULL AND longitudeOriginal IS NOT NULL AND the_geom_original IS NULL; -SELECT AddGeometryColumn('ps_logbook', 'transmittingbuoy', 'the_geom', 4326, 'POINT', 2); +ALTER TABLE ps_logbook.transmittingbuoy ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ps_logbook_transmittingbuoy_gist ON ps_logbook.TransmittingBuoy USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ps_logbook_transmittingbuoy_the_geom ON ps_logbook.TransmittingBuoy; CREATE TRIGGER tr_sync_ps_logbook_transmittingbuoy_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ps_logbook.TransmittingBuoy FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ps_logbook.TransmittingBuoy SET the_geom = ST_SetSRID(ST_MakePoint(longitude, latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; +UPDATE ps_logbook.TransmittingBuoy SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision, latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_3_create-postgis-ll.sql ===================================== @@ -20,72 +20,72 @@ -- #L% --- -SELECT AddGeometryColumn('ll_observation', 'activity', 'the_geom', 4326, 'POINT', 2); +ALTER TABLE ll_observation.activity ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_observation_activity_gist ON ll_observation.activity USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ll_observation_activity_the_geom ON ll_observation.activity; CREATE TRIGGER tr_sync_ll_observation_activity_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ll_observation.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ll_observation.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude, latitude), 4326) AND the_geom IS NULL; +UPDATE ll_observation.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision, latitude::double precision), 4326) WHERE the_geom IS NULL; -SELECT AddGeometryColumn('ll_observation', 'set', 'the_geom_settingstart', 4326, 'POINT', 2); +ALTER TABLE ll_observation.set ADD COLUMN the_geom_settingstart geometry(Point, 4326); DROP INDEX IF EXISTS idx_ll_observation_set_gist_settingstart; CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gist_settingstart ON ll_observation.set USING GIST (the_geom_settingstart); DROP TRIGGER IF EXISTS tr_sync_ll_observation_set_the_geom_settingstart ON ll_observation.set; CREATE TRIGGER tr_sync_ll_observation_set_the_geom_settingstart BEFORE INSERT OR UPDATE OF settingStartLatitude, settingStartLongitude ON ll_observation.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_settingStart(); -UPDATE ll_observation.set SET the_geom_settingstart = ST_SetSRID(ST_MakePoint(settingStartLongitude, settingStartLatitude), 4326) AND the_geom_settingstart IS NULL; +UPDATE ll_observation.set SET the_geom_settingstart = ST_SetSRID(ST_MakePoint(settingStartLongitude::double precision, settingStartLatitude::double precision), 4326) WHERE the_geom_settingstart IS NULL; -SELECT AddGeometryColumn('ll_observation', 'set', 'the_geom_settingend', 4326, 'POINT', 2); +ALTER TABLE ll_observation.set ADD COLUMN the_geom_settingend geometry(Point, 4326); DROP INDEX IF EXISTS idx_ll_observation_set_gist_settingend; CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gist_settingend ON ll_observation.set USING GIST (the_geom_settingend); DROP TRIGGER IF EXISTS tr_sync_ll_observation_set_the_geom_settingend ON ll_observation.set; CREATE TRIGGER tr_sync_ll_observation_set_the_geom_settingend BEFORE INSERT OR UPDATE OF settingEndLatitude, settingEndLongitude ON ll_observation.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_settingEnd(); -UPDATE ll_observation.set SET the_geom_settingend = ST_SetSRID(ST_MakePoint(settingEndLongitude, settingEndLatitude), 4326) AND the_geom_settingend IS NULL; +UPDATE ll_observation.set SET the_geom_settingend = ST_SetSRID(ST_MakePoint(settingEndLongitude::double precision, settingEndLatitude::double precision), 4326) WHERE the_geom_settingend IS NULL; -SELECT AddGeometryColumn('ll_observation', 'set', 'the_geom_haulingstart', 4326, 'POINT', 2); +ALTER TABLE ll_observation.set ADD COLUMN the_geom_haulingstart geometry(Point, 4326); DROP INDEX IF EXISTS idx_ll_observation_set_gist_haulingstart; CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gist_haulingstart ON ll_observation.set USING GIST (the_geom_haulingstart); DROP TRIGGER IF EXISTS tr_sync_ll_observation_set_the_geom_haulingstart ON ll_observation.set; CREATE TRIGGER tr_sync_ll_observation_set_the_geom_haulingstart BEFORE INSERT OR UPDATE OF haulingStartLatitude, haulingStartLongitude ON ll_observation.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_haulingStart(); -UPDATE ll_observation.set SET the_geom_haulingstart = ST_SetSRID(ST_MakePoint(haulingStartLongitude, haulingStartLatitude), 4326) AND the_geom_haulingstart IS NULL; +UPDATE ll_observation.set SET the_geom_haulingstart = ST_SetSRID(ST_MakePoint(haulingStartLongitude::double precision, haulingStartLatitude::double precision), 4326) WHERE the_geom_haulingstart IS NULL; -SELECT AddGeometryColumn('ll_observation', 'set', 'the_geom_haulingend', 4326, 'POINT', 2); +ALTER TABLE ll_observation.set ADD COLUMN the_geom_haulingend geometry(Point, 4326); DROP INDEX IF EXISTS idx_ll_observation_set_gist_haulingend; CREATE INDEX IF NOT EXISTS idx_ll_observation_set_gist_haulingend ON ll_observation.set USING GIST (the_geom_haulingend); DROP TRIGGER IF EXISTS tr_sync_ll_observation_set_the_geom_haulingend ON ll_observation.set; CREATE TRIGGER tr_sync_ll_observation_set_the_geom_haulingend BEFORE INSERT OR UPDATE OF haulingEndLatitude, haulingEndLongitude ON ll_observation.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_haulingEnd(); -UPDATE ll_observation.set SET the_geom_haulingend = ST_SetSRID(ST_MakePoint(haulingEndLongitude, haulingEndLatitude), 4326) AND the_geom_haulingend IS NULL; +UPDATE ll_observation.set SET the_geom_haulingend = ST_SetSRID(ST_MakePoint(haulingEndLongitude::double precision, haulingEndLatitude::double precision), 4326) WHERE the_geom_haulingend IS NULL; -SELECT AddGeometryColumn('ll_logbook', 'activity', 'the_geom', 4326, 'POINT', 2); +ALTER TABLE ll_logbook.activity ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_logbook_activity_gist ON ll_logbook.activity USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_activity_the_geom ON ll_logbook.activity; CREATE TRIGGER tr_sync_ll_logbook_activity_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ll_logbook.activity FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); UPDATE ll_logbook.activity SET the_geom = ST_SetSRID(ST_MakePoint(longitude, latitude), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; -SELECT AddGeometryColumn('ll_logbook', 'set', 'the_geom_settingstart', 4326, 'POINT', 2); +ALTER TABLE ll_logbook.set ADD COLUMN the_geom_settingstart geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gist_settingstart ON ll_logbook.set USING GIST (the_geom_settingstart); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_set_the_geom_settingstart ON ll_logbook.set; CREATE TRIGGER tr_sync_ll_logbook_set_the_geom_settingstart BEFORE INSERT OR UPDATE OF settingStartLatitude, settingStartLongitude ON ll_logbook.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_settingStart(); -UPDATE ll_logbook.set SET the_geom_settingstart = ST_SetSRID(ST_MakePoint(settingStartLongitude, settingStartLatitude), 4326) WHERE settingStartLongitude IS NOT NULL AND settingStartLatitude IS NOT NULL AND the_geom_settingstart IS NULL; +UPDATE ll_logbook.set SET the_geom_settingstart = ST_SetSRID(ST_MakePoint(settingStartLongitude::double precision, settingStartLatitude::double precision), 4326) WHERE settingStartLongitude IS NOT NULL AND settingStartLatitude IS NOT NULL AND the_geom_settingstart IS NULL; -SELECT AddGeometryColumn('ll_logbook', 'set', 'the_geom_settingend', 4326, 'POINT', 2); +ALTER TABLE ll_logbook.set ADD COLUMN the_geom_settingend geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gist_settingend ON ll_logbook.set USING GIST (the_geom_settingend); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_set_the_geom_settingend ON ll_logbook.set; CREATE TRIGGER tr_sync_ll_logbook_set_the_geom_settingend BEFORE INSERT OR UPDATE OF settingEndLatitude, settingEndLongitude ON ll_logbook.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_settingEnd(); -UPDATE ll_logbook.set SET the_geom_settingend = ST_SetSRID(ST_MakePoint(settingEndLongitude, settingEndLatitude), 4326) WHERE settingEndLongitude IS NOT NULL AND settingEndLatitude IS NOT NULL AND the_geom_settingend IS NULL; +UPDATE ll_logbook.set SET the_geom_settingend = ST_SetSRID(ST_MakePoint(settingEndLongitude::double precision, settingEndLatitude::double precision), 4326) WHERE settingEndLongitude IS NOT NULL AND settingEndLatitude IS NOT NULL AND the_geom_settingend IS NULL; -SELECT AddGeometryColumn('ll_logbook', 'set', 'the_geom_haulingstart', 4326, 'POINT', 2); +ALTER TABLE ll_logbook.set ADD COLUMN the_geom_haulingstart geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gist_haulingstart ON ll_logbook.set USING GIST (the_geom_haulingstart); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_set_the_geom_haulingstart ON ll_logbook.set; CREATE TRIGGER tr_sync_ll_logbook_set_the_geom_haulingstart BEFORE INSERT OR UPDATE OF haulingStartLatitude, haulingStartLongitude ON ll_logbook.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_haulingStart(); -UPDATE ll_logbook.set SET the_geom_haulingstart = ST_SetSRID(ST_MakePoint(haulingStartLongitude, haulingStartLatitude), 4326) WHERE haulingStartLongitude IS NOT NULL AND haulingStartLatitude IS NOT NULL AND the_geom_haulingstart IS NULL; +UPDATE ll_logbook.set SET the_geom_haulingstart = ST_SetSRID(ST_MakePoint(haulingStartLongitude::double precision, haulingStartLatitude::double precision), 4326) WHERE haulingStartLongitude IS NOT NULL AND haulingStartLatitude IS NOT NULL AND the_geom_haulingstart IS NULL; -SELECT AddGeometryColumn('ll_logbook', 'set', 'the_geom_haulingend', 4326, 'POINT', 2); +ALTER TABLE ll_logbook.set ADD COLUMN the_geom_haulingend geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_logbook_set_gist_haulingend ON ll_logbook.set USING GIST (the_geom_haulingend); DROP TRIGGER IF EXISTS tr_sync_ll_logbook_set_the_geom_haulingend ON ll_logbook.set; CREATE TRIGGER tr_sync_ll_logbook_set_the_geom_haulingend BEFORE INSERT OR UPDATE OF haulingEndLatitude, haulingEndLongitude ON ll_logbook.set FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_haulingEnd(); -UPDATE ll_logbook.set SET the_geom_haulingend = ST_SetSRID(ST_MakePoint(haulingEndLongitude, haulingEndLatitude), 4326) WHERE haulingEndLongitude IS NOT NULL AND haulingEndLatitude IS NOT NULL AND the_geom_haulingend IS NULL; +UPDATE ll_logbook.set SET the_geom_haulingend = ST_SetSRID(ST_MakePoint(haulingEndLongitude::double precision, haulingEndLatitude::double precision), 4326) WHERE haulingEndLongitude IS NOT NULL AND haulingEndLatitude IS NOT NULL AND the_geom_haulingend IS NULL; -SELECT AddGeometryColumn('ll_landing', 'landing', 'the_geom', 4326, 'POINT', 2); +ALTER TABLE ll_landing.landing ADD COLUMN the_geom geometry(Point, 4326); CREATE INDEX IF NOT EXISTS idx_ll_landing_landing_gist ON ll_landing.landing USING GIST (the_geom); DROP TRIGGER IF EXISTS tr_sync_ll_landing_landing_the_geom ON ll_landing.landing; CREATE TRIGGER tr_sync_ll_landing_landing_the_geom BEFORE INSERT OR UPDATE OF latitude, longitude ON ll_landing.landing FOR EACH ROW EXECUTE PROCEDURE sync_the_geom_default(); -UPDATE ll_landing.landing SET the_geom = ST_SetSRID(ST_MakePoint(longitude, latitude), 4326) AND the_geom IS NULL; +UPDATE ll_landing.landing SET the_geom = ST_SetSRID(ST_MakePoint(longitude::double precision, latitude::double precision), 4326) WHERE latitude IS NOT NULL AND longitude IS NOT NULL AND the_geom IS NULL; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ead78f219371b12a5c63753e5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ead78f219371b12a5c63753e5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Modification d'un libellé sur Capture logbook - Closes #2741
by Tony CHEMIT (＠tchemit) June 25, 2023

June 25, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b4350d1d by Tony Chemit at 2023-06-25T11:03:58+02:00 Modification d'un libellé sur Capture logbook - Closes #2741 - - - - - c0053ac4 by Tony Chemit at 2023-06-25T11:10:08+02:00 update pom - - - - - 630b5a95 by Tony Chemit at 2023-06-25T14:06:40+02:00 Rendre visible les heures de début et de fin de chaque sous-échantillon et faciliter leur saisie - Closes #2718 - - - - - 6fcb7656 by Tony Chemit at 2023-06-25T14:06:40+02:00 Fix AutoService usage - - - - - 4e00782a by Tony Chemit at 2023-06-25T14:06:40+02:00 Toolkit persistence : be able to extract a attribute tag value from the tag values store - - - - - 3be9296e by Tony Chemit at 2023-06-25T14:06:40+02:00 Toolkit api : add method to transform a dto type into a persistence type - - - - - 383d4b79 by Tony Chemit at 2023-06-25T14:06:40+02:00 Client - add table renderer for date types. - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/predicates/CheckTripLogbookAvailability.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/predicates/CheckTripObservationsAvailability.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLandingAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketSurveySamplingAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketWellsSamplingAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLogbookAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripObservationsAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripTargetWellsSamplingAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/UseLogbookFloatingObjectPreset.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/UseObservationFloatingObjectPreset.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/GenerateContentUIMojo.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/UiMojoRunnable.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUITableModel.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleSpeciesDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleSpeciesDto-update-error-validation.xml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/SampleSpecies/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/SampleSpecies/validation-update.json - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b927d0be928d90bd0c123e6c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b927d0be928d90bd0c123e6c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Le fichier de configuration du serveur n'est pas consistent - Closes #2735
by Tony CHEMIT (＠tchemit) June 19, 2023

June 19, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ff48a8d8 by Tony Chemit at 2023-06-19T14:24:51+02:00 Le fichier de configuration du serveur n'est pas consistent - Closes #2735 - - - - - b927d0be by Tony Chemit at 2023-06-19T14:53:49+02:00 Ne pas regénérer le fichier de configuration des logs sur le serveur si celui contient déjà la bonne version - Closes #2736 - - - - - 1 changed file: - server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java Changes: ===================================== server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java ===================================== @@ -37,6 +37,7 @@ import org.apache.logging.log4j.Logger; import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.Collections; @@ -103,10 +104,10 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar Path directory = Files.createTempDirectory("taiste"); ApplicationConfigInit init = ApplicationConfigInit .forAllScopesWithout(ApplicationConfigScope.CURRENT, - ApplicationConfigScope.HOME, - ApplicationConfigScope.ENV, - ApplicationConfigScope.CLASS_PATH, - ApplicationConfigScope.SYSTEM) + ApplicationConfigScope.HOME, + ApplicationConfigScope.ENV, + ApplicationConfigScope.CLASS_PATH, + ApplicationConfigScope.SYSTEM) .addDefaults(ServerConfigOption.CONTEXT_PATH.getKey(), "observe-${build.version}") .addDefaults(ServerConfigOption.COMMON_CONFIG_DIRECTORY.getKey(), String.format("%s/${build.version.major}", directory.resolve("conf"))) .addDefaults(ServerConfigOption.COMMON_INSTANCES_DIRECTORY.getKey(), directory.resolve("instances").toString()); @@ -165,17 +166,19 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar parse(); Path baseDirectory = getBaseDirectory().toPath(); - log.info(getConfigurationDescription()); createDirectories(baseDirectory, "Could not create application instance directory (%s)"); File extraConfigFile = get().getExtraConfigFile(); - if (Files.notExists(extraConfigFile.toPath())) { - boolean generated = ServerResources.APPLICATION_CONFIGURATION.setForWindows(isWindows()).copyResource(getCommonConfigurationFile().toPath(), extraConfigFile); - if (generated) { - log.info(String.format("Generate empty configuration file to: %s", extraConfigFile)); - } else { - log.info(String.format("Create symbolic link from common configuration file to: %s", extraConfigFile)); - } + + // store the configuration on extra config file to have correct options linked to the current build + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2735 + + log.info(String.format("Save instance configuration file to: %s", extraConfigFile)); + ConfigHelper.save(get(), extraConfigFile, new String[0], ServerResources.APPLICATION_CONFIGURATION, options()); + + if (log.isInfoEnabled()) { + String message = getConfigurationDescription(); + log.info(message); } Path temporaryDirectory = getTemporaryDirectory().toPath(); @@ -225,10 +228,22 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar private void initLog() { File log4jConfigurationFile = getLog4jConfigurationFile(); - try { - Files.deleteIfExists(log4jConfigurationFile.toPath()); - } catch (IOException e) { - throw new RuntimeException(e); + if (Files.exists(log4jConfigurationFile.toPath())) { + // check if version is the same as the instance one, if not then delete configuration file, otherwise keep it + // to be able to modify it before redeploying the instance + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2736 + try { + String content = Files.readString(log4jConfigurationFile.toPath(), StandardCharsets.UTF_8); + if (!content.contains("observe-server-" + getBuildVersion() + ".log\"")) { + // We need to delete the configuration file, build version mismatch + log.info("Delete previous log configuration file ({}) since the build version is not the same as the instance one ({})", log4jConfigurationFile, getBuildVersion()); + Files.deleteIfExists(log4jConfigurationFile.toPath()); + } else { + log.info("Keep previous log configuration file ({}) since the build version is the same as the instance one ({})", log4jConfigurationFile, getBuildVersion()); + } + } catch (IOException e) { + throw new RuntimeException(e); + } } log.info(String.format("Chargement du fichier de log : %s", log4jConfigurationFile)); ObserveUtil.loadLogConfiguration(ServerResources.LOG_CONFIGURATION, getCommonLog4jConfigurationFile().toPath(), log4jConfigurationFile.toPath(), this); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a057723b741495da5ffae252… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a057723b741495da5ffae252… You're receiving this email because of your account on gitlab.com.

1 0