[Git][ultreiaio/ird-observe][develop] 2 commits: [CARTO] Petits ajustement sur la carte - Closes #1368 - Observe-commits

4 Aug 2019


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


Commits:
b32ca653 by tchemit at 2019-08-04T15:27:37Z
[CARTO] Petits ajustement sur la carte - Closes #1368

- - - - -
f25d6134 by tchemit at 2019-08-04T15:27:39Z
[SERVEUR] observe-server.conf / observeweb.host - Closes #1369

- - - - -


6 changed files:

- client-core/src/main/map/ps-style.xml
- 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
- server-configuration/src/main/config/Server.ini
- server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java


Changes:

=====================================
client-core/src/main/map/ps-style.xml
=====================================
@@ -138,7 +138,7 @@
                   <CssParameter name="stroke-width">1</CssParameter>
                 </Stroke>
               </Mark>
-              <Size>8</Size>
+              <Size>4</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>
@@ -183,7 +183,7 @@
           <PointSymbolizer>
             <Graphic>
               <Mark>
-                <WellKnownName>ttf://Serif#U+2B1F</WellKnownName>
+                <WellKnownName>ttf://Serif#U+002B</WellKnownName>
                 <Fill>
                   <CssParameter name="fill">#00FF00</CssParameter>
                 </Fill>
@@ -192,7 +192,7 @@
                   <CssParameter name="stroke-width">1</CssParameter>
                 </Stroke>
               </Mark>
-              <Size>16</Size>
+              <Size>12</Size>
             </Graphic>
           </PointSymbolizer>
         </Rule>


=====================================
observe-i18n/src/main/i18n/translations/observe_en_GB.properties
=====================================
@@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Security
 observe.constant.StorageStep.ROLES.description=Apply security on database roles
 observe.constant.StorageStep.SELECT_DATA=Data selection
 observe.constant.StorageStep.SELECT_DATA.description=Select data to export in backup
-observe.constant.TripMapPointType.llActivityLogbook=Logbook - Activity (Other)
+observe.constant.TripMapPointType.llActivityLogbook=Logbook - Other activity
 observe.constant.TripMapPointType.llActivityLogbookInHarbour=Logbook - At Harbour
 observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Logbook - Hauling end
 observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Logbook - Hauling start
 observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Logbook - Setting end
 observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Logbook - Setting start
-observe.constant.TripMapPointType.llActivityObs=Observation - Activity (Other)
+observe.constant.TripMapPointType.llActivityObs=Observation - Other activity
 observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - At Harbour
 observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Hauling end
 observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Hauling start
@@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Sett
 observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Setting start
 observe.constant.TripMapPointType.llTripDepartureHarbour=Harbour departure
 observe.constant.TripMapPointType.llTripLandingHarbour=Harbour landing
-observe.constant.TripMapPointType.psActivityObs=Activity (Other)
+observe.constant.TripMapPointType.psActivityObs=Other activity
 observe.constant.TripMapPointType.psActivityObsInHarbour=In harbour
 observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Free School type
 observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Object School type
@@ -723,7 +723,7 @@ observe.content.map.legend.logbook.setting=Logbook - setting
 observe.content.map.legend.obs.hauling=Observation - Hauling
 observe.content.map.legend.obs.setting=Observation - setting
 observe.content.map.legend.setting=setting
-observe.content.map.legend.tripBetweenTwoDays=Trip between two days
+observe.content.map.legend.tripBetweenTwoDays=Night trip
 observe.content.map.legend.tripDay=Day trip
 observe.content.map.miles=miles
 observe.content.map.north=North


=====================================
observe-i18n/src/main/i18n/translations/observe_es_ES.properties
=====================================
@@ -673,13 +673,13 @@ observe.constant.StorageStep.ROLES=Seguridad
 observe.constant.StorageStep.ROLES.description=Configuración de la seguridad
 observe.constant.StorageStep.SELECT_DATA=Selección de datos
 observe.constant.StorageStep.SELECT_DATA.description=Seleccionar los datos a exportar en la copia de seguridad
-observe.constant.TripMapPointType.llActivityLogbook=Logbook - Actividad (Other) \#TODO
+observe.constant.TripMapPointType.llActivityLogbook=Logbook - Otro Actividad
 observe.constant.TripMapPointType.llActivityLogbookInHarbour=Logbook - En el puerto
 observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Logbook - Fin de arrastre
 observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Logbook - Inicio de arrastre
 observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Logbook - Fin de calada
 observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Logbook - Inicio de calada
-observe.constant.TripMapPointType.llActivityObs=Observation - Actividad (Other) \#TODO
+observe.constant.TripMapPointType.llActivityObs=Observation - Otro Actividad
 observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - En el puerto
 observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Fin de arrastre
 observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Inicio de arrastre
@@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin
 observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Inicio de calada
 observe.constant.TripMapPointType.llTripDepartureHarbour=Puerto de salida
 observe.constant.TripMapPointType.llTripLandingHarbour=Puerto de llegada
