feat(capabilities): add INSPIRE fields

.gitignore

@@ -1 +1,2 @@
-.scannerwork/
+.scannerwork/
+node_modules

changelog.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.3.0
+ADDED:
+- new fields in capabilities for INSPIRE compliance
+
 ## 2.2.11
 UPDATED:
 - Updated Dockefile: donwgrade node version to 16 for compatibility with OSRM 5.26.0 

docker/config/service.json

@@ -3,7 +3,6 @@
     "name": "Road2",
     "title": "Service de calcul d'itinéraire",
     "description": "Ce service permet de calculer des itinéraires sur les données du Géoportail.",
-    "url": "https://localhost/",
     "provider": {
       "name": "IGN",
       "site": "www.ign.fr",
@@ -50,7 +49,7 @@
       "cors": {
         "configuration": "/home/docker/config/cors.json"
       }
-    }, 
+    },
     "projections": {
       "directory": "/home/docker/config/projections/"
     },

documentation/apis/administration/1.0.0/api.json

@@ -1353,9 +1353,27 @@
                 "type": "string",
                 "example": "Ce service permet de calculer des itinéraires sur les données du Géoportail."
               },
-              "url": {
+              "language": {
                 "type": "string",
-                "example": "https://localhost/"
+                "example": "Français"
+              },
+              "contact": {
+                "type": "object",
+                "properties": {
+                  "email": {
+                    "type": "string",
+                    "example": "contact.geoservices@ign.fr"
+                  }
+                }
+              },
+              "keywords": {
+                "type": "object",
+                "properties": {
+                  "keyword": {
+                    "type": "string",
+                    "example": "infoMapAccessService"
+                  }
+                }
               },
               "provider": {
                 "type": "object",

documentation/configuration/services/service_model.yaml

@@ -17,10 +17,26 @@
 		"description":
 			type: string
 			required: true
-    # Url du service qui va apparaître dans le getcap
-    "url":
-      type: string
-      required: true
+		"language":
+			type: string
+			required: false
+    # Informations de contact
+		"contact":
+			type: object
+			required: false
+			properties:
+				# Adresse mail du fournisseur
+				"email":
+					type: string
+					required: true*
+    # Mots clefs associés au service
+    "keywords":
+			type: object
+			required: false
+			properties:
+				"keyword":
+					type: string
+					required: true
 		# Information sur le fournisseur du service
 		"provider":
 			type: object
@@ -90,7 +106,7 @@
 					items:
 						type: object
 						properties:
-							# Id du serveur 
+							# Id du serveur
 							"id":
 								type: string
 								required: true
@@ -104,7 +120,7 @@
 								required: true
 							# Utilisation du HTTPS
 							"https":
-								type: string 
+								type: string
 								enum: ["true", "false"]
 								required: true
 							# Options pour le HTTPS (nécessaire si https="true")
@@ -121,13 +137,13 @@
 										type: string
 										required: true
 				# Configuration des cors
-				"cors":	
-					type: object 
+				"cors":
+					type: object
 					required: false
 					properties:
-						# Fichier de configuration des cors 
-						"configuration": 
-							type: string 
+						# Fichier de configuration des cors
+						"configuration":
+							type: string
 							required: true
     # Configuration des projections disponibles
     "projections":

documentation_en/apis/administration/1.0.0/api.json

@@ -1353,9 +1353,27 @@
                   "type": "string",
                   "example": "Ce service permet de calculer des itinéraires sur les données du Géoportail."
                 },
-                "url": {
+                "language": {
                   "type": "string",
-                  "example": "https://localhost/"
+                  "example": "Français"
+                },
+                "contact": {
+                  "type": "object",
+                  "properties": {
+                    "email": {
+                      "type": "string",
+                      "example": "contact.geoservices@ign.fr"
+                    }
+                  }
+                },
+                "keywords": {
+                  "type": "object",
+                  "properties": {
+                    "keyword": {
+                      "type": "string",
+                      "example": "infoMapAccessService"
+                    }
+                  }
                 },
                 "provider": {
                   "type": "object",
@@ -1859,4 +1877,4 @@
         }
       }
     }
-  }
+  }

src/js/apis/simple/1.0.0/init.js

@@ -36,12 +36,25 @@ module.exports = {
     getCapabilities.info.title = globalConfiguration.application.title;
     // info.description
     getCapabilities.info.description = globalConfiguration.application.description;
-    // info.url
-    getCapabilities.info.url = globalConfiguration.application.url;
+    // info.language
+    getCapabilities.info.language = "";
+    if (globalConfiguration.application.language) {
+      getCapabilities.info.language = globalConfiguration.application.language;
+    }
+    // info.keywords
+    getCapabilities.info.keywords = {};
+    if (globalConfiguration.application.keywords) {
+      getCapabilities.info.keywords.keyword = globalConfiguration.application.keywords.keyword;
+    }
+    // info.contact
+    getCapabilities.info.contact = {};
+    if (globalConfiguration.application.contact) {
+      getCapabilities.info.contact.email = globalConfiguration.application.contact.email;
+    }
 
-    // provider 
+    // provider
     getCapabilities.provider = {};
-    
+
     if (globalConfiguration.application.provider) {
 
       // provider.name
@@ -61,6 +74,7 @@ module.exports = {
       getCapabilities.provider.mail = "";
     }
 
+
     // api
     getCapabilities.api = {};
     // api.name
@@ -575,7 +589,7 @@ module.exports = {
       crsParameterDescription.example = "EPSG:4326";
       nearestDescription.parameters.push(crsParameterDescription);
 
-      
+
 
       // -- end nearest.parameters