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

Commits:

6 changed files:

Changes:

  • client-core/src/main/map/ps-style.xml
    ... ... @@ -138,7 +138,7 @@
    138 138 
                       <CssParameter name="stroke-width">1</CssParameter>
    139 139 
                     </Stroke>
    140 140 
                   </Mark>
    141 
    -              <Size>8</Size>
    141 
    +              <Size>4</Size>
    142 142 
                 </Graphic>
    143 143 
               </PointSymbolizer>
    144 144 
             </Rule>
    ... ... @@ -183,7 +183,7 @@
    183 183 
               <PointSymbolizer>
    184 184 
                 <Graphic>
    185 185 
                   <Mark>
    186 
    -                <WellKnownName>ttf://Serif#U+2B1F</WellKnownName>
    186 
    +                <WellKnownName>ttf://Serif#U+002B</WellKnownName>
    187 187 
                     <Fill>
    188 188 
                       <CssParameter name="fill">#00FF00</CssParameter>
    189 189 
                     </Fill>
    ... ... @@ -192,7 +192,7 @@
    192 192 
                       <CssParameter name="stroke-width">1</CssParameter>
    193 193 
                     </Stroke>
    194 194 
                   </Mark>
    195 
    -              <Size>16</Size>
    195 
    +              <Size>12</Size>
    196 196 
                 </Graphic>
    197 197 
               </PointSymbolizer>
    198 198 
             </Rule>

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Security
    673 673 
     observe.constant.StorageStep.ROLES.description=Apply security on database roles
    674 674 
     observe.constant.StorageStep.SELECT_DATA=Data selection
    675 675 
     observe.constant.StorageStep.SELECT_DATA.description=Select data to export in backup
    676 
    -observe.constant.TripMapPointType.llActivityLogbook=Logbook - Activity (Other)
    676 
    +observe.constant.TripMapPointType.llActivityLogbook=Logbook - Other activity
    677 677 
     observe.constant.TripMapPointType.llActivityLogbookInHarbour=Logbook - At Harbour
    678 678 
     observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Logbook - Hauling end
    679 679 
     observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Logbook - Hauling start
    680 680 
     observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Logbook - Setting end
    681 681 
     observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Logbook - Setting start
    682 
    -observe.constant.TripMapPointType.llActivityObs=Observation - Activity (Other)
    682 
    +observe.constant.TripMapPointType.llActivityObs=Observation - Other activity
    683 683 
     observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - At Harbour
    684 684 
     observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Hauling end
    685 685 
     observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Hauling start
    ... ... @@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Sett
    687 687 
     observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Setting start
    688 688 
     observe.constant.TripMapPointType.llTripDepartureHarbour=Harbour departure
    689 689 
     observe.constant.TripMapPointType.llTripLandingHarbour=Harbour landing
    690 
    -observe.constant.TripMapPointType.psActivityObs=Activity (Other)
    690 
    +observe.constant.TripMapPointType.psActivityObs=Other activity
    691 691 
     observe.constant.TripMapPointType.psActivityObsInHarbour=In harbour
    692 692 
     observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Free School type
    693 693 
     observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Object School type
    ... ... @@ -723,7 +723,7 @@ observe.content.map.legend.logbook.setting=Logbook - setting
    723 723 
     observe.content.map.legend.obs.hauling=Observation - Hauling
    724 724 
     observe.content.map.legend.obs.setting=Observation - setting
    725 725 
     observe.content.map.legend.setting=setting
    726 
    -observe.content.map.legend.tripBetweenTwoDays=Trip between two days
    726 
    +observe.content.map.legend.tripBetweenTwoDays=Night trip
    727 727 
     observe.content.map.legend.tripDay=Day trip
    728 728 
     observe.content.map.miles=miles
    729 729 
     observe.content.map.north=North

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Seguridad
    673 673 
     observe.constant.StorageStep.ROLES.description=Configuración de la seguridad
    674 674 
     observe.constant.StorageStep.SELECT_DATA=Selección de datos
    675 675 
     observe.constant.StorageStep.SELECT_DATA.description=Seleccionar los datos a exportar en la copia de seguridad
    676 
    -observe.constant.TripMapPointType.llActivityLogbook=Logbook - Actividad (Other) \#TODO
    676 
    +observe.constant.TripMapPointType.llActivityLogbook=Logbook - Otro Actividad
    677 677 
     observe.constant.TripMapPointType.llActivityLogbookInHarbour=Logbook - En el puerto
    678 678 
     observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Logbook - Fin de arrastre
    679 679 
     observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Logbook - Inicio de arrastre
    680 680 
     observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Logbook - Fin de calada
    681 681 
     observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Logbook - Inicio de calada
    682 
    -observe.constant.TripMapPointType.llActivityObs=Observation - Actividad (Other) \#TODO
    682 
    +observe.constant.TripMapPointType.llActivityObs=Observation - Otro Actividad
    683 683 
     observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - En el puerto
    684 684 
     observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Fin de arrastre
    685 685 
     observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Inicio de arrastre
    ... ... @@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin
    687 687 
     observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Inicio de calada
    688 688 
     observe.constant.TripMapPointType.llTripDepartureHarbour=Puerto de salida
    689 689 
     observe.constant.TripMapPointType.llTripLandingHarbour=Puerto de llegada
    690 
    -observe.constant.TripMapPointType.psActivityObs=Actividad (Other) \#TODO
    690 
    +observe.constant.TripMapPointType.psActivityObs=Otro Actividad
    691 691 
     observe.constant.TripMapPointType.psActivityObsInHarbour=En puerto
    692 692 
     observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Banco libre
    693 693 
     observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Banco a objeto
    ... ... @@ -723,7 +723,7 @@ observe.content.map.legend.logbook.setting=Logbook - Calada
    723 723 
     observe.content.map.legend.obs.hauling=Observation - Arrastre
    724 724 
     observe.content.map.legend.obs.setting=Observation - Calada
    725 725 
     observe.content.map.legend.setting=Calada
    726 
    -observe.content.map.legend.tripBetweenTwoDays=Trayecto entre dos días
    726 
    +observe.content.map.legend.tripBetweenTwoDays=Trayecto del noche
    727 727 
     observe.content.map.legend.tripDay=Trayecto del día
    728 728 
     observe.content.map.miles=milles
    729 729 
     observe.content.map.north=Norte

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Sécurité
    673 673 
     observe.constant.StorageStep.ROLES.description=Mise en place de la sécurité
    674 674 
     observe.constant.StorageStep.SELECT_DATA=Sélection données
    675 675 
     observe.constant.StorageStep.SELECT_DATA.description=Sélectionner les données à exporter dans la sauvegarde
    676 
    -observe.constant.TripMapPointType.llActivityLogbook=Livre de bord - Activité (autre)
    676 
    +observe.constant.TripMapPointType.llActivityLogbook=Livre de bord - Autre Activité
    677 677 
     observe.constant.TripMapPointType.llActivityLogbookInHarbour=Livre de bord - Au port
    678 678 
     observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Livre de bord - Fin de virage
    679 679 
     observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Livre de bord - Début de virage
    680 680 
     observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Livre de bord - Fin de filage
    681 681 
     observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Livre de bord - Début de filage
    682 
    -observe.constant.TripMapPointType.llActivityObs=Observation - Activité (autre)
    682 
    +observe.constant.TripMapPointType.llActivityObs=Observation - autre activité
    683 683 
     observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - Au port
    684 684 
     observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Fin de virage
    685 685 
     observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Début de virage
    ... ... @@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin
    687 687 
     observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Début de filage
    688 688 
     observe.constant.TripMapPointType.llTripDepartureHarbour=Port de départ
    689 689 
     observe.constant.TripMapPointType.llTripLandingHarbour=Port d'arrivée
    690 
    -observe.constant.TripMapPointType.psActivityObs=Activité (autre)
    690 
    +observe.constant.TripMapPointType.psActivityObs=Autre activité
    691 691 
     observe.constant.TripMapPointType.psActivityObsInHarbour=Au port
    692 692 
     observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Banc libre
    693 693 
     observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Banc objet
    ... ... @@ -723,8 +723,8 @@ observe.content.map.legend.logbook.setting=Livre de bord - Filage
    723 723 
     observe.content.map.legend.obs.hauling=Observation - Virage
    724 724 
     observe.content.map.legend.obs.setting=Observation - Filage
    725 725 
     observe.content.map.legend.setting=Filage
    726 
    -observe.content.map.legend.tripBetweenTwoDays=Trajet entre deux jours
    727 
    -observe.content.map.legend.tripDay=Trajet d'une journée
    726 
    +observe.content.map.legend.tripBetweenTwoDays=Trajet de nuit
    727 
    +observe.content.map.legend.tripDay=Trajet de jour
    728 728 
     observe.content.map.miles=milles
    729 729 
     observe.content.map.north=Nord
    730 730 
     observe.content.map.showLogbook=Voir les données Livre de bord

  • server-configuration/src/main/config/Server.ini
    ... ... @@ -28,20 +28,6 @@ type = string
    28 28 
     defaultValue = changeme
    29 29 
     final = true
    30 30
    31 
    -[option host]
    32 
    -description = observeweb.host.description
    33 
    -key = observeweb.host
    34 
    -type = url
    35 
    -defaultValue = http://localhost:8080
    36 
    -final = true
    37 
    -
    38 
    -[option apiUrl]
    39 
    -description = observeweb.apiUrl.description
    40 
    -key = observeweb.apiUrl
    41 
    -type = url
    42 
    -defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1
    43 
    -final = true
    44 
    -
    45 31 
     [option modelVersion]
    46 32 
     description = observe.model.version
    47 33 
     key = observeweb.model.version

  • server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java
    ... ... @@ -44,6 +44,7 @@ import org.apache.logging.log4j.Logger;
    44 44 
     import org.apache.logging.log4j.LogManager;
    45 45
    46 46 
     import java.io.File;
    47 
    +import java.net.URL;
    47 48 
     import java.util.LinkedHashSet;
    48 49 
     import java.util.Optional;
    49 50 
     import java.util.Set;
    ... ... @@ -71,7 +72,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
    71 72 
             ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration);
    72 73
    73 74 
             String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
    74 
    -        return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
    75 
    +        return createDataSourceConnection(((ObserveDataSourceConnectionRest)dataSourceConfiguration).getServerUrl(), observeDataSourceConnection, authenticationToken);
    75 76
    76 77 
         }
    77 78
    ... ... @@ -83,7 +84,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
    83 84 
             ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia);
    84 85
    85 86 
             String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
    86 
    -        return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
    87 
    +        return createDataSourceConnection(((ObserveDataSourceConfigurationRest)dataSourceConfiguration).getServerUrl(),observeDataSourceConnection, authenticationToken);
    87 88
    88 89 
         }
    89 90
    ... ... @@ -155,10 +156,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
    155 156
    156 157 
         }
    157 158
    158 
    -    protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) {
    159 
    +    protected ObserveDataSourceConnectionRest createDataSourceConnection(URL serverUrl, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) {
    159 160
    160 161 
             return new ObserveDataSourceConnectionRest(
    161 
    -                getApplicationConfiguration().getApiUrl(),
    162 
    +                serverUrl,
    162 163 
                     authenticationToken,
    163 164 
                     observeDataSourceConnection.canReadReferential(),
    164 165 
                     observeDataSourceConnection.canWriteReferential(),

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.