Commit Graph

832 Commits

Author SHA1 Message Date
Markus Gail
a4ecd9d73e Merge branch 'tigerlines' of /home/markus/Nominatim into tiger
Conflicts:
	lib/Geocode.php
	lib/ReverseGeocode.php
	lib/lib.php
2016-03-22 11:26:39 +01:00
Markus Gail
e94b667e16 adapt to code style conventions 2016-03-21 14:15:22 +01:00
Markus Gail
f6127df15d add osm_type='tiger' to json, jsonv2 and xml output 2016-03-21 14:14:01 +01:00
Markus Gail
a8afb9bd3c Removed unnecessary test for tiger. 2016-03-21 14:14:01 +01:00
Markus Gail
86622662bf Removed some files for the commit. 2016-03-21 14:14:01 +01:00
Markus Gail
291fdd1894 Tested Version of new Tiger line storage format. 2016-03-21 14:14:01 +01:00
Markus Gail
46cef36184 Implement geocoding and reverse geocoding with tiger interpolation lines instead of points. 2016-03-21 14:14:01 +01:00
Markus Gail
bc449e10be change tiger housenumber format to save as lines instead of points and thus new interpolation 2016-03-21 14:07:12 +01:00
Markus Gail
d8703c223b adapt to code style conventions 2016-03-21 13:32:44 +01:00
Markus Gail
28166c5bb1 add osm_type='tiger' to json, jsonv2 and xml output 2016-03-21 13:32:44 +01:00
Markus Gail
54fdc572c1 Removed unnecessary test for tiger. 2016-03-21 13:32:44 +01:00
Markus Gail
6fb8fab665 Removed some files for the commit. 2016-03-21 13:32:44 +01:00
Markus Gail
df6b433066 Tested Version of new Tiger line storage format. 2016-03-21 13:32:44 +01:00
Markus Gail
26e30bf8e1 Implement geocoding and reverse geocoding with tiger interpolation lines instead of points. 2016-03-21 13:32:44 +01:00
Markus Gail
49d0ce1de4 change tiger housenumber format to save as lines instead of points and thus new interpolation 2016-03-21 13:32:44 +01:00
marc tobias
d020e05f5b query the last updated timestamp only if output format is HTML 2016-03-21 13:32:44 +01:00
marc tobias
c346c57341 corrected layout of keywords on HTML details page 2016-03-21 13:32:44 +01:00
Marc Tobias Metten
d237549496 moved bIncludePolygonAsPoints related logic into lib.php, added tests 2016-03-21 13:32:44 +01:00
Marc Tobias Metten
607fef2d8f moved bIncludePolygonAsPoints related logic into lib.php, added tests 2016-03-21 13:32:44 +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