]>
git.openstreetmap.org Git - nominatim.git/log
Sarah Hoffmann [Wed, 27 May 2020 09:16:27 +0000 (11:16 +0200)]
each address line must fill at most one geocodejson field
This fixes an issue where a postcode with rank_address 5
would also appear in the state field.
Frederik Ramm [Mon, 25 May 2020 10:45:35 +0000 (12:45 +0200)]
Fix script names in README (#1805)
Sarah Hoffmann [Sat, 23 May 2020 17:40:41 +0000 (19:40 +0200)]
adapt tests to new ranks
Sarah Hoffmann [Sat, 23 May 2020 14:19:27 +0000 (16:19 +0200)]
Adapt boundary labels for Sweden and Norway
This also gives us the correct labels for address output in
json and xml.
Sarah Hoffmann [Sat, 25 Apr 2020 20:53:35 +0000 (22:53 +0200)]
fix admin levels for Norway and Sweden
Admin levels 3 and 4 are used for region and county respectively,
so downgrade the ranking.
Sarah Hoffmann [Sun, 5 Apr 2020 14:15:55 +0000 (16:15 +0200)]
adapt municipality and region for Germany
Sarah Hoffmann [Wed, 20 May 2020 06:22:56 +0000 (08:22 +0200)]
Merge pull request #1801 from lonvia/rework-classtypes
Rework ClassTypes helper functions
Sarah Hoffmann [Mon, 18 May 2020 20:20:36 +0000 (22:20 +0200)]
fix style
Sarah Hoffmann [Sun, 17 May 2020 14:53:33 +0000 (16:53 +0200)]
adapt tests to modified address types
Sarah Hoffmann [Sun, 17 May 2020 14:45:46 +0000 (16:45 +0200)]
encapsulate icon URL in a function
Sarah Hoffmann [Sun, 17 May 2020 14:32:42 +0000 (16:32 +0200)]
also adapt uses of ClassTypes in website/
Sarah Hoffmann [Sun, 17 May 2020 11:47:08 +0000 (13:47 +0200)]
adapt php tests
Also fixes some errors found by the tests.
Sarah Hoffmann [Fri, 15 May 2020 21:00:04 +0000 (23:00 +0200)]
reorganise class/type information
Add a separate function for each property which saves necessary
information independently. Simplify computation of labels and
simple labels to not explicitly save the labels.
Sarah Hoffmann [Fri, 15 May 2020 15:36:37 +0000 (17:36 +0200)]
first draft
Sarah Hoffmann [Fri, 15 May 2020 16:48:01 +0000 (18:48 +0200)]
nominatim: always use deadlock-protected wait
Fixes #1785.
Sarah Hoffmann [Fri, 15 May 2020 14:50:54 +0000 (16:50 +0200)]
Merge pull request #1793 from lonvia/remove-struct-params-in-gui
search UI: hide unused query parameters
mmd [Thu, 14 May 2020 20:52:04 +0000 (22:52 +0200)]
Update travis to bionic=Ubuntu18 (#1800)
Sarah Hoffmann [Thu, 14 May 2020 18:54:17 +0000 (20:54 +0200)]
Merge pull request #1797 from mtmail/jquery-3-5-1
update jquery dependency 3.5.0 => 3.5.1
marc tobias [Thu, 14 May 2020 13:53:05 +0000 (15:53 +0200)]
update jquery dependency 3.5.0 => 3.5.1
Sarah Hoffmann [Wed, 13 May 2020 08:13:15 +0000 (10:13 +0200)]
improve syntax highlighting for apache and nginx examples
Sarah Hoffmann [Wed, 13 May 2020 08:04:31 +0000 (10:04 +0200)]
switch to php-fpm 7.3
Also fixes indent.
Sarah Hoffmann [Wed, 13 May 2020 07:55:48 +0000 (09:55 +0200)]
Merge branch 'patch-1' of https://github.com/ganeshkrishnan1/Nominatim into ganeshkrishnan1-patch-1
Sarah Hoffmann [Sun, 10 May 2020 22:15:30 +0000 (00:15 +0200)]
search UI: hide unused query parameters
Only send query parameters relevant for the current query
type (simple/structured), hide the other input fields.
This is quite a bit of CSS state changing, so move the intial
setup of the input field states into Javascript.
Sarah Hoffmann [Sun, 10 May 2020 21:52:53 +0000 (23:52 +0200)]
show simple query field when no parameters are given
Sarah Hoffmann [Sun, 10 May 2020 21:41:04 +0000 (23:41 +0200)]
Fix PHP errors in structured HTML output
Correctly handle missing parameters.
Sarah Hoffmann [Sun, 10 May 2020 13:49:20 +0000 (15:49 +0200)]
Merge pull request #1792 from lonvia/remove-from-location-area
remove linked places also from the location_area_large tables
Sarah Hoffmann [Sun, 10 May 2020 11:59:47 +0000 (13:59 +0200)]
remove linked places also from the location_area_large tables
We don't want linked places to show up in addresses either,
so remove them from the address lookup table.
galewis2 [Thu, 7 May 2020 23:29:44 +0000 (19:29 -0400)]
Add simple/structured query selector to HTML search page (#1722)
Sarah Hoffmann [Thu, 7 May 2020 20:42:31 +0000 (22:42 +0200)]
Merge pull request #1786 from lonvia/remove-ubuntu-1604
remove Ubuntu 16 installation instructions
Sarah Hoffmann [Thu, 7 May 2020 20:01:35 +0000 (22:01 +0200)]
Merge pull request #1782 from Simon-Will/1781-make-tests-work-with-phpunit-8
Make tests work with phpunit 8
Sarah Hoffmann [Thu, 7 May 2020 19:55:04 +0000 (21:55 +0200)]
remove Ubuntu 16 installation instructions
Also fixes up CentOS 8 links in documentation.
Simon Will [Thu, 7 May 2020 19:44:45 +0000 (21:44 +0200)]
Use Ubuntu’s packaged composer, not the custom installation
Sarah Hoffmann [Thu, 7 May 2020 18:46:44 +0000 (20:46 +0200)]
Merge pull request #1780 from Simon-Will/1768-vagrant-installation-for-ubuntu-20
Add vagrant machine for Ubuntu 20.04
Simon Will [Wed, 6 May 2020 22:36:13 +0000 (00:36 +0200)]
Integrate Ubuntu 20 instructions into documentation
Simon Will [Wed, 6 May 2020 21:47:16 +0000 (23:47 +0200)]
Document minimum phpunit version
Simon Will [Wed, 6 May 2020 21:46:53 +0000 (23:46 +0200)]
Install phpunit 8 on Ubuntu 18 with composer
Sarah Hoffmann [Wed, 6 May 2020 19:37:29 +0000 (21:37 +0200)]
Merge pull request #1784 from krahulreddy/patch-1
Removed redundant question
K Rahul Reddy [Wed, 6 May 2020 15:56:32 +0000 (21:26 +0530)]
Removed redundant question
Simon Will [Tue, 5 May 2020 21:43:09 +0000 (23:43 +0200)]
Use assertEqualsWithDelta for float comparisons
PHPUnit 7.3 introduced the functions assertEqualsWithDelta for comparing
floats with a delta. The old four-argument version of assertEquals is
deprecated in PHPUnit 8 and removed in PHPUnit 9.
This commit means that the tests will fail with PHPUnit < 7.3 because
assertEqualsWithDelta is not defined there.
Simon Will [Tue, 5 May 2020 21:40:18 +0000 (23:40 +0200)]
Declare return type of testcase setUp method
PHPUnit 7 changed the signature of the TestCase methods to include the
return type.
Simon Will [Tue, 5 May 2020 21:10:35 +0000 (23:10 +0200)]
Add vagrant machine for Ubuntu 20.04
The instructions in
[`VAGRANT.md`](https://github.com/osm-search/Nominatim/blob/
42c80893cb1038e21c05c2d0d30e3a7a20f0fa26 /VAGRANT.md)
still work as before. The names of the Vagrant machines are updated so
that Ubuntu 18.04 (previously called `ubuntu`) is now called `ubuntu18`
and Ubuntu 20.04 is now called `ubuntu20`.
The version changes from Ubuntu 18.04 to Ubuntu 20.04 are:
- Python: 3.6 to 3.8
- Postgres: 10 to 12
- PHP: 7.2 to 7.4
In the `apt-get`, I changed `--force` to `--allow-downgrades --allow-remove-essential --allow-change-held-packages`, because the former is deprecated. Cf. the [manpage of apt-get](http://manpages.ubuntu.com/manpages/focal/man8/apt-get.8.html)
The php module `codesniffer` was previously installed via Composer, but it is available via the Ubuntu repository, so I installed it via `apt-get` now.
Sarah Hoffmann [Mon, 4 May 2020 19:11:57 +0000 (21:11 +0200)]
docs: add link to new status page
marc tobias [Mon, 4 May 2020 15:06:06 +0000 (17:06 +0200)]
documenation for /status endpoint
Sarah Hoffmann [Sat, 2 May 2020 19:54:14 +0000 (21:54 +0200)]
properly escape class parameter
The class parameter was used as is, allowing for potential
SQL injection via the API.
Thanks to @bladeswords for finding this.
Sarah Hoffmann [Sun, 26 Apr 2020 19:48:43 +0000 (21:48 +0200)]
Merge pull request #1770 from lonvia/eyusupov-separate-compilation
Separate compilation
Sarah Hoffmann [Sun, 26 Apr 2020 14:18:56 +0000 (16:18 +0200)]
Merge pull request #1769 from lonvia/display-name-order
Ensure that result object name is always first in display_name
Sarah Hoffmann [Sun, 26 Apr 2020 14:17:43 +0000 (16:17 +0200)]
cmake: reintroduce check script
Sarah Hoffmann [Sun, 26 Apr 2020 13:00:28 +0000 (15:00 +0200)]
fix docs typos
Sarah Hoffmann [Sun, 26 Apr 2020 12:17:21 +0000 (14:17 +0200)]
cmake: restructure splitting between modules
Make a clear distinction between parts used for the importer
and parts used for the API.
Sarah Hoffmann [Sun, 26 Apr 2020 08:47:41 +0000 (10:47 +0200)]
Merge branch 'separate-compilation' of https://github.com/eyusupov/Nominatim into eyusupov-separate-compilation
Sarah Hoffmann [Sun, 26 Apr 2020 08:20:30 +0000 (10:20 +0200)]
Merge pull request #1754 from mtmail/nominatim-db-tests-against-postgres
Nominatim::DB tests against separate postgresql database
marc tobias [Sun, 26 Apr 2020 01:33:15 +0000 (03:33 +0200)]
lonvia PR feedback
Sarah Hoffmann [Sat, 25 Apr 2020 22:18:29 +0000 (00:18 +0200)]
simplify display_name computation
Sarah Hoffmann [Sat, 25 Apr 2020 22:14:55 +0000 (00:14 +0200)]
ensure that result object name is always first in display_name
The display name might be mixed up if the result object has a lower
rank_address than its address members.
Sarah Hoffmann [Sat, 25 Apr 2020 14:48:04 +0000 (16:48 +0200)]
Merge pull request #1752 from mtmail/new-oo-shell-class
new PHP Nominatim\Shell class to wrap shell escaping
Sarah Hoffmann [Wed, 22 Apr 2020 07:59:44 +0000 (09:59 +0200)]
Merge pull request #1758 from krahulreddy/advanced-installations
Advanced installations
Sarah Hoffmann [Wed, 22 Apr 2020 07:57:59 +0000 (09:57 +0200)]
Merge pull request #1764 from mtmail/docs-countrycodes-based-on-adminlevel-2
API docs: countrycode assignment happens using admin_level=2 tags
Sarah Hoffmann [Wed, 22 Apr 2020 07:08:33 +0000 (09:08 +0200)]
highway:construction should appear as 'road' in the address list
Fixes #1763.
marc tobias [Tue, 21 Apr 2020 15:42:12 +0000 (17:42 +0200)]
API documentation: clarification countrycode assignment happens using admin_level=2 tags
Sarah Hoffmann [Sun, 19 Apr 2020 15:59:49 +0000 (17:59 +0200)]
nominatim.py: fix wrong use of assert
Fixes #1762.
K Rahul Reddy [Sat, 18 Apr 2020 22:42:24 +0000 (04:12 +0530)]
Fix documentation links (#1760)
Update installation documentation link in VAGRANT.md, update.php
K Rahul Reddy [Fri, 17 Apr 2020 09:54:37 +0000 (15:24 +0530)]
Adjustments made to documentation
K Rahul Reddy [Wed, 15 Apr 2020 11:48:57 +0000 (17:18 +0530)]
Added Advanced Installations documentation
K Rahul Reddy [Wed, 15 Apr 2020 11:48:02 +0000 (17:18 +0530)]
Added scripts for multiple country setup and updates
Sarah Hoffmann [Fri, 17 Apr 2020 06:46:40 +0000 (08:46 +0200)]
Merge pull request #1756 from lonvia/downgrade-waterways
downgrade waterways
Sarah Hoffmann [Tue, 14 Apr 2020 15:14:20 +0000 (17:14 +0200)]
downgrade waterways
A lot of streams in OSM are of minor importance, they certainly
should show up lower in the list of results than villages. Those
rivers/streams that are well known have a wikipedia page and get
a higher importance from that.
The disadvantage with downgrading is that the address gets even
more useless but that's something that needs to be solved outside
the rank search.
Sarah Hoffmann [Mon, 13 Apr 2020 16:36:02 +0000 (18:36 +0200)]
Merge pull request #1753 from mtmail/fix-travis-ci-badge
fix Travis-CI badge in README output
marc tobias [Mon, 13 Apr 2020 15:48:20 +0000 (17:48 +0200)]
Nominatim::DB tests against separate postgresql database
marc tobias [Mon, 13 Apr 2020 15:55:17 +0000 (17:55 +0200)]
fix Travis-CI badge in README output
Sarah Hoffmann [Mon, 13 Apr 2020 09:53:44 +0000 (11:53 +0200)]
fix logging of lookup calls
Log start was called but the actual writing was missing.
marc tobias [Tue, 18 Feb 2020 18:42:15 +0000 (19:42 +0100)]
new PHP Nominatim\Shell class to wrap shell escaping
Sarah Hoffmann [Sat, 11 Apr 2020 21:41:19 +0000 (23:41 +0200)]
Merge pull request #1751 from lonvia/respect-admin-hierarchy
Address ranks must not invert admin_level hierarchy
Sarah Hoffmann [Wed, 8 Apr 2020 08:04:49 +0000 (10:04 +0200)]
address ranks must not invert admin_level hierarchy
When inheriting an address rank from a linked place we
must be careful not to destroy the hierarchy established
through boundary admin_level. Therefore, before assigning
an address rank from a linked place, find the next higher
boundary in the admin_level hierarchy, look up its address
rank and then only use the address rank from the linked
place if it is higher.
Sarah Hoffmann [Sat, 11 Apr 2020 18:53:14 +0000 (20:53 +0200)]
Merge branch 'update-jquery-leaflet' of https://github.com/mtmail/Nominatim into mtmail-update-jquery-leaflet
Sarah Hoffmann [Sat, 11 Apr 2020 18:52:05 +0000 (20:52 +0200)]
Merge pull request #1749 from lonvia/ranking-during-updates
Reset search and address ranks on update
marc tobias [Sat, 11 Apr 2020 16:18:57 +0000 (18:18 +0200)]
website dependencies: jQuery v2.1 => 3.5, leaflet 1.3 => 1.6
Sarah Hoffmann [Sat, 11 Apr 2020 07:20:13 +0000 (09:20 +0200)]
reset address and search ranks on update
With ranks being dynamically changed through linking of places,
it is important to reset the ranks on update, so that changes
of the rank due to changes in linking are correctly taken into
account.
Sarah Hoffmann [Fri, 10 Apr 2020 20:37:14 +0000 (22:37 +0200)]
factor out computation of address and search rank
Sarah Hoffmann [Fri, 10 Apr 2020 20:56:55 +0000 (22:56 +0200)]
make admin levels 3 and 7 distinct ones in addresses
There really is no need to conflate these two levels as they
are in use in various countries.
Also adds province as a distinct place.
Fixes #1736.
Sarah Hoffmann [Fri, 10 Apr 2020 15:23:09 +0000 (17:23 +0200)]
Merge pull request #1745 from lonvia/shuffle-sql-functions
Some more SQL function reorganisation
Sarah Hoffmann [Fri, 10 Apr 2020 15:20:51 +0000 (17:20 +0200)]
Merge branch 'deletable-and-polygons-as-json' of https://github.com/mtmail/Nominatim into mtmail-deletable-and-polygons-as-json
marc tobias [Fri, 10 Apr 2020 01:21:52 +0000 (03:21 +0200)]
Add JSON output for /deletable.php and /polygons.php
Sarah Hoffmann [Fri, 10 Apr 2020 09:34:14 +0000 (11:34 +0200)]
move ranks-related functions in separate sql file
Also adds a common function for computing the update radius
around place nodes.
Sarah Hoffmann [Fri, 10 Apr 2020 09:05:11 +0000 (11:05 +0200)]
move helper functions from placex_triggers into utils
Also adds documentation for these functions.
Sarah Hoffmann [Fri, 10 Apr 2020 06:46:50 +0000 (08:46 +0200)]
Merge pull request #1742 from mtmail/travis-ci-add-os
Travis-Ci configuration: remove -sudo-, add -os-
marc tobias [Thu, 9 Apr 2020 23:20:51 +0000 (01:20 +0200)]
travis-ci configuration: remove -sudo-, add -os-
Sarah Hoffmann [Thu, 9 Apr 2020 21:00:34 +0000 (23:00 +0200)]
Merge pull request #1741 from filimongeorge/patch-1
Updated Import and Update .md file
Sarah Hoffmann [Thu, 9 Apr 2020 20:57:51 +0000 (22:57 +0200)]
Merge pull request #1740 from mtmail/setupclass-index-outputfile-not-used
SetupClass.php: remove unused variable
Sarah Hoffmann [Thu, 9 Apr 2020 20:51:20 +0000 (22:51 +0200)]
Merge pull request #1739 from lonvia/remove-self-from-geojson
Further tweaks to geocodejson output
filimongeorge [Thu, 9 Apr 2020 17:51:38 +0000 (20:51 +0300)]
Updated Import and Update .md file
marc tobias [Wed, 8 Apr 2020 12:16:06 +0000 (14:16 +0200)]
SetupClass.php: remove unused variable
Sarah Hoffmann [Wed, 8 Apr 2020 09:12:27 +0000 (11:12 +0200)]
remove name from geocodejson when not set
Sarah Hoffmann [Wed, 8 Apr 2020 09:11:53 +0000 (11:11 +0200)]
adapt tests to geocodejson format adaptions
Sarah Hoffmann [Wed, 8 Apr 2020 08:11:08 +0000 (10:11 +0200)]
further tweaks to geocodejson address output
Removes the place itself from the address details and use
the lowest ranking element in the rank range for the output.
Sarah Hoffmann [Wed, 8 Apr 2020 08:28:28 +0000 (10:28 +0200)]
ignore isaddress in details output when it is not present
Sarah Hoffmann [Tue, 7 Apr 2020 18:49:31 +0000 (20:49 +0200)]
Merge pull request #1737 from mtmail/expose-isaddress-in-details-json
details JSON: also print isaddress addressline field
marc tobias [Tue, 7 Apr 2020 12:50:41 +0000 (14:50 +0200)]
details JSON: also print isaddress addressline field
Sarah Hoffmann [Sun, 5 Apr 2020 21:25:50 +0000 (23:25 +0200)]
Merge pull request #1734 from krahulreddy/fixed-parselatlon
Added whitespace support for parseLatLon
Sarah Hoffmann [Sat, 4 Apr 2020 16:26:27 +0000 (18:26 +0200)]
avoid deletes on search_name in reverse-only mode
Rahul [Fri, 3 Apr 2020 16:39:11 +0000 (22:09 +0530)]
Added test cases for whitespaces in LatLon