osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-25 22:12:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2039 from lonvia/migration-for-ui

Browse Source 
Add  migration hints for UI removal and remove tests for icon attribute
This commit is contained in:
Sarah Hoffmann 2020-11-03 08:48:45 +01:00 committed by GitHub
commit ac9be161f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/admin/Migration.md
View File

@ -8,6 +8,18 @@ SQL statements should be executed from the PostgreSQL commandline. Execute
## 3.5.0 -> master ## 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 ### Change order during indexing
When reindexing places during updates, there is now a different order used When reindexing places during updates, there is now a different order used

6
docs/admin/Setup-Nominatim-UI.md
View File

@ -70,7 +70,7 @@ map $args $format {
map $uri/$format $forward_to_ui { map $uri/$format $forward_to_ui {
default 1; # The default is to forward. default 1; # The default is to forward.
~^/ui 0; # If the URI point to the UI already, we are done. ~^/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 ~/reverse.*/default 0; # Reverse and lookup assume xml format when
~/lookup.*/default 0; # no format parameter is given. No forwarding. ~/lookup.*/default 0; # no format parameter is given. No forwarding.
} }
@ -87,14 +87,14 @@ rewrite ^/$ /search;
location @php { location @php {
# fastcgi stuff.. # fastcgi stuff..
if ($forward_to_ui) { if ($forward_to_ui) {
rewrite ^(/[^/]*) http://nominatim.loar/ui$1.html redirect; rewrite ^(/[^/]*) https://yourserver.com/ui$1.html redirect;
} }
} }
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
# fastcgi stuff.. # fastcgi stuff..
if ($forward_to_ui) { if ($forward_to_ui) {
rewrite (.*).php http://nominatim.loar/ui$1.html redirect; rewrite (.*).php https://yourserver.com/ui$1.html redirect;
} }
} }
``` ```

4
test/bdd/api/search/params.feature
View File

@ -7,13 +7,13 @@ Feature: Search queries
Then result 0 has attributes place_id,osm_type,osm_id Then result 0 has attributes place_id,osm_type,osm_id
And result 0 has attributes place_rank,boundingbox And result 0 has attributes place_rank,boundingbox
And result 0 has attributes lat,lon,display_name 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 not attributes address
And result 0 has bounding box in 46.5,47.5,9,10 And result 0 has bounding box in 46.5,47.5,9,10
Scenario: Simple JSON search Scenario: Simple JSON search
When sending json search query "Vaduz" 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 osm_type,osm_id,boundingbox
And result 0 has attributes lat,lon,display_name,importance And result 0 has attributes lat,lon,display_name,importance
And result 0 has not attributes address And result 0 has not attributes address