]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
8 years agoupdate comments and formatting
Sarah Hoffmann [Sun, 15 May 2016 10:37:20 +0000 (12:37 +0200)]
update comments and formatting

8 years agofix scene making scripts and add building-parallel-road scene
Sarah Hoffmann [Sun, 15 May 2016 09:29:09 +0000 (11:29 +0200)]
fix scene making scripts and add building-parallel-road scene

Scripts updated to newest libosmium and shebang fixed.

8 years agoremove duplicate index
Sarah Hoffmann [Sun, 15 May 2016 08:57:03 +0000 (10:57 +0200)]
remove duplicate index

8 years agoget housenumber data for interpolations from place table
Sarah Hoffmann [Sun, 15 May 2016 07:44:00 +0000 (09:44 +0200)]
get housenumber data for interpolations from place table

The placex table may not yet be filled when the interpolation
lines are computed.

8 years agofix syntax in load-data function
Sarah Hoffmann [Sun, 15 May 2016 07:41:11 +0000 (09:41 +0200)]
fix syntax in load-data function

Also makes sure that load data runs with at least 2 threads: one
for loading placex and one for loading osmline.

8 years agoMerge remote-tracking branch 'markus/master' into master
Sarah Hoffmann [Sat, 14 May 2016 19:09:57 +0000 (21:09 +0200)]
Merge remote-tracking branch 'markus/master' into master

8 years agoChange load-data in setup.php.
markigail [Mon, 9 May 2016 13:07:58 +0000 (15:07 +0200)]
Change load-data in setup.php.

8 years agoFix bug in index.c and remove column admin_level from location_property_osmline.
markigail [Sun, 8 May 2016 14:46:42 +0000 (16:46 +0200)]
Fix bug in index.c and remove column admin_level from location_property_osmline.

8 years agofix small bug in index.c
markigail [Tue, 3 May 2016 10:52:08 +0000 (12:52 +0200)]
fix small bug in index.c

8 years agoMerge pull request #447 from lonvia/fix-array-expression
mtmail [Sun, 1 May 2016 09:53:54 +0000 (11:53 +0200)]
Merge pull request #447 from lonvia/fix-array-expression

replace new-style [] expression with old-style array()

8 years agoreplace new-style [] expression with old-style array()
Sarah Hoffmann [Sun, 1 May 2016 09:17:18 +0000 (11:17 +0200)]
replace new-style [] expression with old-style array()

Also removes some unused code.

fixes #444

8 years agoMerge pull request #446 from mtmail/make-outline-clickable-in-ui
Sarah Hoffmann [Sun, 1 May 2016 09:11:21 +0000 (11:11 +0200)]
Merge pull request #446 from mtmail/make-outline-clickable-in-ui

UI: the result outline (geojson/polygon) now lets the map handle clicks

8 years agoUI: the result outline (geojson/polygon) now lets the map handle its clicks
marc tobias [Sun, 1 May 2016 08:47:13 +0000 (10:47 +0200)]
UI: the result outline (geojson/polygon) now lets the map handle its clicks

8 years agofix bug in Geocode.php
Markus Gail [Fri, 29 Apr 2016 08:24:30 +0000 (10:24 +0200)]
fix bug in Geocode.php

8 years agoindex on geometry of interpolation lines, and more improvements.
Markus Gail [Wed, 27 Apr 2016 15:42:59 +0000 (17:42 +0200)]
index on geometry of interpolation lines, and more improvements.

8 years agoMerge pull request #441 from mtmail/update-php-to-check-for-correct-js-file
Sarah Hoffmann [Tue, 26 Apr 2016 19:03:58 +0000 (21:03 +0200)]
Merge pull request #441 from mtmail/update-php-to-check-for-correct-js-file

update.php was checking for static file which is no longer part of the project

8 years agoupdate.php was checking for static file which is no longer part of the project
Marc Tobias Metten [Tue, 26 Apr 2016 18:45:48 +0000 (20:45 +0200)]
update.php was checking for static file which is no longer part of the project

