From 90b707c00f26100946edd7c91c49e2d76c796f4e Mon Sep 17 00:00:00 2001
From: elias couppe <elias.couppe@gmail.com>
Date: Sun, 17 Mar 2024 20:01:56 +0100
Subject: [PATCH] update(samples): suppression samples compare-wxs et
 branchement develop access-lib

---
 package.json                                  |   2 +-
 ...-elevationpath-bundle-compare-wxs-gpf.html | 191 -------------
 ...es-ol-isocurve-bundle-compare-wxs-gpf.html | 251 ------------------
 ...es-ol-location-bundle-compare-wxs-gpf.html | 113 --------
 ...-mouseposition-bundle-compare-wxs-gpf.html | 169 ------------
 ...reversegeocode-bundle-compare-wxs-gpf.html | 165 ------------
 ...pages-ol-route-bundle-compare-wxs-gpf.html | 216 ---------------
 ...l-searchengine-bundle-compare-wxs-gpf.html | 118 --------
 8 files changed, 1 insertion(+), 1224 deletions(-)
 delete mode 100644 samples-src/pages/openlayers/ElevationPath/pages-ol-elevationpath-bundle-compare-wxs-gpf.html
 delete mode 100644 samples-src/pages/openlayers/Isocurve/pages-ol-isocurve-bundle-compare-wxs-gpf.html
 delete mode 100644 samples-src/pages/openlayers/LocationSelector/pages-ol-location-bundle-compare-wxs-gpf.html
 delete mode 100644 samples-src/pages/openlayers/MousePosition/pages-ol-mouseposition-bundle-compare-wxs-gpf.html
 delete mode 100644 samples-src/pages/openlayers/ReverseGeocode/pages-ol-reversegeocode-bundle-compare-wxs-gpf.html
 delete mode 100644 samples-src/pages/openlayers/Route/pages-ol-route-bundle-compare-wxs-gpf.html
 delete mode 100644 samples-src/pages/openlayers/SearchEngine/pages-ol-searchengine-bundle-compare-wxs-gpf.html

