This is an automated email from the git hooks/post-receive script. New commit to branch feature/7133 in repository observe. See http://git.codelutin.com/observe.git commit a5d9544ea4864e608097b469f3ea2c6bc4dfcc5b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 20 17:11:40 2015 +0200 refs #7133 : ajout des point "Au port" et style de la carte --- .../observe/entities/seine/TripSeineDAOImpl.java | 11 ++++++-- .../fr/ird/observe/tripMap/TripMapPointType.java | 1 + .../i18n/observe-entities_en_GB.properties | 1 + .../i18n/observe-entities_es_ES.properties | 1 + .../i18n/observe-entities_fr_FR.properties | 1 + .../observe/ui/util/tripMap/TripMapUIHandler.java | 3 +- observe-swing/src/main/map/style.xml | 32 ++++++++++++++++++++-- 7 files changed, 45 insertions(+), 5 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java index f2bd087..90709e6 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java @@ -53,6 +53,8 @@ import java.util.List; */ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract<E> { + public static final int ACTIVITY_HARBOUR_CODE = 0; + public int findPositionByProgramId(String programId, String tripId) throws TopiaException { int result = 0; List<E> list = findAllStubByProgramId(programId, ReferenceLocale.FR); @@ -123,10 +125,13 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< " a.time, " + " a.latitude," + " a.longitude," + + " v.code, " + " s.schoolType" + " FROM observe_seine.route r" + " INNER JOIN observe_seine.activity a" + " ON a.route = r.topiaId" + + " INNER JOIN observe_seine.vesselactivity v" + + " ON a.vesselactivity = v.topiaid" + " LEFT OUTER JOIN observe_seine.set s" + " ON s.topiaId = a.set" + " WHERE r.trip = ?" + @@ -158,10 +163,12 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< point.setTime(calendar.getTime()); point.setLatitude(resultSet.getFloat(3)); point.setLongitude(resultSet.getFloat(4)); - if (resultSet.getString(5) == null) { + if (resultSet.getInt(5) == ACTIVITY_HARBOUR_CODE) { + point.setType(TripMapPointType.SEINE_ACTIVITY_IN_HARBOUR); + } else if (resultSet.getString(6) == null) { point.setType(TripMapPointType.SEINE_ACTIVITY); } else { - SchoolType schoolType = SchoolType.values()[resultSet.getInt(5)]; + SchoolType schoolType = SchoolType.values()[resultSet.getInt(6)]; switch (schoolType) { case libre: point.setType(TripMapPointType.SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE); diff --git a/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java b/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java index 1024d95..4380ce4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java +++ b/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java @@ -33,6 +33,7 @@ public enum TripMapPointType { SEINE_DEPARTURE_HARBOUR(n("observe.map.seine.harbour.departure")), SEINE_LANDINGE_HARBOUR(n("observe.map.seine.harbour.landing")), SEINE_ACTIVITY(n("observe.map.seine.activity")), + SEINE_ACTIVITY_IN_HARBOUR(n("observe.map.seine.activity.inHarbour")), SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.free")), SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.object")), diff --git a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties index 9f50422..b33150c 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties @@ -28,6 +28,7 @@ observe.map.longLine.activity.setting.start= observe.map.longLine.seine.harbour.departure= observe.map.longLine.seine.harbour.landing= observe.map.seine.activity= +observe.map.seine.activity.inHarbour= observe.map.seine.activity.schollType.free= observe.map.seine.activity.schollType.object= observe.map.seine.harbour.departure= diff --git a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties index a0f0749..b7b3dde 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties @@ -28,6 +28,7 @@ observe.map.longLine.activity.setting.start= observe.map.longLine.seine.harbour.departure= observe.map.longLine.seine.harbour.landing= observe.map.seine.activity= +observe.map.seine.activity.inHarbour= observe.map.seine.activity.schollType.free= observe.map.seine.activity.schollType.object= observe.map.seine.harbour.departure= diff --git a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties index 60be1c5..858bcda 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties @@ -28,6 +28,7 @@ observe.map.longLine.activity.setting.start=Début de virage observe.map.longLine.seine.harbour.departure=Port de départ observe.map.longLine.seine.harbour.landing=Port d'arrivée observe.map.seine.activity=point d'activité +observe.map.seine.activity.inHarbour=Au port observe.map.seine.activity.schollType.free=Banc libre observe.map.seine.activity.schollType.object=Banc objet observe.map.seine.harbour.departure=Port de départ diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java index c3f1512..40994fb 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java @@ -107,6 +107,7 @@ public class TripMapUIHandler { public static final double ZOOM_STEP_RATIO = 0.1; protected static final Set<TripMapPointType> TRIP_MAP_POINT_TYPES_IN_LEGEND = ImmutableSet.of( + TripMapPointType.SEINE_ACTIVITY_IN_HARBOUR, TripMapPointType.SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE, TripMapPointType.SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE, TripMapPointType.LONGLINE_ACTIVITY_WITH_SETTING_START, @@ -246,7 +247,7 @@ public class TripMapUIHandler { mapContent.addLayer(layer); } - SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM"); GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory(); diff --git a/observe-swing/src/main/map/style.xml b/observe-swing/src/main/map/style.xml index 6218ae8..7305fd4 100644 --- a/observe-swing/src/main/map/style.xml +++ b/observe-swing/src/main/map/style.xml @@ -42,7 +42,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#000000</CssParameter> + <CssParameter name="stroke">#ff4444</CssParameter> <CssParameter name="stroke-width">2</CssParameter> </Stroke> </LineSymbolizer> @@ -77,7 +77,7 @@ </ogc:Filter> <LineSymbolizer> <Stroke> - <CssParameter name="stroke">#000000</CssParameter> + <CssParameter name="stroke">#ff4444</CssParameter> <CssParameter name="stroke-width">2</CssParameter> <CssParameter name="stroke-dasharray">6 4</CssParameter> </Stroke> @@ -93,6 +93,34 @@ <IsDefault>true</IsDefault> <FeatureTypeStyle> <Rule> + <Name>Point seine activity in harbour</Name> + <ogc:Filter> + <ogc:PropertyIsEqualTo> + <ogc:PropertyName>pointType</ogc:PropertyName> + <ogc:Literal>SEINE_ACTIVITY_IN_HARBOUR</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <PointSymbolizer> + <Graphic> + <Mark> + <WellKnownName>Circle</WellKnownName> + <Fill> + <CssParameter name="fill">#7800f6</CssParameter> + </Fill> + <Stroke> + <CssParameter name="stroke">#000000</CssParameter> + <CssParameter name="stroke-width">1</CssParameter> + </Stroke> + </Mark> + <Size>16</Size> + </Graphic> + </PointSymbolizer> + </Rule> + </FeatureTypeStyle> + + + <FeatureTypeStyle> + <Rule> <Name>Point seine activity with free school type</Name> <ogc:Filter> <ogc:PropertyIsEqualTo> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.