8 years agoCorrect merge error in Geocode.php.
Markus Gail [Mon, 25 Apr 2016 15:44:34 +0000 (17:44 +0200)]
Correct merge error in Geocode.php.

8 years agoCoding style adaptions and correcting small errors from merge.
Markus Gail [Mon, 25 Apr 2016 11:58:28 +0000 (13:58 +0200)]
Coding style adaptions and correcting small errors from merge.

8 years agoMerge remote-tracking branch 'origin/master' into osmline
Markus Gail [Mon, 25 Apr 2016 09:01:04 +0000 (11:01 +0200)]
Merge remote-tracking branch 'origin/master' into osmline

Conflicts:
lib/Geocode.php
lib/PlaceLookup.php
sql/functions.sql
sql/tables.sql
utils/setup.php

8 years agoRemove interpolation lines from placex and save them in an extra table.
Markus Gail [Mon, 25 Apr 2016 07:44:01 +0000 (09:44 +0200)]
Remove interpolation lines from placex and save them in an extra table.

8 years agoMerge pull request #436 from lonvia/remove-location-property-tables
Sarah Hoffmann [Sun, 24 Apr 2016 14:05:10 +0000 (16:05 +0200)]
Merge pull request #436 from lonvia/remove-location-property-tables

remove unused location_property_-partion- tables

8 years agocreate_sql_functions() needs the commandline parameters
Sarah Hoffmann [Sat, 23 Apr 2016 09:07:12 +0000 (11:07 +0200)]
create_sql_functions() needs the commandline parameters

Fixes one failing test.

8 years agoremove unused location_property_-partion- tables
Sarah Hoffmann [Sat, 23 Apr 2016 08:07:57 +0000 (10:07 +0200)]
remove unused location_property_-partion- tables

8 years agoapply marker filtering to functions.sql also after table creation
Sarah Hoffmann [Wed, 20 Apr 2016 22:00:15 +0000 (00:00 +0200)]
apply marker filtering to functions.sql also after table creation

fixes #430

8 years agoremove duplicate CORS header
Sarah Hoffmann [Tue, 12 Apr 2016 21:04:38 +0000 (23:04 +0200)]
remove duplicate CORS header

fixes #427

8 years agoMerge pull request #425 from lonvia/disable-aux-tables
Sarah Hoffmann [Tue, 12 Apr 2016 21:00:24 +0000 (23:00 +0200)]
Merge pull request #425 from lonvia/disable-aux-tables

make tables for external data (Tiger and aux) configurable

8 years agoMerge pull request #424 from lonvia/cleanup-logging
Sarah Hoffmann [Tue, 12 Apr 2016 20:58:14 +0000 (22:58 +0200)]
Merge pull request #424 from lonvia/cleanup-logging

clean up query logging

8 years agomake tables for external data (Tiger and aux) configurable
Sarah Hoffmann [Thu, 7 Apr 2016 19:47:51 +0000 (21:47 +0200)]
make tables for external data (Tiger and aux) configurable

Introduces two new settings CONST_Use_US_Tiger_Data and
CONST_Use_Aux_Location_data, which are disabled by default.
When false the corresponding tables are ignored in queries
and updates.

Aux and tiger tables are no longer created by default. This
has to be done by the corresponding import scripts. The former
aux table creation can be found in sql/aux_tables.sql for
reference.

8 years agoclean up query logging
Sarah Hoffmann [Thu, 7 Apr 2016 18:37:27 +0000 (20:37 +0200)]
clean up query logging

- remove query_log table, keeping only new_query_log
- drop unused import_npi_log table
- disable DB logging per default
- use file logging structure from osm.org

8 years agoMerge pull request #420 from lonvia/remove-explicit-software-versions
Sarah Hoffmann [Fri, 1 Apr 2016 21:03:01 +0000 (23:03 +0200)]
Merge pull request #420 from lonvia/remove-explicit-software-versions