diff --git a/package.json b/package.json
index 24af76789..a127e45e2 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
   "dependencies": {
     "@mapbox/mapbox-gl-style-spec": "13.20.1",
     "eventbusjs": "0.2.0",
-    "geoportal-access-lib": "3.4.0-beta4",
+    "geoportal-access-lib": "https://raw.githubusercontent.com/IGNF/geoportal-access-lib/develop/geoportal-access-lib-3.4.0-beta4.tgz",
     "itowns": "2.38.2",
     "leaflet": "1.7.1",
     "leaflet-draw": "1.0.4",
diff --git a/samples-src/pages/openlayers/ElevationPath/pages-ol-elevationpath-bundle-compare-wxs-gpf.html b/samples-src/pages/openlayers/ElevationPath/pages-ol-elevationpath-bundle-compare-wxs-gpf.html
deleted file mode 100644
index 9193f5426..000000000
--- a/samples-src/pages/openlayers/ElevationPath/pages-ol-elevationpath-bundle-compare-wxs-gpf.html
+++ /dev/null
@@ -1,191 +0,0 @@
-{{#extend "ol-sample-bundle-multikeys-layout"}}
-
-{{#content "head"}}
-<title>Sample OpenLayers ElevationPath GPF WXS</title>
-{{/content}}
-
-{{#content "style"}}
-<style>
-    div#map {
-        width: 100%;
-        height: 500px;
-        background-position: center center;
-        background-repeat: no-repeat;
-        display: none;
-    }
-
-    div#alti1 {
-        width: 50%;
-        height: 300px;
-        float: left;
-    }
-
-    div#alti2 {
-        width: 50%;
-        height: 300px;
-        float: right;
-    }
-
-    div#results {
-        display: none;
-        position: center;
-        width: 100%;
-        height: 300px;
-    }
-
-    div.titles {
-        left: 8px;
-        position: relative;
-    }
-
-    div.rawResponse {
-        float: right;
-        position: relative;
-        width: 60%;
-        height: 300px;
-        background-color: black;
-        color: white;
-        overflow: scroll;
-        overflow-x: hidden;
-    }
-
-    div[id^="GPtoolbox-measure-main"] {
-        display: none;
-    }
-</style>
-{{/content}}
-
-{{#content "body"}}
-<h2>Comparaison des profils altimetriques avec toutes les options</h2>
-<div id="form">
-    <label for="sampling">Sampling (200 par défaut):</label>
-    <input type="number" id="sampling" name="sampling" value="200">
-<br/>
-    <label for="resource">Resource à utiliser côté alti GPF :</label>
-    <input type="text" id="resource" name="resource" value="rge_alti_corse2a_float32_zip_lamb93">
-
-    <br/>
-
-    <label for="display_type">Type d'affichage :</label>
-    <select id="display_type" name="display_type">
-        <option selected="selected" value="DISPLAY_PROFILE_BY_DEFAULT">Profil altimétrique</option>
-        <option value="DISPLAY_PROFILE_RAW">Donnée brute</option>
-    </select>
-
-    <br/>
-
-    <label for="measures">Réponse détaillée (measures) :</label>
-    <select id="measures" name="measures">
-        <option selected="selected" value="true">OUI</option>
-        <option value="false">NON</option>
-    </select>
-    <br/>
-    <br/>
-    <input type="button" id="createMap" value="Valider" />
-</div>
-<div id="map">
-</div>
-
-<div id="results">
-
-    <div id="alti1">
-        <div class="titles">GPF</div>
-        <div class="rawResponse" id="rawResponse1"></div>
-    </div>
-
-    <div id="alti2">
-        <div class="titles">WXS</div>
-        <div class="rawResponse" id="rawResponse2"></div>
-    </div>
-</div>
-
-{{/content}}
-
-{{#content "js"}}
-<script type="text/javascript">
-    /** Affichage de la reponse dans la balise (+ console) */
-    function print(response, divId) {
-        var el = document.getElementById(divId);
-        el.innerHTML = "<pre>" + JSON.stringify(response, null, 2) + "</pre>";
-        console.log(response);
-    };
-    var map;
-    var alti1 = document.getElementById("alti1");
-    var alti2 = document.getElementById("alti2");
-
-    document.getElementById("createMap").onclick = function () {
-        // Affichage de la carte
-        document.getElementById('form').style.display = 'none';
-        document.getElementById('map').style.display = 'block';
-        document.getElementById('results').style.display = 'block';
-
-        // récupération des valeurs du formulaire
-        let sampling = parseInt(document.getElementById('sampling').value);
-        let resource = document.getElementById('resource').value;
-        let display = ol.control.ElevationPath[document.getElementById('display_type').value];
-        let measuresParam = document.getElementById('measures').value;
-
-        var osm = new ol.layer.Tile({
-            source: new ol.source.OSM({
-                attributions: [
-                    "OSM"
-                ]
-            })
-        });
-        //Création de la map
-        map = new ol.Map({
-            target: "map",
-            layers: [osm],
-            view: new ol.View({
-                center: [1015083.735627, 5098655.534734],
-                zoom: 10
-            })
-        });
-
-
-        var elevation_gpf_options = {
-            active: true,
-            elevationOptions: {
-                sampling: sampling,
-                resource: resource,
-                measures: measuresParam,
-                onSuccess: function (response) {
-                    print(response, "rawResponse1");
-                }
-            },
-            displayProfileOptions: {
-                apply: display,
-                target: alti1
-            }
-        };
-
-        var elevation_wxs_options = {
-            active: true,
-            elevationOptions: {
-                sampling: sampling,
-                oldAltiService: true,
-                resource: "none",
-                onSuccess: function (response) {
-                    print(response, "rawResponse2");
-                }
-            },
-            displayProfileOptions: {
-                apply: display,
-                target: alti2
-            }
-        };
-
-        var mouse_position = new ol.control.MousePosition(mouse_position);
-
-        var elevation_gpf = new ol.control.ElevationPath(elevation_gpf_options);
-
-        var elevation_wxs = new ol.control.ElevationPath(elevation_wxs_options);
-
-        map.addControl(mouse_position);
-        map.addControl(elevation_gpf);
-        map.addControl(elevation_wxs);
-    };
-</script>
-{{/content}}
-
-{{/extend}}
\ No newline at end of file
diff --git a/samples-src/pages/openlayers/Isocurve/pages-ol-isocurve-bundle-compare-wxs-gpf.html b/samples-src/pages/openlayers/Isocurve/pages-ol-isocurve-bundle-compare-wxs-gpf.html
deleted file mode 100644
index 2eb89e5eb..000000000
--- a/samples-src/pages/openlayers/Isocurve/pages-ol-isocurve-bundle-compare-wxs-gpf.html
+++ /dev/null
@@ -1,251 +0,0 @@
-{{#extend "ol-sample-bundle-multikeys-layout"}}
-
-{{#content "head"}}
-<title>Sample OpenLayers Isocurve GPF WXS</title>
-{{/content}}
-
-{{#content "style"}}
-<style>
-    div#map1 {
-        width: 50%;
-        height: 500px;
-        background-position: center center;
-        background-repeat: no-repeat;
-        display: none;
-        float: left;
-    }
-
-    div#map2 {
-        width: 50%;
-        height: 500px;
-        background-position: center center;
-        background-repeat: no-repeat;
-        display: none;
-        float: left;
-    }
-
-    div#iso1 {
-        width: 50%;
-        height: 300px;
-        float: left;
-    }
-
-    div#iso2 {
-        width: 50%;
-        height: 300px;
-        float: right;
-    }
-
-    div#results {
-        display: none;
-        position: center;
-        width: 100%;
-        height: 300px;
-    }
-
-    div.titles {
-        left: 8px;
-        position: relative;
-    }
-
-    div.rawResponse {
-        float: right;
-        position: relative;
-        width: 60%;
-        height: 300px;
-        background-color: black;
-        color: white;
-        overflow: scroll;
-        overflow-x: hidden;
-    }
-
-    div[id^="GPisochron-"] {
-        top: 0px;
-        left: 0px;
-        position: relative;
-    }
-</style>
-{{/content}}
-
-{{#content "body"}}
-<h2>Comparaison des services d'isocurve avec l'Isocurve Control</h2>
-<div id="form">
-    <label for="resource">Resource à utiliser côté isocurve GPF :</label>
-    <input type="text" id="resource" name="resource" value="valhalla77">
-
-    <br />
-    <input type="button" id="createMap" value="Valider" />
-</div>
-<div id="map1">
-</div>
-<div id="map2">
-</div>
-
-<div id="results">
-
-    <div id="iso1">
-        <div class="titles">WXS</div>
-        <div class="rawResponse" id="rawResponse1"></div>
-    </div>
-
-    <div id="iso2">
-        <div class="titles">GPF</div>
-        <div class="rawResponse" id="rawResponse2"></div>
-    </div>
-</div>
-
-{{/content}}
-
-{{#content "js"}}
-<script type="text/javascript">
-
-    Array.prototype.equals = function (getArray) {
-        if (this.length != getArray.length) return false;
-
-        for (var i = 0; i < getArray.length; i++) {
-            if (this[i] instanceof Array && getArray[i] instanceof Array) {
-                if (!this[i].equals(getArray[i])) return false;
-            } else if (this[i] != getArray[i]) {
-                return false;
-            }
-        }
-        return true;
-    };
-
-    function toTime(seconds) {
-        var date = new Date(null);
-        date.setSeconds(seconds);
-        return date.toISOString().substr(11, 8);
-    }
-
-    /** Affichage de la reponse dans la balise (+ console) */
-    function print(response, divId) {
-        var el = document.getElementById(divId);
-        el.innerHTML = "<pre>" + JSON.stringify(response, null, 2) + "</pre>";
-        console.log(response);
-    };
-    var map;
-    var iso1 = document.getElementById("iso1");
-    var iso2 = document.getElementById("iso2");
-
-    document.getElementById("createMap").onclick = function () {
-
-        // Affichage de la carte
-        document.getElementById('form').style.display = 'none';
-        document.getElementById('map1').style.display = 'block';
-        document.getElementById('map2').style.display = 'block';
-        document.getElementById('results').style.display = 'block';
-
-        // récupération des valeurs du formulaire
-        let resource = document.getElementById('resource').value;
-
-        var osm1 = new ol.layer.Tile({
-            source: new ol.source.OSM({
-                attributions: [
-                    "OSM"
-                ]
-            })
-        });
-        var osm2 = new ol.layer.Tile({
-            source: new ol.source.OSM({
-                attributions: [
-                    "OSM"
-                ]
-            })
-        });
-        // Création de la map
-        var map1 = new ol.Map({
-            target: "map1",
-            layers: [osm1],
-            view: new ol.View({
-                center: [309646.401583, 6252625.350756],
-                zoom: 14
-            })
-        });
-
-        // Création de la map
-        var map2 = new ol.Map({
-            target: "map2",
-            layers: [osm2],
-            view: new ol.View({
-                center: [309646.401583, 6252625.350756],
-                zoom: 14
-            })
-        });
-
-        var isocurve2 = new ol.control.Isocurve({
-            collapsed: false,
-            target: iso2,
-            isocurveOptions: {
-                resource: resource,
-                onSuccess: function (response) {
-                    print(response, "rawResponse2");
-                    var requestOptions = this.getData();
-                    if (Array.isArray(requestOptions.point) && Array.isArray(isocurve1.getData().point) && requestOptions.point.equals(isocurve1.getData().point)) {
-                        // pas de calcul à faire
-                        return;
-                    }
-                    var value;
-                    var position = ol.proj.transform(requestOptions.point, "EPSG:4326", "EPSG:3857");
-                    var otherOptions = {
-                        direction: requestOptions.direction,
-                        method: requestOptions.computation,
-                        transport: requestOptions.transport,
-                        exclusions: requestOptions.exclusions
-                    };
-                    if (requestOptions.computation === "time") {
-                        value = toTime(requestOptions.results.time);
-                        value = value.replaceAll(":", '.');
-                    } else {
-                        value = requestOptions.results.distance / 1000;
-                    }
-                    isocurve1.compute(position, value, otherOptions);
-                }
-            }
-        });
-
-        var isocurve1 = new ol.control.Isocurve({
-            collapsed: false,
-            target: iso1,
-            isocurveOptions: {
-                oldIsoService: true,
-                resource: "bdtopo-iso",
-                onSuccess: function (response) {
-                    print(response, "rawResponse1");
-                    var requestOptions = this.getData();
-                    if (Array.isArray(requestOptions.point) && Array.isArray(isocurve2.getData().point) && requestOptions.point.equals(isocurve2.getData().point)) {
-                        // pas de calcul à faire
-                        return;
-                    }
-                    var value;
-                    var position = ol.proj.transform(requestOptions.point, "EPSG:4326", "EPSG:3857");
-                    var otherOptions = {
-                        direction: requestOptions.direction,
-                        method: requestOptions.computation,
-                        transport: requestOptions.transport,
-                        exclusions: requestOptions.exclusions
-                    };
-                    if (requestOptions.computation === "time") {
-                        value = toTime(requestOptions.results.time);
-                        value = value.replaceAll(":", '.');
-                    } else {
-                        value = requestOptions.results.distance / 1000;
-                    }
-                    isocurve2.compute(position, value, otherOptions);
-                }
-            }
-        });
-        var layerSwitcher1 = new ol.control.LayerSwitcher({});
-        map1.addControl(layerSwitcher1);
-
-        var layerSwitcher2 = new ol.control.LayerSwitcher({});
-        map2.addControl(layerSwitcher2);
-
-        map1.addControl(isocurve1);
-        map2.addControl(isocurve2);
-    };
-
-</script>
-{{/content}}
-
-{{/extend}}
\ No newline at end of file
diff --git a/samples-src/pages/openlayers/LocationSelector/pages-ol-location-bundle-compare-wxs-gpf.html b/samples-src/pages/openlayers/LocationSelector/pages-ol-location-bundle-compare-wxs-gpf.html
deleted file mode 100644
index c4d66ed53..000000000
--- a/samples-src/pages/openlayers/LocationSelector/pages-ol-location-bundle-compare-wxs-gpf.html
+++ /dev/null
@@ -1,113 +0,0 @@
-{{#extend "ol-sample-bundle-multikeys-layout"}}
-
-{{#content "head"}}
-<title>Sample openlayers LocationSelector</title>
-{{/content}}
-
-{{#content "style"}}
-<style>
-    div#map {
-        width: 100%;
-        height: 500px;
-    }
-
-    div#ls1 {
-        width: 50%;
-        height: 300px;
-        float: left;
-    }
-
-    div#ls2 {
-        width: 50%;
-        height: 300px;
-        float: right;
-    }
-</style>
-{{/content}}
-
-{{#content "body"}}
-<h2>Ajout du widget du LocationSelector, avec les options par défaut</h2>
-<!-- map -->
-<div id="map">
-</div>
-<div id="locationSelectors">
-
-    <div id="ls1">
-        <div class="titles">WXS</div>
-    </div>
-
-    <div id="ls2">
-        <div class="titles">GPF</div>
-    </div>
-</div>
-{{/content}}
-
-{{#content "js"}}
-<script type="text/javascript">
-
-
-    window.onload = function () {
-
-        // on cache l'image de chargement du Géoportail.
-        document.getElementById("map").style.backgroundImage = "none";
-        var osm = new ol.layer.Tile({
-            source: new ol.source.OSM({
-                attributions: [
-                    "OSM"
-                ]
-            })
-        });
-        // Création de la map
-        var map = new ol.Map({
-            target: "map",
-            layers: [osm],
-            view: new ol.View({
-                center: [288074.8449901076, 6247982.515792289],
-                zoom: 8
-            })
-        });
-
-        var infoWXS = new ol.control.LocationSelector({
-            target: ls1,
-            autocompleteOptions: {
-                oldAutocompleteService: true,
-                onSuccess: function (response) {
-                    if (infoWXS._currentLocation !== infoGPF._currentLocation) {
-                        var currentText = {
-                            target: {
-                                value: infoWXS._currentLocation
-                            }
-                        }
-                        infoGPF.onAutoCompleteSearchText(currentText);
-                        document.getElementsByClassName("GPadvancedAutoCompleteList")[0].style.display = "block";
-                    }
-                }
-            }
-        });
-        map.addControl(infoWXS);
-
-        var infoGPF = new ol.control.LocationSelector({
-            target: ls2,
-            autocompleteOptions: {
-                onSuccess: function (response) {
-                    if (infoGPF._currentLocation !== infoWXS._currentLocation) {
-                        var currentText = {
-                            target: {
-                                value: infoGPF._currentLocation
-                            }
-                        }
-                        infoWXS.onAutoCompleteSearchText(currentText);
-                        document.getElementsByClassName("GPadvancedAutoCompleteList")[1].style.display = "block";
-                    }
-
-                }
-            }
-        });
-        map.addControl(infoGPF);
-
-        var layerSwitcher = new ol.control.LayerSwitcher({});
-        map.addControl(layerSwitcher);
-    };
-</script>
-{{/content}}
-{{/extend}}
\ No newline at end of file
diff --git a/samples-src/pages/openlayers/MousePosition/pages-ol-mouseposition-bundle-compare-wxs-gpf.html b/samples-src/pages/openlayers/MousePosition/pages-ol-mouseposition-bundle-compare-wxs-gpf.html
deleted file mode 100644
index 2acd0e9ec..000000000
--- a/samples-src/pages/openlayers/MousePosition/pages-ol-mouseposition-bundle-compare-wxs-gpf.html
+++ /dev/null
@@ -1,169 +0,0 @@
-{{#extend "ol-sample-bundle-multikeys-layout"}}
-
-{{#content "head"}}
-<title>Sample OpenLayers ElevationPath GPF WXS</title>
-{{/content}}
-
-{{#content "style"}}
-<style>
-    div#map {
-        width: 100%;
-        height: 500px;
-        background-position: center center;
-        background-repeat: no-repeat;
-        display: none;
-    }
-
-    div#mp1 {
-        width: 50%;
-        height: 300px;
-        float: left;
-    }
-
-    div#mp2 {
-        width: 50%;
-        height: 300px;
-        float: right;
-    }
-
-    div#results {
-        display: none;
-        position: center;
-        width: 100%;
-        height: 300px;
-    }
-
-    div.titles {
-        left: 8px;
-        position: relative;
-    }
-
-    div.rawResponse {
-        float: right;
-        position: relative;
-        width: 60%;
-        height: 300px;
-        background-color: black;
-        color: white;
-        overflow: scroll;
-        overflow-x: hidden;
-    }
-
-    div[id^="GPmousePosition-"] {
-        top: 130px;
-        left: 0px;
-        position: relative;
-    }
-</style>
-{{/content}}
-
-{{#content "body"}}
-<h2>Comparaison des services d'alti avec le mouseposition</h2>
-<div id="form">
-    <label for="resource">Resource à utiliser côté alti GPF :</label>
-    <input type="text" id="resource" name="resource" value="rge_alti_corse2a_float32_zip_lamb93">
-
-    <br/>
-
-    <label for="measures">Réponse détaillée (measures) :</label>
-    <select id="measures" name="measures">
-        <option selected="selected" value="true">OUI</option>
-        <option value="false">NON</option>
-    </select>
-    <br/>
-    <br/>
-    <input type="button" id="createMap" value="Valider" />
-</div>
-<div id="map">
-</div>
-<div id="results">
-
-    <div id="mp1">
-        <div class="titles">GPF</div>
-        <div class="rawResponse" id="rawResponse1"></div>
-    </div>
-
-    <div id="mp2">
-        <div class="titles">WXS</div>
-        <div class="rawResponse" id="rawResponse2"></div>
-    </div>
-</div>
-
-{{/content}}
-
-{{#content "js"}}
-<script type="text/javascript">
-    /** Affichage de la reponse dans la balise (+ console) */
-    function print(response, divId) {
-        var el = document.getElementById(divId);
-        el.innerHTML = "<pre>" + JSON.stringify(response, null, 2) + "</pre>";
-        console.log(response);
-    };
-    var map;
-    var mp1 = document.getElementById("mp1");
-    var mp2 = document.getElementById("mp2");
-    document.getElementById("createMap").onclick = function () {
-
-        // Affichage de la carte
-        document.getElementById('form').style.display = 'none';
-        document.getElementById('map').style.display = 'block';
-        document.getElementById('results').style.display = 'block';
-
-        // récupération des valeurs du formulaire
-        let resource = document.getElementById('resource').value;
-        let measuresParam = document.getElementById('measures').value;
-
-        var osm = new ol.layer.Tile({
-            source: new ol.source.OSM({
-                attributions: [
-                    "OSM"
-                ]
-            })
-        });
-        // Création de la map
-        var map = new ol.Map({
-            target: "map",
-            layers: [osm],
-            view: new ol.View({
-                center: [1015083.735627, 5098655.534734],
-                zoom: 10
-            })
-        });
-
-        var mouseposition2 = new ol.control.GeoportalMousePosition({
-            collapsed: false,
-            target: mp2,
-            altitude: {
-                serviceOptions: {
-                    resource: resource,
-                    zonly: false,
-                    measures: measuresParam,
-                    onSuccess: function (response) {
-                        print(response, "rawResponse2");
-                    }
-                }
-            }
-        });
-        var mouseposition1 = new ol.control.GeoportalMousePosition({
-            collapsed: false,
-            target: mp1,
-            altitude: {
-                serviceOptions: {
-                    oldAltiService: true,
-                    resource: "none",
-                    zonly: false,
-                    onSuccess: function (response) {
-                        print(response, "rawResponse1");
-                    }
-                }
-            }
-        });
-
-        map.addControl(mouseposition1);
-        map.addControl(mouseposition2);
-    };
-
-</script>
-{{/content}}
-
-{{/extend}}
\ No newline at end of file
diff --git a/samples-src/pages/openlayers/ReverseGeocode/pages-ol-reversegeocode-bundle-compare-wxs-gpf.html b/samples-src/pages/openlayers/ReverseGeocode/pages-ol-reversegeocode-bundle-compare-wxs-gpf.html
deleted file mode 100644
index a80315f33..000000000
--- a/samples-src/pages/openlayers/ReverseGeocode/pages-ol-reversegeocode-bundle-compare-wxs-gpf.html
+++ /dev/null
@@ -1,165 +0,0 @@
-{{#extend "ol-sample-bundle-multikeys-layout"}}
-
-{{#content "head"}}
-<title>Sample openlayers ReverseGeocode</title>
-{{/content}}
-
-{{#content "style"}}
-<style>
-    div#map1 {
-        width: 50%;
-        height: 500px;
-        float: left;
-    }
-
-    div#map2 {
-        width: 50%;
-        height: 500px;
-        float: right;
-    }
-
-    div#rg1 {
-        width: 50%;
-        height: 300px;
-        float: left;
-    }
-
-    div#rg2 {
-        width: 50%;
-        height: 300px;
-        float: right;
-    }
-
-    div[id^="GPreverseGeocoding-"] {
-        position: relative;
-        top: 0px;
-    }
-</style>
-{{/content}}
-
-{{#content "body"}}
-<h2>Ajout du controle de géocodage inverse avec les options par défaut pour comparer les services de geocodage inverse
-    WXS/GPF</h2>
-<!-- map -->
-<div id="map1">
-</div>
-<div id="map2">
-</div>
-<div id="searchEngines">
-
-    <div id="rg1">
-        <div class="titles">WXS</div>
-    </div>
-
-    <div id="rg2">
-        <div class="titles">GPF</div>
-    </div>
-</div>
-{{/content}}
-
-{{#content "js"}}
-<script type="text/javascript">
-    var map;
-    window.onload = function () {
-        var rg1 = document.getElementById("rg1");
-        var rg2 = document.getElementById("rg2");
-        // on cache l'image de chargement du Géoportail.
-        document.getElementById('map1').style.backgroundImage = 'none';
-        document.getElementById('map2').style.backgroundImage = 'none';
-
-        var osm1 = new ol.layer.Tile({
-            source: new ol.source.OSM({
-                attributions: [
-                    "OSM"
-                ]
-            })
-        });
-
-        var osm2 = new ol.layer.Tile({
-            source: new ol.source.OSM({
-                attributions: [
-                    "OSM"
-                ]
-            })
-        });
-
-        // 1. Création de la map
-        map1 = new ol.Map({
-            target: "map1",
-            view: new ol.View({
-                center: [288074.8449901076, 6247982.515792289],
-                zoom: 6
-            }),
-            layers: [osm1]
-        });
-        map2 = new ol.Map({
-            target: "map2",
-            view: new ol.View({
-                center: [288074.8449901076, 6247982.515792289],
-                zoom: 6
-            }),
-            layers: [osm2]
-        });
-
-        // 2. Appel du SearchEngine
-        var reverseWXS = new ol.control.ReverseGeocode({
-            target: rg1,
-            collapsed: false,
-            geocodeOptions: {
-                serviceOptions: {
-                    maximumResponses: 15,
-                    oldGeocodeService: true
-                }
-            },
-            autocompleteOptions: {
-                serviceOptions: {
-                    maximumResponses: 15,
-                    oldAutocompleteService: true
-                }
-            },
-            reverseGeocodeOptions: {
-                oldReverseService: true,
-                onSuccess: function (response) {
-                    if (reverseGPF._requestPosition !== reverseWXS._requestPosition) {
-                        reverseGPF._currentGeocodingType = reverseWXS._currentGeocodingType;
-                        reverseGPF._requestGeom = reverseWXS._requestGeom;  
-                        reverseGPF._reverseGeocodingRequest();
-                    }
-                }
-            }
-        });
-
-        var reverseGPF = new ol.control.ReverseGeocode({
-            target: rg2,
-            collapsed: false,
-            geocodeOptions: {
-                serviceOptions: {
-                    maximumResponses: 15
-                }
-            },
-            autocompleteOptions: {
-                serviceOptions: {
-                    maximumResponses: 15
-                },
-            },
-            reverseGeocodeOptions: {
-                onSuccess: function (response) {
-                    if (reverseWXS._requestPosition !== reverseGPF._requestPosition) {
-                        reverseWXS._requestPosition = reverseGPF._requestPosition;
-                        reverseWXS._currentGeocodingType = reverseGPF._currentGeocodingType;
-                        reverseWXS._requestGeom = reverseGPF._requestGeom;
-                        reverseWXS._reverseGeocodingRequest();
-                    }
-                }
-            }
-        });
-
-        // 3. Ajout du ReverseGeocode à la carte
-        map1.addControl(reverseWXS);
-        map2.addControl(reverseGPF);
-
-    };
-</script>
-{{/content}}
-
-{{/extend}}
\ No newline at end of file
diff --git a/samples-src/pages/openlayers/Route/pages-ol-route-bundle-compare-wxs-gpf.html b/samples-src/pages/openlayers/Route/pages-ol-route-bundle-compare-wxs-gpf.html
deleted file mode 100644
index 22d8d2713..000000000
--- a/samples-src/pages/openlayers/Route/pages-ol-route-bundle-compare-wxs-gpf.html
+++ /dev/null
@@ -1,216 +0,0 @@
-{{#extend "ol-sample-bundle-multikeys-layout"}}
-
-{{#content "head"}}
-<title>Sample OpenLayers Route GPF WXS</title>
-{{/content}}
-
-{{#content "style"}}
-<style>
-    div#map1 {
-        width: 50%;
-        height: 500px;
-        background-position: center center;
-        background-repeat: no-repeat;
-        display: none;
-        float: left;
-    }
-
-    div#map2 {
-        width: 50%;
-        height: 500px;
-        background-position: center center;
-        background-repeat: no-repeat;
-        display: none;
-        float: left;
-    }
-
-    div#iti1 {
-        width: 50%;
-        height: 300px;
-        float: left;
-    }
-
-    div#iti2 {
-        width: 50%;
-        height: 300px;
-        float: right;
-    }
-
-    div#results {
-        display: none;
-        position: center;
-        width: 100%;
-        height: 300px;
-    }
-
-    div.titles {
-        left: 8px;
-        position: relative;
-    }
-
-    div.rawResponse {
-        float: right;
-        position: relative;
-        width: 60%;
-        height: 300px;
-        background-color: black;
-        color: white;
-        overflow: scroll;
-        overflow-x: hidden;
-    }
-
-    div[id^="GProute-"] {
-        top: 0px;
-        left: 0px;
-        position: relative;
-    }
-</style>
-{{/content}}
-
-{{#content "body"}}
-<h2>Comparaison des services d'itinéraires avec le control d'itinéraire</h2>
-<div id="form">
-    <label for="resource">Resource à utiliser côté itinéraire GPF :</label>
-    <input type="text" id="resource" name="resource" value="osrm77">
-
-    <br />
-    <input type="button" id="createMap" value="Valider" />
-</div>
-<div id="map1">
-</div>
-<div id="map2">
-</div>
-
-<div id="results">
-
-    <div id="iti1">
-        <div class="titles">WXS</div>
-        <div class="rawResponse" id="rawResponse1"></div>
-    </div>
-
-    <div id="iti2">
-        <div class="titles">GPF</div>
-        <div class="rawResponse" id="rawResponse2"></div>
-    </div>
-</div>
-
-{{/content}}
-
-{{#content "js"}}
-<script type="text/javascript">
-    Array.prototype.equals = function (getArray) {
-        if (this.length != getArray.length) return false;
-
-        for (var i = 0; i < getArray.length; i++) {
-            if (this[i] instanceof Array && getArray[i] instanceof Array) {
-                if (!this[i].equals(getArray[i])) return false;
-            } else if (this[i] != getArray[i]) {
-                return false;
-            }
-        }
-        return true;
-    };
-
-    /** Affichage de la reponse dans la balise (+ console) */
-    function print(response, divId) {
-        var el = document.getElementById(divId);
-        el.innerHTML = "<pre>" + JSON.stringify(response, null, 2) + "</pre>";
-        console.log(response);
-    };
-    var map;
-    var iti1 = document.getElementById("iti1");
-    var iti2 = document.getElementById("iti2");
-
-    document.getElementById("createMap").onclick = function () {
-
-        // Affichage de la carte
-        document.getElementById('form').style.display = 'none';
-        document.getElementById('map1').style.display = 'block';
-        document.getElementById('map2').style.display = 'block';
-        document.getElementById('results').style.display = 'block';
-
-        // récupération des valeurs du formulaire
-        let resource = document.getElementById('resource').value;
-
-        var osm1 = new ol.layer.Tile({
-            source: new ol.source.OSM({
-                attributions: [
-                    "OSM"
-                ]
-            })
-        });
-        var osm2 = new ol.layer.Tile({
-            source: new ol.source.OSM({
-                attributions: [
-                    "OSM"
-                ]
-            })
-        });
-        // Création de la map
-        var map1 = new ol.Map({
-            target: "map1",
-            layers: [osm1],
-            view: new ol.View({
-                center: [309646.401583, 6252625.350756],
-                zoom: 14
-            })
-        });
-
-        // Création de la map
-        var map2 = new ol.Map({
-            target: "map2",
-            layers: [osm2],
-            view: new ol.View({
-                center: [309646.401583, 6252625.350756],
-                zoom: 14
-            })
-        });
-
-        var route2 = new ol.control.Route({
-            collapsed: false,
-            target: iti2,
-            routeOptions: {
-                resource: resource,
-                onSuccess: function (response) {
-                    print(response, "rawResponse2");
-                    var requestOptions = this.getData();
-                    if (requestOptions.points.equals(route1.getData().points)) {
-                        return;
-                    }
-                    route1.setData(requestOptions);
-                    route1.onRouteComputationSubmit(route1.getData());
-                }
-            }
-        });
-
-        var route1 = new ol.control.Route({
-            collapsed: false,
-            target: iti1,
-            routeOptions: {
-                oldRouteService: true,
-                resource: "bdtopo-osrm",
-                onSuccess: function (response) {
-                    print(response, "rawResponse1");
-                    var requestOptions = this.getData();
-                    if (requestOptions.points.equals(route2.getData().points)) {
-                        return;
-                    }
-                    route2.setData(requestOptions);
-                    route2.onRouteComputationSubmit(route2.getData());
-                }
-            }
-        });
-        var layerSwitcher1 = new ol.control.LayerSwitcher({});
-        map1.addControl(layerSwitcher1);
-
-        var layerSwitcher2 = new ol.control.LayerSwitcher({});
-        map2.addControl(layerSwitcher2);
-
-        map1.addControl(route1);
-        map2.addControl(route2);
-    };
-
-</script>
-{{/content}}
-
-{{/extend}}
\ No newline at end of file
diff --git a/samples-src/pages/openlayers/SearchEngine/pages-ol-searchengine-bundle-compare-wxs-gpf.html b/samples-src/pages/openlayers/SearchEngine/pages-ol-searchengine-bundle-compare-wxs-gpf.html
deleted file mode 100644
index 42ed0bd6e..000000000
--- a/samples-src/pages/openlayers/SearchEngine/pages-ol-searchengine-bundle-compare-wxs-gpf.html
+++ /dev/null
@@ -1,118 +0,0 @@
-{{#extend "ol-sample-bundle-multikeys-layout"}}
-
-{{#content "head"}}
-<title>Sample openlayers SearchEngine</title>
-{{/content}}
-
-{{#content "style"}}
-<style>
-    div#map {
-        width: 100%;
-        height: 500px;
-    }
-
-    div#se1 {
-        width: 50%;
-        height: 300px;
-        float: left;
-    }
-
-    div#se2 {
-        width: 50%;
-        height: 300px;
-        float: right;
-    }
-
-    div[id^="GPsearchEngine-"] {
-        position: relative;
-    }
-</style>
-{{/content}}
-
-{{#content "body"}}
-<h2>Ajout du moteur de recherche avec les options par défaut pour comparer autocomplétion et geocodage WXS/GPF</h2>
-<p>La recherche avancée utilise les services de geocodage. La recherche simple utilise les services d'autocomplétion.</p>
-<!-- map -->
-<div id="map">
-</div>
-<div id="searchEngines">
-
-    <div id="se1">
-        <div class="titles">WXS</div>
-    </div>
-
-    <div id="se2">
-        <div class="titles">GPF</div>
-    </div>
-</div>
-{{/content}}
-
-{{#content "js"}}
-<script type="text/javascript">
-    var map;
-    window.onload = function () {
-        var se1 = document.getElementById("se1");
-        var se2 = document.getElementById("se2");
-        // on cache l'image de chargement du Géoportail.
-        document.getElementById('map').style.backgroundImage = 'none';
-
-        // 1. Création de la map
-        map = new ol.Map({
-            target: "map",
-            view: new ol.View({
-                center: [288074.8449901076, 6247982.515792289],
-                zoom: 6
-            }),
-            layers: [
-                new ol.layer.Tile({
-                    source: new ol.source.GeoportalWMTS({
-                        layer: "GEOGRAPHICALGRIDSYSTEMS.ETATMAJOR40"
-                    })
-                })
-            ]
-        });
-
-        // 2. Appel du SearchEngine
-        var searchWXS = new ol.control.SearchEngine({
-            target: se1,
-            collapsed: false,
-            displayAdvancedSearch: true,
-            geocodeOptions: {
-                serviceOptions: {
-                    maximumResponses: 15,
-                    oldGeocodeService: true
-                }
-            },
-            autocompleteOptions: {
-                serviceOptions: {
-                    maximumResponses: 15,
-                    oldAutocompleteService: true
-                }
-            }
-        });
-
-        var searchGPF = new ol.control.SearchEngine({
-            target: se2,
-            collapsed: false,
-            displayAdvancedSearch: true,
-            geocodeOptions: {
-                serviceOptions: {
-                    maximumResponses: 15
-                }
-            },
-            autocompleteOptions: {
-                serviceOptions: {
-                    maximumResponses: 15
-                }
-            }
-        });
-
-        // 3. Ajout du SearchEngine à la carte
-        map.addControl(searchWXS);
-        map.addControl(searchGPF);
-
-    };
-</script>
-{{/content}}
-
-{{/extend}}
\ No newline at end of file