From 965c4c93b506016331f2c57c24ea2eb0300582ac Mon Sep 17 00:00:00 2001 From: elias couppe Date: Fri, 15 Mar 2024 19:18:29 +0100 Subject: [PATCH] =?UTF-8?q?update(Samples):=20mise=20=C3=A0=20jour=20des?= =?UTF-8?q?=20exemples=20pour=20GPF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pages-alti-bundle-options-compare-gpf.html | 93 ---------- ...pages-autocomplete-bundle-compare-gpf.html | 58 ------- .../pages-geocode-bundle-compare-gpf.html | 147 ---------------- .../Geocode/pages-geocode-bundle-default.html | 72 +++----- ...-isochrone-bundle-options-compare-gpf.html | 92 ---------- .../pages-isodistance-bundle-default.html | 12 +- ...sodistance-bundle-options-compare-gpf.html | 92 ---------- .../pages-reverse-bundle-compare-gpf.html | 163 ------------------ ...ages-route-bundle-options-compare-gpf.html | 142 --------------- .../pages-services-bundle-default-urls.html | 12 +- .../ProcessIsoCurve/ProcessIsoCurve.js | 3 +- 11 files changed, 40 insertions(+), 846 deletions(-) delete mode 100644 samples-src/pages/Alti/pages-alti-bundle-options-compare-gpf.html delete mode 100644 samples-src/pages/AutoComplete/pages-autocomplete-bundle-compare-gpf.html delete mode 100644 samples-src/pages/Geocode/pages-geocode-bundle-compare-gpf.html delete mode 100644 samples-src/pages/ProcessIsoCurve/pages-isochrone-bundle-options-compare-gpf.html delete mode 100644 samples-src/pages/ProcessIsoCurve/pages-isodistance-bundle-options-compare-gpf.html delete mode 100644 samples-src/pages/ReverseGeocode/pages-reverse-bundle-compare-gpf.html delete mode 100644 samples-src/pages/Route/pages-route-bundle-options-compare-gpf.html diff --git a/samples-src/pages/Alti/pages-alti-bundle-options-compare-gpf.html b/samples-src/pages/Alti/pages-alti-bundle-options-compare-gpf.html deleted file mode 100644 index d569e46b..00000000 --- a/samples-src/pages/Alti/pages-alti-bundle-options-compare-gpf.html +++ /dev/null @@ -1,93 +0,0 @@ -{{#extend "layout-sample-bundle"}} - -{{#content "head"}} - Service de Calcul Altimétrique : comparaison GPF / ancien service -{{/content}} - -{{#content "style"}} - -{{/content}} - -{{#content "body"}} -
-

- longitude 1 : - latitude 1 : - -

-

- longitude 2 : - latitude 2 : - -

-

- sampling (nombre de points intermédaires) : - -

-

- zonly -

-
-
- -
-

GEOPLATEFORME : Utilisation du Service de Calcul Altimétrique

-
- -

WXS : Utilisation du Service de Calcul Altimétrique

-
-{{/content}} - -{{#content "js"}} -function go() { - // récupération des options du formulaire - - var lon1 = document.getElementById("lon1").value; - var lat1 = document.getElementById("lat1").value; - var lon2 = document.getElementById("lon2").value; - var lat2 = document.getElementById("lat2").value; - var zonly= document.getElementById("zonly").checked; - var sampling = document.getElementById("sampling").value; - var resultDiv = document.getElementById("result"); - var positions = []; - if (lon1 && lat1) positions.push({ - lon: lon1, - lat: lat1 - }); - if (lon2 && lat2) positions.push({ - lon: lon2, - lat: lat2 - }); - - // Appel service WXS - Gp.Services.getAltitude({ - positions: positions, - sampling: sampling, - apiKey: "calcul", - zonly: zonly, - oldAltiService : true, - resource : "none", - onSuccess: function(result) { - print(result.elevations, "result1"); - }, - onFailure: function(error) { - resultDiv.innerHTML = "

" + error + "

" - } - }); - - // Appel service GPF - Gp.Services.getAltitude({ - positions: positions, - sampling: sampling, - apiKey: "calcul", - zonly: zonly, - onSuccess: function(result) { - print(result.elevations, "result2"); - }, - onFailure: function(error) { - resultDiv.innerHTML = "

" + error + "

" - } - }); -} -{{/content}} -{{/extend}} diff --git a/samples-src/pages/AutoComplete/pages-autocomplete-bundle-compare-gpf.html b/samples-src/pages/AutoComplete/pages-autocomplete-bundle-compare-gpf.html deleted file mode 100644 index 7718ae93..00000000 --- a/samples-src/pages/AutoComplete/pages-autocomplete-bundle-compare-gpf.html +++ /dev/null @@ -1,58 +0,0 @@ -{{#extend "layout-sample-bundle"}} - -{{#content "head"}} - Service d'autocompletion -{{/content}} - -{{#content "style"}} - -{{/content}} - -{{#content "body"}} -

Utilisation du Service d'autocompletion

-

Avec les paramètres obligatoires seulement

- 
-          
-              var options = {
-                apiKey : "calcul",
-                onSuccess : function (response) {
-                    print(response);
-                },
-                // spécifique au service
-                text : "Saint-Man"
-            };
-            Gp.Services.autoComplete(options);
-          
-
-

GEOPLATEFORME : Utilisation du Service d'Autocompletion'

-
- -

WXS : Utilisation du Service d'Autocompletion

-
- -
-{{/content}} - -{{#content "js"}} -var optionsGPF = { - apiKey : "calcul", - onSuccess : function (response) { - print(response, "result1"); - }, - // spécifique au service - text : "Saint-Man" -}; -Gp.Services.autoComplete(optionsGPF); - -var optionsWXS = { - apiKey : "calcul", - oldAutocompleteService: true, - onSuccess : function (response) { - print(response, "result2"); - }, - // spécifique au service - text : "Saint-Man" -}; -Gp.Services.autoComplete(optionsWXS); -{{/content}} -{{/extend}} diff --git a/samples-src/pages/Geocode/pages-geocode-bundle-compare-gpf.html b/samples-src/pages/Geocode/pages-geocode-bundle-compare-gpf.html deleted file mode 100644 index 1f6a8129..00000000 --- a/samples-src/pages/Geocode/pages-geocode-bundle-compare-gpf.html +++ /dev/null @@ -1,147 +0,0 @@ -{{#extend "layout-sample-bundle"}} - -{{#content "head"}} - Service de geocodage -{{/content}} - -{{#content "style"}} - -{{/content}} - -{{#content "body"}} -

Paramétrage du Service de geocodage

- -

Indexes et filtres:

- 
-- CadastralParcel
-   * identifiant
-   * codeDepartement
-   * codeCommune
-   * nomCommune
-   * codeCommuneAbs
-   * codeArrondissement
-   * section
-   * numero
-   * feuille
-- PositionOfInterest
-   * type
-   * postalCode
-   * inseeCode
-- StreetAddress
-   * city
-   * postalCode
-   * inseeCode
-
-
-

Ecrire ici l'objet de paramétrage du service:

-

var option =

-
- -
- - - -
-

Exemple de paramètrage du nouveau service:

-

var option =

-
- 
-{
-    "index" : "StreetAddress",
-    "maximumResponses": 1,
-    "returnTrueGeometry": "true",
-    "filters": {
-        "postcode": 94160,
-    },
-    "query" : "73 avenue de paris, 94160 Saint-Mandé"
-}
-
-
-
-
-
- -
-

WXS

-
-

GPF

-
- -{{/content}} - -{{#content "js"}} - var geocodeAction = function () { - var optionText = document.getElementById("optionObject").value; - var optionObject = JSON.parse(optionText); - - - var optionsWXS = {}; - Object.assign(optionsWXS,optionObject); - var optionsGPF = {}; - Object.assign(optionsGPF,optionObject); - - optionsWXS.onSuccess = function (response) { - print(response.locations, "result1"); - }; - optionsWXS.onFailure = function (error) { - print(error, "result1"); - }; - - optionsWXS.oldGeocodeService = true; - - optionsGPF.onSuccess = function (response) { - print(response.locations, "result2"); - }; - optionsGPF.onFailure = function (error) { - print(error, "result2"); - }; - Gp.Services.geocode(optionsGPF); - Gp.Services.geocode(optionsWXS); - - }; - - document.getElementById("geocodeButton").onclick = geocodeAction; -{{/content}} -{{/extend}} diff --git a/samples-src/pages/Geocode/pages-geocode-bundle-default.html b/samples-src/pages/Geocode/pages-geocode-bundle-default.html index 3fe59f6c..f75900b9 100644 --- a/samples-src/pages/Geocode/pages-geocode-bundle-default.html +++ b/samples-src/pages/Geocode/pages-geocode-bundle-default.html @@ -1,24 +1,24 @@ {{#extend "layout-sample-bundle"}} {{#content "head"}} - Service de geocodage +Service de geocodage {{/content}} {{#content "style"}} - + {{/content}} {{#content "body"}} -

Utilisation du Service de geocodage

-

Avec les paramètres obligatoires seulement

- 
+
Utilisation du Service de geocodage

+
Avec les paramètres obligatoires seulement

+
             
                 var options = {
-                    index : "CadastralParcel", // CadastralParcel, PositionOfInterest, StreetAddress
+                    index : "PositionOfInterest", // CadastralParcel, PositionOfInterest, StreetAddress
                     // maximumResponses: 1,
                     // returnTrueGeometry: true,
                     filters: {
-                        type: "CadastralParcel", // CadastralParcel, PositionOfInterest, StreetAddress
+                        type: "PositionOfInterest", // CadastralParcel, PositionOfInterest, StreetAddress
                         departmentcode: 75,
                     },
                     onSuccess : function (response) {
@@ -27,8 +27,8 @@ 
Avec les paramètres obligatoires seulement

                     onFailure : function (error) {
                         print(error);
                     },
-                    // query : "73 avenue de paris, 94160 Saint-Mandé"
-                    query : "75102000AO0020"
+                    query : "73 avenue de paris, 94160 Saint-Mandé"
+                    // query : "75102000AO0020"
                 };
                 Gp.Services.geocode(options);
               
@@ -36,42 +36,22 @@ 
Avec les paramètres obligatoires seulement

 {{/content}}
 
 {{#content "js"}}
-        var options = {
-            // maximumResponses: 1,
-            // returnTrueGeometry: true,
-            index : "CadastralParcel", // CadastralParcel, PositionOfInterest, StreetAddress
-            filters: {
-                // postalCode: 94160,
-                departmentcode: 75,
-            },
-            onSuccess : function (response) {
-                print(response);
-            },
-            onFailure : function (error) {
-                print(error);
-            },
-            // query : "73 avenue de paris, 94160 Saint-Mandé"
-            query : "75102000AO0020"
-        };
+var options = {
+// maximumResponses: 1,
+// returnTrueGeometry: true,
+index : "PositionOfInterest", // CadastralParcel, PositionOfInterest, StreetAddress
+filters: {
+postalCode: 94160,
+},
+onSuccess : function (response) {
+print(response);
+},
+onFailure : function (error) {
+print(error);
+},
+query : "73 avenue de paris, 94160 Saint-Mandé"
+};
 
-        //test patch ancien formalisme
-        //var options = {
-        //    apiKey : "{{ apikey }}",
-        //    onSuccess : function (response) {
-        //    print(response.locations);
-        //    },
-        //    filterOptions : {
-        //       type : ["PositionOfInterest"],
-        //       postalCode : "41290"
-        //    },
-        //    position: {
-        //        x : 1.3,
-        //        y : 47.8
-        //    },
-        //    location : "Saint-Mandé",
-        //    maximumResponses : 1
-        //};
-
-        Gp.Services.geocode(options);
+Gp.Services.geocode(options);
 {{/content}}
-{{/extend}}
+{{/extend}}
\ No newline at end of file
diff --git a/samples-src/pages/ProcessIsoCurve/pages-isochrone-bundle-options-compare-gpf.html b/samples-src/pages/ProcessIsoCurve/pages-isochrone-bundle-options-compare-gpf.html
deleted file mode 100644
index fec70b3a..00000000
--- a/samples-src/pages/ProcessIsoCurve/pages-isochrone-bundle-options-compare-gpf.html
+++ /dev/null
@@ -1,92 +0,0 @@
-{{#extend "layout-sample-bundle"}}
-
-{{#content "head"}}
-        Service Isochrone : comparaison GPF / ancien service
-{{/content}}
-
-{{#content "style"}}
-        
-{{/content}}
-
-{{#content "body"}}
-        

-            

-              longitude  :
-               
-              latitude  :
-              
-              temps (200 par défaut)  :
-              
-              
-              
-              
-              
-            

-          

-          

-            
-        

-        
GEOPLATEFORME : Utilisation du Service de Calcul d'isochrone

-        

-
-        
WXS : Utilisation du Service de Calcul d'isochrone

-        

-{{/content}}
-
-{{#content "js"}}
-function go() {
-    // récupération des options du formulaire
-
-    var lon1 = document.getElementById("lon1").value;
-    var lat1 = document.getElementById("lat1").value;
-    var time = document.getElementById("time").value;
-    var direction = JSON.parse(document.getElementById("direction").value);
-    var graph = document.getElementById("graph").value;
-
-    var result1Div = document.getElementById("result1");
-    var result2Div = document.getElementById("result2");
-
-    var position = {};
-    if (lon1 && lat1) {
-        position.x = lon1;
-        position.y = lat1;
-    };
-
-    // Appel service WXS
-    Gp.Services.isoCurve({
-        position : position,
-        oldIsoService : true,
-        resource : "bdtopo-iso",
-        time : time,
-        graph : graph,
-        reverse : direction,
-        onSuccess: function(result) {
-            print(result, "result2");
-        },
-        onFailure: function(error) {
-          result2Div.innerHTML = "
" + error + "
"
-        }
-    });
-
-    // Appel service GPF
-    Gp.Services.isoCurve({
-        position : position,
-        time : time,
-        reverse : direction,
-        graph : graph,
-        onSuccess: function(result) {
-            print(result, "result1");
-        },
-        onFailure: function(error) {
-          result1Div.innerHTML = "
" + error + "
"
-        }
-    });
-}
-{{/content}}
-{{/extend}}
diff --git a/samples-src/pages/ProcessIsoCurve/pages-isodistance-bundle-default.html b/samples-src/pages/ProcessIsoCurve/pages-isodistance-bundle-default.html
index ace4057b..c4ea52a4 100644
--- a/samples-src/pages/ProcessIsoCurve/pages-isodistance-bundle-default.html
+++ b/samples-src/pages/ProcessIsoCurve/pages-isodistance-bundle-default.html
@@ -14,8 +14,7 @@ 
Avec les paramètres obligatoires seulement

         
           
             var options = {
-                apiKey : "{{ apikey }}",
-                serverUrl : "https://wxs.ign.fr/calcul/geoportail/isochrone/rest/1.0.0/isochrone",
+                serverUrl : "https://data.geopf.fr/navigation/isochrone",
                 onSuccess : function (response) {
                     print(response);
                 },
@@ -23,7 +22,8 @@ 
Avec les paramètres obligatoires seulement

                    x : 2.35,
                    y : 48.87
                 },
-                distance : 200
+                distance : 200,
+                resource : "bdtopo-pgr"
             };
             Gp.Services.isoCurve(options);
           
@@ -32,8 +32,7 @@ 
Avec les paramètres obligatoires seulement

 
 {{#content "js"}}
         var options = {
-            apiKey : "{{ apikey }}",
-            serverUrl : "https://wxs.ign.fr/calcul/geoportail/isochrone/rest/1.0.0/isochrone",
+            serverUrl : "https://data.geopf.fr/navigation/isochrone",
             onSuccess : function (response) {
                 print(response);
             },
@@ -41,7 +40,8 @@ 
Avec les paramètres obligatoires seulement

                x : 2.35,
                y : 48.87
             },
-            distance : 200
+            distance : 200,
+            resource : "bdtopo-pgr"
         };
         Gp.Services.isoCurve(options);
 {{/content}}
diff --git a/samples-src/pages/ProcessIsoCurve/pages-isodistance-bundle-options-compare-gpf.html b/samples-src/pages/ProcessIsoCurve/pages-isodistance-bundle-options-compare-gpf.html
deleted file mode 100644
index d22b12d9..00000000
--- a/samples-src/pages/ProcessIsoCurve/pages-isodistance-bundle-options-compare-gpf.html
+++ /dev/null
@@ -1,92 +0,0 @@
-{{#extend "layout-sample-bundle"}}
-
-{{#content "head"}}
-        Service Isodistance : comparaison GPF / ancien service
-{{/content}}
-
-{{#content "style"}}
-        
-{{/content}}
-
-{{#content "body"}}
-

-    

-      longitude  :
-       
-      latitude  :
-      
-      distance (200 par défaut)  :
-      
-      
-      
-      
-      
-    

-  

-  

-    
-

-
GEOPLATEFORME : Utilisation du Service de Calcul d'isodistance

-

-
-
WXS : Utilisation du Service de Calcul d'isodistance

-

-{{/content}}
-
-{{#content "js"}}
-function go() {
-    // récupération des options du formulaire
-
-    var lon1 = document.getElementById("lon1").value;
-    var lat1 = document.getElementById("lat1").value;
-    var dist = document.getElementById("dist").value;
-    var direction = JSON.parse(document.getElementById("direction").value);
-    var graph = document.getElementById("graph").value;
-
-    var result1Div = document.getElementById("result1");
-    var result2Div = document.getElementById("result2");
-
-    var position = {};
-    if (lon1 && lat1) {
-        position.x = lon1;
-        position.y = lat1;
-    };
-
-    // Appel service WXS
-    Gp.Services.isoCurve({
-        position : position,
-        oldIsoService : true,
-        resource : "bdtopo-iso",
-        distance : dist,
-        reverse : direction,
-        graph : graph,
-        onSuccess: function(result) {
-            print(result, "result2");
-        },
-        onFailure: function(error) {
-          result2Div.innerHTML = "
" + error + "
"
-        }
-    });
-
-    // Appel service GPF
-    Gp.Services.isoCurve({
-        position : position,
-        distance : dist,
-        reverse : direction,
-        graph : graph,
-        onSuccess: function(result) {
-            print(result, "result1");
-        },
-        onFailure: function(error) {
-          result1Div.innerHTML = "
" + error + "
"
-        }
-    });
-}
-{{/content}}
-{{/extend}}
diff --git a/samples-src/pages/ReverseGeocode/pages-reverse-bundle-compare-gpf.html b/samples-src/pages/ReverseGeocode/pages-reverse-bundle-compare-gpf.html
deleted file mode 100644
index b09eb79d..00000000
--- a/samples-src/pages/ReverseGeocode/pages-reverse-bundle-compare-gpf.html
+++ /dev/null
@@ -1,163 +0,0 @@
-{{#extend "layout-sample-bundle"}}
-
-{{#content "head"}}
-        Service de geocodage inverse
-{{/content}}
-
-{{#content "style"}}
-    
-{{/content}}
-
-{{#content "body"}}
-        
Paramétrage du Service de geocodage inverse

-
-        
Indexes et filtres:

-        
-- CadastralParcel
-   * identifiant
-   * codeDepartement
-   * codeCommune
-   * nomCommune
-   * codeCommuneAbs
-   * codeArrondissement
-   * section
-   * numero
-   * feuille
-- PositionOfInterest
-   * type
-   * postalCode
-   * inseeCode
-- StreetAddress
-   * city
-   * postalCode
-   * inseeCode
-        

-        

-            
Ecrire ici l'objet de paramétrage du service:

-            
var option =

-            

-            
-        

-        

-            
Exemple de paramètrage du nouveau service:

-            
var option =

-            

-            
-{
-    "index" : "CadastralParcel",
-    "filters" : {
-        "departmentcode" : "75",
-        "municipalitycode" : "056"
-    },
-    "maximumResponses" : 2,
-    "returnTrueGeometry" : true,
-    "searchGeometry" : {
-      "type" : "Circle",
-      "coordinates" : [
-        2.35,
-        48.87
-      ],
-      "radius" : 100
-    },
-    "position" : {
-      "lon" : 2.36,
-      "lat" : 48.87
-    }
-}
-
-            

-            

-        

-
-        

-            
-        

-        
WXS

-        

-        
GPF

-        

-        
-{{/content}}
-
-{{#content "js"}}
-        var reverseGeocodeAction = function () {
-            var optionText = document.getElementById("optionObject").value;
-            var optionObject = JSON.parse(optionText);
-
-            var optionsWXS = {}; 
-            Object.assign(optionsWXS,optionObject);
-            var optionsGPF = {};
-            Object.assign(optionsGPF,optionObject);
-
-            optionsWXS.onSuccess = function (response) {
-                print(response.locations, "result1");
-            };
-            optionsWXS.onFailure = function (error) {
-                print(error, "result1");
-            };
-
-            optionsWXS.oldReverseService = true;
-
-            optionsGPF.onSuccess = function (response) {
-                print(response.locations, "result2");
-            };
-            optionsGPF.onFailure = function (error) {
-                print(error, "result2");
-            };
-
-            Gp.Services.reverseGeocode(optionsGPF);
-            Gp.Services.reverseGeocode(optionsWXS);
-        };
-
-        document.getElementById("geocodeButton").onclick = reverseGeocodeAction;
-{{/content}}
-{{/extend}}
diff --git a/samples-src/pages/Route/pages-route-bundle-options-compare-gpf.html b/samples-src/pages/Route/pages-route-bundle-options-compare-gpf.html
deleted file mode 100644
index fec7be31..00000000
--- a/samples-src/pages/Route/pages-route-bundle-options-compare-gpf.html
+++ /dev/null
@@ -1,142 +0,0 @@
-{{#extend "layout-sample-bundle"}}
-
-{{#content "head"}}
-Service Itinéraire : comparaison GPF / ancien service
-{{/content}}
-
-{{#content "style"}}
-
-{{/content}}
-
-{{#content "body"}}
-

-    

-        lon départ:
-         lat départ :
-        
-    

-    

-        lon inter :
-         lat inter :
-        
-    

-    

-        lon arrivée:
-         lat arrivée :
-        
-    

-    
 Eviter :
-         péages
-         ponts
-         tunnels
-    

-    
Graphe :
-        
-        Methode de calcul :
-        
-    

-

-

-    
-

-
GEOPLATEFORME : Utilisation du Service de Calcul d'itinéraire

-

-
-
WXS : Utilisation du Service de Calcul d'itinéraire

-

-{{/content}}
-
-{{#content "js"}}
-function go() {
-// récupération des options du formulaire
-var lon1 = document.getElementById("lon1").value;
-var lat1 = document.getElementById("lat1").value;
-var lon2 = document.getElementById("lon2").value;
-var lat2 = document.getElementById("lat2").value;
-var lon3 = document.getElementById("lon3").value;
-var lat3 = document.getElementById("lat3").value;
-var avoidFeatures = [];
-var noToll = document.getElementById("toll").checked;
-if (noToll) avoidFeatures.push("toll");
-var noBridge = document.getElementById("bridge").checked;
-if (noBridge) avoidFeatures.push("bridge");
-var noTunnel = document.getElementById("tunnel").checked;
-if (noTunnel) avoidFeatures.push("tunnel");
-var graphIdx = document.getElementById("graph").selectedIndex;
-var graph = document.getElementById("graph").options[graphIdx].value;
-var methodIdx = document.getElementById("method").selectedIndex;
-var method = document.getElementById("method").options[methodIdx].value;
-var result1Div = document.getElementById("result1");
-var result2Div = document.getElementById("result2");
-
-// Appel service WXS
-
-var routeOptionsWXS = {
-    startPoint: {
-      x: lon1,
-      y: lat1
-    },
-    endPoint: {
-      x: lon3,
-      y: lat3
-    },
-    oldRouteService : true,
-    resource : "bdtopo-osrm",
-    graph: graph,
-    avoidFeature: avoidFeatures,
-    routePreference: method,
-    onSuccess: function(result) {
-      result2Div.innerHTML = "
" + JSON.stringify(result) + "
" ;
-    },
-    onFailure: function(error) {
-      result2Div.innerHTML = "
" + error + "
" ;
-    }
-  };
-
-  if (lon2 && lat2) {
-    routeOptionsWXS.viaPoints = [{
-        x: lon2,
-        y: lat2
-      }]
-  }
-Gp.Services.route(routeOptionsWXS);
-
-  // Appel service GPF
-
-  var routeOptionsGPF = {
-    startPoint: {
-      x: lon1,
-      y: lat1
-    },
-    endPoint: {
-      x: lon3,
-      y: lat3
-    },
-    graph: graph,
-    avoidFeature: avoidFeatures,
-    routePreference: method,
-    onSuccess: function(result) {
-      result1Div.innerHTML = "
" + JSON.stringify(result) + "
" ;
-    },
-    onFailure: function(error) {
-      result1Div.innerHTML = "
" + error + "
" ;
-    }
-  };
-
-  if (lon2 && lat2) {
-    routeOptionsGPF.viaPoints = [{
-        x: lon2,
-        y: lat2
-      }]
-  }
-
-Gp.Services.route(routeOptionsGPF);
-}
-{{/content}}
-{{/extend}}
\ No newline at end of file
diff --git a/samples-src/pages/Services/pages-services-bundle-default-urls.html b/samples-src/pages/Services/pages-services-bundle-default-urls.html
index 82a89095..278e2751 100644
--- a/samples-src/pages/Services/pages-services-bundle-default-urls.html
+++ b/samples-src/pages/Services/pages-services-bundle-default-urls.html
@@ -26,24 +26,24 @@ 
Obtention des URLs par défaut des services

       var key = "{{ apikey }}";
       // alti
       span = document.getElementById("alti") ;
-      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.Alti.url(key), null, 2) + "
";
+      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.Alti.newUrl(), null, 2) + "
";
       // autocomplete
       span = document.getElementById("autocomplete") ;
-      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.AutoComplete.url(key), null, 2) + "
";
+      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.AutoComplete.newUrl(), null, 2) + "
";
       // Config (getConfig)
       span = document.getElementById("config") ;
       span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.Config.url(key), null, 2) + "
";
       // geocode
       span = document.getElementById("geocode") ;
-      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.Geocode.url(key), null, 2) + "
";
+      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.Geocode.newUrl(), null, 2) + "
";
       // isocurve
       span = document.getElementById("iso") ;
-      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.ProcessIsoCurve.url(key), null, 2) + "
";
+      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.ProcessIsoCurve.newUrl(), null, 2) + "
";
       // reverse
       span = document.getElementById("reverse") ;
-      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.ReverseGeocode.url(key), null, 2) + "
";
+      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.ReverseGeocode.newUrl(), null, 2) + "
";
       // route
       span = document.getElementById("route") ;
-      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.Route.url(key), null, 2) + "
";
+      span.innerHTML = "
" + JSON.stringify(Gp.Services.DefaultUrl.Route.newUrl(), null, 2) + "
";
 {{/content}}
 {{/extend}}
diff --git a/src/Services/ProcessIsoCurve/ProcessIsoCurve.js b/src/Services/ProcessIsoCurve/ProcessIsoCurve.js
index 2fb1b7d5..be2d18f3 100644
--- a/src/Services/ProcessIsoCurve/ProcessIsoCurve.js
+++ b/src/Services/ProcessIsoCurve/ProcessIsoCurve.js
@@ -18,7 +18,7 @@ import ProcessIsoCurveResponseFactory from "./Response/ProcessIsoCurveResponseFa
  * @alias Gp.Services.ProcessIsoCurve
  * @param {Object} options - options spécifiques au service (+ les options heritées)
  *
- * @param {String} options.resource - La ressource utilisée pour le calcul. Ce paramètre devrait être obligatoire car il l'est dans l'appel au service. Mais il ne l'est pas pour des raisons de rétrocompatibilité.
+ * @param {String} options.resource - La ressource utilisée pour le calcul : bdtopo-valhalla (par défaut) ou bdtopo-pgr.
  *
  * @param {String} options.outputFormat - Le format de la réponse du service iso : 'json' uniquement et par défaut.
  *
@@ -89,6 +89,7 @@ import ProcessIsoCurveResponseFactory from "./Response/ProcessIsoCurveResponseFa
  *           x : 2.3242664298058053,
  *           y : 48.86118017324745
  *      },
+ *      resource : bdtopo-valhalla,
  *      distance : 200,
  *      [time : ]
  *      method : "distance",