Remove unsupported/unused features and settings

8 years agoremove deleted us_state* tables from tests as well
Sarah Hoffmann [Fri, 1 Apr 2016 20:57:45 +0000 (22:57 +0200)]
remove deleted us_state* tables from tests as well

8 years agoremove state and county data for US and make postcode import optional
Sarah Hoffmann [Wed, 30 Mar 2016 21:21:13 +0000 (23:21 +0200)]
remove state and county data for US and make postcode import optional

8 years agoremove unused settings
Sarah Hoffmann [Wed, 30 Mar 2016 21:03:10 +0000 (23:03 +0200)]
remove unused settings

8 years agoremove 'closed for indexing' feature
Sarah Hoffmann [Wed, 30 Mar 2016 20:53:19 +0000 (22:53 +0200)]
remove 'closed for indexing' feature

Simultanous updates are fine these days.

8 years agoremove explicitly set postgres/postgis version
Sarah Hoffmann [Wed, 30 Mar 2016 20:48:18 +0000 (22:48 +0200)]
remove explicitly set postgres/postgis version

Get the version from the database where necessary or simply
probe for existence of features. Fake hstore_to_json when
necessary.

Bumps the minimum required versions fro postgres to 9.1 and
for postgis to 2.0.

8 years agoMerge pull request #416 from lonvia/dead-code-removal
Sarah Hoffmann [Wed, 30 Mar 2016 18:33:54 +0000 (20:33 +0200)]
Merge pull request #416 from lonvia/dead-code-removal

Remove unused and/or unmaintained php code

8 years agotest: catch script output in as debug log output
Sarah Hoffmann [Tue, 29 Mar 2016 21:14:03 +0000 (23:14 +0200)]
test: catch script output in as debug log output

8 years agoremove unused functions in php library
Sarah Hoffmann [Mon, 28 Mar 2016 20:55:21 +0000 (22:55 +0200)]
remove unused functions in php library

8 years agoremove unused files
Sarah Hoffmann [Mon, 28 Mar 2016 20:28:27 +0000 (22:28 +0200)]
remove unused files

8 years agoremove unused/unmaintained options in import scripts
Sarah Hoffmann [Mon, 28 Mar 2016 19:50:14 +0000 (21:50 +0200)]
remove unused/unmaintained options in import scripts

8 years agoFix fixing of coding style
Sarah Hoffmann [Mon, 28 Mar 2016 20:04:08 +0000 (22:04 +0200)]
Fix fixing of coding style

8 years agoexclude Tiger stuff from required tests
Sarah Hoffmann [Mon, 28 Mar 2016 15:17:56 +0000 (17:17 +0200)]
exclude Tiger stuff from required tests

8 years agoadapt tests to new tiger algorithm
Sarah Hoffmann [Mon, 28 Mar 2016 15:08:27 +0000 (17:08 +0200)]
adapt tests to new tiger algorithm

8 years agomake sure linked places get recomputed when unlinked
Sarah Hoffmann [Mon, 28 Mar 2016 07:51:29 +0000 (09:51 +0200)]
make sure linked places get recomputed when unlinked

When linked the place may not be in the search index,
so it must be reindexed when being unlinked. The status
change will only have an effect during the subsequent
update, so change tests to that effect.

8 years agofix syntax errors in tiger code and adapt format of dummy tables
Sarah Hoffmann [Sun, 27 Mar 2016 21:45:20 +0000 (23:45 +0200)]
fix syntax errors in tiger code and adapt format of dummy tables

8 years agoMerge branch 'tigerlines' of https://github.com/markigail/Nominatim
Sarah Hoffmann [Sun, 27 Mar 2016 18:00:15 +0000 (20:00 +0200)]
Merge branch 'tigerlines' of https://github.com/markigail/Nominatim

8 years agotests: update for osm2gsql changes
Sarah Hoffmann [Fri, 25 Mar 2016 10:18:27 +0000 (11:18 +0100)]
tests: update for osm2gsql changes

