REMOVE: Map URL

Author: neo-garaix

tests/end2end/tests/auth.setup.js

@@ -9,8 +9,7 @@ async function initializeServersURLs(page, wps, map) {
 
 setup('authenticate as admin and add map', async ({ page }) => {
     const WPS_URL = "http://tests-wps-1:8080/";
-    const MAP_URL = "";
 
     await authUsingLogin(page, 'admin', 'admin', getAuthStorageStatePath('admin'));
-    await initializeServersURLs(page, WPS_URL, MAP_URL);
+    await initializeServersURLs(page, WPS_URL);
 });

tests/end2end/tests/pom/lizmap-edit-wps-url-page.js

@@ -7,7 +7,6 @@ export class LizmapEditionWPSURLPage {
     constructor(page) {
         this.page = page;
         this.inputFieldPyQGIS_WPSServer = page.locator('#jforms_wps_url_server_manage_pygiswps_server_url');
-        this.inputFieldMapServer = page.locator('#jforms_wps_url_server_manage_map_server_url');
         this.saveButton = page.locator('#jforms_wps_url_server_manage_submit');
     }
 
@@ -27,15 +26,6 @@ export class LizmapEditionWPSURLPage {
         await this.inputFieldPyQGIS_WPSServer.fill(url);
     }
 
-    /**
-     * Fills the Map server URL input field with the provided URL.
-     *
-     * @param {string} url - The URL to be filled in the Map server input field.
-     */
-    async fillMapURL(url) {
-        await this.inputFieldMapServer.fill(url);
-    }
-
     /**
      * Performs the action of clicking the save button.
      */
@@ -47,13 +37,11 @@ export class LizmapEditionWPSURLPage {
      * Initializes the URLs for the application by setting up a WPS URL and a Map URL.
      *
      * @param {string} wpsURL - The URL for the Web Processing Service (WPS) server.
-     * @param {string} mapURL - The URL for the map server.
      */
-    async initializeURLS(wpsURL, mapURL) {
+    async initializeURLS(wpsURL) {
         await this.goto();
 
         await this.fillPyQGIS_WPS_URL(wpsURL);
-        await this.fillMapURL(mapURL);
 
         await this.save();
     }

wps/classes/wps.listener.php

@@ -1,7 +1,5 @@
 <?php
 
-use LizmapWPS\WPS\UrlServerUtil;
-
 $lproj = null;
 
 class wpsListener extends jEventListener
@@ -49,7 +47,6 @@ public function ongetMapAdditions($event)
                 'wps_ogc_processes' => jUrl::get('wps~processes_rest:get'),
                 'wps_ogc_jobs' => jUrl::get('wps~jobs_rest:get'),
             ),
-            'mapURL' => UrlServerUtil::retrieveServerURL('map_server_url'),
         );
         $css = array(
             jUrl::get('jelix~www:getfile', array('targetmodule' => 'wps', 'file' => 'wps.css')),

wps/forms/url_server_manage.form.xml

@@ -3,9 +3,6 @@
     <input ref="pygiswps_server_url">
         <label locale="wps~wps.form.url_server_pyqgiswps.label"/>
     </input>
-    <input ref="map_server_url">
-        <label locale="wps~wps.form.url_server_map.label"/>
-    </input>
     <submit ref="submit">
         <label locale="jelix~ui.buttons.save"></label>
     </submit>

wps/locales/en_US/wps.UTF-8.properties

@@ -29,17 +29,16 @@ ui.page.qml.upload.title=QGIS style file upload
 ui.page.conf.title=Project restrictions configuration
 ui.page.confirmdelete.title=Confirm file deletion
 ui.page.confirmdelete.msg.html=Are you sure to want to delete <strong>%s</strong> ?
-ui.page.url.server.title=Servers URL
+ui.page.url.server.title=Server URL
 
 ui.admin.menu.group=WPS configuration
 ui.admin.menu.model3list=Manage QGIS models
 ui.admin.menu.project_restriction=Project restrictions
-ui.admin.menu.url_server=Servers URL
+ui.admin.menu.url_server=Server URL
 
 form.projects.restrict_to_authenticated_users=Restrict to authenticated users
 form.projects.restrict_to_config_projects=Restrict to projects with WPS configuration
 form.url_server_pyqgiswps.label=PyQGIS-WPS URL server
-form.url_server_map.label=Map server URL
 
 dock.main.title=Processing
 run.tab.execute.button=Run

wps/locales/fr_FR/wps.UTF-8.properties

@@ -26,17 +26,16 @@ ui.page.qml.upload.title=Téléversement d'un fichier de style QGIS
 ui.page.conf.title=Configuration des restrictions de projet
 ui.page.confirmdelete.title=Confirmer la suppression du fichier
 ui.page.confirmdelete.msg.html=Êtes-vous sûr de vouloir supprimer le fichier <strong>%s</strong> ?
-ui.page.url.server.title=URL des serveurs
+ui.page.url.server.title=URL du serveur
 
 ui.admin.menu.group=Configuration WPS
 ui.admin.menu.model3list=Gestion des modèles QGIS
 ui.admin.menu.project_restriction=Restrictions de projet
-ui.admin.menu.url_server=URL serveurs
+ui.admin.menu.url_server=URL serveur
 
 form.projects.restrict_to_authenticated_users=Restreindre aux utilisateurs authentifiés
 form.projects.restrict_to_config_projects=Restreindre aux projets ayant une configuration WPS
 form.url_server_pyqgiswps.label=URL du serveur PyQGIS-WPS
-form.url_server_map.label=URL du serveur Map
 
 dock.main.title=Traitement
 run.tab.execute.button=Exécuter