From e96caa9a173c6e38a635dc07e571b1289e65b7dd Mon Sep 17 00:00:00 2001
From: mtmail <mtmail@gmx.net>
Date: Tue, 27 May 2025 16:16:01 +0200
Subject: [PATCH] Remove php from endpoint urls (#281)

* Nominatim no longer uses .php URLs
---
 dist/config.defaults.js     |  2 +-
 src/lib/api_utils.js        |  3 ++-
 src/pages/StatusPage.svelte | 10 +++++-----
 test/_bootstrap.js          |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dist/config.defaults.js b/dist/config.defaults.js
index 21e3880..178beff 100644
--- a/dist/config.defaults.js
+++ b/dist/config.defaults.js
@@ -9,7 +9,7 @@ let Nominatim_Config = {
   // Alternatively provide a function callback
   // Nominatim_API_Endpoint: function (endpoint) {
   //   var url = 'http://localhost/nominatim/';
-  //   if (endpoint) { url += endpoint + '.php' };
+  //   if (endpoint) { url += endpoint };
   //   return url;
   // }
 
diff --git a/src/lib/api_utils.js b/src/lib/api_utils.js
index 3cbc0df..158de20 100644
--- a/src/lib/api_utils.js
+++ b/src/lib/api_utils.js
@@ -86,13 +86,14 @@ export async function fetch_content_into_element(url, dom_element) {
 function generate_nominatim_endpoint_url(endpoint_name) {
   var conf_endpoint = Nominatim_Config.Nominatim_API_Endpoint;
 
+  console.log(typeof conf_endpoint);
   if (typeof conf_endpoint === 'function') {
     return conf_endpoint(endpoint_name);
   }
 
   if (!endpoint_name) return conf_endpoint;
 
-  return conf_endpoint + endpoint_name + '.php';
+  return conf_endpoint + endpoint_name;
 }
 
 function generate_nominatim_api_url(endpoint_name, params) {
diff --git a/src/pages/StatusPage.svelte b/src/pages/StatusPage.svelte
index 1a29d56..662e52e 100644
--- a/src/pages/StatusPage.svelte
+++ b/src/pages/StatusPage.svelte
@@ -7,6 +7,10 @@
   let aStatusData = {};
   let configuration = Nominatim_Config;
 
+  let endpoint_url = (typeof configuration.Nominatim_API_Endpoint === 'function') ?
+                      configuration.Nominatim_API_Endpoint() :
+                      configuration.Nominatim_API_Endpoint;
+
   function loaddata() {
     fetch_from_api('status', { format: 'json' }, function (data) {
       aStatusData = data;
@@ -24,11 +28,7 @@
 
       <dl>
         <dt>API Endpoint</dt>
-        <dd>
-          <a href={configuration.Nominatim_API_Endpoint}>
-            {configuration.Nominatim_API_Endpoint}
-          </a>
-        </dd>
+        <dd><a href={endpoint_url}>{endpoint_url}</a></dd>
 
         <dt>Software version</dt>
         <dd>{aStatusData.software_version}</dd>
diff --git a/test/_bootstrap.js b/test/_bootstrap.js
index e608d2b..d0d5865 100644
--- a/test/_bootstrap.js
+++ b/test/_bootstrap.js
@@ -46,7 +46,7 @@ Nominatim_Config.Reverse_Only = ${reverse_only};
 
     this.proxy_server = await http.createServer((req, res) => {
       // identify if the requests should be served by the (remote) API or static webserver
-      let api_url_match = req.url.match(/\/(\w+\.php)/);
+      let api_url_match = !req.url.match(/(.html|.css|.js|.ico|.png)(\?|$)/);
 
       let target = api_url_match
         ? 'https://nominatim.openstreetmap.org'
-- 
2.39.5