Also fixes a missing type set for query.php tests.

8 years agoAdd hints about coding style
Sarah Hoffmann [Fri, 25 Mar 2016 11:06:30 +0000 (12:06 +0100)]
Add hints about coding style

heavily borrowed from osm2pgsql

8 years agoreinstate NOMINATIM_SETTINGS variable
Sarah Hoffmann [Thu, 24 Mar 2016 21:06:54 +0000 (22:06 +0100)]
reinstate NOMINATIM_SETTINGS variable

Move sourcing of this script to settings.php so that
it is loaded before anything else.

8 years agoFix coding style.
Markus Gail [Wed, 23 Mar 2016 08:34:36 +0000 (09:34 +0100)]
Fix coding style.

8 years agoMerge branch 'tigerlines' of /home/markus/Nominatim into tiger
Markus Gail [Mon, 21 Mar 2016 13:26:39 +0000 (14:26 +0100)]
Merge branch 'tigerlines' of /home/markus/Nominatim into tiger

Conflicts:
lib/Geocode.php
lib/ReverseGeocode.php
lib/lib.php

8 years agoadapt to code style conventions
Markus Gail [Mon, 21 Mar 2016 11:42:38 +0000 (12:42 +0100)]
adapt to code style conventions

8 years agoadd osm_type='tiger' to json, jsonv2 and xml output
Markus Gail [Thu, 17 Mar 2016 15:34:10 +0000 (16:34 +0100)]
add osm_type='tiger' to json, jsonv2 and xml output

8 years agoRemoved unnecessary test for tiger.
Markus Gail [Thu, 17 Mar 2016 14:14:51 +0000 (15:14 +0100)]
Removed unnecessary test for tiger.

8 years agoRemoved some files for the commit.
Markus Gail [Thu, 17 Mar 2016 13:55:40 +0000 (14:55 +0100)]
Removed some files for the commit.

8 years agoTested Version of new Tiger line storage format.
Markus Gail [Thu, 17 Mar 2016 13:21:17 +0000 (14:21 +0100)]
Tested Version of new Tiger line storage format.

8 years agoImplement geocoding and reverse geocoding with tiger interpolation lines instead...
Markus Gail [Thu, 10 Mar 2016 15:22:39 +0000 (16:22 +0100)]
Implement geocoding and reverse geocoding with tiger interpolation lines instead of points.

8 years agochange tiger housenumber format to save as lines instead of points and thus new inter...
Markus Gail [Mon, 7 Mar 2016 10:07:33 +0000 (11:07 +0100)]
change tiger housenumber format to save as lines instead of points and thus new interpolation

8 years agoadapt to code style conventions
Markus Gail [Mon, 21 Mar 2016 11:42:38 +0000 (12:42 +0100)]
adapt to code style conventions

8 years agoadd osm_type='tiger' to json, jsonv2 and xml output
Markus Gail [Thu, 17 Mar 2016 15:34:10 +0000 (16:34 +0100)]
add osm_type='tiger' to json, jsonv2 and xml output

8 years agoRemoved unnecessary test for tiger.
Markus Gail [Thu, 17 Mar 2016 14:14:51 +0000 (15:14 +0100)]
Removed unnecessary test for tiger.

8 years agoRemoved some files for the commit.
Markus Gail [Thu, 17 Mar 2016 13:55:40 +0000 (14:55 +0100)]
Removed some files for the commit.

8 years agoTested Version of new Tiger line storage format.
Markus Gail [Thu, 17 Mar 2016 13:21:17 +0000 (14:21 +0100)]
Tested Version of new Tiger line storage format.

8 years agoImplement geocoding and reverse geocoding with tiger interpolation lines instead...
Markus Gail [Thu, 10 Mar 2016 15:22:39 +0000 (16:22 +0100)]
Implement geocoding and reverse geocoding with tiger interpolation lines instead of points.