-observe.constant.TripMapPointType.psActivityObs=Actividad (Other) \#TODO
+observe.constant.TripMapPointType.psActivityObs=Otro Actividad
 observe.constant.TripMapPointType.psActivityObsInHarbour=En puerto
 observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Banco libre
 observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Banco a objeto
@@ -723,7 +723,7 @@ observe.content.map.legend.logbook.setting=Logbook - Calada
 observe.content.map.legend.obs.hauling=Observation - Arrastre
 observe.content.map.legend.obs.setting=Observation - Calada
 observe.content.map.legend.setting=Calada
-observe.content.map.legend.tripBetweenTwoDays=Trayecto entre dos días
+observe.content.map.legend.tripBetweenTwoDays=Trayecto del noche
 observe.content.map.legend.tripDay=Trayecto del día
 observe.content.map.miles=milles
 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é
 observe.constant.StorageStep.ROLES.description=Mise en place de la sécurité
 observe.constant.StorageStep.SELECT_DATA=Sélection données
 observe.constant.StorageStep.SELECT_DATA.description=Sélectionner les données à exporter dans la sauvegarde
-observe.constant.TripMapPointType.llActivityLogbook=Livre de bord - Activité (autre)
+observe.constant.TripMapPointType.llActivityLogbook=Livre de bord - Autre Activité
 observe.constant.TripMapPointType.llActivityLogbookInHarbour=Livre de bord - Au port
 observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Livre de bord - Fin de virage
 observe.constant.TripMapPointType.llActivityLogbookWithHaulingStart=Livre de bord - Début de virage
 observe.constant.TripMapPointType.llActivityLogbookWithSettingEnd=Livre de bord - Fin de filage
 observe.constant.TripMapPointType.llActivityLogbookWithSettingStart=Livre de bord - Début de filage
-observe.constant.TripMapPointType.llActivityObs=Observation - Activité (autre)
+observe.constant.TripMapPointType.llActivityObs=Observation - autre activité
 observe.constant.TripMapPointType.llActivityObsInHarbour=Observation - Au port
 observe.constant.TripMapPointType.llActivityObsWithHaulingEnd=Observation - Fin de virage
 observe.constant.TripMapPointType.llActivityObsWithHaulingStart=Observation - Début de virage
@@ -687,7 +687,7 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin
 observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Début de filage
 observe.constant.TripMapPointType.llTripDepartureHarbour=Port de départ
 observe.constant.TripMapPointType.llTripLandingHarbour=Port d'arrivée
-observe.constant.TripMapPointType.psActivityObs=Activité (autre)
+observe.constant.TripMapPointType.psActivityObs=Autre activité
 observe.constant.TripMapPointType.psActivityObsInHarbour=Au port
 observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Banc libre
 observe.constant.TripMapPointType.psActivityObsWithObjectSchoolType=Banc objet
@@ -723,8 +723,8 @@ observe.content.map.legend.logbook.setting=Livre de bord - Filage
 observe.content.map.legend.obs.hauling=Observation - Virage
 observe.content.map.legend.obs.setting=Observation - Filage
 observe.content.map.legend.setting=Filage
-observe.content.map.legend.tripBetweenTwoDays=Trajet entre deux jours
-observe.content.map.legend.tripDay=Trajet d'une journée
+observe.content.map.legend.tripBetweenTwoDays=Trajet de nuit
+observe.content.map.legend.tripDay=Trajet de jour
 observe.content.map.miles=milles
 observe.content.map.north=Nord
 observe.content.map.showLogbook=Voir les données Livre de bord


=====================================
server-configuration/src/main/config/Server.ini
=====================================
@@ -28,20 +28,6 @@ type = string
 defaultValue = changeme
 final = true
 
-[option host]
-description = observeweb.host.description
-key = observeweb.host
-type = url
-defaultValue = http://localhost:8080
-final = true
-
-[option apiUrl]
-description = observeweb.apiUrl.description
-key = observeweb.apiUrl
-type = url
-defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1
-final = true
-
 [option modelVersion]
 description = observe.model.version
 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;
 import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
+import java.net.URL;
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -71,7 +72,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
         ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration);
 
         String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
-        return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
+        return createDataSourceConnection(((ObserveDataSourceConnectionRest)dataSourceConfiguration).getServerUrl(), observeDataSourceConnection, authenticationToken);
 
     }
 
@@ -83,7 +84,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
         ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia);
 
         String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
-        return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
+        return createDataSourceConnection(((ObserveDataSourceConfigurationRest)dataSourceConfiguration).getServerUrl(),observeDataSourceConnection, authenticationToken);
 
     }
 
@@ -155,10 +156,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
 
     }
 
-    protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) {
+    protected ObserveDataSourceConnectionRest createDataSourceConnection(URL serverUrl, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) {
 
         return new ObserveDataSourceConnectionRest(
-                getApplicationConfiguration().getApiUrl(),
+                serverUrl,
                 authenticationToken,
                 observeDataSourceConnection.canReadReferential(),
                 observeDataSourceConnection.canWriteReferential(),



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

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

    

[Git][ultreiaio/ird-observe][develop] 2 commits: [CARTO] Petits ajustement sur la carte - Closes #1368

Tony CHEMIT

tags

participants (1)