[Git][ultreiaio/ird-observe][develop] 5 commits: [persistence] add activity points except if settingStart is a valid point (Obs & Logbook)

16 Sep 2024


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


Commits:
7000f8a2 by Tony Chemit at 2024-09-16T12:33:06+02:00
[persistence] add activity points except if settingStart is a valid point (Obs & Logbook)

- - - - -
4a1b9c7c by Tony Chemit at 2024-09-16T12:33:06+02:00
[ui] Remove date from any zone

- - - - -
faf74f95 by Tony Chemit at 2024-09-16T12:33:06+02:00
[ui] Add date on activity point and settingStart one

- - - - -
13477b41 by Tony Chemit at 2024-09-16T12:33:06+02:00
[ui] Use Setting and Hauling line colors for setting and hauling points as well

- - - - -
af3d5df3 by Tony Chemit at 2024-09-16T12:33:16+02:00
Merge branch 'feature/feature/issue-2875' into develop
A propos des dates d'activités sur la carte LL - Closes #2875

- - - - -


2 changed files:

- client/datasource/editor/ll/src/main/resources/map/ll-style.xml
- core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripTopiaDao.java


Changes:

=====================================
client/datasource/editor/ll/src/main/resources/map/ll-style.xml
=====================================
@@ -37,7 +37,7 @@
               <CssParameter name="fill-opacity">0.5</CssParameter>
             </Fill>
           </PolygonSymbolizer>
-          <TextSymbolizer>
+          <!--TextSymbolizer>
             <Label>
               <ogc:PropertyName>label</ogc:PropertyName>
             </Label>
@@ -57,7 +57,7 @@
             <Fill>
               <CssParameter name="fill">#000000</CssParameter>
             </Fill>
-          </TextSymbolizer>
+          </TextSymbolizer-->
         </Rule>
       </FeatureTypeStyle>
     </UserStyle>
@@ -76,7 +76,7 @@
               <CssParameter name="fill-opacity">0.5</CssParameter>
             </Fill>
           </PolygonSymbolizer>
-          <TextSymbolizer>
+          <!--TextSymbolizer>
             <Label>
               <ogc:PropertyName>label</ogc:PropertyName>
             </Label>
@@ -96,7 +96,7 @@
             <Fill>
               <CssParameter name="fill">#220000</CssParameter>
             </Fill>
-          </TextSymbolizer>
+          </TextSymbolizer-->
         </Rule>
       </FeatureTypeStyle>
     </UserStyle>
@@ -250,6 +250,27 @@
               <Size>8</Size>
             </Graphic>
           </PointSymbolizer>
+          <TextSymbolizer>
+            <Label>
+              <ogc:PropertyName>label</ogc:PropertyName>
+            </Label>
+            <Font>
+              <CssParameter name="font-size">14</CssParameter>
+              <CssParameter name="font-style">normal</CssParameter>
+              <CssParameter name="font-weight">bold</CssParameter>
+            </Font>
+            <LabelPlacement>
+              <PointPlacement>
+                <Displacement>
+                  <DisplacementX>5</DisplacementX>
+                  <DisplacementY>5</DisplacementY>
+                </Displacement>
+              </PointPlacement>
+            </LabelPlacement>
+            <Fill>
+              <CssParameter name="fill">#000000</CssParameter>
+            </Fill>
+          </TextSymbolizer>
         </Rule>
       </FeatureTypeStyle>
 
@@ -267,7 +288,7 @@
               <Mark>
                 <WellKnownName>Triangle</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
+                  <CssParameter name="fill">${mapLlStyleObservationsLineSettingColor}</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -277,6 +298,27 @@
               <Size>16</Size>
             </Graphic>
           </PointSymbolizer>
+          <TextSymbolizer>
+            <Label>
+              <ogc:PropertyName>label</ogc:PropertyName>
+            </Label>
+            <Font>
+              <CssParameter name="font-size">14</CssParameter>
+              <CssParameter name="font-style">normal</CssParameter>
+              <CssParameter name="font-weight">bold</CssParameter>
+            </Font>
+            <LabelPlacement>
+              <PointPlacement>
+                <Displacement>
+                  <DisplacementX>5</DisplacementX>
+                  <DisplacementY>5</DisplacementY>
+                </Displacement>
+              </PointPlacement>
+            </LabelPlacement>
+            <Fill>
+              <CssParameter name="fill">#000000</CssParameter>
+            </Fill>
+          </TextSymbolizer>
         </Rule>
       </FeatureTypeStyle>
       <FeatureTypeStyle>
@@ -293,7 +335,7 @@
               <Mark>
                 <WellKnownName>Square</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
+                  <CssParameter name="fill">${mapLlStyleObservationsLineSettingColor}</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -319,7 +361,7 @@
               <Mark>
                 <WellKnownName>Circle</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
+                  <CssParameter name="fill">${mapLlStyleObservationsLineHaulingColor}</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -345,7 +387,7 @@
               <Mark>
                 <WellKnownName>X</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