8 years agochange tiger housenumber format to save as lines instead of points and thus new inter...
Markus Gail [Mon, 7 Mar 2016 10:07:33 +0000 (11:07 +0100)]
change tiger housenumber format to save as lines instead of points and thus new interpolation

8 years agoquery the last updated timestamp only if output format is HTML
marc tobias [Wed, 2 Mar 2016 00:22:19 +0000 (01:22 +0100)]
query the last updated timestamp only if output format is HTML

8 years agocorrected layout of keywords on HTML details page
marc tobias [Tue, 1 Mar 2016 23:53:56 +0000 (00:53 +0100)]
corrected layout of keywords on HTML details page

8 years agomoved bIncludePolygonAsPoints related logic into lib.php, added tests
Marc Tobias Metten [Sun, 28 Feb 2016 16:08:20 +0000 (17:08 +0100)]
moved bIncludePolygonAsPoints related logic into lib.php, added tests

8 years agomoved bIncludePolygonAsPoints related logic into lib.php, added tests
Marc Tobias Metten [Sun, 28 Feb 2016 16:06:52 +0000 (17:06 +0100)]
moved bIncludePolygonAsPoints related logic into lib.php, added tests

8 years agoupdate osm2pgsql (WITH_LUA switch)
Sarah Hoffmann [Wed, 16 Mar 2016 19:05:52 +0000 (20:05 +0100)]
update osm2pgsql (WITH_LUA switch)

8 years agofix path for website installations
Sarah Hoffmann [Wed, 16 Mar 2016 19:02:09 +0000 (20:02 +0100)]
fix path for website installations

8 years agofix nominatim paths
Sarah Hoffmann [Wed, 16 Mar 2016 18:56:10 +0000 (19:56 +0100)]
fix nominatim paths

8 years agoMerge branch 'cmake-port' into master
Sarah Hoffmann [Wed, 16 Mar 2016 18:45:18 +0000 (19:45 +0100)]
Merge branch 'cmake-port' into master

Conflicts:
CMakeLists.txt
lib/init.php
settings/settings.php

8 years agoMerge pull request #381 from lonvia/cmake-port
Sarah Hoffmann [Sun, 13 Mar 2016 20:40:38 +0000 (21:40 +0100)]
Merge pull request #381 from lonvia/cmake-port

Replace autotools with cmake and update osm2pgsql

8 years agoMerge pull request #395 from mtmail/php7-support
Sarah Hoffmann [Sun, 13 Mar 2016 20:38:57 +0000 (21:38 +0100)]
Merge pull request #395 from mtmail/php7-support

fix for PHP7, added test setup

8 years agoMerge pull request #396 from mtmail/fix-array-merge-warning
Sarah Hoffmann [Sun, 13 Mar 2016 20:37:40 +0000 (21:37 +0100)]
Merge pull request #396 from mtmail/fix-array-merge-warning

second argument of array_merge can be empty

8 years agosecond argument of array_merge can be empty
Marc Tobias Metten [Sun, 13 Mar 2016 02:01:19 +0000 (03:01 +0100)]
second argument of array_merge can be empty

8 years agofix for PHP7, added test setup
Marc Tobias Metten [Sun, 13 Mar 2016 01:06:46 +0000 (02:06 +0100)]
fix for PHP7, added test setup

8 years agoinstall executables and call settings.php explicitly
Sarah Hoffmann [Tue, 8 Mar 2016 23:07:46 +0000 (00:07 +0100)]
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.

8 years agoenable test execution using ctest
Sarah Hoffmann [Mon, 29 Feb 2016 22:45:30 +0000 (23:45 +0100)]
enable test execution using ctest

8 years agoadapt README and vagrant scripts to cmake
Sarah Hoffmann [Mon, 29 Feb 2016 21:26:22 +0000 (22:26 +0100)]
adapt README and vagrant scripts to cmake

8 years agouse external makefile for pgxs with cmake
Sarah Hoffmann [Mon, 29 Feb 2016 20:46:24 +0000 (21:46 +0100)]
use external makefile for pgxs with cmake

