Sarah Hoffmann
7090604de7
reinstate NOMINATIM_SETTINGS variable
...
Move sourcing of this script to settings.php so that
it is loaded before anything else.
2016-03-24 22:06:54 +01:00
Sarah Hoffmann
a50bf1c944
update osm2pgsql (WITH_LUA switch)
2016-03-16 20:05:52 +01:00
Sarah Hoffmann
4ea0074548
fix path for website installations
2016-03-16 20:02:09 +01:00
Sarah Hoffmann
4b46c73088
fix nominatim paths
2016-03-16 19:56:10 +01:00
Sarah Hoffmann
6fc32d9645
Merge branch 'cmake-port' into master
...
Conflicts:
CMakeLists.txt
lib/init.php
settings/settings.php
2016-03-16 19:45:18 +01:00
Sarah Hoffmann
279ea25e7d
Merge pull request #381 from lonvia/cmake-port
...
Replace autotools with cmake and update osm2pgsql
2016-03-13 21:40:38 +01:00
Sarah Hoffmann
50f17666fa
Merge pull request #395 from mtmail/php7-support
...
fix for PHP7, added test setup
2016-03-13 21:38:57 +01:00
Sarah Hoffmann
b097840ba4
Merge pull request #396 from mtmail/fix-array-merge-warning
...
second argument of array_merge can be empty
2016-03-13 21:37:40 +01:00
Marc Tobias Metten
22ebd1c7a9
second argument of array_merge can be empty
2016-03-13 03:01:19 +01:00
Marc Tobias Metten
df764a3f3b
fix for PHP7, added test setup
2016-03-13 02:06:46 +01:00
Sarah Hoffmann
5ccb499a6f
install executables and call settings.php explicitly
...
Executables (including websites) need to be installed in the
build directory, so that they can find the right settings.php.
settings now defines build and source dir.
2016-03-12 09:40:43 +01:00
Sarah Hoffmann
b24ef60b33
enable test execution using ctest
2016-03-12 09:40:43 +01:00
Sarah Hoffmann
6450126933
adapt README and vagrant scripts to cmake
2016-03-12 09:40:43 +01:00
Sarah Hoffmann
314a9e52e9
use external makefile for pgxs with cmake
2016-03-12 09:40:43 +01:00
Sarah Hoffmann
5d7bd37ab2
introduce InstallPath, so that stuff can be executed from build dir
2016-03-12 09:40:43 +01:00
Sarah Hoffmann
c96e71a3d7
add actual cmake file
2016-03-12 09:40:43 +01:00
Sarah Hoffmann
e3f9581a69
move from autotools to cmake and update osm2pgsql
2016-03-12 09:40:43 +01:00
Sarah Hoffmann
1d89098f77
Merge pull request #389 from mtmail/reverse-geocode-include-geometry2
...
Reverse geocode include geometry (v2)
2016-03-09 23:16:51 +01:00
Marc Tobias Metten
71b3aa9cca
Reverse geocode include geometry - added bounding box tests
2016-03-09 19:43:03 +01:00
Marc Tobias Metten
991bd0004a
Reverse geocode include geometry
2016-03-04 20:29:09 +01:00
Marc Tobias Metten
d3ff9600b5
Merge remote-tracking branch 'upstream/master'
2016-03-04 15:42:29 +01:00
Sarah Hoffmann
df9850f5ca
Merge pull request #385 from mtmail/query-lastupdated-only-for-html-output
...
query the last updated timestamp only if output format is HTML
2016-03-02 21:36:34 +01:00
Sarah Hoffmann
fa9677242c
Merge pull request #384 from mtmail/detail-page-name-keywords-with-wordids
...
corrected layout of keywords on HTML details page
2016-03-02 21:34:42 +01:00
Marc Tobias Metten
131b06fec3
Merge branch 'master' of https://github.com/mtmail/Nominatim
2016-03-02 15:07:22 +01:00
marc tobias
8e2b5d7ce3
query the last updated timestamp only if output format is HTML
2016-03-02 01:22:19 +01:00
marc tobias
edaa1f7fcd
corrected layout of keywords on HTML details page
2016-03-02 00:53:56 +01:00
Sarah Hoffmann
30d56b7064
enable test execution using ctest
2016-02-29 23:45:30 +01:00
Sarah Hoffmann
1ed793f000
adapt README and vagrant scripts to cmake
2016-02-29 22:26:55 +01:00
Sarah Hoffmann
ae9291f625
use external makefile for pgxs with cmake
2016-02-29 22:26:55 +01:00
Sarah Hoffmann
1ad6f4a1ce
introduce InstallPath, so that stuff can be executed from build dir
2016-02-29 22:26:55 +01:00
Sarah Hoffmann
932abeb0e2
add actual cmake file
2016-02-29 22:26:55 +01:00
Sarah Hoffmann
35a0f1b246
move from autotools to cmake and update osm2pgsql
2016-02-29 22:26:55 +01:00
Sarah Hoffmann
cb3af09ebd
Merge pull request #380 from mtmail/geometryText2Points
...
Geometry text2 points
2016-02-29 20:53:49 +01:00
Marc Tobias Metten
9fb413a126
corrected layout of keywords on HTML details page
2016-02-29 13:59:16 +01:00
Marc Tobias Metten
27406c8daa
corrected layout of keywords on HTML details page
2016-02-29 13:55:19 +01:00
Marc Tobias Metten
f6129ebfee
moved bIncludePolygonAsPoints related logic into lib.php, added tests
2016-02-28 17:08:20 +01:00
Marc Tobias Metten
7f5fe8c877
moved bIncludePolygonAsPoints related logic into lib.php, added tests
2016-02-28 17:06:52 +01:00
Sarah Hoffmann
07628dc05d
Merge pull request #378 from mtmail/spaces-to-tabs
...
spaces-to-tabs for all *.php files
2016-02-27 09:56:36 +01:00
Marc Tobias Metten
78a29b5a87
spaces-to-tabs for all *.php files
2016-02-27 00:02:20 +01:00
Sarah Hoffmann
8b75e1f4c4
prepare next release
2016-02-08 23:54:06 +01:00
Sarah Hoffmann
a2994fc55c
ubuntu-vagrant: install Nominatim as vagrant user
2016-02-08 23:44:27 +01:00
Sarah Hoffmann
ebdd250fa0
also show line geometries on search page
2016-02-08 23:06:27 +01:00
Sarah Hoffmann
676c565905
update vagrant readme
2016-02-08 23:05:19 +01:00
Sarah Hoffmann
4d15bdaacc
add vagrant script for CentOS
2016-02-08 22:58:59 +01:00
Sarah Hoffmann
f9ee4e3bd3
update dependencies in vagrant provision file
...
also automatically checkout if Nominatim directory does not exist
2016-02-06 18:49:12 +01:00
Sarah Hoffmann
c2112fc6ff
add xml2 configure script now missing in osm2pgsql
2016-02-06 18:22:41 +01:00
Sarah Hoffmann
8b491e8544
Merge pull request #361 from mtmail/detail-page-big-table2
...
UI: columns nicer aligned in details table(s)
2016-02-06 12:51:47 +01:00
Sarah Hoffmann
40588482a2
Merge pull request #362 from mtmail/fix-timeout-on-detail-pages
...
fix timeout on detail pages related to distance calculation
2016-02-06 12:50:38 +01:00
marc tobias
c2b68c337b
remove commented-out lines
2016-02-06 12:49:59 +01:00
marc tobias
a73135aebe
fix timeout on detail pages related to distance calculation
2016-02-06 12:43:12 +01:00
