]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 23 Apr 2017 11:35:12 +0000 (13:35 +0200)]
Merge remote-tracking branch 'upstream/master'

7 years agoupdate osm2pgsql (geometry fix, column reordering)
Sarah Hoffmann [Sat, 22 Apr 2017 16:16:22 +0000 (18:16 +0200)]
update osm2pgsql (geometry fix, column reordering)

7 years agoMerge branch 'roques-tetris'
Sarah Hoffmann [Sat, 22 Apr 2017 16:14:05 +0000 (18:14 +0200)]
Merge branch 'roques-tetris'

7 years agoMerge pull request #708 from lonvia/check-for-invalid-geoms
Sarah Hoffmann [Sat, 22 Apr 2017 16:12:18 +0000 (18:12 +0200)]
Merge pull request #708 from lonvia/check-for-invalid-geoms

make sure no invalid geometries end up in placex

7 years agomake sure no invalid geometries end up in placex
Sarah Hoffmann [Sat, 22 Apr 2017 08:34:03 +0000 (10:34 +0200)]
make sure no invalid geometries end up in placex

7 years agoMerge branch 'tetris' of https://github.com/roques/Nominatim into roques-tetris
Sarah Hoffmann [Thu, 20 Apr 2017 18:56:44 +0000 (20:56 +0200)]
Merge branch 'tetris' of https://github.com/roques/Nominatim into roques-tetris

7 years agouse SMALLINT for ranks and partition; reorder columns for alignment
Christian von Roques [Fri, 14 Apr 2017 13:57:09 +0000 (15:57 +0200)]
use SMALLINT for ranks and partition; reorder columns for alignment

7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Tue, 18 Apr 2017 20:45:34 +0000 (22:45 +0200)]
Merge remote-tracking branch 'upstream/master'

7 years agofix typo
Sarah Hoffmann [Tue, 18 Apr 2017 20:44:39 +0000 (22:44 +0200)]
fix typo

7 years agoget pg error on correct connection
Sarah Hoffmann [Tue, 18 Apr 2017 20:29:21 +0000 (22:29 +0200)]
get pg error on correct connection

7 years agosend address interpolation import to correct postgres conn
Sarah Hoffmann [Tue, 18 Apr 2017 20:11:58 +0000 (22:11 +0200)]
send address interpolation import to correct postgres conn

7 years agoalso use address column for word count computation
Sarah Hoffmann [Tue, 18 Apr 2017 20:11:09 +0000 (22:11 +0200)]
also use address column for word count computation

7 years agoexplicitly name columns at INSERT
Christian von Roques [Fri, 14 Apr 2017 13:50:27 +0000 (15:50 +0200)]
explicitly name columns at INSERT

7 years agodeduplicate words: do not look for duplicates in empty partitions
Christian von Roques [Tue, 4 Apr 2017 17:00:36 +0000 (19:00 +0200)]
deduplicate words: do not look for duplicates in empty partitions

7 years agoupdate: getPostgresVersion requires a database connection
Christian von Roques [Tue, 4 Apr 2017 16:09:28 +0000 (18:09 +0200)]
update: getPostgresVersion requires a database connection

7 years agowith PHP7 the result of new() can no longer be assigned by reference
Christian von Roques [Sun, 2 Apr 2017 16:03:17 +0000 (18:03 +0200)]
with PHP7 the result of new() can no longer be assigned by reference

7 years agocorrect warm.php --search-only help text
Christian von Roques [Sun, 2 Apr 2017 15:13:43 +0000 (17:13 +0200)]
correct warm.php --search-only help text

7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Thu, 13 Apr 2017 20:26:35 +0000 (22:26 +0200)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge pull request #700 from lonvia/structured-address-info
Sarah Hoffmann [Thu, 13 Apr 2017 20:12:19 +0000 (22:12 +0200)]
Merge pull request #700 from lonvia/structured-address-info

Move address information into hstore column