+                  <CssParameter name="fill">${mapLlStyleObservationsLineHaulingColor}</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -464,6 +506,27 @@
               <Size>8</Size>
             </Graphic>
           </PointSymbolizer>
+          <TextSymbolizer>
+            <Label>
+              <ogc:PropertyName>label</ogc:PropertyName>
+            </Label>
+            <Font>
+              <CssParameter name="font-size">16</CssParameter>
+              <CssParameter name="font-style">normal</CssParameter>
+              <CssParameter name="font-weight">bold</CssParameter>
+            </Font>
+            <LabelPlacement>
+              <PointPlacement>
+                <Displacement>
+                  <DisplacementX>5</DisplacementX>
+                  <DisplacementY>5</DisplacementY>
+                </Displacement>
+              </PointPlacement>
+            </LabelPlacement>
+            <Fill>
+              <CssParameter name="fill">#000000</CssParameter>
+            </Fill>
+          </TextSymbolizer>
         </Rule>
       </FeatureTypeStyle>
 
@@ -481,7 +544,7 @@
               <Mark>
                 <WellKnownName>Triangle</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
+                  <CssParameter name="fill">${mapLlStyleLogbookLineSettingColor}</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -491,6 +554,27 @@
               <Size>16</Size>
             </Graphic>
           </PointSymbolizer>
+          <TextSymbolizer>
+            <Label>
+              <ogc:PropertyName>label</ogc:PropertyName>
+            </Label>
+            <Font>
+              <CssParameter name="font-size">14</CssParameter>
+              <CssParameter name="font-style">normal</CssParameter>
+              <CssParameter name="font-weight">bold</CssParameter>
+            </Font>
+            <LabelPlacement>
+              <PointPlacement>
+                <Displacement>
+                  <DisplacementX>5</DisplacementX>
+                  <DisplacementY>5</DisplacementY>
+                </Displacement>
+              </PointPlacement>
+            </LabelPlacement>
+            <Fill>
+              <CssParameter name="fill">#000000</CssParameter>
+            </Fill>
+          </TextSymbolizer>
         </Rule>
       </FeatureTypeStyle>
 
@@ -508,7 +592,7 @@
               <Mark>
                 <WellKnownName>Square</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
+                  <CssParameter name="fill">${mapLlStyleLogbookLineSettingColor}</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -535,7 +619,7 @@
               <Mark>
                 <WellKnownName>Circle</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
+                  <CssParameter name="fill">${mapLlStyleLogbookLineHaulingColor}</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>
@@ -562,7 +646,7 @@
               <Mark>
                 <WellKnownName>X</WellKnownName>
                 <Fill>
-                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
+                  <CssParameter name="fill">${mapLlStyleLogbookLineHaulingColor}</CssParameter>
                 </Fill>
                 <Stroke>
                   <CssParameter name="stroke">#000000</CssParameter>


=====================================
core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripTopiaDao.java
=====================================
@@ -71,9 +71,14 @@ public class TripTopiaDao extends AbstractTripTopiaDao<Trip> {
                 return;
             }
 
+            TripMapPoint activityPoint = Entities.addPointWithTimestamp(TripMapPointType.llActivityObs, resultSet, 0, points);
+            log.debug(String.format("[LL-Logbook] Added activity point: %s", activityPoint));
+
             TripMapPoint settingStart = Entities.addPointWithTimestamp(TripMapPointType.llActivityObsWithSettingStart, resultSet, 5, points);
             log.debug(String.format("[LL-Observation]  Added set settingStart point: %s", settingStart));
-
+            if (settingStart.isValid()) {
+                points.remove(activityPoint);
+            }
             TripMapPoint settingEnd = Entities.addPointWithTimestamp(TripMapPointType.llActivityObsWithSettingEnd, resultSet, 8, points);
             log.debug(String.format("[LL-Observation]  Added set settingEnd point: %s", settingEnd));
 
@@ -101,9 +106,14 @@ public class TripTopiaDao extends AbstractTripTopiaDao<Trip> {
                 return;
             }
 
+            TripMapPoint activityPoint = Entities.addPointWithTimestamp(TripMapPointType.llActivityLogbook, resultSet, 0, points);
+            log.debug(String.format("[LL-Logbook] Added activity point: %s", activityPoint));
+
             TripMapPoint settingStart = Entities.addPointWithTimestamp(TripMapPointType.llActivityLogbookWithSettingStart, resultSet, 5, points);
             log.debug(String.format("[LL-Logbook] Added set settingStart point: %s", settingStart));
-
+            if (settingStart.isValid()) {
+                points.remove(activityPoint);
+            }
             TripMapPoint settingEnd = Entities.addPointWithTimestamp(TripMapPointType.llActivityLogbookWithSettingEnd, resultSet, 8, points);
             log.debug(String.format("[LL-Logbook] Added set settingEnd point: %s", settingEnd));
 



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f983c9dbe934e2296988e2b88...

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

    

Tony CHEMIT (＠tchemit)

tags

participants (1)