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

Commits:

2 changed files:

Changes:

  • client/datasource/editor/ll/src/main/resources/map/ll-style.xml
    ... ... @@ -37,7 +37,7 @@
    37 37 
                   <CssParameter name="fill-opacity">0.5</CssParameter>
    38 38 
                 </Fill>
    39 39 
               </PolygonSymbolizer>
    40 
    -          <TextSymbolizer>
    40 
    +          <!--TextSymbolizer>
    41 41 
                 <Label>
    42 42 
                   <ogc:PropertyName>label</ogc:PropertyName>
    43 43 
                 </Label>
    ... ... @@ -57,7 +57,7 @@
    57 57 
                 <Fill>
    58 58 
                   <CssParameter name="fill">#000000</CssParameter>
    59 59 
                 </Fill>
    60 
    -          </TextSymbolizer>
    60 
    +          </TextSymbolizer-->
    61 61 
             </Rule>
    62 62 
           </FeatureTypeStyle>
    63 63 
         </UserStyle>
    ... ... @@ -76,7 +76,7 @@
    76 76 
                   <CssParameter name="fill-opacity">0.5</CssParameter>
    77 77 
                 </Fill>
    78 78 
               </PolygonSymbolizer>
    79 
    -          <TextSymbolizer>
    79 
    +          <!--TextSymbolizer>
    80 80 
                 <Label>
    81 81 
                   <ogc:PropertyName>label</ogc:PropertyName>
    82 82 
                 </Label>
    ... ... @@ -96,7 +96,7 @@
    96 96 
                 <Fill>
    97 97 
                   <CssParameter name="fill">#220000</CssParameter>
    98 98 
                 </Fill>
    99 
    -          </TextSymbolizer>
    99 
    +          </TextSymbolizer-->
    100 100 
             </Rule>
    101 101 
           </FeatureTypeStyle>
    102 102 
         </UserStyle>
    ... ... @@ -250,6 +250,27 @@
    250 250 
                   <Size>8</Size>
    251 251 
                 </Graphic>
    252 252 
               </PointSymbolizer>
    253 
    +          <TextSymbolizer>
    254 
    +            <Label>
    255 
    +              <ogc:PropertyName>label</ogc:PropertyName>
    256 
    +            </Label>
    257 
    +            <Font>
    258 
    +              <CssParameter name="font-size">14</CssParameter>
    259 
    +              <CssParameter name="font-style">normal</CssParameter>
    260 
    +              <CssParameter name="font-weight">bold</CssParameter>
    261 
    +            </Font>
    262 
    +            <LabelPlacement>
    263 
    +              <PointPlacement>
    264 
    +                <Displacement>
    265 
    +                  <DisplacementX>5</DisplacementX>
    266 
    +                  <DisplacementY>5</DisplacementY>
    267 
    +                </Displacement>
    268 
    +              </PointPlacement>
    269 
    +            </LabelPlacement>
    270 
    +            <Fill>
    271 
    +              <CssParameter name="fill">#000000</CssParameter>
    272 
    +            </Fill>
    273 
    +          </TextSymbolizer>
    253 274 
             </Rule>
    254 275 
           </FeatureTypeStyle>
    255 276
    ... ... @@ -267,7 +288,7 @@
    267 288 
                   <Mark>
    268 289 
                     <WellKnownName>Triangle</WellKnownName>
    269 290 
                     <Fill>
    270 
    -                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    291 
    +                  <CssParameter name="fill">${mapLlStyleObservationsLineSettingColor}</CssParameter>
    271 292 
                     </Fill>
    272 293 
                     <Stroke>
    273 294 
                       <CssParameter name="stroke">#000000</CssParameter>
    ... ... @@ -277,6 +298,27 @@
    277 298 
                   <Size>16</Size>
    278 299 
                 </Graphic>
    279 300 
               </PointSymbolizer>
    301 
    +          <TextSymbolizer>
    302 
    +            <Label>
    303 
    +              <ogc:PropertyName>label</ogc:PropertyName>
    304 
    +            </Label>
    305 
    +            <Font>
    306 
    +              <CssParameter name="font-size">14</CssParameter>
    307 
    +              <CssParameter name="font-style">normal</CssParameter>
    308 
    +              <CssParameter name="font-weight">bold</CssParameter>
    309 
    +            </Font>
    310 
    +            <LabelPlacement>
    311 
    +              <PointPlacement>
    312 
    +                <Displacement>
    313 
    +                  <DisplacementX>5</DisplacementX>
    314 
    +                  <DisplacementY>5</DisplacementY>
    315 
    +                </Displacement>
    316 
    +              </PointPlacement>
    317 
    +            </LabelPlacement>
    318 
    +            <Fill>
    319 
    +              <CssParameter name="fill">#000000</CssParameter>
    320 
    +            </Fill>
    321 
    +          </TextSymbolizer>
    280 322 
             </Rule>
    281 323 
           </FeatureTypeStyle>
    282 324 
           <FeatureTypeStyle>
    ... ... @@ -293,7 +335,7 @@
    293 335 
                   <Mark>
    294 336 
                     <WellKnownName>Square</WellKnownName>
    295 337 
                     <Fill>
    296 
    -                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    338 
    +                  <CssParameter name="fill">${mapLlStyleObservationsLineSettingColor}</CssParameter>
    297 339 
                     </Fill>
    298 340 
                     <Stroke>
    299 341 
                       <CssParameter name="stroke">#000000</CssParameter>
    ... ... @@ -319,7 +361,7 @@
    319 361 
                   <Mark>
    320 362 
                     <WellKnownName>Circle</WellKnownName>
    321 363 
                     <Fill>
    322 
    -                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    364 
    +                  <CssParameter name="fill">${mapLlStyleObservationsLineHaulingColor}</CssParameter>
    323 365 
                     </Fill>
    324 366 
                     <Stroke>
    325 367 
                       <CssParameter name="stroke">#000000</CssParameter>
    ... ... @@ -345,7 +387,7 @@
    345 387 
                   <Mark>
    346 388 
                     <WellKnownName>X</WellKnownName>
    347 389 
                     <Fill>
    348 
    -                  <CssParameter name="fill">${mapLlStyleObservationsPointColor}</CssParameter>
    390 
    +                  <CssParameter name="fill">${mapLlStyleObservationsLineHaulingColor}</CssParameter>
    349 391 
                     </Fill>
    350 392 
                     <Stroke>
    351 393 
                       <CssParameter name="stroke">#000000</CssParameter>
    ... ... @@ -464,6 +506,27 @@
    464 506 
                   <Size>8</Size>
    465 507 
                 </Graphic>
    466 508 
               </PointSymbolizer>
    509 
    +          <TextSymbolizer>
    510 
    +            <Label>
    511 
    +              <ogc:PropertyName>label</ogc:PropertyName>
    512 
    +            </Label>
    513 
    +            <Font>
    514 
    +              <CssParameter name="font-size">16</CssParameter>
    515 
    +              <CssParameter name="font-style">normal</CssParameter>
    516 
    +              <CssParameter name="font-weight">bold</CssParameter>
    517 
    +            </Font>
    518 
    +            <LabelPlacement>
    519 
    +              <PointPlacement>
    520 
    +                <Displacement>
    521 
    +                  <DisplacementX>5</DisplacementX>
    522 
    +                  <DisplacementY>5</DisplacementY>
    523 
    +                </Displacement>
    524 
    +              </PointPlacement>
    525 
    +            </LabelPlacement>
    526 
    +            <Fill>
    527 
    +              <CssParameter name="fill">#000000</CssParameter>
    528 
    +            </Fill>
    529 
    +          </TextSymbolizer>
    467 530 
             </Rule>
    468 531 
           </FeatureTypeStyle>
    469 532
    ... ... @@ -481,7 +544,7 @@
    481 544 
                   <Mark>
    482 545 
                     <WellKnownName>Triangle</WellKnownName>
    483 546 
                     <Fill>
    484 
    -                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    547 
    +                  <CssParameter name="fill">${mapLlStyleLogbookLineSettingColor}</CssParameter>
    485 548 
                     </Fill>
    486 549 
                     <Stroke>
    487 550 
                       <CssParameter name="stroke">#000000</CssParameter>
    ... ... @@ -491,6 +554,27 @@
    491 554 
                   <Size>16</Size>
    492 555 
                 </Graphic>
    493 556 
               </PointSymbolizer>
    557 
    +          <TextSymbolizer>
    558 
    +            <Label>
    559 
    +              <ogc:PropertyName>label</ogc:PropertyName>
    560 
    +            </Label>
    561 
    +            <Font>
    562 
    +              <CssParameter name="font-size">14</CssParameter>
    563 
    +              <CssParameter name="font-style">normal</CssParameter>
    564 
    +              <CssParameter name="font-weight">bold</CssParameter>
    565 
    +            </Font>
    566 
    +            <LabelPlacement>
    567 
    +              <PointPlacement>
    568 
    +                <Displacement>
    569 
    +                  <DisplacementX>5</DisplacementX>
    570 
    +                  <DisplacementY>5</DisplacementY>
    571 
    +                </Displacement>
    572 
    +              </PointPlacement>
    573 
    +            </LabelPlacement>
    574 
    +            <Fill>
    575 
    +              <CssParameter name="fill">#000000</CssParameter>
    576 
    +            </Fill>
    577 
    +          </TextSymbolizer>
    494 578 
             </Rule>
    495 579 
           </FeatureTypeStyle>
    496 580
    ... ... @@ -508,7 +592,7 @@
    508 592 
                   <Mark>
    509 593 
                     <WellKnownName>Square</WellKnownName>
    510 594 
                     <Fill>
    511 
    -                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    595 
    +                  <CssParameter name="fill">${mapLlStyleLogbookLineSettingColor}</CssParameter>
    512 596 
                     </Fill>
    513 597 
                     <Stroke>
    514 598 
                       <CssParameter name="stroke">#000000</CssParameter>
    ... ... @@ -535,7 +619,7 @@
    535 619 
                   <Mark>
    536 620 
                     <WellKnownName>Circle</WellKnownName>
    537 621 
                     <Fill>
    538 
    -                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    622 
    +                  <CssParameter name="fill">${mapLlStyleLogbookLineHaulingColor}</CssParameter>
    539 623 
                     </Fill>
    540 624 
                     <Stroke>
    541 625 
                       <CssParameter name="stroke">#000000</CssParameter>
    ... ... @@ -562,7 +646,7 @@
    562 646 
                   <Mark>
    563 647 
                     <WellKnownName>X</WellKnownName>
    564 648 
                     <Fill>
    565 
    -                  <CssParameter name="fill">${mapLlStyleLogbookPointColor}</CssParameter>
    649 
    +                  <CssParameter name="fill">${mapLlStyleLogbookLineHaulingColor}</CssParameter>
    566 650 
                     </Fill>
    567 651 
                     <Stroke>
    568 652 
                       <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> {
    71 71 
                     return;
    72 72 
                 }
    73 73
    74 
    +            TripMapPoint activityPoint = Entities.addPointWithTimestamp(TripMapPointType.llActivityObs, resultSet, 0, points);
    75 
    +            log.debug(String.format("[LL-Logbook] Added activity point: %s", activityPoint));
    76 
    +
    74 77 
                 TripMapPoint settingStart = Entities.addPointWithTimestamp(TripMapPointType.llActivityObsWithSettingStart, resultSet, 5, points);
    75 78 
                 log.debug(String.format("[LL-Observation]  Added set settingStart point: %s", settingStart));
    76 
    -
    79 
    +            if (settingStart.isValid()) {
    80 
    +                points.remove(activityPoint);
    81 
    +            }
    77 82 
                 TripMapPoint settingEnd = Entities.addPointWithTimestamp(TripMapPointType.llActivityObsWithSettingEnd, resultSet, 8, points);
    78 83 
                 log.debug(String.format("[LL-Observation]  Added set settingEnd point: %s", settingEnd));
    79 84
    ... ... @@ -101,9 +106,14 @@ public class TripTopiaDao extends AbstractTripTopiaDao<Trip> {
    101 106 
                     return;
    102 107 
                 }
    103 108
    109 
    +            TripMapPoint activityPoint = Entities.addPointWithTimestamp(TripMapPointType.llActivityLogbook, resultSet, 0, points);
    110 
    +            log.debug(String.format("[LL-Logbook] Added activity point: %s", activityPoint));
    111 
    +
    104 112 
                 TripMapPoint settingStart = Entities.addPointWithTimestamp(TripMapPointType.llActivityLogbookWithSettingStart, resultSet, 5, points);
    105 113 
                 log.debug(String.format("[LL-Logbook] Added set settingStart point: %s", settingStart));
    106 
    -
    114 
    +            if (settingStart.isValid()) {
    115 
    +                points.remove(activityPoint);
    116 
    +            }
    107 117 
                 TripMapPoint settingEnd = Entities.addPointWithTimestamp(TripMapPointType.llActivityLogbookWithSettingEnd, resultSet, 8, points);
    108 118 
                 log.debug(String.format("[LL-Logbook] Added set settingEnd point: %s", settingEnd));
    109 119

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help