From ff984f72c904d8c4c1acbc894ac04a7f1546a80b Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Tue, 29 Aug 2023 22:48:12 +0200
Subject: [PATCH] Details page: Allow searching for negative OSM ids

---
 src/components/SearchSectionDetails.svelte | 6 +++---
 src/lib/helpers.js                         | 2 +-
 test/unit/helpers.js                       | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/SearchSectionDetails.svelte b/src/components/SearchSectionDetails.svelte
index f23a24c..5ca614a 100644
--- a/src/components/SearchSectionDetails.svelte
+++ b/src/components/SearchSectionDetails.svelte
@@ -6,8 +6,8 @@
   function handleFormSubmit(event) {
     let form_el = event.target;
     let val = form_el.querySelector('input[type=edit]').value.trim();
-    let type_and_id_match = val.match(/^\s*([NWR])(\d+)\s*$/i)
-                            || val.match(/\/(relation|way|node)\/(\d+)\s*$/);
+    let type_and_id_match = val.match(/^\s*([NWR])(-?\d+)\s*$/i)
+                            || val.match(/\/(relation|way|node)\/(-?\d+)\s*$/);
 
     var params = new URLSearchParams();
     if (type_and_id_match) {
@@ -30,7 +30,7 @@
       <!-- eslint-disable-next-line max-len -->
       <input type="edit"
              class="form-control form-control-sm me-1"
-             pattern="^[NWRnwr]?[0-9]+$|.*openstreetmap.*"
+             pattern="^[1-9][0-9]*$|^[NWRnwr]-?[1-9][0-9]*$|.*openstreetmap.*"
              value="{
               (api_request_params.osmtype || '')
               + (api_request_params.osmid || '')
diff --git a/src/lib/helpers.js b/src/lib/helpers.js
index c95dbe9..0099d83 100644
--- a/src/lib/helpers.js
+++ b/src/lib/helpers.js
@@ -17,7 +17,7 @@ export function formatOSMType(sType, bExcludeExternal) {
 // w123 => ['W', 123]
 export function identifyLinkInQuery(query) {
   if (!query) return undefined;
-  const m = query.match(/\/(relation|way|node)\/(\d+)/) || query.match(/^([nwr])(\d+)$/i);
+  const m = query.match(/\/(relation|way|node)\/(-?\d+)/) || query.match(/^([nwr])(-?\d+)$/i);
   if (!m) return undefined;
   return [m[1][0].toUpperCase(), Number(m[2])];
 }
diff --git a/test/unit/helpers.js b/test/unit/helpers.js
index ed57c03..103f221 100644
--- a/test/unit/helpers.js
+++ b/test/unit/helpers.js
@@ -10,6 +10,7 @@ describe('Helpers', function () {
     assert.deepStrictEqual(identifyLinkInQuery('https://www.openstreetmap.org/relation/1234#map=11/41.2388/-8.3867'), ['R', 1234]);
     assert.deepStrictEqual(identifyLinkInQuery('n1234'), ['N', 1234]);
     assert.deepStrictEqual(identifyLinkInQuery('W1234'), ['W', 1234]);
+    assert.deepStrictEqual(identifyLinkInQuery('R-123'), ['R', -123]);
   });
 
   it('.formatLabel', function () {
-- 
2.39.5