Sarah Hoffmann
4956f5e710
Merge pull request #1809 from lonvia/fix-display-names
...
Fix some glitches in choice of address tags
2020-05-27 21:28:17 +02:00
Sarah Hoffmann
5bebdfa434
Merge pull request #1804 from lonvia/ranking-improvement-germany
...
Localized ranking adaptions for Germany, Sweden and Norway
2020-05-27 11:58:21 +02:00
Sarah Hoffmann
aea915aa8d
prefer linked place type over own place type
...
For state cities, tagging might prefer the place=state on
the admin boundary. The linked place is a more reliable indicator.
2020-05-27 11:31:50 +02:00
Sarah Hoffmann
e0d29f398e
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.
2020-05-27 11:16:27 +02:00
Frederik Ramm
c43b39bd88
Fix script names in README ( #1805 )
2020-05-25 12:45:35 +02:00
Sarah Hoffmann
8218da27b3
adapt tests to new ranks
2020-05-23 19:40:41 +02:00
Sarah Hoffmann
aa4bd00631
Adapt boundary labels for Sweden and Norway
...
This also gives us the correct labels for address output in
json and xml.
2020-05-23 16:19:27 +02:00
Sarah Hoffmann
af6b9fdb39
fix admin levels for Norway and Sweden
...
Admin levels 3 and 4 are used for region and county respectively,
so downgrade the ranking.
2020-05-23 15:48:40 +02:00
Sarah Hoffmann
c1b6493373
adapt municipality and region for Germany
2020-05-23 15:20:15 +02:00
Sarah Hoffmann
c386cca73f
Merge pull request #1801 from lonvia/rework-classtypes
...
Rework ClassTypes helper functions
2020-05-20 08:22:56 +02:00
Sarah Hoffmann
cadbdaff18
fix style
2020-05-18 22:20:36 +02:00
Sarah Hoffmann
57510f517a
adapt tests to modified address types
2020-05-17 16:53:33 +02:00
Sarah Hoffmann
3a2ddbe2e0
encapsulate icon URL in a function
2020-05-17 16:46:45 +02:00
Sarah Hoffmann
859347523f
also adapt uses of ClassTypes in website/
2020-05-17 16:46:45 +02:00
Sarah Hoffmann
528fe6553f
adapt php tests
...
Also fixes some errors found by the tests.
2020-05-17 16:46:45 +02:00
Sarah Hoffmann
1faa0f4d41
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.
2020-05-17 16:46:45 +02:00
Sarah Hoffmann
82a11cae2d
first draft
2020-05-17 16:46:45 +02:00
Sarah Hoffmann
431948d768
nominatim: always use deadlock-protected wait
...
Fixes #1785 .
2020-05-15 18:49:27 +02:00
Sarah Hoffmann
f69c3d2b66
Merge pull request #1793 from lonvia/remove-struct-params-in-gui
...
search UI: hide unused query parameters
2020-05-15 16:50:54 +02:00
mmd
08b05964fa
Update travis to bionic=Ubuntu18 ( #1800 )
2020-05-14 22:52:04 +02:00
Sarah Hoffmann
bd7f597682
Merge pull request #1797 from mtmail/jquery-3-5-1
...
update jquery dependency 3.5.0 => 3.5.1
2020-05-14 20:54:17 +02:00
marc tobias
6d4fbc9d32
update jquery dependency 3.5.0 => 3.5.1
2020-05-14 15:53:05 +02:00
Sarah Hoffmann
124410a17b
improve syntax highlighting for apache and nginx examples
2020-05-13 10:13:15 +02:00
Sarah Hoffmann
a543d57cbd
switch to php-fpm 7.3
...
Also fixes indent.
2020-05-13 10:04:31 +02:00
Sarah Hoffmann
8c3a0efe8b
Merge branch 'patch-1' of https://github.com/ganeshkrishnan1/Nominatim into ganeshkrishnan1-patch-1
2020-05-13 09:55:48 +02:00
Sarah Hoffmann
9e2841ad44
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.
2020-05-11 00:19:33 +02:00
Sarah Hoffmann
233e5f7c0e
show simple query field when no parameters are given
2020-05-10 23:52:53 +02:00
Sarah Hoffmann
d5d9445cfd
Fix PHP errors in structured HTML output
...
Correctly handle missing parameters.
2020-05-10 23:41:04 +02:00
Sarah Hoffmann
7be7417b5b
Merge pull request #1792 from lonvia/remove-from-location-area
...
remove linked places also from the location_area_large tables
2020-05-10 15:49:20 +02:00
Sarah Hoffmann
0a14142156
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.
2020-05-10 13:59:47 +02:00
galewis2
a5e3785843
Add simple/structured query selector to HTML search page ( #1722 )
2020-05-08 01:29:44 +02:00
Sarah Hoffmann
fc19ebb218
Merge pull request #1786 from lonvia/remove-ubuntu-1604
...
remove Ubuntu 16 installation instructions
2020-05-07 22:42:31 +02:00
Sarah Hoffmann
b45411f988
Merge pull request #1782 from Simon-Will/1781-make-tests-work-with-phpunit-8
...
Make tests work with phpunit 8
2020-05-07 22:01:35 +02:00
Sarah Hoffmann
42f6371e47
remove Ubuntu 16 installation instructions
...
Also fixes up CentOS 8 links in documentation.
2020-05-07 21:55:04 +02:00
Simon Will
be2aa6ab3a
Use Ubuntu’s packaged composer, not the custom installation
2020-05-07 21:44:45 +02:00
Sarah Hoffmann
6e39ed9573
Merge pull request #1780 from Simon-Will/1768-vagrant-installation-for-ubuntu-20
...
Add vagrant machine for Ubuntu 20.04
2020-05-07 20:46:44 +02:00
Simon Will
daf45a2993
Integrate Ubuntu 20 instructions into documentation
2020-05-07 00:36:13 +02:00
Simon Will
d351b10fde
Document minimum phpunit version
2020-05-06 23:47:16 +02:00
Simon Will
0b21050904
Install phpunit 8 on Ubuntu 18 with composer
2020-05-06 23:46:53 +02:00
Sarah Hoffmann
644a7f524c
Merge pull request #1784 from krahulreddy/patch-1
...
Removed redundant question
2020-05-06 21:37:29 +02:00
K Rahul Reddy
53949ace36
Removed redundant question
2020-05-06 21:26:32 +05:30
Simon Will
14dba39157
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.
2020-05-05 23:43:09 +02:00
Simon Will
43fd2a7423
Declare return type of testcase setUp method
...
PHPUnit 7 changed the signature of the TestCase methods to include the
return type.
2020-05-05 23:40:18 +02:00
Simon Will
4b0ac5356e
Add vagrant machine for Ubuntu 20.04
...
The instructions in
[`VAGRANT.md`](42c80893cb/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.
2020-05-05 23:10:35 +02:00
Sarah Hoffmann
c2f0d8e5ba
docs: add link to new status page
2020-05-04 21:11:57 +02:00
marc tobias
0fb93b1e8a
documenation for /status endpoint
2020-05-04 17:06:06 +02:00
Sarah Hoffmann
f94828c3f4
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.
2020-05-02 21:54:14 +02:00
Sarah Hoffmann
0e1e7c7df2
Merge pull request #1770 from lonvia/eyusupov-separate-compilation
...
Separate compilation
2020-04-26 21:48:43 +02:00
Sarah Hoffmann
06110ba358
Merge pull request #1769 from lonvia/display-name-order
...
Ensure that result object name is always first in display_name
2020-04-26 16:18:56 +02:00
Sarah Hoffmann
bae69f0102
cmake: reintroduce check script
2020-04-26 16:17:43 +02:00