branch feature/6511 created (now bb698ea)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6511 in repository echobase. See http://git.codelutin.com/echobase.git at bb698ea refs #6511 : mise à jour de la documentation d'installation de lizmap This branch includes the following new commits: new de1924a refs #6511 : correction du fichier de template lizmap new bb698ea refs #6511 : mise à jour de la documentation d'installation de lizmap The 2 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 bb698eaa8336f85534c6add6b38ea066fb353602 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 11 14:30:21 2015 +0200 refs #6511 : mise à jour de la documentation d'installation de lizmap commit de1924a714d67384196fd67b91474cc4a2da27df Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 11 14:29:30 2015 +0200 refs #6511 : correction du fichier de template lizmap -- 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 feature/6511 in repository echobase. See http://git.codelutin.com/echobase.git commit de1924a714d67384196fd67b91474cc4a2da27df Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 11 14:29:30 2015 +0200 refs #6511 : correction du fichier de template lizmap --- .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 169 +++++++++------------ 1 file changed, 74 insertions(+), 95 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 5b8021b..70a9970 100644 --- a/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg +++ b/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg @@ -1,18 +1,19 @@ { "layers": { - "Anchovy biomass": { - "abstract": "", + "Sardine biomass": { + "abstract": "", + "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "cellesduviewspeciesbiomass{{voyageId}}", - "title": "Anchovy", + "id": "biomass_sardpil{{voyageId}}", + "title": "Sardine biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", "toggled": "False", - "name": "Anchovy biomass", + "name": "Sardine biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, @@ -24,8 +25,8 @@ "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "Sprat_biomass{{voyageId}}", - "title": "Horse mackerel", + "id": "biomass_tractru{{voyageId}}", + "title": "Horse mackerel biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", @@ -64,14 +65,14 @@ "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "Mackerel_biomass{{voyageId}}", - "title": "Blue whitting", + "id": "biomass_micrpou{{voyageId}}", + "title": "Blue whitting biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "False", + "toggled": "True", "name": "Blue whitting biomass", "cached": "False", "type": "layer", @@ -79,80 +80,60 @@ "imageFormat": "image/png", "minScale": 1 }, - "Blue whitting mean Biomass": { + "Anchovy biomass": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomassmicrpou{{voyageId}}", - "title": "Blue whitting", + "id": "biomass_engrenc{{voyageId}}", + "title": "Anchovy biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "False", - "name": "Blue whitting mean Biomass", + "toggled": "True", + "name": "Anchovy biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 }, - "Sardine biomass": { + "Blue whitting mean biomass": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "Anchovy_biomass{{voyageId}}", - "title": "Sardine", + "id": "meanmapcellbiomass_micrpou{{voyageId}}", + "title": "Blue whitting mean biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", "toggled": "False", - "name": "Sardine biomass", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "imageFormat": "image/png", - "minScale": 1 - }, - "Country": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "country{{voyageId}}", - "title": "Country", - "singleTile": "True", - "groupAsLayer": "False", - "popup": "False", - "clientCacheExpiration": 300, - "link": "", - "toggled": "True", - "name": "Country", + "name": "Blue whitting mean biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 }, - "Mackerel mean Biomass": { + "Mackerel mean biomass": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomassscomsco{{voyageId}}", - "title": "Mackerel", + "id": "meanmapcellbiomass_scomsco{{voyageId}}", + "title": "Mackerel mean biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", "toggled": "False", - "name": "Mackerel mean Biomass", + "name": "Mackerel mean biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, @@ -163,16 +144,15 @@ "abstract": "", "displayInLegend": "True", "baseLayer": "False", - "noLegendImage": "True", + "noLegendImage": "False", "id": "totalcatchspopwide{{voyageId}}", "title": "Pelagic trawl catch", - "singleTile": "True", + "singleTile": "False", "groupAsLayer": "False", - "popupTemplate": "", - "popup": "True", + "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "False", + "toggled": "True", "name": "Pelagic trawl catch", "cached": "False", "type": "layer", @@ -180,161 +160,160 @@ "imageFormat": "image/png", "minScale": 1 }, - "Anchovy mean Biomass": { + "Biomass": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomassengrenc{{voyageId}}", - "title": "Anchovy", + "id": "Biomass", + "title": "Biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "False", - "name": "Anchovy mean Biomass", + "toggled": "True", + "name": "Biomass", "cached": "False", - "type": "layer", + "type": "group", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 }, - "Biomass": { + "Anchovy mean biomass": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "Biomass", - "title": "Biomass", + "id": "meanmapcellbiomass_engrenc{{voyageId}}", + "title": "Anchovy mean biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "True", - "name": "Biomass", + "toggled": "False", + "name": "Anchovy mean biomass", "cached": "False", - "type": "group", + "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 }, - "Sprat mean Biomass": { + "Sprat mean biomass": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomassspraspr{{voyageId}}", - "title": "Sprat", + "id": "meanmapcellbiomass_spraspr{{voyageId}}", + "title": "Sprat mean biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", "toggled": "False", - "name": "Sprat mean Biomass", + "name": "Sprat mean biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 }, - "Bathymetry": { + "Country": { "abstract": "", "displayInLegend": "True", - "cacheExpiration": 86400, "baseLayer": "False", "noLegendImage": "False", - "id": "pelgas{{voyageId}}", - "title": "Bathymetry", - "singleTile": "True", + "id": "country{{voyageId}}", + "title": "Country", + "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", "toggled": "True", - "name": "Bathymetry", - "cached": "False", + "name": "Country", + "cached": "False", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 }, - "Sprat biomass": { + "Sardine mean biomass": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "Sardine_biomass{{voyageId}}", - "title": "Sprat", + "id": "meanmapcellbiomass_sardpil{{voyageId}}", + "title": "Sardine mean biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", "toggled": "False", - "name": "Sprat biomass", + "name": "Sardine mean biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 }, - "Mackerel biomass": { + "Bathymetry": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "Horse_mackerel_biomass{{voyageId}}", - "title": "Mackerel", + "id": "pelgas{{voyageId}}", + "title": "Bathymetry", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", - "toggled": "False", - "name": "Mackerel biomass", + "toggled": "True", + "name": "Bathymetry", "cached": "False", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 }, - "Sardine mean Biomass": { + "Mackerel biomass": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomasssardpil{{voyageId}}", - "title": "Sardine", + "id": "biomass_scomsco{{voyageId}}", + "title": "Mackerel biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", "toggled": "False", - "name": "Sardine mean Biomass", + "name": "Mackerel biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", "minScale": 1 }, - "Horse mackerel mean Biomass": { + "Horse mackerel mean biomass": { "abstract": "", "displayInLegend": "True", "baseLayer": "False", "noLegendImage": "False", - "id": "meanmapcellbiomasstractru{{voyageId}}", - "title": "Horse mackerel", + "id": "meanmapcellbiomass_tractru{{voyageId}}", + "title": "Horse mackerel mean biomass", "singleTile": "False", "groupAsLayer": "False", "popup": "False", "clientCacheExpiration": 300, "link": "", "toggled": "False", - "name": "Horse mackerel mean Biomass", + "name": "Horse mackerel mean biomass", "cached": "False", "type": "layer", "maxScale": 1000000000000, @@ -348,10 +327,10 @@ "ref": "EPSG:4326" }, "initialExtent": [ - -7.68500431446, - 42.5244137172, - 4.50530473346, - 49.5897853926 + -7.82208212997, + 42.7928625035, + 1.50876992928, + 49.1306102424 ], "maxScale": 3000000, "tmTimeFrameType": "seconds", @@ -370,11 +349,11 @@ "tmTimeFrameSize": 10, "tmAnimationFrameLength": 1000, "bbox": [ - -8.52951124806, + -7.82208212997, 42.7928625035, - 2.21619904737, + 1.50876992928, 49.1306102424 ], - "minScale": 500000 + "minScale": 10000 } } \ No newline at end of file -- 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 feature/6511 in repository echobase. See http://git.codelutin.com/echobase.git commit bb698eaa8336f85534c6add6b38ea066fb353602 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 11 14:30:21 2015 +0200 refs #6511 : mise à jour de la documentation d'installation de lizmap --- .../config/EchoBaseConfigurationOption.java | 8 +-- src/site/rst/install.rst.vm | 69 ++++++++++++++++++---- 2 files changed, 59 insertions(+), 18 deletions(-) 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 a662ae0..9eb621e 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,13 +115,9 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { n("echobase.config.lizmap.projects.directory.description"), "${echobase.gis.directory}/projects", File.class), - 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}", + "/var/www/echobase-map", File.class), LIZMAP_APPLICATION_CONFIG_FILE("echobase.lizmap.application.config.file", n("echobase.config.lizmap.application.config.file.description"), @@ -129,7 +125,7 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { File.class), 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", + "http://localhost/echobase-map/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/src/site/rst/install.rst.vm b/src/site/rst/install.rst.vm index e7bebac..562f3ec 100644 --- a/src/site/rst/install.rst.vm +++ b/src/site/rst/install.rst.vm @@ -152,8 +152,6 @@ Pour utiliser une nouvelle version de l'application, c'est très simple. 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 -:: - http://localhost:8080/echobase Divers @@ -199,9 +197,29 @@ Pour installer Qgis map server : :: - apt-get install qgis-server libapache2-mod-fcgid - a2enmod cgid - service apache2 restart + sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable + sudo apt-get update + sudo apt-get install qgis-server libapache2-mod-fcgid qgis + sudo apt-get install apache2 + sudo a2enmod cgid + sudo service apache2 restart + + +L'url : http://localhost/cgi-bin/qgis_mapserv.fcgi?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities +doit renvoyer un fichier XML de description des couches disponibles. + +Création du groupe d'utilisateur +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + addgroup echobase + adduser wwww-data echobase + adduser tomcat7 echobase + cd /var/local/echobase + chown -R tomcat7:echobase . + chmod g+w -R . + Lizmap ~~~~~~ @@ -210,28 +228,55 @@ Nous utilisons pour le moment la version ${lizmapVersion}. Installation Lizmap:: + apt-get install php5 curl php5-curl php5-sqlite php5-gd cd /var/www/ - VERSION=${lizmapVersion} - wget https://github.com/3liz/lizmap-web-client/archive/$VERSION.zip - unzip $VERSION.zip - rm $VERSION.zip + wget https://github.com/3liz/lizmap-web-client/archive/${lizmapVersion}.zip + unzip ${lizmapVersion}.zip + rm ${lizmapVersion}.zip + mv lizmap-web-client-${lizmapVersion} echobase-map + +**Note** + +Dans les nouvelles conventions d'Apache2, le repetoire de partage n'est plus **/var/wwww** mais **/var/www/html** . +Dans ce cas, il faudrat modifier la configuration d'echobase comme suit :: + + echobase.lizmap.application.basedir=/var/www/html/echobase-map -On obtient alors un répertoire **lizmap-web-client-${lizmapVersion}**. Il faut ensuite installer le style adapté pour EchoBase:: - cd /var/www/lizmap-web-client-${lizmapVersion}/lizmap + cd /var/www/echobase-map/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 . + chown -R wwww-data:echobase . + chmod g+w -R . + +Pour tester le server lizmap utilisez l'url : http://localhost/echobase-map/lizmap/www + Configuration des répertoires ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Il est possible de modifier la configuration de ces différents répertoires dans la configuration (voir le `détail des options disponibles`_). +Il peut être necessaire de redefinir l'addresse public du serveur lizmap +:: + + echobase.lizmap.application.map.url=http://<serveur>/echobase-map/lizmap/www/index.php/view/map + + +Finalisation +~~~~~~~~~~~~ + +Il est nécessaire de redemarer les services +:: + + sudo service apache2 restart + sudo service tomvcat7 restart + + .. _créer une base travail: ./db.html#creation-d-une-base-postgresql .. _détail des options disponibles: ./config-report.html .. _Qgis map server: http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm