This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See http://git.codelutin.com/echobase.git from 57e5d46 Merge branch 'release/2.7.2' adds eede296 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3076588 Merge branch 'master' into develop adds 97470c0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds ee4029f refs-50 #6462 Amélioration de la documentation d'installation adds 83d687d fix rst adds 9845bfa improve lizmap configuration options adds 4c2f27a fixes #6456: Ne plus rafraichir les données spatiales à la fin d'un import adds c22d33f refs-50 #6457: Proposer de rafraichir les données spatiales sur la page de visualisation des données spatiales adds 7243107 fixes #6463: Impossible de cloner une configuration de base de travail adds a4c2fa4 add plugin version adds 4b3f74e review gis templates adds 8134c36 change map ulr option for lizmap adds d5540af review Lizmap service adds c1fe8f0 fixes #6271 + #6457 adds 17f20f0 fixes #6271 + #6457 adds 3599750 fixes #6271 cusotmize lizmap css adds caa31d7 fixes #6458: Ne pas importer les résultats avec valeurs *NA* sur les résultats de type Région adds 9daf16e fixes #6460: Afficher les logs d'excution des script R adds 72ab470 use mavenpom 1.8.1 adds 1dd83b9 add license headers adds f36d7f4 [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions adds 0e157a3 Merge branch 'release/2.8' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 12 +- .../config/EchoBaseConfigurationOption.java | 26 +- .../fr/ifremer/echobase/io/CommandLineUtils.java | 52 ++-- .../i18n/echobase-domain_en_GB.properties | 7 +- .../i18n/echobase-domain_fr_FR.properties | 12 +- echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 33 +++ .../exportCoser/ExportCoserConfiguration.java | 10 + .../service/exportCoser/ExportCoserService.java | 7 +- .../GenerateCoserMapException.java} | 25 +- .../importdata/AbstractImportDataService.java | 24 -- .../importdata/ResultsEsduCellImportService.java | 8 +- .../ResultsMapFishCellImportService.java | 7 +- .../ResultsMapOtherCellImportService.java | 2 +- .../services/service/importdb/ImportDbService.java | 22 +- .../services/service/spatial/GisService.java | 192 ++---------- .../services/service/spatial/LizmapRepository.java | 326 +++++++++++++++++++++ .../service/spatial/SpatialDataService.java | 57 ++-- .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 302 +++++++++++-------- .../gis/templates/EchoBaseQGisTemplate.qgs | 268 +++++++++-------- echobase-ui/pom.xml | 69 ++--- .../assembly/lizmap/www/themes/default/css/map.css | 8 + .../echobase/ui/EchoBaseApplicationContext.java | 2 +- .../ui/actions/AbstractWaitAndExecAction.java | 2 +- .../echobase/ui/actions/exportCoser/Export.java | 19 +- ...shSpatialViews.java => ComputeSpatialData.java} | 8 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 51 +++- .../spatial/{Show.java => ShowVoyageMap.java} | 71 ++++- .../src/main/resources/config/struts-spatial.xml | 13 +- echobase-ui/src/main/resources/echobase.properties | 3 + .../resources/i18n/echobase-ui_en_GB.properties | 3 +- .../resources/i18n/echobase-ui_fr_FR.properties | 3 +- .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 60 ++-- .../jsp/spatial/{show.jsp => showVoyageMap.jsp} | 57 ++-- .../main/webapp/WEB-INF/jsp/workingDb/manage.jsp | 14 +- pom.xml | 14 +- src/site/en/rst/exportCoser.rst | 1 + src/site/rst/exportCoser.rst | 1 + src/site/rst/install.rst.vm | 73 ++--- 40 files changed, 1147 insertions(+), 721 deletions(-) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/{exportquery/ExportQueryInvalidNameException.java => exportCoser/GenerateCoserMapException.java} (61%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java rename echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/{RefreshSpatialViews.java => ComputeSpatialData.java} (87%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/{Show.java => ShowVoyageMap.java} (65%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/{show.jsp => showVoyageMap.jsp} (58%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.