[Git][ultreiaio/ird-observe][develop] Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - Observe-commits

29 Jun 2019


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
74dcde81 by tchemit at 2019-06-29T19:13:44Z
Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293

- - - - -


8 changed files:

- client-core/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapContentBuilder.java
- client-core/src/main/map/style.xml
- dto/src/main/i18n/getters/java-enumeration.getter
- dto/src/main/java/fr/ird/observe/dto/data/TripMapPointType.java
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
- persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripSeineTopiaDao.java


Changes:

=====================================
client-core/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapContentBuilder.java
=====================================
@@ -84,9 +84,9 @@ public class TripMapContentBuilder {
     public static final String TRIP_POINTS_LAYER_NAME = "Trip points";
     public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM");
     protected static final Set<TripMapPointType> TRIP_MAP_POINT_TYPES_IN_LEGEND = ImmutableSet.of(
-            TripMapPointType.seineActivityInHarbour,
-            TripMapPointType.seineActivityWithFreeSchoolType,
-            TripMapPointType.seineActivityWithObjectSchoolType,
+            TripMapPointType.seineActivityObsInHarbour,
+            TripMapPointType.seineActivityObsWithFreeSchoolType,
+            TripMapPointType.seineActivityObsWithObjectSchoolType,
             TripMapPointType.longlineActivityObsInHarbour,
             TripMapPointType.longlineActivityObsWithSettingStart,
             TripMapPointType.longlineActivityObsWithSettingEnd,


=====================================
client-core/src/main/map/style.xml
=====================================
@@ -30,7 +30,6 @@
     <Name>Trip lines</Name>
     <UserStyle>
       <IsDefault>true</IsDefault>
-      <Title>SLD Cook Book: Simple Line</Title>
       <FeatureTypeStyle>
         <Rule>
           <Name>Trip day</Name>
@@ -91,7 +90,6 @@
     <Name>Trip longline observation zone</Name>
     <UserStyle>
       <IsDefault>true</IsDefault>
-      <Title>SLD Cook Book: Simple Line</Title>
       <FeatureTypeStyle>
         <Rule>
           <Name>Trip day</Name>
@@ -131,7 +129,6 @@
     <Name>Trip longline logbook zone</Name>
     <UserStyle>
       <IsDefault>true</IsDefault>
-      <Title>SLD Cook Book: Simple Line</Title>
       <FeatureTypeStyle>
         <Rule>
           <Name>Trip day</Name>
@@ -171,7 +168,6 @@
     <Name>Trip longline observation line</Name>
     <UserStyle>
       <IsDefault>true</IsDefault>
-      <Title>SLD Cook Book: Simple Line</Title>
       <FeatureTypeStyle>
         <Rule>
           <Name>Trip</Name>
@@ -231,7 +227,6 @@
     <Name>Trip longline logbook line</Name>
     <UserStyle>
       <IsDefault>true</IsDefault>
-      <Title>SLD Cook Book: Simple Line</Title>
       <FeatureTypeStyle>
         <Rule>
           <Name>Trip</Name>
@@ -294,11 +289,11 @@
       <IsDefault>true</IsDefault>
       <FeatureTypeStyle>
         <Rule>
-          <Name>Point seine activity in harbour</Name>
+          <Name>Point seine activity Obs in harbour</Name>
           <ogc:Filter>
             <ogc:PropertyIsEqualTo>
               <ogc:PropertyName>pointType</ogc:PropertyName>
-              <ogc:Literal>seineActivityInHarbour</ogc:Literal>
+              <ogc:Literal>seineActivityObsInHarbour</ogc:Literal>
             </ogc:PropertyIsEqualTo>
           </ogc:Filter>
           <PointSymbolizer>
@@ -322,11 +317,11 @@
 
       <FeatureTypeStyle>
         <Rule>
-          <Name>Point seine activity with free school type</Name>
+          <Name>Point seine activity Obs with free school type</Name>
           <ogc:Filter>
             <ogc:PropertyIsEqualTo>
               <ogc:PropertyName>pointType</ogc:PropertyName>
-              <ogc:Literal>seineActivityWithFreeSchoolType</ogc:Literal>
+              <ogc:Literal>seineActivityObsWithFreeSchoolType</ogc:Literal>
             </ogc:PropertyIsEqualTo>
           </ogc:Filter>
           <PointSymbolizer>
@@ -334,7 +329,7 @@
               <Mark>
                 <WellKnownName>Triangle</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">#FFC800</CssParameter>
+                  <CssParameter name="fill">#7800f6</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -349,11 +344,11 @@
 
       <FeatureTypeStyle>
         <Rule>
-          <Name>Point seine activity with object school type</Name>
+          <Name>Point seine activity Obs with object school type</Name>
           <ogc:Filter>
             <ogc:PropertyIsEqualTo>
               <ogc:PropertyName>pointType</ogc:PropertyName>
-              <ogc:Literal>seineActivityWithObjectSchoolType</ogc:Literal>
+              <ogc:Literal>seineActivityObsWithObjectSchoolType</ogc:Literal>
             </ogc:PropertyIsEqualTo>
           </ogc:Filter>
           <PointSymbolizer>
@@ -361,7 +356,7 @@
               <Mark>
                 <WellKnownName>X</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">#00FF00</CssParameter>
+                  <CssParameter name="fill">#7800f6</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -414,7 +409,7 @@
           <PointSymbolizer>
             <Graphic>
               <Mark>
-                <WellKnownName>X</WellKnownName>
+                <WellKnownName>Square</WellKnownName>
                 <Fill>
                   <CssParameter name="fill">#00FF00</CssParameter>
                 </Fill>
@@ -442,9 +437,9 @@
           <PointSymbolizer>
             <Graphic>
               <Mark>
-                <WellKnownName>Triangle</WellKnownName>
+                <WellKnownName>Circle</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#00FF00</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -471,7 +466,7 @@
               <Mark>
                 <WellKnownName>X</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#00FF00</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -641,7 +636,7 @@
               <Mark>
                 <WellKnownName>Triangle</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">#00FF00</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -667,9 +662,9 @@
           <PointSymbolizer>
             <Graphic>
               <Mark>
-                <WellKnownName>X</WellKnownName>
+                <WellKnownName>Square</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">#00FF00</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -695,7 +690,7 @@
           <PointSymbolizer>
             <Graphic>
               <Mark>
-                <WellKnownName>Triangle</WellKnownName>
+                <WellKnownName>Circle</WellKnownName>
                 <Fill>
                   <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>


=====================================
dto/src/main/i18n/getters/java-enumeration.getter
=====================================
@@ -36,10 +36,10 @@ observe.constant.TripMapPointType.longlineActivityObsWithSettingStart
 observe.constant.TripMapPointType.longlineActivityObsWithStation
 observe.constant.TripMapPointType.longlineDepartureHarbour
 observe.constant.TripMapPointType.longlineLandingHarbour
-observe.constant.TripMapPointType.seineActivity
-observe.constant.TripMapPointType.seineActivityInHarbour
-observe.constant.TripMapPointType.seineActivityWithFreeSchoolType
-observe.constant.TripMapPointType.seineActivityWithObjectSchoolType
+observe.constant.TripMapPointType.seineActivityObs
+observe.constant.TripMapPointType.seineActivityObsInHarbour
+observe.constant.TripMapPointType.seineActivityObsWithFreeSchoolType
+observe.constant.TripMapPointType.seineActivityObsWithObjectSchoolType
 observe.constant.TripMapPointType.seineDepartureHarbour
 observe.constant.TripMapPointType.seineLandingHarbour
 observe.constant.TypeTransmittingBuoyOperation.pasDeBalise


=====================================
dto/src/main/java/fr/ird/observe/dto/data/TripMapPointType.java
=====================================
@@ -32,10 +32,10 @@ public enum TripMapPointType {
 
     seineDepartureHarbour,
     seineLandingHarbour,
-    seineActivity,
-    seineActivityInHarbour,
-    seineActivityWithFreeSchoolType,
-    seineActivityWithObjectSchoolType,
+    seineActivityObs,
+    seineActivityObsInHarbour,
+    seineActivityObsWithFreeSchoolType,
+    seineActivityObsWithObjectSchoolType,
 
     longlineDepartureHarbour,
     longlineLandingHarbour,


=====================================
observe-i18n/src/main/i18n/translations/observe_en_GB.properties
=====================================
@@ -2865,10 +2865,10 @@ observe.constant.TripMapPointType.longlineActivityWithSettingStart=Setting start
 observe.constant.TripMapPointType.longlineActivityWithStation=Station
 observe.constant.TripMapPointType.longlineDepartureHarbour=Harbour departure
 observe.constant.TripMapPointType.longlineLandingHarbour=Harbour landing
-observe.constant.TripMapPointType.seineActivity=Activity
-observe.constant.TripMapPointType.seineActivityInHarbour=In harbour
-observe.constant.TripMapPointType.seineActivityWithFreeSchoolType=Free School type
-observe.constant.TripMapPointType.seineActivityWithObjectSchoolType=Object School type
+observe.constant.TripMapPointType.seineActivityObs=Activity
+observe.constant.TripMapPointType.seineActivityObsInHarbour=In harbour
+observe.constant.TripMapPointType.seineActivityObsWithFreeSchoolType=Free School type
+observe.constant.TripMapPointType.seineActivityObsWithObjectSchoolType=Object School type
 observe.constant.TripMapPointType.seineDepartureHarbour=Harbour departure
 observe.constant.TripMapPointType.seineLandingHarbour=Harbour landing
 observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon


=====================================
observe-i18n/src/main/i18n/translations/observe_es_ES.properties
=====================================
@@ -2865,10 +2865,10 @@ observe.constant.TripMapPointType.longlineActivityWithSettingStart=Inicio de cal
 observe.constant.TripMapPointType.longlineActivityWithStation=Estación Oceanográfica
 observe.constant.TripMapPointType.longlineDepartureHarbour=Puerto de salida
 observe.constant.TripMapPointType.longlineLandingHarbour=Puerto de llegada
-observe.constant.TripMapPointType.seineActivity=Actividad
-observe.constant.TripMapPointType.seineActivityInHarbour=En puerto
-observe.constant.TripMapPointType.seineActivityWithFreeSchoolType=Banco libre
-observe.constant.TripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto
+observe.constant.TripMapPointType.seineActivityObs=Actividad
+observe.constant.TripMapPointType.seineActivityObsInHarbour=En puerto
+observe.constant.TripMapPointType.seineActivityObsWithFreeSchoolType=Banco libre
+observe.constant.TripMapPointType.seineActivityObsWithObjectSchoolType=Banco a objeto
 observe.constant.TripMapPointType.seineDepartureHarbour=Puerto de salida
 observe.constant.TripMapPointType.seineLandingHarbour=Puerto de llegada
 observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza


=====================================
observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
=====================================
@@ -2865,10 +2865,10 @@ observe.constant.TripMapPointType.longlineActivityWithSettingStart=Début de fil
 observe.constant.TripMapPointType.longlineActivityWithStation=Station océanographique
 observe.constant.TripMapPointType.longlineDepartureHarbour=Port de départ
 observe.constant.TripMapPointType.longlineLandingHarbour=Port d'arrivée
-observe.constant.TripMapPointType.seineActivity=point d'activité
-observe.constant.TripMapPointType.seineActivityInHarbour=Au port
-observe.constant.TripMapPointType.seineActivityWithFreeSchoolType=Banc libre
-observe.constant.TripMapPointType.seineActivityWithObjectSchoolType=Banc objet
+observe.constant.TripMapPointType.seineActivityObs=point d'activité
+observe.constant.TripMapPointType.seineActivityObsInHarbour=Au port
+observe.constant.TripMapPointType.seineActivityObsWithFreeSchoolType=Banc libre
+observe.constant.TripMapPointType.seineActivityObsWithObjectSchoolType=Banc objet
 observe.constant.TripMapPointType.seineDepartureHarbour=Port de départ
 observe.constant.TripMapPointType.seineLandingHarbour=Port d'arrivée
 observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP


=====================================
persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripSeineTopiaDao.java
=====================================
@@ -141,23 +141,23 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> {
             point.setLatitude(resultSet.getFloat(3));
             point.setLongitude(resultSet.getFloat(4));
             if (ACTIVITY_HARBOUR_ID.equals(resultSet.getString(5))) {
-                point.setType(TripMapPointType.seineActivityInHarbour);
+                point.setType(TripMapPointType.seineActivityObsInHarbour);
             } else if (resultSet.getString(6) == null) {
-                point.setType(TripMapPointType.seineActivity);
+                point.setType(TripMapPointType.seineActivityObs);
             } else {
                 String schoolType = resultSet.getString(6);
                 switch (schoolType) {
                     case SchoolTypeHelper.SCHOOL_TYPE_FREE_ID:
-                        point.setType(TripMapPointType.seineActivityWithFreeSchoolType);
+                        point.setType(TripMapPointType.seineActivityObsWithFreeSchoolType);
                         break;
                     case SchoolTypeHelper.SCHOOL_TYPE_OBJECT_ID:
-                        point.setType(TripMapPointType.seineActivityWithObjectSchoolType);
+                        point.setType(TripMapPointType.seineActivityObsWithObjectSchoolType);
                         break;
                     case SchoolTypeHelper.SCHOOL_TYPE_UNDEFINED_ID:
-                        point.setType(TripMapPointType.seineActivity);
+                        point.setType(TripMapPointType.seineActivityObs);
                         break;
                     default:
-                        point.setType(TripMapPointType.seineActivity);
+                        point.setType(TripMapPointType.seineActivityObs);
                 }
 
             }



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/74dcde816b4e5563f750190f5bf5...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/74dcde816b4e5563f750190f5bf5...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop] Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293

Tony CHEMIT

tags

participants (1)