Merge pull request #2038 from lonvia/addresses-for-large-areas

Improve addresses for large areas

diff --git a/docs/admin/Migration.md b/docs/admin/Migration.md
index fb766ba6f41b2a641f4bb180390004e8eba8775f..66b4c28b41046134058c0ada04424367e8336e5e 100644 (file)
--- a/docs/admin/Migration.md
+++ b/docs/admin/Migration.md
@@ -8,6 +8,18 @@ SQL statements should be executed from the PostgreSQL commandline. Execute
 
 ## 3.5.0 -> master
 
+### Removal of html output
+
+The debugging UI is no longer directly provided with Nominatim. Instead we
+now provide a simple Javascript application. Please refer to
+[Setting up the Nominatim UI](../Setup-Nominatim-UI) for details on how to
+set up the UI.
+
+The icons served together with the API responses have been moved to the
+nominatim-ui project as well. If you want to keep the `icon` field in the
+response, you need to set `CONST_MapIcon_URL` to the URL of the `/mapicon`
+directory of nominatim-ui.
+
 ### Change order during indexing
 
 When reindexing places during updates, there is now a different order used

diff --git a/docs/admin/Setup-Nominatim-UI.md b/docs/admin/Setup-Nominatim-UI.md
index 818ea4083cbc7ef52caedc2b7c2b5719ebb29207..9a6e163b9ef94355d154bfe30d5541b11374519c 100644 (file)
--- a/docs/admin/Setup-Nominatim-UI.md
+++ b/docs/admin/Setup-Nominatim-UI.md
@@ -70,7 +70,7 @@ map $args $format {
 map $uri/$format $forward_to_ui {
     default               1;   # The default is to forward.
     ~^/ui                 0;   # If the URI point to the UI already, we are done.
-    ~/other$              0;   # An explicit non-html format paramter. No forwarding.
+    ~/other$              0;   # An explicit non-html format parameter. No forwarding.
     ~/reverse.*/default   0;   # Reverse and lookup assume xml format when
     ~/lookup.*/default    0;   #   no format parameter is given. No forwarding.
 }
@@ -87,14 +87,14 @@ rewrite ^/$ /search;
 location @php {
     # fastcgi stuff..
     if ($forward_to_ui) {
-        rewrite ^(/[^/]*) http://nominatim.loar/ui$1.html redirect;
+        rewrite ^(/[^/]*) https://yourserver.com/ui$1.html redirect;
     }
 }
 
 location ~ [^/]\.php(/|$) {
     # fastcgi stuff..
     if ($forward_to_ui) {
-        rewrite (.*).php http://nominatim.loar/ui$1.html redirect;
+        rewrite (.*).php https://yourserver.com/ui$1.html redirect;
     }
 }
 ```

diff --git a/test/bdd/api/search/params.feature b/test/bdd/api/search/params.feature
index e27442793d78902e7ed202ca572219e05e41180f..ec8454b08a9757a0e584ee9d03aa4afde84af35c 100644 (file)
--- a/test/bdd/api/search/params.feature
+++ b/test/bdd/api/search/params.feature
@@ -7,13 +7,13 @@ Feature: Search queries
         Then result 0 has attributes place_id,osm_type,osm_id
         And result 0 has attributes place_rank,boundingbox
         And result 0 has attributes lat,lon,display_name
-        And result 0 has attributes class,type,importance,icon
+        And result 0 has attributes class,type,importance
         And result 0 has not attributes address
         And result 0 has bounding box in 46.5,47.5,9,10
 
     Scenario: Simple JSON search
         When sending json search query "Vaduz"
-        Then result 0 has attributes place_id,licence,icon,class,type
+        Then result 0 has attributes place_id,licence,class,type
         And result 0 has attributes osm_type,osm_id,boundingbox
         And result 0 has attributes lat,lon,display_name,importance
         And result 0 has not attributes address