Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
74dcde81
by tchemit at 2019-06-29T19:13:44Z
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:
| ... | ... | @@ -84,9 +84,9 @@ public class TripMapContentBuilder { |
| 84 | 84 |
public static final String TRIP_POINTS_LAYER_NAME = "Trip points";
|
| 85 | 85 |
public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM");
|
| 86 | 86 |
protected static final Set<TripMapPointType> TRIP_MAP_POINT_TYPES_IN_LEGEND = ImmutableSet.of(
|
| 87 |
- TripMapPointType.seineActivityInHarbour,
|
|
| 88 |
- TripMapPointType.seineActivityWithFreeSchoolType,
|
|
| 89 |
- TripMapPointType.seineActivityWithObjectSchoolType,
|
|
| 87 |
+ TripMapPointType.seineActivityObsInHarbour,
|
|
| 88 |
+ TripMapPointType.seineActivityObsWithFreeSchoolType,
|
|
| 89 |
+ TripMapPointType.seineActivityObsWithObjectSchoolType,
|
|
| 90 | 90 |
TripMapPointType.longlineActivityObsInHarbour,
|
| 91 | 91 |
TripMapPointType.longlineActivityObsWithSettingStart,
|
| 92 | 92 |
TripMapPointType.longlineActivityObsWithSettingEnd,
|
| ... | ... | @@ -30,7 +30,6 @@ |
| 30 | 30 |
<Name>Trip lines</Name>
|
| 31 | 31 |
<UserStyle>
|
| 32 | 32 |
<IsDefault>true</IsDefault>
|
| 33 |
- <Title>SLD Cook Book: Simple Line</Title>
|
|
| 34 | 33 |
<FeatureTypeStyle>
|
| 35 | 34 |
<Rule>
|
| 36 | 35 |
<Name>Trip day</Name>
|
| ... | ... | @@ -91,7 +90,6 @@ |
| 91 | 90 |
<Name>Trip longline observation zone</Name>
|
| 92 | 91 |
<UserStyle>
|
| 93 | 92 |
<IsDefault>true</IsDefault>
|
| 94 |
- <Title>SLD Cook Book: Simple Line</Title>
|
|
| 95 | 93 |
<FeatureTypeStyle>
|
| 96 | 94 |
<Rule>
|
| 97 | 95 |
<Name>Trip day</Name>
|
| ... | ... | @@ -131,7 +129,6 @@ |
| 131 | 129 |
<Name>Trip longline logbook zone</Name>
|
| 132 | 130 |
<UserStyle>
|
| 133 | 131 |
<IsDefault>true</IsDefault>
|
| 134 |
- <Title>SLD Cook Book: Simple Line</Title>
|
|
| 135 | 132 |
<FeatureTypeStyle>
|
| 136 | 133 |
<Rule>
|
| 137 | 134 |
<Name>Trip day</Name>
|
| ... | ... | @@ -171,7 +168,6 @@ |
| 171 | 168 |
<Name>Trip longline observation line</Name>
|
| 172 | 169 |
<UserStyle>
|
| 173 | 170 |
<IsDefault>true</IsDefault>
|
| 174 |
- <Title>SLD Cook Book: Simple Line</Title>
|
|
| 175 | 171 |
<FeatureTypeStyle>
|
| 176 | 172 |
<Rule>
|
| 177 | 173 |
<Name>Trip</Name>
|
| ... | ... | @@ -231,7 +227,6 @@ |
| 231 | 227 |
<Name>Trip longline logbook line</Name>
|
| 232 | 228 |
<UserStyle>
|
| 233 | 229 |
<IsDefault>true</IsDefault>
|
| 234 |
- <Title>SLD Cook Book: Simple Line</Title>
|
|
| 235 | 230 |
<FeatureTypeStyle>
|
| 236 | 231 |
<Rule>
|
| 237 | 232 |
<Name>Trip</Name>
|
| ... | ... | @@ -294,11 +289,11 @@ |
| 294 | 289 |
<IsDefault>true</IsDefault>
|
| 295 | 290 |
<FeatureTypeStyle>
|
| 296 | 291 |
<Rule>
|
| 297 |
- <Name>Point seine activity in harbour</Name>
|
|
| 292 |
+ <Name>Point seine activity Obs in harbour</Name>
|
|
| 298 | 293 |
<ogc:Filter>
|
| 299 | 294 |
<ogc:PropertyIsEqualTo>
|
| 300 | 295 |
<ogc:PropertyName>pointType</ogc:PropertyName>
|
| 301 |
- <ogc:Literal>seineActivityInHarbour</ogc:Literal>
|
|
| 296 |
+ <ogc:Literal>seineActivityObsInHarbour</ogc:Literal>
|
|
| 302 | 297 |
</ogc:PropertyIsEqualTo>
|
| 303 | 298 |
</ogc:Filter>
|
| 304 | 299 |
<PointSymbolizer>
|
| ... | ... | @@ -322,11 +317,11 @@ |
| 322 | 317 |
|
| 323 | 318 |
<FeatureTypeStyle>
|
| 324 | 319 |
<Rule>
|
| 325 |
- <Name>Point seine activity with free school type</Name>
|
|
| 320 |
+ <Name>Point seine activity Obs with free school type</Name>
|
|
| 326 | 321 |
<ogc:Filter>
|
| 327 | 322 |
<ogc:PropertyIsEqualTo>
|
| 328 | 323 |
<ogc:PropertyName>pointType</ogc:PropertyName>
|
| 329 |
- <ogc:Literal>seineActivityWithFreeSchoolType</ogc:Literal>
|
|
| 324 |
+ <ogc:Literal>seineActivityObsWithFreeSchoolType</ogc:Literal>
|
|
| 330 | 325 |
</ogc:PropertyIsEqualTo>
|
| 331 | 326 |
</ogc:Filter>
|
| 332 | 327 |
<PointSymbolizer>
|
| ... | ... | @@ -334,7 +329,7 @@ |
| 334 | 329 |
<Mark>
|
| 335 | 330 |
<WellKnownName>Triangle</WellKnownName>
|
| 336 | 331 |
<Fill>
|
| 337 |
- <CssParameter name="fill">#FFC800</CssParameter>
|
|
| 332 |
+ <CssParameter name="fill">#7800f6</CssParameter>
|
|
| 338 | 333 |
</Fill>
|
| 339 | 334 |
<Stroke>
|
| 340 | 335 |
<CssParameter name="stroke">#000000</CssParameter>
|
| ... | ... | @@ -349,11 +344,11 @@ |
| 349 | 344 |
|
| 350 | 345 |
<FeatureTypeStyle>
|
| 351 | 346 |
<Rule>
|
| 352 |
- <Name>Point seine activity with object school type</Name>
|
|
| 347 |
+ <Name>Point seine activity Obs with object school type</Name>
|
|
| 353 | 348 |
<ogc:Filter>
|
| 354 | 349 |
<ogc:PropertyIsEqualTo>
|
| 355 | 350 |
<ogc:PropertyName>pointType</ogc:PropertyName>
|
| 356 |
- <ogc:Literal>seineActivityWithObjectSchoolType</ogc:Literal>
|
|
| 351 |
+ <ogc:Literal>seineActivityObsWithObjectSchoolType</ogc:Literal>
|
|
| 357 | 352 |
</ogc:PropertyIsEqualTo>
|
| 358 | 353 |
</ogc:Filter>
|
| 359 | 354 |
<PointSymbolizer>
|
| ... | ... | @@ -361,7 +356,7 @@ |
| 361 | 356 |
<Mark>
|
| 362 | 357 |
<WellKnownName>X</WellKnownName>
|
| 363 | 358 |
<Fill>
|
| 364 |
- <CssParameter name="fill">#00FF00</CssParameter>
|
|
| 359 |
+ <CssParameter name="fill">#7800f6</CssParameter>
|
|
| 365 | 360 |
</Fill>
|
| 366 | 361 |
<Stroke>
|
| 367 | 362 |
<CssParameter name="stroke">#000000</CssParameter>
|
| ... | ... | @@ -414,7 +409,7 @@ |
| 414 | 409 |
<PointSymbolizer>
|
| 415 | 410 |
<Graphic>
|
| 416 | 411 |
<Mark>
|
| 417 |
- <WellKnownName>X</WellKnownName>
|
|
| 412 |
+ <WellKnownName>Square</WellKnownName>
|
|
| 418 | 413 |
<Fill>
|
| 419 | 414 |
<CssParameter name="fill">#00FF00</CssParameter>
|
| 420 | 415 |
</Fill>
|
| ... | ... | @@ -442,9 +437,9 @@ |
| 442 | 437 |
<PointSymbolizer>
|
| 443 | 438 |
<Graphic>
|
| 444 | 439 |
<Mark>
|
| 445 |
- <WellKnownName>Triangle</WellKnownName>
|
|
| 440 |
+ <WellKnownName>Circle</WellKnownName>
|
|
| 446 | 441 |
<Fill>
|
| 447 |
- <CssParameter name="fill">#FF0000</CssParameter>
|
|
| 442 |
+ <CssParameter name="fill">#00FF00</CssParameter>
|
|
| 448 | 443 |
</Fill>
|
| 449 | 444 |
<Stroke>
|
| 450 | 445 |
<CssParameter name="stroke">#000000</CssParameter>
|
| ... | ... | @@ -471,7 +466,7 @@ |
| 471 | 466 |
<Mark>
|
| 472 | 467 |
<WellKnownName>X</WellKnownName>
|
| 473 | 468 |
<Fill>
|
| 474 |
- <CssParameter name="fill">#FF0000</CssParameter>
|
|
| 469 |
+ <CssParameter name="fill">#00FF00</CssParameter>
|
|
| 475 | 470 |
</Fill>
|
| 476 | 471 |
<Stroke>
|
| 477 | 472 |
<CssParameter name="stroke">#000000</CssParameter>
|
| ... | ... | @@ -641,7 +636,7 @@ |
| 641 | 636 |
<Mark>
|
| 642 | 637 |
<WellKnownName>Triangle</WellKnownName>
|
| 643 | 638 |
<Fill>
|
| 644 |
- <CssParameter name="fill">#00FF00</CssParameter>
|
|
| 639 |
+ <CssParameter name="fill">#FF0000</CssParameter>
|
|
| 645 | 640 |
</Fill>
|
| 646 | 641 |
<Stroke>
|
| 647 | 642 |
<CssParameter name="stroke">#000000</CssParameter>
|
| ... | ... | @@ -667,9 +662,9 @@ |
| 667 | 662 |
<PointSymbolizer>
|
| 668 | 663 |
<Graphic>
|
| 669 | 664 |
<Mark>
|
| 670 |
- <WellKnownName>X</WellKnownName>
|
|
| 665 |
+ <WellKnownName>Square</WellKnownName>
|
|
| 671 | 666 |
<Fill>
|
| 672 |
- <CssParameter name="fill">#00FF00</CssParameter>
|
|
| 667 |
+ <CssParameter name="fill">#FF0000</CssParameter>
|
|
| 673 | 668 |
</Fill>
|
| 674 | 669 |
<Stroke>
|
| 675 | 670 |
<CssParameter name="stroke">#000000</CssParameter>
|
| ... | ... | @@ -695,7 +690,7 @@ |
| 695 | 690 |
<PointSymbolizer>
|
| 696 | 691 |
<Graphic>
|
| 697 | 692 |
<Mark>
|
| 698 |
- <WellKnownName>Triangle</WellKnownName>
|
|
| 693 |
+ <WellKnownName>Circle</WellKnownName>
|
|
| 699 | 694 |
<Fill>
|
| 700 | 695 |
<CssParameter name="fill">#FF0000</CssParameter>
|
| 701 | 696 |
</Fill>
|
| ... | ... | @@ -36,10 +36,10 @@ observe.constant.TripMapPointType.longlineActivityObsWithSettingStart |
| 36 | 36 |
observe.constant.TripMapPointType.longlineActivityObsWithStation
|
| 37 | 37 |
observe.constant.TripMapPointType.longlineDepartureHarbour
|
| 38 | 38 |
observe.constant.TripMapPointType.longlineLandingHarbour
|
| 39 |
-observe.constant.TripMapPointType.seineActivity
|
|
| 40 |
-observe.constant.TripMapPointType.seineActivityInHarbour
|
|
| 41 |
-observe.constant.TripMapPointType.seineActivityWithFreeSchoolType
|
|
| 42 |
-observe.constant.TripMapPointType.seineActivityWithObjectSchoolType
|
|
| 39 |
+observe.constant.TripMapPointType.seineActivityObs
|
|
| 40 |
+observe.constant.TripMapPointType.seineActivityObsInHarbour
|
|
| 41 |
+observe.constant.TripMapPointType.seineActivityObsWithFreeSchoolType
|
|
| 42 |
+observe.constant.TripMapPointType.seineActivityObsWithObjectSchoolType
|
|
| 43 | 43 |
observe.constant.TripMapPointType.seineDepartureHarbour
|
| 44 | 44 |
observe.constant.TripMapPointType.seineLandingHarbour
|
| 45 | 45 |
observe.constant.TypeTransmittingBuoyOperation.pasDeBalise
|
| ... | ... | @@ -32,10 +32,10 @@ public enum TripMapPointType { |
| 32 | 32 |
|
| 33 | 33 |
seineDepartureHarbour,
|
| 34 | 34 |
seineLandingHarbour,
|
| 35 |
- seineActivity,
|
|
| 36 |
- seineActivityInHarbour,
|
|
| 37 |
- seineActivityWithFreeSchoolType,
|
|
| 38 |
- seineActivityWithObjectSchoolType,
|
|
| 35 |
+ seineActivityObs,
|
|
| 36 |
+ seineActivityObsInHarbour,
|
|
| 37 |
+ seineActivityObsWithFreeSchoolType,
|
|
| 38 |
+ seineActivityObsWithObjectSchoolType,
|
|
| 39 | 39 |
|
| 40 | 40 |
longlineDepartureHarbour,
|
| 41 | 41 |
longlineLandingHarbour,
|
| ... | ... | @@ -2865,10 +2865,10 @@ observe.constant.TripMapPointType.longlineActivityWithSettingStart=Setting start |
| 2865 | 2865 |
observe.constant.TripMapPointType.longlineActivityWithStation=Station
|
| 2866 | 2866 |
observe.constant.TripMapPointType.longlineDepartureHarbour=Harbour departure
|
| 2867 | 2867 |
observe.constant.TripMapPointType.longlineLandingHarbour=Harbour landing
|
| 2868 |
-observe.constant.TripMapPointType.seineActivity=Activity
|
|
| 2869 |
-observe.constant.TripMapPointType.seineActivityInHarbour=In harbour
|
|
| 2870 |
-observe.constant.TripMapPointType.seineActivityWithFreeSchoolType=Free School type
|
|
| 2871 |
-observe.constant.TripMapPointType.seineActivityWithObjectSchoolType=Object School type
|
|
| 2868 |
+observe.constant.TripMapPointType.seineActivityObs=Activity
|
|
| 2869 |
+observe.constant.TripMapPointType.seineActivityObsInHarbour=In harbour
|
|
| 2870 |
+observe.constant.TripMapPointType.seineActivityObsWithFreeSchoolType=Free School type
|
|
| 2871 |
+observe.constant.TripMapPointType.seineActivityObsWithObjectSchoolType=Object School type
|
|
| 2872 | 2872 |
observe.constant.TripMapPointType.seineDepartureHarbour=Harbour departure
|
| 2873 | 2873 |
observe.constant.TripMapPointType.seineLandingHarbour=Harbour landing
|
| 2874 | 2874 |
observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon
|
| ... | ... | @@ -2865,10 +2865,10 @@ observe.constant.TripMapPointType.longlineActivityWithSettingStart=Inicio de cal |
| 2865 | 2865 |
observe.constant.TripMapPointType.longlineActivityWithStation=Estación Oceanográfica
|
| 2866 | 2866 |
observe.constant.TripMapPointType.longlineDepartureHarbour=Puerto de salida
|
| 2867 | 2867 |
observe.constant.TripMapPointType.longlineLandingHarbour=Puerto de llegada
|
| 2868 |
-observe.constant.TripMapPointType.seineActivity=Actividad
|
|
| 2869 |
-observe.constant.TripMapPointType.seineActivityInHarbour=En puerto
|
|
| 2870 |
-observe.constant.TripMapPointType.seineActivityWithFreeSchoolType=Banco libre
|
|
| 2871 |
-observe.constant.TripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto
|
|
| 2868 |
+observe.constant.TripMapPointType.seineActivityObs=Actividad
|
|
| 2869 |
+observe.constant.TripMapPointType.seineActivityObsInHarbour=En puerto
|
|
| 2870 |
+observe.constant.TripMapPointType.seineActivityObsWithFreeSchoolType=Banco libre
|
|
| 2871 |
+observe.constant.TripMapPointType.seineActivityObsWithObjectSchoolType=Banco a objeto
|
|
| 2872 | 2872 |
observe.constant.TripMapPointType.seineDepartureHarbour=Puerto de salida
|
| 2873 | 2873 |
observe.constant.TripMapPointType.seineLandingHarbour=Puerto de llegada
|
| 2874 | 2874 |
observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza
|
| ... | ... | @@ -2865,10 +2865,10 @@ observe.constant.TripMapPointType.longlineActivityWithSettingStart=Début de fil |
| 2865 | 2865 |
observe.constant.TripMapPointType.longlineActivityWithStation=Station océanographique
|
| 2866 | 2866 |
observe.constant.TripMapPointType.longlineDepartureHarbour=Port de départ
|
| 2867 | 2867 |
observe.constant.TripMapPointType.longlineLandingHarbour=Port d'arrivée
|
| 2868 |
-observe.constant.TripMapPointType.seineActivity=point d'activité
|
|
| 2869 |
-observe.constant.TripMapPointType.seineActivityInHarbour=Au port
|
|
| 2870 |
-observe.constant.TripMapPointType.seineActivityWithFreeSchoolType=Banc libre
|
|
| 2871 |
-observe.constant.TripMapPointType.seineActivityWithObjectSchoolType=Banc objet
|
|
| 2868 |
+observe.constant.TripMapPointType.seineActivityObs=point d'activité
|
|
| 2869 |
+observe.constant.TripMapPointType.seineActivityObsInHarbour=Au port
|
|
| 2870 |
+observe.constant.TripMapPointType.seineActivityObsWithFreeSchoolType=Banc libre
|
|
| 2871 |
+observe.constant.TripMapPointType.seineActivityObsWithObjectSchoolType=Banc objet
|
|
| 2872 | 2872 |
observe.constant.TripMapPointType.seineDepartureHarbour=Port de départ
|
| 2873 | 2873 |
observe.constant.TripMapPointType.seineLandingHarbour=Port d'arrivée
|
| 2874 | 2874 |
observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP
|
| ... | ... | @@ -141,23 +141,23 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { |
| 141 | 141 |
point.setLatitude(resultSet.getFloat(3));
|
| 142 | 142 |
point.setLongitude(resultSet.getFloat(4));
|
| 143 | 143 |
if (ACTIVITY_HARBOUR_ID.equals(resultSet.getString(5))) {
|
| 144 |
- point.setType(TripMapPointType.seineActivityInHarbour);
|
|
| 144 |
+ point.setType(TripMapPointType.seineActivityObsInHarbour);
|
|
| 145 | 145 |
} else if (resultSet.getString(6) == null) {
|
| 146 |
- point.setType(TripMapPointType.seineActivity);
|
|
| 146 |
+ point.setType(TripMapPointType.seineActivityObs);
|
|
| 147 | 147 |
} else {
|
| 148 | 148 |
String schoolType = resultSet.getString(6);
|
| 149 | 149 |
switch (schoolType) {
|
| 150 | 150 |
case SchoolTypeHelper.SCHOOL_TYPE_FREE_ID:
|
| 151 |
- point.setType(TripMapPointType.seineActivityWithFreeSchoolType);
|
|
| 151 |
+ point.setType(TripMapPointType.seineActivityObsWithFreeSchoolType);
|
|
| 152 | 152 |
break;
|
| 153 | 153 |
case SchoolTypeHelper.SCHOOL_TYPE_OBJECT_ID:
|
| 154 |
- point.setType(TripMapPointType.seineActivityWithObjectSchoolType);
|
|
| 154 |
+ point.setType(TripMapPointType.seineActivityObsWithObjectSchoolType);
|
|
| 155 | 155 |
break;
|
| 156 | 156 |
case SchoolTypeHelper.SCHOOL_TYPE_UNDEFINED_ID:
|
| 157 |
- point.setType(TripMapPointType.seineActivity);
|
|
| 157 |
+ point.setType(TripMapPointType.seineActivityObs);
|
|
| 158 | 158 |
break;
|
| 159 | 159 |
default:
|
| 160 |
- point.setType(TripMapPointType.seineActivity);
|
|
| 160 |
+ point.setType(TripMapPointType.seineActivityObs);
|
|
| 161 | 161 |
}
|
| 162 | 162 |
|
| 163 | 163 |
}
|