8 years agointroduce InstallPath, so that stuff can be executed from build dir
Sarah Hoffmann [Sun, 28 Feb 2016 15:42:24 +0000 (16:42 +0100)]
introduce InstallPath, so that stuff can be executed from build dir

8 years agoadd actual cmake file
Sarah Hoffmann [Sat, 27 Feb 2016 18:06:32 +0000 (19:06 +0100)]
add actual cmake file

8 years agomove from autotools to cmake and update osm2pgsql
Sarah Hoffmann [Sat, 27 Feb 2016 16:10:05 +0000 (17:10 +0100)]
move from autotools to cmake and update osm2pgsql

8 years agoMerge pull request #389 from mtmail/reverse-geocode-include-geometry2
Sarah Hoffmann [Wed, 9 Mar 2016 22:16:51 +0000 (23:16 +0100)]
Merge pull request #389 from mtmail/reverse-geocode-include-geometry2

Reverse geocode include geometry (v2)

8 years agoReverse geocode include geometry - added bounding box tests
Marc Tobias Metten [Wed, 9 Mar 2016 18:43:03 +0000 (19:43 +0100)]
Reverse geocode include geometry - added bounding box tests

8 years agoReverse geocode include geometry
Marc Tobias Metten [Fri, 4 Mar 2016 19:29:09 +0000 (20:29 +0100)]
Reverse geocode include geometry

8 years agoMerge remote-tracking branch 'upstream/master'
Marc Tobias Metten [Fri, 4 Mar 2016 14:42:29 +0000 (15:42 +0100)]
Merge remote-tracking branch 'upstream/master'

8 years agoMerge pull request #385 from mtmail/query-lastupdated-only-for-html-output
Sarah Hoffmann [Wed, 2 Mar 2016 20:36:34 +0000 (21:36 +0100)]
Merge pull request #385 from mtmail/query-lastupdated-only-for-html-output

query the last updated timestamp only if output format is HTML

8 years agoMerge pull request #384 from mtmail/detail-page-name-keywords-with-wordids
Sarah Hoffmann [Wed, 2 Mar 2016 20:34:42 +0000 (21:34 +0100)]
Merge pull request #384 from mtmail/detail-page-name-keywords-with-wordids

corrected layout of keywords on HTML details page

8 years agoMerge branch 'master' of https://github.com/mtmail/Nominatim
Marc Tobias Metten [Wed, 2 Mar 2016 14:07:22 +0000 (15:07 +0100)]
Merge branch 'master' of https://github.com/mtmail/Nominatim

8 years agoquery the last updated timestamp only if output format is HTML
marc tobias [Wed, 2 Mar 2016 00:22:19 +0000 (01:22 +0100)]
query the last updated timestamp only if output format is HTML

8 years agocorrected layout of keywords on HTML details page
marc tobias [Tue, 1 Mar 2016 23:53:56 +0000 (00:53 +0100)]
corrected layout of keywords on HTML details page

8 years agoenable test execution using ctest
Sarah Hoffmann [Mon, 29 Feb 2016 22:45:30 +0000 (23:45 +0100)]
enable test execution using ctest

8 years agoadapt README and vagrant scripts to cmake
Sarah Hoffmann [Mon, 29 Feb 2016 21:26:22 +0000 (22:26 +0100)]
adapt README and vagrant scripts to cmake

8 years agouse external makefile for pgxs with cmake
Sarah Hoffmann [Mon, 29 Feb 2016 20:46:24 +0000 (21:46 +0100)]
use external makefile for pgxs with cmake

8 years agointroduce InstallPath, so that stuff can be executed from build dir
Sarah Hoffmann [Sun, 28 Feb 2016 15:42:24 +0000 (16:42 +0100)]
introduce InstallPath, so that stuff can be executed from build dir

8 years agoadd actual cmake file
Sarah Hoffmann [Sat, 27 Feb 2016 18:06:32 +0000 (19:06 +0100)]
add actual cmake file