update from upstream

.all-contributorsrc

@@ -98,6 +98,7 @@
       "profile": "https://twitter.com/mtmthemovie",
       "contributions": [
         "doc",
+        "code",
         "question",
         "review"
       ]
@@ -380,6 +381,84 @@
         "code",
         "doc"
       ]
+    },
+    {
+      "login": "iAlex97",
+      "name": "iAlex97",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12383594?v=4",
+      "profile": "https://github.com/iAlex97",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "mausch",
+      "name": "Mauricio Scheffer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95194?v=4",
+      "profile": "http://bugsquash.blogspot.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "anthropos9",
+      "name": "Sean Dean",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3867685?v=4",
+      "profile": "https://github.com/anthropos9",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "pgassmann",
+      "name": "Philipp Gassmann",
+      "avatar_url": "https://avatars.githubusercontent.com/u/460192?v=4",
+      "profile": "https://github.com/pgassmann",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "saddfox",
+      "name": "saddfox",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48035291?v=4",
+      "profile": "https://github.com/saddfox",
+      "contributions": [
+        "doc",
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "gsg-git",
+      "name": "gsg-git",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92863111?v=4",
+      "profile": "https://github.com/gsg-git",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "breunigs",
+      "name": "Stefan Breunig",
+      "avatar_url": "https://avatars.githubusercontent.com/u/307954?v=4",
+      "profile": "https://github.com/breunigs",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "carlomion",
+      "name": "carlomion",
+      "avatar_url": "https://avatars.githubusercontent.com/u/161817799?v=4",
+      "profile": "https://github.com/carlomion",
+      "contributions": [
+        "code",
+        "infra"
+      ]
     }
   ],
   "contributorsPerLine": 6,
@@ -388,5 +467,6 @@
   "repoType": "github",
   "repoHost": "https://github.com",
   "skipCi": true,
-  "commitConvention": "none"
+  "commitConvention": "none",
+  "commitType": "docs"
 }

.github/workflows/assert-non-empty-json

@@ -16,7 +16,7 @@ from requests.packages.urllib3.util.retry import Retry
 logging.basicConfig(level=logging.WARNING)
 
 s = requests.Session()
-retries = Retry(total=7, backoff_factor=2, status_forcelist=[ 502, 503, 504 ])
+retries = Retry(total=18, backoff_factor=2, status_forcelist=[ 502, 503, 504 ])
 s.mount('http://', HTTPAdapter(max_retries=retries))
 
 resp = s.get(sys.argv[1])

.github/workflows/assert-reverse-only

@@ -0,0 +1,29 @@
+#! /usr/bin/env python3
+
+# This script sends a HTTP request to a URL and asserts that its
+# response matches that of an instance running in reverse-only mode.
+#
+# It retries the HTTP request a number of times.
+
+import logging
+import requests
+import sys
+import json
+
+from requests.adapters import HTTPAdapter
+from requests.packages.urllib3.util.retry import Retry
+
+logging.basicConfig(level=logging.WARNING)
+
+s = requests.Session()
+retries = Retry(total=7, backoff_factor=2, status_forcelist=[502, 503, 504])
+s.mount('http://', HTTPAdapter(max_retries=retries))
+
+resp = s.get(sys.argv[1])
+jsn = resp.json()
+
+if (resp.status_code == 404 and jsn["error"]["message"] == "Reverse-only import does not support forward searching."):
+    print("✅ Nominatim is running in reverse-only mode")
+else:
+    print(f'Endpoint returned status code {resp.status_code}: {resp.content}')
+    sys.exit(1)