7 years agoupdate osm2pgsql (structured addresses and new libosmium)
Sarah Hoffmann [Tue, 11 Apr 2017 19:29:10 +0000 (21:29 +0200)]
update osm2pgsql (structured addresses and new libosmium)

7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 9 Apr 2017 21:16:11 +0000 (23:16 +0200)]
Merge remote-tracking branch 'upstream/master'

7 years agouse centroid for near feature search on rank 30
Sarah Hoffmann [Sun, 9 Apr 2017 21:12:35 +0000 (23:12 +0200)]
use centroid for near feature search on rank 30

Rank 30 has some very large geometries (peninsulas, time zones,
etc.) for which a near feature search for the full geometry is
too expensive, so do the search on the centroid only.

7 years agofix operator precedence for hstore
Sarah Hoffmann [Sun, 9 Apr 2017 08:06:31 +0000 (10:06 +0200)]
fix operator precedence for hstore

7 years agoremove street and addr_place columns in placex
Sarah Hoffmann [Wed, 5 Apr 2017 20:19:42 +0000 (22:19 +0200)]
remove street and addr_place columns in placex

The information is onyl needed for parenting,
so no need to store it permanently.

7 years agoRemove street and addr_place from location_property_osmline
Sarah Hoffmann [Sun, 2 Apr 2017 13:19:39 +0000 (15:19 +0200)]
Remove street and addr_place from location_property_osmline

Derived columns are not needed because parent information is
always computed from scratch. So the columns are just duplicate
information.

Also get address information on nodes from address columns. The
other columns are not necessarily reliable when the node have not
been indexed yet.

7 years agoadapt more BDD tests to hstore
Sarah Hoffmann [Thu, 30 Mar 2017 19:57:34 +0000 (21:57 +0200)]
adapt more BDD tests to hstore

7 years agofix DB bd tests for address hstore
Sarah Hoffmann [Sun, 26 Mar 2017 19:19:52 +0000 (21:19 +0200)]
fix DB bd tests for address hstore

7 years agoadapt osm2pgsql tests for new address column
Sarah Hoffmann [Sat, 25 Mar 2017 22:12:51 +0000 (23:12 +0100)]
adapt osm2pgsql tests for new address column

7 years agointroduce address column for place tables
Sarah Hoffmann [Sat, 25 Mar 2017 22:11:09 +0000 (23:11 +0100)]
introduce address column for place tables

The column is a hstore containing the full OSM tag with key and
value.

7 years agoabort osmline update correctly when way nodes are missing
Sarah Hoffmann [Thu, 30 Mar 2017 20:14:47 +0000 (22:14 +0200)]
abort osmline update correctly when way nodes are missing

Fixes #695.

7 years agoMerge pull request #690 from ImreSamu/fix_install_sql_warnings
Sarah Hoffmann [Mon, 27 Mar 2017 20:41:52 +0000 (22:41 +0200)]
Merge pull request #690 from ImreSamu/fix_install_sql_warnings

fix table/sequence ... does not exist

7 years agofix sql warnings
ImreSamu [Sun, 26 Mar 2017 23:02:29 +0000 (01:02 +0200)]
fix sql warnings
* ERROR:  sequence "seq_postcodes" does not exist
* ERROR:  table "import_polygon_error" does not exist
* ERROR:  table "import_polygon_delete" does not exist
* ERROR:  sequence "file" does not exist

7 years agoMerge pull request #683 from lonvia/more-url-function
Sarah Hoffmann [Thu, 23 Mar 2017 17:25:09 +0000 (18:25 +0100)]
Merge pull request #683 from lonvia/more-url-function

Factor out moreurl computation

7 years agomove moreURL computation into Geocode and include all params
Sarah Hoffmann [Wed, 22 Mar 2017 23:16:58 +0000 (00:16 +0100)]
move moreURL computation into Geocode and include all params

Fixes #678.

7 years agoremove unused code
Sarah Hoffmann [Wed, 22 Mar 2017 22:02:19 +0000 (23:02 +0100)]
remove unused code

