branch develop updated (fe94fbc -> ba09131)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from fe94fbc Construire une base intermédiaire avec toutes les données si besoin, puis utiliser un instruction sql H2 pour sauver la base new f831c86 Fix point names in styles file (Fixes #8488) new ba09131 Correction du problème de rendu des cartes (Fixes #8494) 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 ba09131dcd39fc1bcc517e7537548d0354af2cc8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 10:52:15 2016 +0200 Correction du problème de rendu des cartes (Fixes #8494) commit f831c86a258680dbb7108d61db516bf6ae6282df Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 09:04:52 2016 +0200 Fix point names in styles file (Fixes #8488) Summary of changes: application-swing/src/main/map/style.xml | 22 ++-- pom.xml | 124 ++++++++++++++++++++- .../services/dto/constants/TripMapPointType.java | 3 + 3 files changed, 136 insertions(+), 13 deletions(-) -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f831c86a258680dbb7108d61db516bf6ae6282df Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 09:04:52 2016 +0200 Fix point names in styles file (Fixes #8488) --- application-swing/src/main/map/style.xml | 22 +++++++++++----------- .../services/dto/constants/TripMapPointType.java | 3 +++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/application-swing/src/main/map/style.xml b/application-swing/src/main/map/style.xml index 92dc07c..663666e 100644 --- a/application-swing/src/main/map/style.xml +++ b/application-swing/src/main/map/style.xml @@ -198,7 +198,7 @@ <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>SEINE_ACTIVITY_IN_HARBOUR</ogc:Literal> + <ogc:Literal>seineActivityInHarbour</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> @@ -226,7 +226,7 @@ <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE</ogc:Literal> + <ogc:Literal>seineActivityWithFreeSchoolType</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> @@ -253,7 +253,7 @@ <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE</ogc:Literal> + <ogc:Literal>seineActivityWithObjectSchoolType</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> @@ -280,7 +280,7 @@ <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>LONGLINE_ACTIVITY_WITH_SETTING_START</ogc:Literal> + <ogc:Literal>longlineActivityWithSettingStart</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> @@ -308,7 +308,7 @@ <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>LONGLINE_ACTIVITY_WITH_SETTING_END</ogc:Literal> + <ogc:Literal>longlineActivityWithSettingEnd</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> @@ -336,7 +336,7 @@ <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>LONGLINE_ACTIVITY_WITH_HAULING_START</ogc:Literal> + <ogc:Literal>longlineActivityWithHaulingStart</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> @@ -363,7 +363,7 @@ <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>LONGLINE_ACTIVITY_WITH_HAULING_END</ogc:Literal> + <ogc:Literal>longlineActivityWithHaulingEnd</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> @@ -386,11 +386,11 @@ <FeatureTypeStyle> <Rule> - <Name>Point seine activity in harbour</Name> + <Name>Point longline activity in harbour</Name> <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>LONGLINE_IN_HARBOUR</ogc:Literal> + <ogc:Literal>longlineActivityInHarbour</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> @@ -438,7 +438,7 @@ <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>LONGLINE_ACTIVITY_WITH_INTERACTION</ogc:Literal> + <ogc:Literal>longlineActivityWithInteraction</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> @@ -486,7 +486,7 @@ <ogc:Filter> <ogc:PropertyIsEqualTo> <ogc:PropertyName>pointType</ogc:PropertyName> - <ogc:Literal>LONGLINE_ACTIVITY_WITH_STATION</ogc:Literal> + <ogc:Literal>longlineActivityWithStation</ogc:Literal> </ogc:PropertyIsEqualTo> </ogc:Filter> <PointSymbolizer> diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java index 88d20d2..c90aacd 100644 --- a/services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java +++ b/services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java @@ -23,6 +23,9 @@ package fr.ird.observe.services.dto.constants; */ /** + * <b>Attention : les noms des constantes sont utilisées dans la feuille de style de rendu. Si on change les noms ici, + * il faut réimpacter dans le fichier style.xml</b> + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public enum TripMapPointType { -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ba09131dcd39fc1bcc517e7537548d0354af2cc8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 3 10:52:15 2016 +0200 Correction du problème de rendu des cartes (Fixes #8494) --- pom.xml | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 122 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b70b217..62fda54 100644 --- a/pom.xml +++ b/pom.xml @@ -576,8 +576,128 @@ <version>${geoToolsVersion}</version> <exclusions> <exclusion> - <groupId>org.geotools</groupId> - <artifactId>gt-coverage</artifactId> + <groupId>it.geosolutions.jaiext</groupId> + <artifactId>jaiext</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandmerge</groupId> + <artifactId>jt-bandmerge</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandcombine</groupId> + <artifactId>jt-bandcombine</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandselect</groupId> + <artifactId>jt-bandselect</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.imageio-ext</groupId> + <artifactId>imageio-ext-tiff</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.affine</groupId> + <artifactId>jt-affine</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.crop</groupId> + <artifactId>jt-crop</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.colorconvert</groupId> + <artifactId>jt-colorconvert</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.mosaic</groupId> + <artifactId>jt-mosaic</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.zonal</groupId> + <artifactId>jt-zonal</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.binarize</groupId> + <artifactId>jt-binarize</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.stats</groupId> + <artifactId>jt-stats</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.nullop</groupId> + <artifactId>jt-nullop</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.piecewise</groupId> + <artifactId>jt-piecewise</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.classifier</groupId> + <artifactId>jt-classifier</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.rlookup</groupId> + <artifactId>jt-rlookup</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.algebra</groupId> + <artifactId>jt-algebra</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.border</groupId> + <artifactId>jt-border</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.lookup</groupId> + <artifactId>jt-lookup</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.warp</groupId> + <artifactId>jt-warp</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.rescale</groupId> + <artifactId>jt-rescale</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.format</groupId> + <artifactId>jt-format</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.errordiffusion</groupId> + <artifactId>jt-errordiffusion</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.orderdither</groupId> + <artifactId>jt-orderdither</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.colorindexer</groupId> + <artifactId>jt-colorindexer</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.imagefunction</groupId> + <artifactId>jt-imagefunction</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.vectorbin</groupId> + <artifactId>jt-vectorbin</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.buffer</groupId> + <artifactId>jt-buffer</artifactId> + </exclusion> + <exclusion> + <groupId>javax.media</groupId> + <artifactId>jai_imageio</artifactId> + </exclusion> + <exclusion> + <groupId>org.jaitools</groupId> + <artifactId>jt-zonalstats</artifactId> + </exclusion> + <exclusion> + <groupId>org.jaitools</groupId> + <artifactId>jt-utils</artifactId> </exclusion> </exclusions> </dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm