Sarah Hoffmann
6a7e0d652b
Merge pull request #2164 from lonvia/add-make-install
...
Make Nominatim installable
2021-02-12 10:32:26 +01:00
Sarah Hoffmann
7cc4c53adb
always return 0 for updates unless there is an error
...
This is more in line with previous behavioru than returning
a status code when no updates are available.
2021-02-11 10:33:49 +01:00
Sarah Hoffmann
24b13a7a87
docs: adapt check-database command
2021-02-10 21:55:04 +01:00
Sarah Hoffmann
b6c2dbf69c
actions: remove install directories before import
...
This ensures that any dangling references to the build
or source directory are caught by the CI.
2021-02-10 17:59:52 +01:00
Sarah Hoffmann
0e0e9a6809
need test database for analysing cli test
2021-02-10 16:19:51 +01:00
Sarah Hoffmann
ed60154552
actions: test import with installed version of Nominatim
2021-02-10 16:17:52 +01:00
Sarah Hoffmann
85589cf7dc
add 'make install' to installation instructions
2021-02-10 11:15:21 +01:00
Sarah Hoffmann
99dcd10d3f
test for existance of country grid in cmake already
...
Given that the file potentially gets installed, it needs to be
present during build time already. Checking during the import
is too late.
2021-02-10 10:40:36 +01:00
Sarah Hoffmann
745ae02f47
make installation targets conditional to what is built
2021-02-10 10:04:07 +01:00
Sarah Hoffmann
b6bd11f292
add make install target
...
Installation includes PHP andPython libraries, settings, the basic
country data, the postgresql module and our custom version of
osm2pgsql. The latter is installed in our private library directory
so that it does not get in the way of a potentially installed
osm2pgsql from the distribution.
2021-02-09 21:04:42 +01:00
Sarah Hoffmann
c60a0784ea
adapt unit tests to new directory structure
2021-02-09 20:13:00 +01:00
Sarah Hoffmann
3cb6f3e460
use DataDir constant for data only
...
So far the data directory constant has pointed to the source
directory to be usable with different subdirectories. Now only
the data subdirectory itself is being used with the constant,
so point to the directory directly.
2021-02-09 20:04:08 +01:00
Sarah Hoffmann
de37dc9300
forgot to replace one occurence of sql_dir
2021-02-09 19:32:05 +01:00
Sarah Hoffmann
8ffd7d9243
remove unused BINDIR constant
2021-02-09 19:30:31 +01:00
Sarah Hoffmann
298ed11261
introduce constant for configuration directory
...
This replaces {data_dir}/settings throughout the code, so that
the configuration may be placed somewhere else in the directory
structure (e.g. in /etc).
2021-02-09 18:45:45 +01:00
Sarah Hoffmann
b9517c99ae
rename sql directory to lib-sql
...
Also introduces a separate constant for the sql directory, so that
it can be put separately from the rest of the data if required.
2021-02-09 15:26:56 +01:00
Sarah Hoffmann
db3ced17bb
rename lib to lib-php
2021-02-09 11:52:07 +01:00
Sarah Hoffmann
248b4cddab
update osm2pgsql (disable install rule)
2021-02-09 09:48:50 +01:00
Sarah Hoffmann
d81e152804
integrate analyse of indexing into nominatim tool
2021-02-08 22:22:49 +01:00
Sarah Hoffmann
0cbf98c020
consolidate warm and db-check into single admin command
2021-02-08 21:05:06 +01:00
Sarah Hoffmann
195f9f5ef3
split cli.py by subcommands
...
Reduces file size below 1000 lines.
2021-02-08 17:23:05 +01:00
Sarah Hoffmann
a759c5b75b
move website into php library directory
2021-02-08 12:00:34 +01:00
Sarah Hoffmann
7dfe645b5f
move postcode table setup to sql/
...
Also moves the call to the setup from the setup-db
step to the calculate-postcodes step. The tables also need
no longer be accessible by the webservice.
2021-02-08 11:53:01 +01:00
Sarah Hoffmann
ca3283cbaa
remove unused SQL script
2021-02-08 11:28:24 +01:00
Sarah Hoffmann
861e67dfe8
fix off-by-one error in replication download
2021-02-04 17:04:04 +01:00
Sarah Hoffmann
82ef02cd1a
Merge pull request #2161 from lonvia/timeout-for-replication
...
Reintroduce timeout for replication file download
2021-02-04 16:52:24 +01:00
Sarah Hoffmann
948217d5e9
reintroduce timeout for replication file download
...
This ports the --socket-timeout parameter from
pyosmium-get-changes which ensures that the update
process eventually times out on hanging network connections.
2021-02-04 11:47:11 +01:00
Sarah Hoffmann
6cc06828db
Merge pull request #2160 from lonvia/introduce-project-dir
...
Officially introduce and recommend use of a project directory
2021-02-04 09:52:59 +01:00
Sarah Hoffmann
0b2abfb115
replace make serve with nominatim serve command
...
With the website directory now tied to the project directory instead
of the build directory, it is no longer possible to use make for
running the web server.
2021-02-03 16:34:31 +01:00
Sarah Hoffmann
b2f8fb6201
add migration info for status table
2021-02-03 14:13:09 +01:00
Sarah Hoffmann
e2329c03fe
Revert "increase splitting for large geometries"
...
This reverts commit 559fe513fa
.
Increasing the splitting results in geometries where with rounding
issues at the split points, so that contain operations do not
work as expected anymore.
Fixes #2137 .
2021-02-03 10:23:38 +01:00
Sarah Hoffmann
9bca670b4e
adapt quick start instructions in README to project dir
2021-02-03 10:17:22 +01:00
Sarah Hoffmann
cb06d1f4ca
do not overwrite custom set module paths
...
Given that the module is now copied to the project directory
when no module path is set, we need the information that the
module path is empty. Therefore hand in the default module path
in a separate variable.
2021-02-02 18:31:25 +01:00
Sarah Hoffmann
36447c488a
print project directory before running any command
2021-02-02 11:19:31 +01:00
Sarah Hoffmann
69092030cd
make phpcs happy
2021-02-02 11:15:56 +01:00
Sarah Hoffmann
109aa9c428
actions: switch to using separate project dir
...
Also fixes reverse-only import which not run at all.
2021-02-02 11:03:09 +01:00
Sarah Hoffmann
1d97816c53
docs: add hint about putting the nominatim tool into the PATH
2021-02-02 10:56:40 +01:00
Sarah Hoffmann
7591c4fb42
copy database module on install
...
When no explicity database module is configured, then the
module is now copied into the project directory and used from
there. This means that Nominatim can be updated to a new
version of the module while existing installation keep their
version of normalisation.
2021-02-02 10:56:40 +01:00
Sarah Hoffmann
60cbeb165e
hand in absolute path to nominatim tool to php scripts
2021-02-02 10:56:40 +01:00
Sarah Hoffmann
bddfc109f8
refer to new nominatim tool in configuration comments
2021-02-02 10:56:40 +01:00
Sarah Hoffmann
b05c379b39
change the default location for external data to project dir
2021-02-02 10:56:40 +01:00
Sarah Hoffmann
7ba5283fe8
actions: revert to reletive paths for caching
2021-02-02 10:37:18 +01:00
Sarah Hoffmann
98fe5af07d
actions: remove setting custom .env
...
It only set the pyosmium-get-changes binary which is no longer
needed.
2021-02-02 10:35:30 +01:00
Sarah Hoffmann
59cb1d6c27
remove pyosmium-get-changes detection from cmake
...
pyosmium-get-changes is not longer used.
2021-02-02 10:33:15 +01:00
Sarah Hoffmann
0ad1b28497
Merge pull request #2155 from lonvia/port-regresh-to-python
...
Port replication and part of the refrsh function to native Python
2021-02-01 11:50:05 +01:00
Sarah Hoffmann
5f63d4ca1f
print nice summary after updates
2021-02-01 10:34:31 +01:00
Sarah Hoffmann
90aaab77fc
fix linting issues
2021-01-30 16:42:25 +01:00
Sarah Hoffmann
7158433cd3
disable warning about non-toplevel import
...
They are needed here so nominatim can be run when osmium
is not installed. Everything except replication will work fine.
2021-01-30 16:29:28 +01:00
Sarah Hoffmann
e629a175ed
introduce custom UsageError
...
This is a exception to be thrown when the error occures because
of bad user data. We don't want to print a full stack trace in
these cases but just tell the user what went wrong.
2021-01-30 16:20:10 +01:00
Sarah Hoffmann
45ea73913f
remove setting for PYOSMIUM_BINARY
...
pyosmium is now called as a library from the python code,
so that pyosmium-get-changes is no longer needed.
2021-01-30 15:55:04 +01:00