7 years agoMerge pull request #682 from mtmail/update-docs
Sarah Hoffmann [Tue, 21 Mar 2017 19:54:52 +0000 (20:54 +0100)]
Merge pull request #682 from mtmail/update-docs

update docs/*.md based on vagrant/*.sh

7 years agoupdate docs/*.md based on vagrant/*.sh
marc tobias [Tue, 21 Mar 2017 12:16:29 +0000 (13:16 +0100)]
update docs/*.md based on vagrant/*.sh

7 years agoMerge pull request #680 from mtmail/git-submodule-hint
Sarah Hoffmann [Tue, 21 Mar 2017 11:44:10 +0000 (12:44 +0100)]
Merge pull request #680 from mtmail/git-submodule-hint

Update CMakeLists.txt

7 years agoUpdate CMakeLists.txt
mtmail [Tue, 21 Mar 2017 11:34:24 +0000 (12:34 +0100)]
Update CMakeLists.txt

Ran into the issue this morning.
`git submodules` => `git submodule`

7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 20 Mar 2017 19:42:09 +0000 (20:42 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge pull request #676 from mtmail/html-map-position-box-disappeared
Sarah Hoffmann [Mon, 20 Mar 2017 19:19:41 +0000 (20:19 +0100)]
Merge pull request #676 from mtmail/html-map-position-box-disappeared

On /search.php the map-position box disappeared behind the map tiles

7 years agoMerge pull request #674 from mtmail/leaflet-image-path-changed
Sarah Hoffmann [Mon, 20 Mar 2017 19:18:29 +0000 (20:18 +0100)]
Merge pull request #674 from mtmail/leaflet-image-path-changed

leaflet 1.0 changed the path of the marker icon

7 years agoOn /search.php the map-position box disappeared behind the map tiles
marc tobias [Mon, 20 Mar 2017 14:38:12 +0000 (15:38 +0100)]
On /search.php the map-position box disappeared behind the map tiles

7 years agoleaflet 1.0 changed the path of the marker icon
marc tobias [Mon, 20 Mar 2017 11:27:48 +0000 (12:27 +0100)]
leaflet 1.0 changed the path of the marker icon

7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 19 Mar 2017 22:06:06 +0000 (23:06 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge pull request #671 from mtmail/html-view-use-geojson-geometries
Sarah Hoffmann [Sun, 19 Mar 2017 21:53:22 +0000 (22:53 +0100)]
Merge pull request #671 from mtmail/html-view-use-geojson-geometries

Html view use geojson geometries

7 years agoupdate leaflet CSS file as well. Fixes delayed layer animation
Marc Tobias Metten [Sun, 19 Mar 2017 21:38:23 +0000 (22:38 +0100)]
update leaflet CSS file as well. Fixes delayed layer animation

7 years agoMerge pull request #669 from lonvia/address-part-on-intersect
Sarah Hoffmann [Sun, 19 Mar 2017 20:50:45 +0000 (21:50 +0100)]
Merge pull request #669 from lonvia/address-part-on-intersect

Add all intersecting boundaries to address list for roads

7 years agofor search,details in format=HTML return geometry in geojson, not wkt. No longer...
Marc Tobias Metten [Sun, 19 Mar 2017 16:31:00 +0000 (17:31 +0100)]
for search,details in format=HTML return geometry in geojson, not wkt. No longer need leaflet-omnivore plugin

7 years agoupdate leaflet.js 0.7.7 => 1.0.3
Marc Tobias Metten [Sun, 19 Mar 2017 14:53:52 +0000 (15:53 +0100)]
update leaflet.js 0.7.7 => 1.0.3

7 years agoremove obsolete openlayers theme files
Marc Tobias Metten [Sun, 19 Mar 2017 14:50:00 +0000 (15:50 +0100)]
remove obsolete openlayers theme files

7 years agofor roads add all intersecting boundaries to address list
Sarah Hoffmann [Sat, 18 Mar 2017 11:17:48 +0000 (12:17 +0100)]
for roads add all intersecting boundaries to address list

When roads cross boundaries, both administrative entities should
be added to the address list, so that both entities can be used
for searching. Also allows in a second step to better sort out
addresses of POIs on such roads.

Fixes #121.

7 years agoMerge pull request #667 from lonvia/refactor-nearpoint
Sarah Hoffmann [Sat, 18 Mar 2017 08:25:07 +0000 (09:25 +0100)]
Merge pull request #667 from lonvia/refactor-nearpoint

Factor out near point into class

7 years agoMerge pull request #668 from lonvia/warn-on-missing-osm2pgsql
Sarah Hoffmann [Sat, 18 Mar 2017 08:24:47 +0000 (09:24 +0100)]
Merge pull request #668 from lonvia/warn-on-missing-osm2pgsql

cmake: add a more explicit hint when osm2pgsql is missing

7 years agocmake: add a more explicit hint when osm2pgsql is missing
Sarah Hoffmann [Fri, 17 Mar 2017 22:05:06 +0000 (23:05 +0100)]
cmake: add a more explicit hint when osm2pgsql is missing

Fixes #642.

7 years agofix style
Sarah Hoffmann [Fri, 17 Mar 2017 21:36:22 +0000 (22:36 +0100)]
fix style

7 years agoMerge pull request #665 from openstreetmap/lonvia-patch-1
Sarah Hoffmann [Fri, 17 Mar 2017 21:08:01 +0000 (22:08 +0100)]
Merge pull request #665 from openstreetmap/lonvia-patch-1

add unzip tool to requirements for Tiger imports

7 years agoadd tests for nearpoint sql functions
Sarah Hoffmann [Thu, 16 Mar 2017 21:12:20 +0000 (22:12 +0100)]
add tests for nearpoint sql functions

7 years agouse NearPoint class in Search array
Sarah Hoffmann [Thu, 16 Mar 2017 21:04:30 +0000 (22:04 +0100)]
use NearPoint class in Search array

7 years agoadapt unit tests for new NearPoint type
Sarah Hoffmann [Wed, 15 Mar 2017 22:58:51 +0000 (23:58 +0100)]
adapt unit tests for new NearPoint type

7 years agomake NearPoint its own class
Sarah Hoffmann [Wed, 15 Mar 2017 19:43:08 +0000 (20:43 +0100)]
make NearPoint its own class

7 years agoadd unzip tool to requirements for Tiger imports
Sarah Hoffmann [Wed, 15 Mar 2017 19:41:21 +0000 (20:41 +0100)]
add unzip tool to requirements for Tiger imports

Fixes #663

7 years agoMerge pull request #661 from mtmail/travis-ci-badge
Sarah Hoffmann [Sun, 12 Mar 2017 13:00:11 +0000 (14:00 +0100)]
Merge pull request #661 from mtmail/travis-ci-badge

add travis-ci badge ("build passing") to README file

7 years agoMerge pull request #660 from mtmail/new-github-URL
Sarah Hoffmann [Sun, 12 Mar 2017 12:59:11 +0000 (13:59 +0100)]
Merge pull request #660 from mtmail/new-github-URL

github.com/twain47 => github.com/openstreetmap

7 years agoadd travis-ci badge ("build passing") to README file
marc tobias [Sun, 12 Mar 2017 12:11:56 +0000 (13:11 +0100)]
add travis-ci badge ("build passing") to README file

7 years agogithub.com/twain47 => github.com/openstreetmap
marc tobias [Sun, 12 Mar 2017 12:06:25 +0000 (13:06 +0100)]
github.com/twain47 => github.com/openstreetmap

7 years agoMerge pull request #659 from lonvia/full-indexing-in-tests
Sarah Hoffmann [Sat, 11 Mar 2017 16:38:46 +0000 (17:38 +0100)]
Merge pull request #659 from lonvia/full-indexing-in-tests

Fix travis tests and update CONTRIBUTING.md

7 years agoadapt CONTRIBUTING.md to new test locations and tools
Sarah Hoffmann [Sat, 11 Mar 2017 16:13:24 +0000 (17:13 +0100)]
adapt CONTRIBUTING.md to new test locations and tools

7 years agotest: rerun indexing after updates until really all is done
Sarah Hoffmann [Sat, 11 Mar 2017 16:09:14 +0000 (17:09 +0100)]
test: rerun indexing after updates until really all is done

There are caess where indexing needs to be done a second round
because related objects need to be updated.

7 years agoMerge pull request #656 from EdwardBetts/master
mtmail [Wed, 8 Mar 2017 15:36:40 +0000 (16:36 +0100)]
Merge pull request #656 from EdwardBetts/master

correct spelling mistakes

7 years agocorrect spelling mistakes
Edward Betts [Wed, 8 Mar 2017 15:06:50 +0000 (15:06 +0000)]
correct spelling mistakes

7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Tue, 28 Feb 2017 20:41:38 +0000 (21:41 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agoinclude housenumbers and postcodes when rechecking for exact matches
Sarah Hoffmann [Tue, 28 Feb 2017 20:40:05 +0000 (21:40 +0100)]
include housenumbers and postcodes when rechecking for exact matches

7 years agoMerge pull request #649 from ldgeo/master
mtmail [Tue, 28 Feb 2017 16:18:12 +0000 (17:18 +0100)]
Merge pull request #649 from ldgeo/master

UI: Extra HTML headers for compatibility on MSIE>8

7 years agoextra headers for compatibility on IE7
Ludovic Delauné [Tue, 28 Feb 2017 15:57:58 +0000 (16:57 +0100)]
extra headers for compatibility on IE7

7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Mon, 27 Feb 2017 21:30:54 +0000 (22:30 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agomake sure the flatnode file is disabled while testing
Sarah Hoffmann [Mon, 27 Feb 2017 21:01:06 +0000 (22:01 +0100)]
make sure the flatnode file is disabled while testing

7 years agoadd behave settings
Sarah Hoffmann [Sun, 26 Feb 2017 15:45:35 +0000 (16:45 +0100)]
add behave settings

removes @Fail tests

7 years agofix geometry creation from scene
Sarah Hoffmann [Sun, 26 Feb 2017 15:40:51 +0000 (16:40 +0100)]
fix geometry creation from scene

7 years agoadd more interpolation update scenarios (currently failing)
Sarah Hoffmann [Sun, 26 Feb 2017 12:41:37 +0000 (13:41 +0100)]
add more interpolation update scenarios (currently failing)

7 years agotest: enable grid support for DB tests
Sarah Hoffmann [Sun, 26 Feb 2017 12:05:36 +0000 (13:05 +0100)]
test: enable grid support for DB tests

7 years agomove interpolaton computation into indexing step
Sarah Hoffmann [Sun, 26 Feb 2017 11:58:07 +0000 (12:58 +0100)]
move interpolaton computation into indexing step

The interpolaton computation needs information from the osm2pgsql
slim tables which may not be available when the data is inserted.

Insertion now only adds a line with basic address information to
location_property_osmline. The line is then split during the
indexing, leading to more lines (which are complete in that case)
being inserted.

Fixes #598.

7 years agoadd node grids for tests and test for interpolation update
Sarah Hoffmann [Mon, 9 Jan 2017 19:41:57 +0000 (20:41 +0100)]
add node grids for tests and test for interpolation update

7 years agoMerge pull request #644 from ldgeo/master
Sarah Hoffmann [Sat, 25 Feb 2017 08:45:35 +0000 (09:45 +0100)]
Merge pull request #644 from ldgeo/master

fix compilation error (cannot find -lpq)

7 years agofix compilation error (cannot find -lpq)
Ludovic Delauné [Thu, 23 Feb 2017 09:17:25 +0000 (10:17 +0100)]
fix compilation error (cannot find -lpq)

7 years agoSet osmosis if available
Melvyn Sopacua [Fri, 17 Feb 2017 16:00:15 +0000 (17:00 +0100)]
Set osmosis if available

7 years agoadd Kosovo to list of country names
Sarah Hoffmann [Sat, 18 Feb 2017 14:59:01 +0000 (15:59 +0100)]
add Kosovo to list of country names

Kosovo will remain in the same partition as Serbia to not disrupt
existing databases.

7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sat, 18 Feb 2017 12:54:49 +0000 (13:54 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agodon't delete names on unknown country boundaries
Sarah Hoffmann [Sat, 18 Feb 2017 12:51:21 +0000 (13:51 +0100)]
don't delete names on unknown country boundaries

If a country boundary has a country_code that is unknown to
Nominatim, it would delete all names because the coalascing
with country_name would not yield any result.

7 years agoMerge pull request #632 from melvyn-sopacua/libxml2-fixes
Sarah Hoffmann [Wed, 15 Feb 2017 20:31:42 +0000 (21:31 +0100)]
Merge pull request #632 from melvyn-sopacua/libxml2-fixes

Fix warnings:

7 years agoFix warnings:
Melvyn Sopacua [Tue, 14 Feb 2017 17:38:50 +0000 (18:38 +0100)]
Fix warnings:

- be consistent with (const char *) casts when assigning
- use xmlStrlen instead of strlen when dealing with xmlChar *

7 years agoMerge pull request #630 from lonvia/cascading-make
Sarah Hoffmann [Wed, 15 Feb 2017 08:55:26 +0000 (09:55 +0100)]
Merge pull request #630 from lonvia/cascading-make

use properly cascading make for external make file

7 years agouse properly cascading make for external make file
Sarah Hoffmann [Mon, 13 Feb 2017 20:02:49 +0000 (21:02 +0100)]
use properly cascading make for external make file

If make is called directly then the -j option is not
properly propagated. Instead make gives a warning
'No jobserver avilable'.

7 years agoMerge pull request #629 from melvyn-sopacua/release-2.6.0a1
Sarah Hoffmann [Mon, 13 Feb 2017 19:51:00 +0000 (20:51 +0100)]
Merge pull request #629 from melvyn-sopacua/release-2.6.0a1

Build fixes for BSD-like systems

7 years agoUse CMAKE_MAKE_PROGRAM instead of hardcoded make
Melvyn Sopacua [Mon, 13 Feb 2017 13:33:14 +0000 (14:33 +0100)]
Use CMAKE_MAKE_PROGRAM instead of hardcoded make

FreeBSD uses `gmake` instead of `make` if GNU make is required to build
a port.

7 years agoBSD compat: use sys/endian.h if available
Melvyn Sopacua [Mon, 13 Feb 2017 13:30:48 +0000 (14:30 +0100)]
BSD compat: use sys/endian.h if available

<byteswap.h> is a linuxism. On BSD-like systems this is <sys/endian.h>

7 years agoMerge pull request #626 from rory/patch-1
Sarah Hoffmann [Tue, 7 Feb 2017 22:32:37 +0000 (23:32 +0100)]
Merge pull request #626 from rory/patch-1

Syntax improvements

7 years agoSyntax improvements
Rory McCann [Tue, 7 Feb 2017 13:57:54 +0000 (14:57 +0100)]
Syntax improvements

use backticks for more fixed-width type things

7 years agoreverse: choose interpolation only when further than point
Sarah Hoffmann [Sun, 5 Feb 2017 22:02:21 +0000 (23:02 +0100)]
reverse: choose interpolation only when further than point

The ST_DWithin check also includes objects that are the same distance.

Another attempt at #545.

7 years agoMerge remote-tracking branch 'upstream/master'
Sarah Hoffmann [Sun, 5 Feb 2017 12:10:32 +0000 (13:10 +0100)]
Merge remote-tracking branch 'upstream/master'