branch develop updated (97470c0 -> c1fe8f0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 97470c0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ee4029f refs-50 #6462 Amélioration de la documentation d'installation new 83d687d fix rst new 9845bfa improve lizmap configuration options new 4c2f27a fixes #6456: Ne plus rafraichir les données spatiales à la fin d'un import new c22d33f refs-50 #6457: Proposer de rafraichir les données spatiales sur la page de visualisation des données spatiales new 7243107 fixes #6463: Impossible de cloner une configuration de base de travail new a4c2fa4 add plugin version new 4b3f74e review gis templates new 8134c36 change map ulr option for lizmap new d5540af review Lizmap service new c1fe8f0 fixes #6271 + #6457 The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c1fe8f0aeb10021f1fb6da9b04a951b867d4b601 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:58:37 2015 +0100 fixes #6271 + #6457 commit d5540af0fef35e75b70b261621cada0c1163bbbf Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:50:42 2015 +0100 review Lizmap service commit 8134c36471755d179766fd840c482a5aec890dd8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:50:20 2015 +0100 change map ulr option for lizmap commit 4b3f74ec47217066005df4ffdc24d700757120c7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:49:30 2015 +0100 review gis templates commit a4c2fa45f6ad4cedb4e3740e7bc29b6603d8751f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:47:26 2015 +0100 add plugin version commit 7243107ebbecf4d4ab2f876a160e681d5b4b6570 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 16:05:18 2015 +0100 fixes #6463: Impossible de cloner une configuration de base de travail commit c22d33f3490f37d69582150563fed60747996af5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:34:19 2015 +0100 refs-50 #6457: Proposer de rafraichir les données spatiales sur la page de visualisation des données spatiales commit 4c2f27a03dc226ca3ff1f6830759b9583874513d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:33:52 2015 +0100 fixes #6456: Ne plus rafraichir les données spatiales à la fin d'un import commit 9845bfa35690e46b800dcaf6641cd027b8160402 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:05:22 2015 +0100 improve lizmap configuration options commit 83d687d72647f009e39fc0810aac09cb666598ba Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:04:44 2015 +0100 fix rst commit ee4029f4a999dab04ca0185b13e062d6ee4ebaeb Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:03:56 2015 +0100 refs-50 #6462 Amélioration de la documentation d'installation Summary of changes: .../echobase/config/EchoBaseConfiguration.java | 12 +- .../config/EchoBaseConfigurationOption.java | 26 +- .../i18n/echobase-domain_en_GB.properties | 7 +- .../i18n/echobase-domain_fr_FR.properties | 12 +- .../services/service/UserDbPersistenceService.java | 33 +++ .../importdata/AbstractImportDataService.java | 9 - .../services/service/importdb/ImportDbService.java | 22 +- .../services/service/spatial/GisService.java | 192 ++----------- .../services/service/spatial/LizmapRepository.java | 305 +++++++++++++++++++++ .../service/spatial/SpatialDataService.java | 57 ++-- .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 302 +++++++++++--------- .../gis/templates/EchoBaseQGisTemplate.qgs | 268 +++++++++--------- echobase-ui/pom.xml | 67 ++--- .../echobase/ui/EchoBaseApplicationContext.java | 2 +- ...shSpatialViews.java => ComputeSpatialData.java} | 8 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 19 ++ .../echobase/ui/actions/spatial/ShowVoyageMap.java | 10 + echobase-ui/src/main/resources/echobase.properties | 3 + .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 36 ++- .../webapp/WEB-INF/jsp/spatial/showVoyageMap.jsp | 0 .../main/webapp/WEB-INF/jsp/workingDb/manage.jsp | 14 +- pom.xml | 10 + src/site/en/rst/exportCoser.rst | 1 + src/site/rst/exportCoser.rst | 1 + src/site/rst/install.rst.vm | 73 ++--- 25 files changed, 894 insertions(+), 595 deletions(-) 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%) create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowVoyageMap.java copy README.txt => echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showVoyageMap.jsp (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit ee4029f4a999dab04ca0185b13e062d6ee4ebaeb Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:03:56 2015 +0100 refs-50 #6462 Amélioration de la documentation d'installation --- echobase-ui/pom.xml | 67 ++++++++++++++++------------------------- pom.xml | 3 ++ src/site/rst/install.rst.vm | 73 ++++++++++++++++++++++++--------------------- 3 files changed, 67 insertions(+), 76 deletions(-) diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 873b59a..e8b4406 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -26,8 +26,8 @@ <env>dev</env> - <fullWarName>echobase-full-${project.version}</fullWarName> - <lizmapZipName>echobase-lizmap-${project.version}</lizmapZipName> + <fullWarName>echobase-ui-${project.version}-full</fullWarName> + <lizmapZipName>echobase-ui-${project.version}-lizmap</lizmapZipName> <!-- deploy configuration --> <deployFiles>${project.build.directory}/${fullWarName}.war</deployFiles> @@ -516,7 +516,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <executions> <execution> <id>create-embedded-zip</id> @@ -567,6 +566,28 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-lizmap-zip</id> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/${lizmapZipName}.zip</file> + <type>zip</type> + <classifier>lizmap</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> @@ -587,10 +608,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - </configuration> <executions> <execution> <id>create-full-war</id> @@ -603,7 +620,6 @@ <descriptor>src/main/assembly/full-war.xml</descriptor> </descriptors> <finalName>${fullWarName}</finalName> - <attach>true</attach> </configuration> </execution> </executions> @@ -611,9 +627,9 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.9.1</version> <executions> <execution> + <id>attach-full-war</id> <goals> <goal>attach-artifact</goal> </goals> @@ -633,38 +649,5 @@ </build> </profile> - <!--profile> - <id>add-log-to-jetty</id> - <activation> - <file> - <exists>/var/local/echobase</exists> - </file> - </activation> - - <build> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <configuration> - <stopKey>A</stopKey> - <stopPort>1269</stopPort> - <systemProperties> - <systemProperty> - <name>echobase.data.dir</name> - <value>/var/local/echobase</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - </plugins> - </pluginManagement> - - </build> - - </profile--> - </profiles> </project> diff --git a/pom.xml b/pom.xml index 3f1b98d..0def6ba 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,9 @@ <!-- name of embedded war file basename --> <embeddedWarName>echobase-embedded-${project.version}</embeddedWarName> + <!-- Lizmap version --> + <lizmapVersion>2.9.4</lizmapVersion> + </properties> <dependencyManagement> diff --git a/src/site/rst/install.rst.vm b/src/site/rst/install.rst.vm index 529b579..e7bebac 100644 --- a/src/site/rst/install.rst.vm +++ b/src/site/rst/install.rst.vm @@ -75,28 +75,17 @@ que le répertoire **/var/lib/tomcat7** existe. Toutes les données de l'application seront placées dans le répertoire **/var/local/echobase** -- Créer les répertoires - :: mkdir /var/local/echobase - mkdir /var/local/echobase/war - -- Placer le war *echobase-full-${project.version}.war* à utiliser dans **/var/local/echobase/war** -- Ajouter un lien symoblique vers le war à utiliser - -:: - - ln -s /var/local/echobase/war/echobase-full-${project.version}.war /var/local/echobase/echobase.war - -- Ajouter l'application dans tomcat - -:: - + mkdir -p /var/local/echobase/war + cd /var/local/echobase/war + wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war + ln -s /var/local/echobase/war/echobase-ui-${project.version}-full.war /var/local/echobase/echobase.war cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps + chown -R tomcat. . -L'application est bien déployée lorsque vous pouvez accéder à l'application à -l'adresse suivante : +L'application est bien déployée lorsque vous pouvez accéder à l'application à l'adresse suivante : :: http://localhost:8080/echobase @@ -115,19 +104,19 @@ Une fois l'application déployée, vous aurez la structure de répertoires suiva | | `-- postgresql-${postgresqlVersion}.jar | |-- logs | | `-- echobase.log - | `-- lizmap + | `-- gis | |-- resources | | |-- France&Spain.shp | | |-- pelgas09.shp | | `-- ... | |-- projects | `-- templates - | |-- QgisTemplate.qgs - | |-- LizmapTemplate.qgs.cfg + | |-- EchoBaseLizmapTemplate.qgs.cfg + | |-- EchoBaseQGisTemplate.qgs | `-- ... |-- echobase.war `-- war - `-- echobase-full-${project.version}.war + `-- echobase-ui-${project.version}-full.war Mettre à jour le war de l'application @@ -152,18 +141,14 @@ Pour utiliser une nouvelle version de l'application, c'est très simple. - Attendre que le répertoire **/var/lib/tomcat7/webapps/echobase** a bien été supprimé. -- Placer le war *echobase-full-${project.version}.war* à utiliser dans **/var/local/echobase/war** -- Changer le lien symbolique **/var/local/echobase/echobase.war** +- Mettre l'application dans tomcat : :: + cd /var/local/echobase/war + wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-full.war unlink /var/local/echobase/echobase.war - ln -s /var/local/echobase/war/echobase-full-${project.version}.war /var/local/echobase/echobase.war - -- Mettre l'application dans tomcat - -:: - + ln -s /var/local/echobase/war/echobase-ui-${project.version}-full.war /var/local/echobase/echobase.war cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps Tomcat va redéployer l'application et elle sera disponible d'ici peu à l'adresse @@ -210,17 +195,37 @@ EchoBase utilise `Qgis map server`_ et `Lizmap`_ pour la visualisation des donn Qgis map server ~~~~~~~~~~~~~~~ -Pour installer Qgis map server, suivez `le guide d'installation Qgis map server <http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial#Webserver-configuration>`_. +Pour installer Qgis map server : + +:: + + apt-get install qgis-server libapache2-mod-fcgid + a2enmod cgid + service apache2 restart Lizmap ~~~~~~ -Pour installer Lizmap, suivez `le guide d'installation Lizmap <http://docs.3liz.com/fr/lizmap-web-client/installation/linux.html>`_. +Nous utilisons pour le moment la version ${lizmapVersion}. + +Installation Lizmap:: + + cd /var/www/ + VERSION=${lizmapVersion} + wget https://github.com/3liz/lizmap-web-client/archive/$VERSION.zip + unzip $VERSION.zip + rm $VERSION.zip + +On obtient alors un répertoire **lizmap-web-client-${lizmapVersion}**. -Il faut ensuite installer le style adapté pour EchoBase. +Il faut ensuite installer le style adapté pour EchoBase:: -1. Télécharger le fichier **echobase-lizmap-${project.version}.zip** sur le forge (https://forge.codelutin.com/projects/echobase/files) -2. Extraire ce fichier dans le répertoire d'installation de lizmap (par défaut **/var/www/lizmap-web-client-xxx/lizmap/**). + cd /var/www/lizmap-web-client-${lizmapVersion}/lizmap + wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-lizmap.zip + unzip echobase-ui-${project.version}-lizmap.zip + rm -rf echobase-ui-${project.version}-lizmap.zip + cd .. + chown -R o+wr . Configuration des répertoires ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 83d687d72647f009e39fc0810aac09cb666598ba Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:04:44 2015 +0100 fix rst --- src/site/en/rst/exportCoser.rst | 1 + src/site/rst/exportCoser.rst | 1 + 2 files changed, 2 insertions(+) diff --git a/src/site/en/rst/exportCoser.rst b/src/site/en/rst/exportCoser.rst index aa7a9fe..b7e81cc 100644 --- a/src/site/en/rst/exportCoser.rst +++ b/src/site/en/rst/exportCoser.rst @@ -18,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ================================ Export to Indicator site (Coser) ================================ diff --git a/src/site/rst/exportCoser.rst b/src/site/rst/exportCoser.rst index 4b099b3..8f76575 100644 --- a/src/site/rst/exportCoser.rst +++ b/src/site/rst/exportCoser.rst @@ -18,6 +18,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ============================================ Exporter sur le site des indicateurs (Coser) ============================================ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 9845bfa35690e46b800dcaf6641cd027b8160402 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:05:22 2015 +0100 improve lizmap configuration options --- .../echobase/config/EchoBaseConfiguration.java | 12 +++++----- .../config/EchoBaseConfigurationOption.java | 26 ++++++++++++++-------- .../i18n/echobase-domain_en_GB.properties | 7 ++++-- .../i18n/echobase-domain_fr_FR.properties | 12 +++++----- .../services/service/spatial/GisService.java | 6 ++--- .../echobase/ui/EchoBaseApplicationContext.java | 2 +- echobase-ui/src/main/resources/echobase.properties | 3 +++ 7 files changed, 42 insertions(+), 26 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java index 0fb43ce..277118c 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java @@ -319,21 +319,21 @@ public class EchoBaseConfiguration { return file; } - public File getLizmapConfigFile() { + public File getLizmapApplicationConfigFile() { File file = applicationConfig.getOptionAsFile( - EchoBaseConfigurationOption.LIZMAP_CONFIG_FILE.key); + EchoBaseConfigurationOption.LIZMAP_APPLICATION_CONFIG_FILE.key); Preconditions.checkNotNull(file); return file; } - public String getLizmapJdbcUrl() { + public String getLizmapApplicationJdbcUrl() { String jdbcUrl = applicationConfig.getOption( - EchoBaseConfigurationOption.LIZMAP_JDBC_URL.key); + EchoBaseConfigurationOption.LIZMAP_APPLICATION_JDBC_URL.key); return jdbcUrl; } - public String getLizmapUrl() { - String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_URL.key); + public String getLizmapApplicationUrl() { + String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_APPLICATION_URL.key); return url; } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index 86712b6..237b0ae 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -115,17 +115,25 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { n("echobase.config.lizmap.projects.directory.description"), "${echobase.gis.directory}/projects", File.class), - LIZMAP_CONFIG_FILE("echobase.lizmap.config.file", - n("echobase.config.lizmap.config.file.description"), - "/var/www/lizmap-web-client-2.9.4/lizmap/var/config/lizmapConfig.ini.php", + LIZMAP_APPLICATION_VERSION("echobase.lizmap.application.version", + n("echobase.config.lizmap.application.version.description"), + "", + Version.class), + LIZMAP_APPLICATION_BASEDIR("echobase.lizmap.application.basedir", + n("echobase.config.lizmap.application.basedir.description"), + "/var/www/lizmap-web-client-${echobase.lizmap.application.version}", File.class), - LIZMAP_URL("echobase.lizmap.url", - n("echobase.config.lizmap.url.description"), - "http://localhost/lizmap-web-client-2.9.4/lizmap/www/index.php/view/", + LIZMAP_APPLICATION_CONFIG_FILE("echobase.lizmap.application.config.file", + n("echobase.config.lizmap.application.config.file.description"), + "${echobase.lizmap.application.basedir}/lizmap/var/config/lizmapConfig.ini.php", + File.class), + LIZMAP_APPLICATION_URL("echobase.lizmap.application.url", + n("echobase.config.lizmap.application.url.description"), + "http://localhost/lizmap-web-client-${echobase.lizmap.application.version}/lizmap/www/index.php/view/", String.class), - LIZMAP_JDBC_URL("echobase.lizmap.jdbc.url", - n("echobase.config.lizmap.jdbc.url.description"), - "jdbc:sqlite:/var/www/lizmap-web-client-2.9.4/lizmap/var/jauth.db", + LIZMAP_APPLICATION_JDBC_URL("echobase.lizmap.application.jdbc.url", + n("echobase.config.lizmap.application.jdbc.url.description"), + "jdbc:sqlite:${echobase.lizmap.application.basedir}/lizmap/var/jauth.db", String.class), LIZMAP_REPOSITORY_NAME("echobase.lizmap.repositoryName", n("echobase.lizmap.repositoryName.description"), diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties index d2a5c2a..092e643 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties @@ -37,11 +37,14 @@ echobase.config.gis.templates.directory.description=Directory where to store tem echobase.config.h2Version.description=H2 jdbc driver version echobase.config.internal.db.directory.description=Directory of the internal database echobase.config.lib.directory.description=Directory where to put internal libraries (jdbc drivers, embedded war) +echobase.config.lizmap.application.basedir.description=Lizmap application basedir +echobase.config.lizmap.application.config.file.description=Config file of Lizmap application +echobase.config.lizmap.application.version.description=Version of Lizmap echobase.config.lizmap.config.file.description=Lizmap configuration file -echobase.config.lizmap.jdbc.url.description=JDBC URL for lizmap data base +echobase.config.lizmap.application.jdbc.url.description=JDBC URL for lizmap data base echobase.config.lizmap.projects.directory.description=Directory where to store generated lizMap projects echobase.config.lizmap.template.file.description=Lizmap configuration file template -echobase.config.lizmap.url.description=Lizmap URL +echobase.config.lizmap.application.url.description=Lizmap URL echobase.config.log.config.file.description=Log configuration file echobase.config.postgresqlVersion.description=Postgresql driver version echobase.config.qgis.resources.directory.description=Directory where to store any resources used by Qgis projets (such as maps,...) diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties index b4cf1da..0a7d9cb 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties @@ -37,11 +37,13 @@ echobase.config.gis.templates.directory.description=Répertoire des templates ut echobase.config.h2Version.description=Version du pilote jdbc H2 echobase.config.internal.db.directory.description=Répertoire de la base interne echobase.config.lib.directory.description=Chemin où sont stockés les libraires internes (drivers + application embarquée) -echobase.config.lizmap.config.file.description=Fichier de configuration de lizmap -echobase.config.lizmap.jdbc.url.description=URL JDBC de la base lizmap -echobase.config.lizmap.projects.directory.description=Répertoire de génération des projets lizMap -echobase.config.lizmap.template.file.description=Le modièle du fichier de configuration de Lizmap -echobase.config.lizmap.url.description=L'URL de Lizmap +echobase.config.lizmap.application.basedir.description=Le répertoire de base de l'installation de Lizmap +echobase.config.lizmap.application.config.file.description=Fichier de configuration de Lizmap +echobase.config.lizmap.application.jdbc.url.description=URL JDBC de la base Lizmap +echobase.config.lizmap.application.url.description=L'URL de Lizmap +echobase.config.lizmap.application.version.description=Version de Lizmap +echobase.config.lizmap.projects.directory.description=Répertoire de génération des projets Lizmap +echobase.config.lizmap.template.file.description=Le modèle du fichier de configuration de Lizmap pour une campagne echobase.config.log.config.file.description=Fichier de configuration des logs echobase.config.postgresqlVersion.description=Version du pilote jdbc Postgresql echobase.config.qgis.resources.directory.description=Répertoire des resources associées à un projet Qgis diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java index 9df16a8..6a14962 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java @@ -173,7 +173,7 @@ public class GisService extends EchoBaseServiceSupport { public String getRepositoryUrl(JdbcConfiguration conf) { String repositoryName = getRepositoryName(conf); - String repositoryUrl = getConfiguration().getLizmapUrl() + "?" + "repository=" + repositoryName; + String repositoryUrl = getConfiguration().getLizmapApplicationUrl() + "?" + "repository=" + repositoryName; return repositoryUrl; } @@ -183,7 +183,7 @@ public class GisService extends EchoBaseServiceSupport { WorkingDbConfiguration workingDbConfiguration = workingDbConfigurationService.getWorkingDbConfigurationByUrl(conf.getUrl()); - File lizmapConfigFile = getConfiguration().getLizmapConfigFile(); + File lizmapConfigFile = getConfiguration().getLizmapApplicationConfigFile(); try { @@ -212,7 +212,7 @@ public class GisService extends EchoBaseServiceSupport { public void updateLizmapAuthorizations(String repositoryName) { - String lizmapJdbcUrl = getConfiguration().getLizmapJdbcUrl(); + String lizmapJdbcUrl = getConfiguration().getLizmapApplicationJdbcUrl(); Connection connection = null; try { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java index c58d1ff..924a116 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java @@ -223,7 +223,7 @@ public class EchoBaseApplicationContext { throw new TopiaException("Could not extract files (drivers + embedded war)", e); } - File lizmapConfig = getConfiguration().getLizmapConfigFile(); + File lizmapConfig = getConfiguration().getLizmapApplicationConfigFile(); gisSupport = lizmapConfig.exists(); diff --git a/echobase-ui/src/main/resources/echobase.properties b/echobase-ui/src/main/resources/echobase.properties index 9d3ab82..6ed8cc3 100644 --- a/echobase-ui/src/main/resources/echobase.properties +++ b/echobase-ui/src/main/resources/echobase.properties @@ -27,3 +27,6 @@ echobase.postgresqlVersion=${postgresqlVersion} # H2 pilot version echobase.h2Version=${h2Version} + +# Lizmap version +echobase.lizmap.application.version=${lizmapVersion} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 4c2f27a03dc226ca3ff1f6830759b9583874513d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:33:52 2015 +0100 fixes #6456: Ne plus rafraichir les données spatiales à la fin d'un import --- .../importdata/AbstractImportDataService.java | 9 --------- .../services/service/importdb/ImportDbService.java | 22 ++-------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java index 75098d2..5ed3de2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java @@ -44,7 +44,6 @@ import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.service.UserDbPersistenceService; -import fr.ifremer.echobase.services.service.spatial.SpatialDataService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -89,9 +88,6 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur @Inject protected UserDbPersistenceService persistenceService; - @Inject - private SpatialDataService spatialDataService; - public final String doImport(M configuration, EchoBaseUser user) throws ImportException { @@ -116,11 +112,6 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur // do commit persistenceService.commit(); - // update sql spatial data - spatialDataService.updatePostgisTable(); - - s0 = TIME_LOG.log(s0, "postgis update"); - TIME_LOG.log(s0, "importCommited"); return result; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java index 2a18376..2328aed 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java @@ -22,16 +22,13 @@ package fr.ifremer.echobase.services.service.importdb; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.service.importdata.ImportException; import fr.ifremer.echobase.services.service.importdb.strategy.AbstractImportDbStrategy; import fr.ifremer.echobase.services.service.importdb.strategy.FreeImportDbStrategy; import fr.ifremer.echobase.services.service.importdb.strategy.ReferentialImportDbStrategy; -import fr.ifremer.echobase.services.service.spatial.SpatialDataService; import org.nuiton.topia.persistence.TopiaException; -import javax.inject.Inject; import java.io.IOException; /** @@ -42,14 +39,7 @@ import java.io.IOException; */ public class ImportDbService extends EchoBaseServiceSupport { - @Inject - private EchoBaseUserPersistenceContext persistenceContext; - - @Inject - private SpatialDataService spatialDataService; - - public void doImport(ImportDbConfiguration model, - EchoBaseUser user) throws ImportException { + public void doImport(ImportDbConfiguration model, EchoBaseUser user) throws ImportException { ImportDbMode importDbMode = model.getImportDbMode(); @@ -69,18 +59,10 @@ public class ImportDbService extends EchoBaseServiceSupport { try { strategy.doImport(model, user); - } catch (IOException e) { - throw new ImportException("Could not import db", e); - } catch (TopiaException e) { + } catch (IOException | TopiaException e) { throw new ImportException("Could not import db", e); } - if (ImportDbMode.REFERENTIAL != importDbMode && persistenceContext.isSpatialStructureFound()) { - - // let's update postgis table - spatialDataService.updatePostgisTable(); - - } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit c22d33f3490f37d69582150563fed60747996af5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:34:19 2015 +0100 refs-50 #6457: Proposer de rafraichir les données spatiales sur la page de visualisation des données spatiales --- .../services/service/UserDbPersistenceService.java | 33 +++++++++++++ .../service/spatial/SpatialDataService.java | 57 +++++++++++++--------- .../ui/actions/spatial/RefreshSpatialViews.java | 6 ++- .../ifremer/echobase/ui/actions/spatial/Show.java | 19 ++++++++ .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 36 +++++++++----- 5 files changed, 115 insertions(+), 36 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index 6fc2c2f..8498c6c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -82,6 +82,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.io.OutputStream; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.Collection; import java.util.Date; import java.util.List; @@ -862,4 +866,33 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { "Could not find class from id: " + id, e); } } + + public long countTable(String tableName) { + + CountTableRows query = new CountTableRows(tableName); + Long count = findSingleResult(query); + return count; + + } + + private static class CountTableRows extends TopiaSqlQuery<Long> { + + public final String tableName; + + private CountTableRows(String tableName) { + this.tableName = tableName; + } + + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + String hql = "SELECT count(*) FROM "+tableName; + PreparedStatement result = connection.prepareStatement(hql); + return result; + } + + @Override + public Long prepareResult(ResultSet set) throws SQLException { + return set.getLong(1); + } + } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java index 676df49..13c2f8d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java @@ -71,53 +71,66 @@ public class SpatialDataService extends EchoBaseServiceSupport { } /** + * @return {@code true} if there is some postgis data to compute. + * @since 2.8 + */ + public boolean isSpatialDataToComputeExist() { + + boolean result = false; + if (persistenceContext.isSpatialStructureFound()) { + + long nbCellTemp = persistenceService.countTable("echobase_cell_spatial_temp"); + long nbOperationTemp = persistenceService.countTable("echobase_operation_spatial_temp"); + result = nbCellTemp + nbOperationTemp > 0; + } + + return result; + + } + + /** * To update the {@code echobase_cell_spatial} table from the filled - * table {@code echobase_cell_sptaial_temp}. + * table {@code echobase_cell_spatial_temp}. + * + * To update the {@code echobase_operation_spatial} table from the filled + * table {@code echobase_operation_spatial_temp}. + * + * To rebuild the gis views. * - * @since 2.2 + * @since 2.8 */ - public void updatePostgisTable() { + public void updatePostgisData() { if (persistenceContext.isSpatialStructureFound()) { // try the update only for postgresql try { + long time = TimeLog.getTime(); if (log.isInfoEnabled()) { log.info("Will try to compute operation spatial data from temp table..."); } persistenceService.executeSQL("SELECT echobase_fill_operation_spatial_table();"); + TILE_LOG.log(time, "updatePostgisData::echobase_fill_operation_spatial_table"); + + time = TimeLog.getTime(); if (log.isInfoEnabled()) { log.info("Will try to compute cell spatial data from temp table..."); } persistenceService.executeSQL("SELECT echobase_fill_cell_spatial_table();"); - persistenceService.commit(); - } catch (Exception e) { - throw new EchoBaseTechnicalException("Could not compute spatial data", e); - } - } - } + TILE_LOG.log(time, "updatePostgisData::echobase_fill_cell_spatial_table"); - - /** - * To update all posgis materialized views.. - * - * @since 2.6 - */ - public void updatePostgisViews() { - - if (persistenceContext.isSpatialStructureFound()) { - - // try the update only for postgresql - try { + time = TimeLog.getTime(); if (log.isInfoEnabled()) { log.info("Will try to refresh all spatial views..."); } persistenceService.executeSQL("SELECT echobase_refresh_views();"); + TILE_LOG.log(time, "updatePostgisData::echobase_refresh_views"); persistenceService.commit(); } catch (Exception e) { - throw new EchoBaseTechnicalException("Could not refresh spatial views", e); + throw new EchoBaseTechnicalException("Could not compute spatial data", e); } } + } protected void executeSqlScript(String scriptPath) { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java index debd6eb..8ec04d5 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java @@ -42,7 +42,11 @@ public class RefreshSpatialViews extends EchoBaseActionSupport { @Override public String execute() throws Exception { - spatialDataService.updatePostgisViews(); + if (spatialDataService.isSpatialDataToComputeExist()) { + + spatialDataService.updatePostgisData(); + + } return SUCCESS; } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java index e396e76..bb71d80 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java @@ -24,6 +24,7 @@ package fr.ifremer.echobase.ui.actions.spatial; import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.service.spatial.GisService; +import fr.ifremer.echobase.services.service.spatial.SpatialDataService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,6 +47,9 @@ public class Show extends EchoBaseActionSupport { protected transient GisService gisService; @Inject + protected transient SpatialDataService spatialDataService; + + @Inject protected transient EchoBaseUserPersistenceContext userPersistenceContext; /** @@ -64,6 +68,11 @@ public class Show extends EchoBaseActionSupport { protected boolean gisSupport; /** + * Is there some spatial data to compute + */ + protected boolean spatialDataToComputeExists; + + /** * Url to access to gis. */ protected String lizmapUrl; @@ -80,6 +89,10 @@ public class Show extends EchoBaseActionSupport { return spatialSupport; } + public boolean isSpatialDataToComputeExists() { + return spatialDataToComputeExists; + } + public boolean isGisSupport() { return gisSupport; } @@ -103,6 +116,12 @@ public class Show extends EchoBaseActionSupport { log.info("Spatial structure found."); } + spatialDataToComputeExists = spatialDataService.isSpatialDataToComputeExist(); + + if (log.isInfoEnabled()) { + log.info("Is there some spatial data to compute? "+ spatialDataToComputeExists); + } + gisSupport = getEchoBaseApplicationContext().isGisSupport(); if (gisSupport) { diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp index af2c3da..3e5bd0e 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp @@ -32,20 +32,30 @@ <s:if test="spatialStructureFound"> <%-- db has spatial structures --%> - <s:form namespace="/spatial"> - <div class="toolbar"> - <ul class="toolbar floatRight"> - <li> - <s:submit action='refreshSpatialViews' key="echobase.action.reloadSpatialData"/> - </li> - </ul> - </div> - </s:form> + + <s:if test="spatialDataToComputeExists"> + + <%-- there is some postigs data to compute --%> + + <s:form namespace="/spatial"> + <div class="toolbar"> + <ul class="toolbar floatRight"> + <li> + <s:submit action='refreshSpatialViews' key="echobase.action.reloadSpatialData"/> + </li> + </ul> + </div> + </s:form> + + </s:if> <s:if test="gisSupport"> + <p> + TODO Show voyage links to lizmap + </p> <%-- Application has gis support --%> - <iframe id="spatialViewContent" src="${lizmapUrl}"></iframe> + <%--<iframe id="spatialViewContent" src="${lizmapUrl}"></iframe>--%> </s:if> <s:else> @@ -53,9 +63,9 @@ <%-- Application has no gis support --%> <p class="fontsize11"> <s:text name="echobase.message.application.no.gis.support"/> - <s:a href="%{getDocumentation('install.html', 'Visualisation_des_donnes_spatialises')}" target='#doc'> - <s:text name="echobase.message.gis.install"/> - </s:a> + <s:a href="%{getDocumentation('install.html', 'Visualisation_des_donnes_spatialises')}" target='#doc'> + <s:text name="echobase.message.gis.install"/> + </s:a> </p> </s:else> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 7243107ebbecf4d4ab2f876a160e681d5b4b6570 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 16:05:18 2015 +0100 fixes #6463: Impossible de cloner une configuration de base de travail --- .../src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp index 265bf45..caba29b 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp @@ -115,9 +115,17 @@ </div> <br/> - <s:select key="conf.driverType" cssStyle="font-size: 140%" id="confDriverType" - label="%{getText('echobase.label.driverType')}" requiredLabel="true" - list="driverTypes" disabled="%{confExists or clone}" onchange="driverTypeChanged(this)" /> + <s:if test="confExists or clone"> + <s:select cssStyle="font-size: 140%" + label="%{getText('echobase.label.driverType')}" requiredLabel="true" + list="driverTypes" disabled="true" value="conf.driverType"/> + <s:hidden name="conf.driverType"/> + </s:if> + <s:else> + <s:select key="conf.driverType" cssStyle="font-size: 140%" id="confDriverType" + label="%{getText('echobase.label.driverType')}" requiredLabel="true" + list="driverTypes" onchange="driverTypeChanged(this)" /> + </s:else> <s:textfield key="conf.url" requiredLabel="true" size="80" id="confUrl" readonly="%{confExists}" -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit a4c2fa45f6ad4cedb4e3740e7bc29b6603d8751f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:47:26 2015 +0100 add plugin version --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 0def6ba..d5abc9d 100644 --- a/pom.xml +++ b/pom.xml @@ -496,6 +496,13 @@ <version>${nuitonI18nVersion}</version> </plugin> + <!-- FIXME Move to codelutinpom project --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.9.1</version> + </plugin> + </plugins> </pluginManagement> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 4b3f74ec47217066005df4ffdc24d700757120c7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:49:30 2015 +0100 review gis templates --- .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 302 ++++++++++++--------- .../gis/templates/EchoBaseQGisTemplate.qgs | 268 +++++++++--------- 2 files changed, 315 insertions(+), 255 deletions(-) diff --git a/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg b/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg index bb3df6e..43f2f85 100644 --- a/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg +++ b/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg @@ -1,17 +1,101 @@ { "layers": { + + "Country": { + "abstract": "", + "displayInLegend": "False", + "cacheExpiration": 86400, + "baseLayer": "false", + "noLegendImage": "False", + "id": "country{{voyageId}}", + "title": "Country", + "singleTile": "False", + "groupAsLayer": "False", + "popup": "False", + "clientCacheExpiration": 300, + "link": "", + "toggled": "True", + "name": "Country", + "cached": "True", + "type": "layer", + "maxScale": 1000000000000, + "imageFormat": "image/png", + "minScale": 1 + }, + "Bathymetry": { + "abstract": "", + "displayInLegend": "False", + "cacheExpiration": 86400, + "baseLayer": "false", + "noLegendImage": "False", + "id": "pelgas{{voyageId}}", + "title": "Bathymetry", + "singleTile": "False", + "groupAsLayer": "False", + "popup": "False", + "clientCacheExpiration": 300, + "link": "", + "toggled": "True", + "name": "Bathymetry", + "cached": "true", + "type": "layer", + "maxScale": 1000000000000, + "imageFormat": "image/png", + "minScale": 1 + }, + "Pelagic trawl catch": { + "abstract": "", + "baseLayer": "False", + "noLegendImage": "False", + "id": "totalcatchspopwide{{voyageId}}", + "title": "Pelagic trawl catch", + "singleTile": "True", + "groupAsLayer": "False", + "popup": "False", + "clientCacheExpiration": 300, + "link": "", + "toggled": "False", + "name": "Pelagic trawl catch", + "cached": "False", + "type": "layer", + "maxScale": 1000000000000, + "imageFormat": "image/png", + "minScale": 1 + }, + + "Biomass": { + "abstract": "", + "displayInLegend": "True", + "baseLayer": "False", + "noLegendImage": "False", + "id": "Biomass", + "title": "Biomass", + "singleTile": "False", + "groupAsLayer": "False", + "popup": "False", + "clientCacheExpiration": 300, + "link": "", + "toggled": "True", + "name": "Biomass", + "cached": "False", + "type": "group", + "maxScale": 1000000000000, + "imageFormat": "image/png", + "minScale": 1 + }, + "Sardine biomass": { "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "Anchovy_biomass_copier{{voyageId}}", - "title": "Sardine biomass", + "id": "biomass_sardpil{{voyageId}}", + "title": "Sardine", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", + "toggled": "False", "name": "Sardine biomass", "cached": "False", "type": "layer", @@ -23,14 +107,14 @@ "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "Sprat_biomass_copier{{voyageId}}", - "title": "Horse mackerel biomass", + "id": "biomass_tractru{{voyageId}}", + "title": "Horse mackerel", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", + "toggled": "False", "name": "Horse mackerel biomass", "cached": "False", "type": "layer", @@ -42,14 +126,14 @@ "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "Mackerel_biomass_copier{{voyageId}}", + "id": "biomass_mircpou{{voyageId}}", "title": "Blue whitting biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", + "toggled": "False", "name": "Blue whitting biomass", "cached": "False", "type": "layer", @@ -61,33 +145,93 @@ "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "cellesduviewspeciesbiomass{{voyageId}}", + "id": "biomass_engrenc{{voyageId}}", "title": "Anchovy biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", + "toggled": "False", "name": "Anchovy biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 - }, + }, + "Sprat biomass": { + "abstract": "", + "baseLayer": "False", + "noLegendImage": "False", + "id": "biomass_spraspr{{voyageId}}", + "title": "Sprat", + "singleTile": "False", + "groupAsLayer": "False", + "popup": "False", + "clientCacheExpiration": 300, + "link": "", + "toggled": "False", + "name": "Sprat biomass", + "cached": "False", + "type": "layer", + "maxScale": 1000000000000, + "imageFormat": "image/png", + "minScale": 1 + }, + "Mackerel biomass": { + "abstract": "", + "baseLayer": "False", + "noLegendImage": "False", + "id": "biomass_scomsco{{voyageId}}", + "title": "Mackerel", + "singleTile": "False", + "groupAsLayer": "False", + "popup": "False", + "clientCacheExpiration": 300, + "link": "", + "toggled": "False", + "name": "Mackerel biomass", + "cached": "False", + "type": "layer", + "maxScale": 1000000000000, + "imageFormat": "image/png", + "minScale": 1 + }, + + "Mean Biomass": { + "abstract": "", + "displayInLegend": "True", + "baseLayer": "False", + "noLegendImage": "False", + "id": "Mean Biomass", + "title": "Mean Biomass", + "singleTile": "False", + "groupAsLayer": "False", + "popup": "False", + "clientCacheExpiration": 300, + "link": "", + "toggled": "True", + "name": "Mean Biomass", + "cached": "False", + "type": "group", + "maxScale": 1000000000000, + "imageFormat": "image/png", + "minScale": 1 + }, + "Blue whitting mean biomass": { "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomassmicrpou{{voyageId}}", - "title": "Blue whitting mean biomass", + "id": "meanmapcellbiomass_micrpou{{voyageId}}", + "title": "Blue whitting", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", + "toggled": "False", "name": "Blue whitting mean biomass", "cached": "False", "type": "layer", @@ -99,8 +243,8 @@ "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomassscomsco{{voyageId}}", - "title": "Mackerel mean biomass", + "id": "meanmapcellbiomass_scomsco{{voyageId}}", + "title": "Mackerel", "singleTile": "False", "groupAsLayer": "False", "popup": "False", @@ -113,38 +257,19 @@ "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 - }, - "Pelagic trawl catch": { - "abstract": "", - "baseLayer": "False", - "noLegendImage": "False", - "id": "totalcatchspopwide{{voyageId}}", - "title": "Pelagic trawl catch", - "singleTile": "True", - "groupAsLayer": "False", - "popup": "False", - "clientCacheExpiration": 300, - "link": "", - "toggled": "True", - "name": "Pelagic trawl catch", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "imageFormat": "image/png", - "minScale": 1 }, "Sardine mean biomass": { "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomasssardpil{{voyageId}}", - "title": "Sardine mean biomass", + "id": "meanmapcellbiomass_sardpil{{voyageId}}", + "title": "Sardine", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", + "toggled": "False", "name": "Sardine mean biomass", "cached": "False", "type": "layer", @@ -156,14 +281,14 @@ "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomassengrenc{{voyageId}}", - "title": "Anchovy mean biomass", + "id": "meanmapcellbiomass_engrenc{{voyageId}}", + "title": "Anchovy", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", + "toggled": "False", "name": "Anchovy mean biomass", "cached": "False", "type": "layer", @@ -171,38 +296,18 @@ "imageFormat": "image/png", "minScale": 1 }, - "Bathymetry": { - "abstract": "", - "cacheExpiration": 86400, - "baseLayer": "false", - "noLegendImage": "False", - "id": "pelgas{{voyageId}}", - "title": "Bathymetry", - "singleTile": "False", - "groupAsLayer": "False", - "popup": "False", - "clientCacheExpiration": 300, - "link": "", - "toggled": "True", - "name": "Bathymetry", - "cached": "true", - "type": "layer", - "maxScale": 1000000000000, - "imageFormat": "image/png", - "minScale": 1 - }, "Sprat mean biomass": { "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomassspraspr{{voyageId}}", - "title": "Sprat mean biomass", + "id": "meanmapcellbiomass_spraspr{{voyageId}}", + "title": "Sprat", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", + "toggled": "False", "name": "Sprat mean biomass", "cached": "False", "type": "layer", @@ -210,84 +315,27 @@ "imageFormat": "image/png", "minScale": 1 }, - "Country": { - "abstract": "", - "cacheExpiration": 86400, - "baseLayer": "false", - "noLegendImage": "False", - "id": "country{{voyageId}}", - "title": "Country", - "singleTile": "False", - "groupAsLayer": "False", - "popup": "False", - "clientCacheExpiration": 300, - "link": "", - "toggled": "True", - "name": "Country", - "cached": "True", - "type": "layer", - "maxScale": 1000000000000, - "imageFormat": "image/png", - "minScale": 1 - }, - "Sprat biomass": { - "abstract": "", - "baseLayer": "False", - "noLegendImage": "False", - "id": "Sardine_biomass_copier{{voyageId}}", - "title": "Sprat biomass", - "singleTile": "False", - "groupAsLayer": "False", - "popup": "False", - "clientCacheExpiration": 300, - "link": "", - "toggled": "True", - "name": "Sprat biomass", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "imageFormat": "image/png", - "minScale": 1 - }, - "Mackerel biomass": { - "abstract": "", - "baseLayer": "False", - "noLegendImage": "False", - "id": "Horse_mackerel_biomass_copier{{voyageId}}", - "title": "Mackerel biomass", - "singleTile": "False", - "groupAsLayer": "False", - "popup": "False", - "clientCacheExpiration": 300, - "link": "", - "toggled": "True", - "name": "Mackerel biomass", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "imageFormat": "image/png", - "minScale": 1 - }, "Horse mackerel mean biomass": { "abstract": "", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomasstractru{{voyageId}}", - "title": "Horse mackerel mean biomass", + "id": "meanmapcellbiomass_tractru{{voyageId}}", + "title": "Horse mackerel", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", + "toggled": "False", "name": "Horse mackerel mean biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 - } - }, + }, + }, + "options": { "projection": { "proj4": "+proj=longlat +datum=WGS84 +no_defs", diff --git a/echobase-services/src/main/resources/gis/templates/EchoBaseQGisTemplate.qgs b/echobase-services/src/main/resources/gis/templates/EchoBaseQGisTemplate.qgs index 044f340..1710726 100644 --- a/echobase-services/src/main/resources/gis/templates/EchoBaseQGisTemplate.qgs +++ b/echobase-services/src/main/resources/gis/templates/EchoBaseQGisTemplate.qgs @@ -3,46 +3,54 @@ <title>{{voyageName}}</title> <layer-tree-group expanded="1" checked="Qt::PartiallyChecked" name=""> <customproperties/> - <layer-tree-layer expanded="1" checked="Qt::Checked" id="country{{voyageId}}" name="Country"> + <layer-tree-layer expanded="1" checked="Qt::Checked" id="totalcatchspopwide{{voyageId}}" name="Pelagic trawl catch"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Checked" id="cellesduviewspeciesbiomass{{voyageId}}" name="Anchovy biomass"> + <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Biomass"> + <customproperties/> + <layer-tree-layer expanded="0" checked="Qt::Checked" id="biomass_engrenc{{voyageId}}" name="Anchovy biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="Anchovy_biomass{{voyageId}}" name="Sardine biomass"> + <layer-tree-layer expanded="0" checked="Qt::Checked" id="biomass_micrpou{{voyageId}}" name="Blue whitting biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="Sardine_biomass{{voyageId}}" name="Sprat biomass"> + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="biomass_tractru{{voyageId}}" name="Horse mackerel biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="Sprat_biomass{{voyageId}}" name="Horse mackerel biomass"> + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="biomass_scomsco{{voyageId}}" name="Mackerel biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="Horse_mackerel_biomass{{voyageId}}" name="Mackerel biomass"> + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="biomass_sardpil{{voyageId}}" name="Sardine biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Checked" id="Mackerel_biomass{{voyageId}}" name="Blue whitting biomass"> + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="biomass_sparspr{{voyageId}}" name="Sprat biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="1" checked="Qt::Checked" id="totalcatchspopwide{{voyageId}}" name="Pelagic trawl catch"> + </layer-tree-group> + + <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Mean Biomass"> + + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomass_engrenc{{voyageId}}" name="Anchovy mean biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomassspraspr{{voyageId}}" name="Sprat mean biomass"> + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomass_micrpou{{voyageId}}" name="Blue whitting mean biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomasstractru{{voyageId}}" name="Horse mackerel mean biomass"> + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomass_tractru{{voyageId}}" name="Horse mackerel mean biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomassscomsco{{voyageId}}" name="Mackerel mean biomass"> + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomass_scomsco{{voyageId}}" name="Mackerel mean biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomasssardpil{{voyageId}}" name="Sardine mean biomass"> + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomass_sardpil{{voyageId}}" name="Sardine mean biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomassmicrpou{{voyageId}}" name="Blue whitting mean biomass"> + <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomass_spraspr{{voyageId}}" name="Sprat mean biomass"> <customproperties/> </layer-tree-layer> - <layer-tree-layer expanded="0" checked="Qt::Unchecked" id="meanmapcellbiomassengrenc{{voyageId}}" name="Anchovy mean biomass"> + </layer-tree-group> + + <layer-tree-layer expanded="1" checked="Qt::Checked" id="country{{voyageId}}" name="Country"> <customproperties/> </layer-tree-layer> <layer-tree-layer expanded="0" checked="Qt::Checked" id="pelgas{{voyageId}}" name="Bathymetry"> @@ -72,113 +80,117 @@ </spatialrefsys> </destinationsrs> <layer_coordinate_transform_info> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="cellesduviewspeciesbiomass{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomasssardpil{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomassmicrpou{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomassscomsco{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomassengrenc{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="pelgas{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="cellmapview{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomass_sardpil{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomass_micrpou{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomass_scomsco{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomass_engrenc{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomass_engrenc{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomass_tractru{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomass_spraspr{{voyageId}}"/> <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="country{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="Sardine_biomass{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="Horse_mackerel_biomass{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomasstractru{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="pelgas{{voyageId}}"/> <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="totalcatchspopwide{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomassengrenc{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="Mackerel_biomass{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="Anchovy_biomass{{voyageId}}"/> - <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="meanmapcellbiomassspraspr{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="biomass_sardil{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="biomass_micrpou{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="biomass_scomsco{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="biomass_engrenc{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="biomass_tractru{{voyageId}}"/> + <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="biomass_spraspr{{voyageId}}"/> </layer_coordinate_transform_info> </mapcanvas> <visibility-presets/> <layer-tree-canvas> <custom-order enabled="0"> - <item>country{{voyageId}}</item> - <item>cellesduviewspeciesbiomass{{voyageId}}</item> - <item>Anchovy_biomass{{voyageId}}</item> - <item>Sardine_biomass{{voyageId}}</item> - <item>Sprat_biomass{{voyageId}}</item> - <item>Horse_mackerel_biomass{{voyageId}}</item> - <item>Mackerel_biomass{{voyageId}}</item> + <item>biomass_spraspr{{voyageId}}</item> + <item>biomass_tractru{{voyageId}}</item> + <item>biomass_scomsco{{voyageId}}</item> + <item>biomass_sardpil{{voyageId}}</item> + <item>biomass_micrpou{{voyageId}}</item> + <item>biomass_engrenc{{voyageId}}</item> <item>totalcatchspopwide{{voyageId}}</item> - <item>meanmapcellbiomassspraspr{{voyageId}}</item> - <item>meanmapcellbiomasstractru{{voyageId}}</item> - <item>meanmapcellbiomassscomsco{{voyageId}}</item> - <item>meanmapcellbiomasssardpil{{voyageId}}</item> - <item>meanmapcellbiomassmicrpou{{voyageId}}</item> - <item>meanmapcellbiomassengrenc{{voyageId}}</item> + <item>meanmapcellbiomass_spraspr{{voyageId}}</item> + <item>meanmapcellbiomass_tractru{{voyageId}}</item> + <item>meanmapcellbiomass_scomsco{{voyageId}}</item> + <item>meanmapcellbiomass_sardpil{{voyageId}}</item> + <item>meanmapcellbiomass_micrpou{{voyageId}}</item> + <item>meanmapcellbiomass_engrenc{{voyageId}}</item> + <item>country{{voyageId}}</item> <item>pelgas{{voyageId}}</item> </custom-order> </layer-tree-canvas> - <legend updateDrawingOrder="true"> - <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="Country" showFeatureCount="0"> +<legend updateDrawingOrder="true"> + <legendlayer drawingOrder="-1" open="true" checked="Qt::Unchecked" name="Pelagic trawl catch" showFeatureCount="0"> <filegroup open="true" hidden="false"> - <legendlayerfile isInOverview="0" layerid="country{{voyageId}}" visible="1"/> + <legendlayerfile isInOverview="0" layerid="totalcatchspopwide{{voyageId}}" visible="0"/> </filegroup> </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Checked" name="Anchovy biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="cellesduviewspeciesbiomass{{voyageId}}" visible="1"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Sardine biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="Anchovy_biomass{{voyageId}}" visible="0"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Sprat biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="Sardine_biomass{{voyageId}}" visible="0"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Horse mackerel biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="Sprat_biomass{{voyageId}}" visible="0"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Mackerel biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="Horse_mackerel_biomass{{voyageId}}" visible="0"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Checked" name="Blue whitting biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="Mackerel_biomass{{voyageId}}" visible="1"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="Pelagic trawl catch" showFeatureCount="0"> + <legendgroup open="true" checked="Qt::Unchecked" name="Biomass"> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Anchovy biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="biomass_engrenc{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Blue whitting biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="biomass_micrpou{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Horse mackerel biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="biomass_tractru{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Mackerel biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="biomass_scomsco{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Sardine biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="biomass_sardpil{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Sprat biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="biomass_spraspr{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + </legendgroup> + <legendgroup open="true" checked="Qt::Unchecked" name="Mean Biomass"> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Anchovy mean Biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="meanmapcellbiomass_engrenc{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Blue whitting mean Biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="meanmapcellbiomass_micrpou{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Horse mackerel mean Biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="meanmapcellbiomass_tractru{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Mackerel mean Biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="meanmapcellbiomass_scomsco{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Sardine mean Biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="meanmapcellbiomass_sardpil{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Sprat mean Biomass" showFeatureCount="0"> + <filegroup open="false" hidden="false"> + <legendlayerfile isInOverview="0" layerid="meanmapcellbiomass_spraspr{{voyageId}}" visible="0"/> + </filegroup> + </legendlayer> + </legendgroup> + <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="Country" showFeatureCount="0"> <filegroup open="true" hidden="false"> - <legendlayerfile isInOverview="0" layerid="totalcatchspopwide{{voyageId}}" visible="1"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Sprat mean biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="meanmapcellbiomassspraspr{{voyageId}}" visible="0"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Horse mackerel mean biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="meanmapcellbiomasstractru{{voyageId}}" visible="0"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Mackerel mean biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="meanmapcellbiomassscomsco{{voyageId}}" visible="0"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Sardine mean biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="meanmapcellbiomasssardpil{{voyageId}}" visible="0"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Blue whitting mean biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="meanmapcellbiomassmicrpou{{voyageId}}" visible="0"/> - </filegroup> - </legendlayer> - <legendlayer drawingOrder="-1" open="false" checked="Qt::Unchecked" name="Anchovy mean biomass" showFeatureCount="0"> - <filegroup open="false" hidden="false"> - <legendlayerfile isInOverview="0" layerid="meanmapcellbiomassengrenc{{voyageId}}" visible="0"/> + <legendlayerfile isInOverview="0" layerid="country{{voyageId}}" visible="1"/> </filegroup> </legendlayer> <legendlayer drawingOrder="-1" open="false" checked="Qt::Checked" name="Bathymetry" showFeatureCount="0"> @@ -189,7 +201,7 @@ </legend> <projectlayers layercount="15"> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>Anchovy_biomass{{voyageId}}</id> + <id>biomass_sardpil{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POINT table="public"."cellesduviewspeciesbiomass" (coordinate) sql="baracoudacode" ='SARD-PIL'</datasource> <title></title> <abstract></abstract> @@ -556,7 +568,7 @@ </edittypes> </maplayer> <maplayer minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>Horse_mackerel_biomass{{voyageId}}</id> + <id>biomass_scomsco{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POINT table="public"."cellesduviewspeciesbiomass" (coordinate) sql="baracoudacode" ='SCOM-SCO'</datasource> <title></title> <abstract></abstract> @@ -923,7 +935,7 @@ </edittypes> </maplayer> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>Mackerel_biomass{{voyageId}}</id> + <id>biomass_micrpou{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POINT table="public"."cellesduviewspeciesbiomass" (coordinate) sql="baracoudacode" ='MICR-POU'</datasource> <title></title> <abstract></abstract> @@ -1290,7 +1302,7 @@ </edittypes> </maplayer> <maplayer minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>Sardine_biomass{{voyageId}}</id> + <id>biomass_spraspr{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POINT table="public"."cellesduviewspeciesbiomass" (coordinate) sql="baracoudacode" ='SPRA-SPR'</datasource> <title></title> <abstract></abstract> @@ -1656,7 +1668,7 @@ </edittypes> </maplayer> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>Sprat_biomass{{voyageId}}</id> + <id>biomass_tractru{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POINT table="public"."cellesduviewspeciesbiomass" (coordinate) sql="baracoudacode" ='TRAC-TRU'</datasource> <title></title> <abstract></abstract> @@ -2023,7 +2035,7 @@ </edittypes> </maplayer> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>cellesduviewspeciesbiomass{{voyageId}}</id> + <id>biomass_engrenc{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POINT table="public"."cellesduviewspeciesbiomass" (coordinate) sql="baracoudacode" = 'ENGR-ENC'</datasource> <title></title> <abstract></abstract> @@ -2610,7 +2622,7 @@ </edittypes> </maplayer> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>meanmapcellbiomassengrenc{{voyageId}}</id> + <id>meanmapcellbiomass_engrenc{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POLYGON table="public"."meanmapcellbiomassengrenc" (shape) sql=</datasource> <title></title> <abstract></abstract> @@ -2941,7 +2953,7 @@ </edittypes> </maplayer> <maplayer minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>meanmapcellbiomassmicrpou{{voyageId}}</id> + <id>meanmapcellbiomass_micrpou{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POLYGON table="public"."meanmapcellbiomassmicrpou" (shape) sql=</datasource> <title></title> <abstract></abstract> @@ -3272,7 +3284,7 @@ </edittypes> </maplayer> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>meanmapcellbiomasssardpil{{voyageId}}</id> + <id>meanmapcellbiomass_sardpil{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POLYGON table="public"."meanmapcellbiomasssardpil" (shape) sql=</datasource> <title></title> <abstract></abstract> @@ -3603,7 +3615,7 @@ </edittypes> </maplayer> <maplayer minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>meanmapcellbiomassscomsco{{voyageId}}</id> + <id>meanmapcellbiomass_scomsco{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POLYGON table="public"."meanmapcellbiomassscomsco" (shape) sql=</datasource> <title></title> <abstract></abstract> @@ -3934,7 +3946,7 @@ </edittypes> </maplayer> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>meanmapcellbiomassspraspr{{voyageId}}</id> + <id>meanmapcellbiomass_spraspr{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POLYGON table="public"."meanmapcellbiomassspraspr" (shape) sql=</datasource> <title></title> <abstract></abstract> @@ -4264,7 +4276,7 @@ </edittypes> </maplayer> <maplayer minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> - <id>meanmapcellbiomasstractru{{voyageId}}</id> + <id>meanmapcellbiomass_tractru{{voyageId}}</id> <datasource>dbname='{{dbname}}' host='{{host}}' port='{{port}}' user='{{userName}}' password='{{password}}' sslmode=require key='id' srid=4326 type=POLYGON table="public"."meanmapcellbiomasstractru" (shape) sql=</datasource> <title></title> <abstract></abstract> @@ -5332,18 +5344,18 @@ <Digitizing> <LayerSnappingList type="QStringList"> <value>Anchovy_biomass{{voyageId}}</value> - <value>Horse_mackerel_biomass{{voyageId}}</value> - <value>Mackerel_biomass{{voyageId}}</value> + <value>biomass_tractru{{voyageId}}</value> + <value>biomass_scomsco{{voyageId}}</value> <value>Sardine_biomass{{voyageId}}</value> - <value>Sprat_biomass{{voyageId}}</value> - <value>cellesduviewspeciesbiomass{{voyageId}}</value> + <value>biomass_spraspr{{voyageId}}</value> + <value>biomass_engrenc{{voyageId}}</value> <value>country{{voyageId}}</value> - <value>meanmapcellbiomassengrenc{{voyageId}}</value> - <value>meanmapcellbiomassmicrpou{{voyageId}}</value> - <value>meanmapcellbiomasssardpil{{voyageId}}</value> - <value>meanmapcellbiomassscomsco{{voyageId}}</value> - <value>meanmapcellbiomassspraspr{{voyageId}}</value> - <value>meanmapcellbiomasstractru{{voyageId}}</value> + <value>meanmapcellbiomass_engrenc{{voyageId}}</value> + <value>meanmapcellbiomass_micrpou{{voyageId}}</value> + <value>meanmapcellbiomass_sardpil{{voyageId}}</value> + <value>meanmapcellbiomass_scomsco{{voyageId}}</value> + <value>meanmapcellbiomass_spraspr{{voyageId}}</value> + <value>meanmapcellbiomass_tractru{{voyageId}}</value> <value>pelgas{{voyageId}}</value> <value>totalcatchspopwide{{voyageId}}</value> </LayerSnappingList> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 8134c36471755d179766fd840c482a5aec890dd8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:50:20 2015 +0100 change map ulr option for lizmap --- .../main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java | 4 ++-- .../fr/ifremer/echobase/config/EchoBaseConfigurationOption.java | 6 +++--- .../src/main/resources/i18n/echobase-domain_en_GB.properties | 4 ++-- .../src/main/resources/i18n/echobase-domain_fr_FR.properties | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java index 277118c..fbb1026 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java @@ -332,8 +332,8 @@ public class EchoBaseConfiguration { return jdbcUrl; } - public String getLizmapApplicationUrl() { - String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_APPLICATION_URL.key); + public String getLizmapApplicationMapUrl() { + String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_APPLICATION_MAP_URL.key); return url; } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index 237b0ae..a662ae0 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -127,9 +127,9 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { n("echobase.config.lizmap.application.config.file.description"), "${echobase.lizmap.application.basedir}/lizmap/var/config/lizmapConfig.ini.php", File.class), - LIZMAP_APPLICATION_URL("echobase.lizmap.application.url", - n("echobase.config.lizmap.application.url.description"), - "http://localhost/lizmap-web-client-${echobase.lizmap.application.version}/lizmap/www/index.php/view/", + LIZMAP_APPLICATION_MAP_URL("echobase.lizmap.application.map.url", + n("echobase.config.lizmap.application.map.url.description"), + "http://localhost/lizmap-web-client-${echobase.lizmap.application.version}/lizmap/www/index.php/view/map", String.class), LIZMAP_APPLICATION_JDBC_URL("echobase.lizmap.application.jdbc.url", n("echobase.config.lizmap.application.jdbc.url.description"), diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties index 092e643..6e10891 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties @@ -39,12 +39,12 @@ echobase.config.internal.db.directory.description=Directory of the internal data echobase.config.lib.directory.description=Directory where to put internal libraries (jdbc drivers, embedded war) echobase.config.lizmap.application.basedir.description=Lizmap application basedir echobase.config.lizmap.application.config.file.description=Config file of Lizmap application +echobase.config.lizmap.application.jdbc.url.description=JDBC URL for Lizmap data base +echobase.config.lizmap.application.map.url.description=Lizmap URL to access to a map echobase.config.lizmap.application.version.description=Version of Lizmap echobase.config.lizmap.config.file.description=Lizmap configuration file -echobase.config.lizmap.application.jdbc.url.description=JDBC URL for lizmap data base echobase.config.lizmap.projects.directory.description=Directory where to store generated lizMap projects echobase.config.lizmap.template.file.description=Lizmap configuration file template -echobase.config.lizmap.application.url.description=Lizmap URL echobase.config.log.config.file.description=Log configuration file echobase.config.postgresqlVersion.description=Postgresql driver version echobase.config.qgis.resources.directory.description=Directory where to store any resources used by Qgis projets (such as maps,...) diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties index 0a7d9cb..25e4180 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties @@ -39,8 +39,8 @@ echobase.config.internal.db.directory.description=Répertoire de la base interne echobase.config.lib.directory.description=Chemin où sont stockés les libraires internes (drivers + application embarquée) echobase.config.lizmap.application.basedir.description=Le répertoire de base de l'installation de Lizmap echobase.config.lizmap.application.config.file.description=Fichier de configuration de Lizmap -echobase.config.lizmap.application.jdbc.url.description=URL JDBC de la base Lizmap -echobase.config.lizmap.application.url.description=L'URL de Lizmap +echobase.config.lizmap.application.jdbc.url.description=Url d'accès à la base Lizmap +echobase.config.lizmap.application.map.url.description=Url pour accéder à une carte de Lizmap echobase.config.lizmap.application.version.description=Version de Lizmap echobase.config.lizmap.projects.directory.description=Répertoire de génération des projets Lizmap echobase.config.lizmap.template.file.description=Le modèle du fichier de configuration de Lizmap pour une campagne -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit d5540af0fef35e75b70b261621cada0c1163bbbf Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:50:42 2015 +0100 review Lizmap service --- .../services/service/spatial/GisService.java | 192 ++----------- .../services/service/spatial/LizmapRepository.java | 305 +++++++++++++++++++++ .../service/spatial/SpatialDataService.java | 8 +- 3 files changed, 329 insertions(+), 176 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java index 6a14962..e8f98f6 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java @@ -26,31 +26,20 @@ import com.google.common.base.Preconditions; import com.google.common.io.Files; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.config.EchoBaseConfiguration; -import fr.ifremer.echobase.entities.WorkingDbConfiguration; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.io.EchoBaseIOUtil; import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.service.UserDbPersistenceService; -import fr.ifremer.echobase.services.service.workingDb.WorkingDbConfigurationService; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.HierarchicalINIConfiguration; -import org.apache.commons.configuration.SubnodeConfiguration; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.inject.Inject; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; import java.net.URL; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; import java.util.Scanner; /** @@ -74,16 +63,6 @@ public class GisService extends EchoBaseServiceSupport { private static final String QGIS_RESOURCES = "/gis/lizmap/resources/"; - private static final String[] TO_REPLACE = new String[]{"-", "."}; - - private static final String[] REPLACEMENT_LIST = new String[]{"", ""}; - - @Inject - private WorkingDbConfigurationService workingDbConfigurationService; - - @Inject - private UserDbPersistenceService persistenceService; - public static void copyQgisDefaultTemplateFileIfNecessary(EchoBaseConfiguration configuration) throws IOException { File qgisDefaultTemplateFile = configuration.getQgisDefaultTemplateFile(); @@ -137,182 +116,51 @@ public class GisService extends EchoBaseServiceSupport { } /** - * Generate maps files for this database. + * Add given working db to lizmap. * * @param conf data base connexion configuration */ - public void generateMaps(JdbcConfiguration conf) { - - File lizmapTarget = getConfiguration().getLizmapProjectsDirectory(); + public void registerWorkingDb(JdbcConfiguration conf) { - if (!lizmapTarget.isDirectory()) { - throw new EchoBaseTechnicalException("Map target (" + lizmapTarget.getAbsolutePath() + ") is not directory"); - } - - String repositoryName = getRepositoryName(conf); - - if (log.isInfoEnabled()) { - log.info("Lizmap repository name: " + repositoryName); - } - - File repositoryDirectory = new File(lizmapTarget, repositoryName); - EchoBaseIOUtil.forceMkdir(repositoryDirectory); - - // Add repository in Lizmap config - updateLizmapConfigFile(conf, repositoryName, repositoryDirectory); - - // Add authorization in Lizmap database - updateLizmapAuthorizations(repositoryName); - - for (Voyage voyage : persistenceService.getAllVoyages()) { - generateMap(conf, voyage, repositoryDirectory); - } + LizmapRepository lizmapRepository = newLizmapRepository(conf); + lizmapRepository.register(); } - public String getRepositoryUrl(JdbcConfiguration conf) { + public String getVoyageMapUrl(JdbcConfiguration conf, Voyage voyage) { - String repositoryName = getRepositoryName(conf); - String repositoryUrl = getConfiguration().getLizmapApplicationUrl() + "?" + "repository=" + repositoryName; + LizmapRepository lizmapRepository = newLizmapRepository(conf); + String repositoryUrl = lizmapRepository.getVoyageMapUrl(voyage); return repositoryUrl; } - protected void updateLizmapConfigFile(JdbcConfiguration conf, String repositoryName, File repository) { - - WorkingDbConfiguration workingDbConfiguration - = workingDbConfigurationService.getWorkingDbConfigurationByUrl(conf.getUrl()); - - File lizmapConfigFile = getConfiguration().getLizmapApplicationConfigFile(); - - try { - - HierarchicalINIConfiguration lizmapIni = new HierarchicalINIConfiguration(lizmapConfigFile); - - SubnodeConfiguration section = lizmapIni.getSection("repository:" + repositoryName); - section.setProperty("label", "\"" + workingDbConfiguration.getDescription() + "\""); - section.setProperty("path", repository.getAbsolutePath() + "/"); - - BufferedWriter writer = Files.newWriter(lizmapConfigFile, Charsets.UTF_8); - try { - lizmapIni.save(writer); - writer.close(); - } finally { - - IOUtils.closeQuietly(writer); - } - - } catch (ConfigurationException e) { - throw new EchoBaseTechnicalException("Could not load Lizmap config", e); - } catch (IOException e) { - throw new EchoBaseTechnicalException("Could not save Lizmap config", e); - } - - } - - public void updateLizmapAuthorizations(String repositoryName) { - - String lizmapJdbcUrl = getConfiguration().getLizmapApplicationJdbcUrl(); - Connection connection = null; - - try { - connection = DriverManager.getConnection(lizmapJdbcUrl); - connection.setAutoCommit(false); - - executeQuery(connection, "INSERT OR REPLACE INTO jacl2_rights " + - "(id_aclsbj, id_aclgrp, id_aclres, canceled) " + - "VALUES " + - "('lizmap.repositories.view', '__anonymous', '" + repositoryName + "', 0);"); - - executeQuery(connection, "INSERT OR REPLACE INTO jacl2_rights " + - "(id_aclsbj, id_aclgrp, id_aclres, canceled) " + - "VALUES " + - "('lizmap.repositories.view', 'admins', '" + repositoryName + "', 0);"); - - connection.commit(); - - connection.close(); - - } catch (SQLException e) { - throw new EchoBaseTechnicalException("Could not create rights in lizmap", e); - } finally { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - } - } catch (SQLException e) { - //FIXME We should never throw an exception in finally block - throw new EchoBaseTechnicalException("Could not create rights in lizmap", e); - } - } - } - - protected void executeQuery(Connection connection, String query) throws SQLException { - - if (log.isInfoEnabled()) { - log.info("Execute sql query to lizmap: " + query); - } - - Statement statement = connection.createStatement(); - - try { - statement.execute(query); - - statement.close(); - - } finally { - - if (statement != null) { - statement.close(); - } - - } - - } - - protected String getRepositoryName(JdbcConfiguration conf) { - - String url = conf.getUrl(); - - //TODO Use a regex - int hostIndex = START_JDBC_URL.length() - 1; - int portIndex = url.indexOf(':', hostIndex); - int dbnameIndex = url.indexOf("/", portIndex); - - String dbname = url.substring(dbnameIndex + 1); - String host = url.substring(hostIndex + 1, portIndex); - String port = url.substring(portIndex + 1, dbnameIndex); - - String repository = getConfiguration().getLizmapRepositoryName() + host + port + dbname; - - repository = StringUtils.replaceEach(repository, TO_REPLACE, REPLACEMENT_LIST); - - return repository; - } - /** * Generate map files for this database and this voyage. * - * @param conf data base connexion configuration - * @param voyage voyage for this map - * @param repositoryDirectory Lizmap repository - * @return Name of project map + * @param conf data base connexion configuration + * @param voyage voyage for this map */ - protected String generateMap(JdbcConfiguration conf, Voyage voyage, File repositoryDirectory) { + public void generateMap(JdbcConfiguration conf, Voyage voyage) { Preconditions.checkNotNull(conf); Preconditions.checkNotNull(voyage); - String voyageName = voyage.getName(); + LizmapRepository lizmapRepository = newLizmapRepository(conf); + + File repositoryDirectory = lizmapRepository.getRepositoryDirectory(); + EchoBaseIOUtil.forceMkdir(repositoryDirectory); String[] templateValues = getTemplateValues(conf, voyage); - generateFileFromTemplate(getConfiguration().getQgisTemplateFile(), new File(repositoryDirectory, voyageName + ".qgs"), templateValues); + generateFileFromTemplate(getConfiguration().getQgisTemplateFile(), lizmapRepository.getQGisFile(voyage), templateValues); - generateFileFromTemplate(getConfiguration().getLizmapTemplateFile(), new File(repositoryDirectory, voyageName + ".qgs.cfg"), templateValues); + generateFileFromTemplate(getConfiguration().getLizmapTemplateFile(), lizmapRepository.getLizmapFile(voyage), templateValues); - return voyageName; + } + protected LizmapRepository newLizmapRepository(JdbcConfiguration conf) { + return LizmapRepository.newLizmapRepository(getConfiguration(), conf); } /** @@ -323,7 +171,7 @@ public class GisService extends EchoBaseServiceSupport { * @param templateValues values to used in the template * @return file generated */ - public File generateFileFromTemplate(File templateFile, File target, String... templateValues) { + protected File generateFileFromTemplate(File templateFile, File target, String... templateValues) { if (!target.exists()) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java new file mode 100644 index 0000000..f9fc3da --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java @@ -0,0 +1,305 @@ +package fr.ifremer.echobase.services.service.spatial; + +import com.google.common.base.Charsets; +import com.google.common.base.Preconditions; +import com.google.common.io.Files; +import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.config.EchoBaseConfiguration; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.persistence.JdbcConfiguration; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.HierarchicalINIConfiguration; +import org.apache.commons.configuration.SubnodeConfiguration; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; + +/** + * Created on 1/14/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.8 + */ +public class LizmapRepository { + + /** Logger. */ + private static final Log log = LogFactory.getLog(LizmapRepository.class); + + public static class LizmapRepositoryConfiguration { + + private final JdbcConfiguration jdbcConfiguration; + + private final EchoBaseConfiguration configuration; + + LizmapRepositoryConfiguration(JdbcConfiguration jdbcConfiguration, EchoBaseConfiguration configuration) { + this.jdbcConfiguration = jdbcConfiguration; + this.configuration = configuration; + } + + public File getLizmapTemplateFile() { + return configuration.getLizmapTemplateFile(); + } + + public File getLizmapProjectsDirectory() { + return configuration.getLizmapProjectsDirectory(); + } + + public File getLizmapApplicationConfigFile() { + return configuration.getLizmapApplicationConfigFile(); + } + + public String getLizmapApplicationJdbcUrl() { + return configuration.getLizmapApplicationJdbcUrl(); + } + + public String getLizmapApplicationUrl() { + return configuration.getLizmapApplicationMapUrl(); + } + + public String getLizmapRepositoryName() { + return configuration.getLizmapRepositoryName(); + } + + public String getUrl() { + return jdbcConfiguration.getUrl(); + } + + public String getLogin() { + return jdbcConfiguration.getLogin(); + } + + public String getPassword() { + return jdbcConfiguration.getPassword(); + } + } + + private final LizmapRepositoryConfiguration configuration; + + private static final String START_JDBC_URL = "jdbc:postgresql://"; + + private static final String[] TO_REPLACE = new String[]{"-", "."}; + + private static final String[] REPLACEMENT_LIST = new String[]{"", ""}; + + public static LizmapRepository newLizmapRepository(EchoBaseConfiguration configuration, JdbcConfiguration conf) { + + LizmapRepositoryConfiguration lizmapRepositoryConfiguration = new LizmapRepositoryConfiguration(conf, configuration); + + File lizmapTarget = configuration.getLizmapProjectsDirectory(); + + if (!lizmapTarget.isDirectory()) { + throw new EchoBaseTechnicalException("Map target (" + lizmapTarget.getAbsolutePath() + ") is not directory"); + } + + LizmapRepository result = new LizmapRepository(lizmapRepositoryConfiguration); + return result; + + } + + protected LizmapRepository(LizmapRepositoryConfiguration configuration) { + + this.configuration = configuration; + + } + + private String repositoryName; + + private File repositoryDirectory; + + public String getRepositoryName() { + + if (repositoryName == null) { + + String url = configuration.getUrl(); + + //TODO Use a regex + int hostIndex = START_JDBC_URL.length() - 1; + int portIndex = url.indexOf(':', hostIndex); + int dbnameIndex = url.indexOf("/", portIndex); + + String dbname = url.substring(dbnameIndex + 1); + String host = url.substring(hostIndex + 1, portIndex); + String port = url.substring(portIndex + 1, dbnameIndex); + + repositoryName = configuration.getLizmapRepositoryName() + host + port + dbname; + repositoryName = StringUtils.replaceEach(repositoryName, TO_REPLACE, REPLACEMENT_LIST); + + } + + return repositoryName; + + } + + public File getRepositoryDirectory() { + + if (repositoryDirectory == null) { + + String repoName = getRepositoryName(); + repositoryDirectory = new File(configuration.getLizmapProjectsDirectory(), repoName); + + } + + return repositoryDirectory; + + } + + public String getVoyageMapUrl(Voyage voyage) { + + String repoName = getRepositoryName(); + String repositoryUrl = configuration.getLizmapApplicationUrl() + "?" + "repository=" + repoName + "&project=" + voyage.getName(); + return repositoryUrl; + + } + + public void register() { + + String repoName = getRepositoryName(); + + if (log.isDebugEnabled()) { + log.debug("Check if repository named " + repoName + " need to be registered by lizmap"); + } + + File configurationPath = configuration.getLizmapApplicationConfigFile(); + + if (log.isDebugEnabled()) { + log.debug("Use Lizmap configuration file: " + configurationPath); + } + HierarchicalINIConfiguration iniConfiguration; + + try { + iniConfiguration = new HierarchicalINIConfiguration(configurationPath); + } catch (ConfigurationException e) { + throw new EchoBaseTechnicalException("Could not load Lizmap config", e); + } + + SubnodeConfiguration section = iniConfiguration.getSection("repository:" + repoName); + + if (section.isEmpty()) { + + if (log.isInfoEnabled()) { + log.info("Register repository " + repoName + " to Lizmap."); + } + + // Add repository in Lizmap config + updateLizmapConfigFile(iniConfiguration, section, repoName); + + // Add authorization in Lizmap database + updateLizmapAuthorizations(); + + } + + } + + public File getQGisFile(Voyage voyage) { + + return new File(getRepositoryDirectory(), voyage.getName() + ".qgs"); + + + } + + public File getLizmapFile(Voyage voyage) { + + return new File(getRepositoryDirectory(), voyage.getName() + ".qgs.cfg"); + + } + + protected void updateLizmapConfigFile(HierarchicalINIConfiguration iniConfiguration, SubnodeConfiguration section, String repoName) { + + Preconditions.checkArgument(section.isEmpty()); + + File configurationPath = configuration.getLizmapApplicationConfigFile(); + + if (log.isInfoEnabled()) { + log.info("Add Section " + repoName + " to lizmap configuration file."); + } + + section.setProperty("label", repoName); + section.setProperty("path", getRepositoryDirectory().getAbsolutePath() + "/"); + + if (log.isInfoEnabled()) { + log.info("Save lizmap configuration file at " + configurationPath); + } + + try (BufferedWriter writer = Files.newWriter(configurationPath, Charsets.UTF_8)) { + + iniConfiguration.save(writer); + + } catch (IOException | ConfigurationException e) { + throw new EchoBaseTechnicalException("Could not save Lizmap config", e); + } + + } + + protected void updateLizmapAuthorizations() { + + Connection connection = null; + + try { + connection = DriverManager.getConnection(configuration.getLizmapApplicationJdbcUrl()); + connection.setAutoCommit(false); + + String repoName = getRepositoryName(); + + if (log.isInfoEnabled()) { + log.info("Add credentials for repository " + repoName + " in Lizmap."); + } + + executeQuery(connection, "INSERT OR REPLACE INTO jacl2_rights " + + "(id_aclsbj, id_aclgrp, id_aclres, canceled) " + + "VALUES " + + "('lizmap.repositories.view', '__anonymous', '" + repoName + "', 0);"); + + executeQuery(connection, "INSERT OR REPLACE INTO jacl2_rights " + + "(id_aclsbj, id_aclgrp, id_aclres, canceled) " + + "VALUES " + + "('lizmap.repositories.view', 'admins', '" + repoName + "', 0);"); + + connection.commit(); + + connection.close(); + + } catch (SQLException e) { + throw new EchoBaseTechnicalException("Could not create rights in lizmap", e); + } finally { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } catch (SQLException e) { + //FIXME We should never throw an exception in finally block + throw new EchoBaseTechnicalException("Could not create rights in lizmap", e); + } + } + } + + protected void executeQuery(Connection connection, String query) throws SQLException { + + if (log.isDebugEnabled()) { + log.debug("Execute sql query to lizmap: " + query); + } + + Statement statement = connection.createStatement(); + + try { + statement.execute(query); + + statement.close(); + + } finally { + + if (statement != null) { + statement.close(); + } + + } + + } +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java index 13c2f8d..ff555b9 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java @@ -99,7 +99,7 @@ public class SpatialDataService extends EchoBaseServiceSupport { * * @since 2.8 */ - public void updatePostgisData() { + public void computespatialData() { if (persistenceContext.isSpatialStructureFound()) { @@ -110,21 +110,21 @@ public class SpatialDataService extends EchoBaseServiceSupport { log.info("Will try to compute operation spatial data from temp table..."); } persistenceService.executeSQL("SELECT echobase_fill_operation_spatial_table();"); - TILE_LOG.log(time, "updatePostgisData::echobase_fill_operation_spatial_table"); + TILE_LOG.log(time, "computespatialData::echobase_fill_operation_spatial_table"); time = TimeLog.getTime(); if (log.isInfoEnabled()) { log.info("Will try to compute cell spatial data from temp table..."); } persistenceService.executeSQL("SELECT echobase_fill_cell_spatial_table();"); - TILE_LOG.log(time, "updatePostgisData::echobase_fill_cell_spatial_table"); + TILE_LOG.log(time, "computespatialData::echobase_fill_cell_spatial_table"); time = TimeLog.getTime(); if (log.isInfoEnabled()) { log.info("Will try to refresh all spatial views..."); } persistenceService.executeSQL("SELECT echobase_refresh_views();"); - TILE_LOG.log(time, "updatePostgisData::echobase_refresh_views"); + TILE_LOG.log(time, "computespatialData::echobase_refresh_views"); persistenceService.commit(); } catch (Exception e) { throw new EchoBaseTechnicalException("Could not compute spatial data", e); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit c1fe8f0aeb10021f1fb6da9b04a951b867d4b601 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:58:37 2015 +0100 fixes #6271 + #6457 --- .../{RefreshSpatialViews.java => ComputeSpatialData.java} | 2 +- .../fr/ifremer/echobase/ui/actions/spatial/ShowVoyageMap.java | 10 ++++++++++ .../src/main/webapp/WEB-INF/jsp/spatial/showVoyageMap.jsp | 0 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ComputeSpatialData.java similarity index 95% rename from echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java rename to echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ComputeSpatialData.java index 8ec04d5..39a3134 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ComputeSpatialData.java @@ -32,7 +32,7 @@ import javax.inject.Inject; * @author Tony Chemit <chemit@codelutin.com> * @since 2.6 */ -public class RefreshSpatialViews extends EchoBaseActionSupport { +public class ComputeSpatialData extends EchoBaseActionSupport { private static final long serialVersionUID = 1L; diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowVoyageMap.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowVoyageMap.java new file mode 100644 index 0000000..ddf5e61 --- /dev/null +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowVoyageMap.java @@ -0,0 +1,10 @@ +package fr.ifremer.echobase.ui.actions.spatial; + +/** + * Created on 1/14/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since XXX + */ +public class ShowVoyageMap { +} diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showVoyageMap.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showVoyageMap.jsp new file mode 100644 index 0000000..e69de29 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm