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>.