]> git.openstreetmap.org Git - nominatim.git/log
nominatim.git
12 years agofail on error
Sarah Hoffmann [Mon, 30 Jul 2012 22:31:38 +0000 (00:31 +0200)]
fail on error

- stop indexing if there is any other error than deadlock from the DB
- stop import if osm2pgsql or indexing fails

12 years agosend place_rank in jsonv2 format
Sarah Hoffmann [Mon, 23 Jul 2012 21:34:13 +0000 (23:34 +0200)]
send place_rank in jsonv2 format

12 years agoMerge branch 'patch-1' of https://github.com/Firefishy/Nominatim
Sarah Hoffmann [Sun, 22 Jul 2012 07:02:55 +0000 (09:02 +0200)]
Merge branch 'patch-1' of https://github.com/Firefishy/Nominatim

12 years agoFix repeating lat twice in span instead of lat, lon.
Grant [Sun, 22 Jul 2012 02:45:45 +0000 (04:45 +0200)]
Fix repeating lat twice in span instead of lat, lon.

12 years agoMerge remote-tracking branch 'lonvia/address-order'
Sarah Hoffmann [Fri, 20 Jul 2012 22:53:53 +0000 (00:53 +0200)]
Merge remote-tracking branch 'lonvia/address-order'

12 years agoadapt distance heuristics for nodes
Sarah Hoffmann [Fri, 20 Jul 2012 22:41:18 +0000 (00:41 +0200)]
adapt distance heuristics for nodes

Include only those nodes that are closer than 1.5 times the distance
of the closest feature of the same address rank.

12 years agogracefully fail if nodes from an address interpolation are missing
Sarah Hoffmann [Fri, 13 Jul 2012 20:33:09 +0000 (22:33 +0200)]
gracefully fail if nodes from an address interpolation are missing

12 years agoFix more typos
Daniele Forsi [Tue, 10 Jul 2012 13:36:17 +0000 (15:36 +0200)]
Fix more typos

12 years agoFix typos found with codespell in comments
Daniele Forsi [Tue, 10 Jul 2012 13:31:01 +0000 (15:31 +0200)]
Fix typos found with codespell in comments

12 years agoFix typos in function name
Daniele Forsi [Mon, 9 Jul 2012 17:07:09 +0000 (19:07 +0200)]
Fix typos in function name

perl -p -e s/getPrefferedLangauges/getPreferredLanguages/ -i */*.php

12 years agoFix wrong variable used with PEAR::IsError()
Daniele Forsi [Mon, 9 Jul 2012 16:16:54 +0000 (18:16 +0200)]
Fix wrong variable used with PEAR::IsError()

Fixes:
PHP Fatal error:  Cannot use object of type DB_Error as array in /home/daniele/Programmazione/OSM/Nominatim/website/reverse.php on line 104

12 years agoexcluded place nodes outside parent boundaries from addresses
Sarah Hoffmann [Tue, 3 Jul 2012 20:44:06 +0000 (22:44 +0200)]
excluded place nodes outside parent boundaries from addresses

Changes slightly the logic which decides if a guessed places
(i.e. a place node) is included in an address: it will be
part of the address only if it is inside the next lower
available boundary. This fixes problematic cases where
neighbouring entities have additional admin levels.

12 years agoput libraries in right place when linking
Sarah Hoffmann [Tue, 3 Jul 2012 13:09:00 +0000 (16:09 +0300)]
put libraries in right place when linking

12 years agouse json_encode in search stuff as well
Sarah Hoffmann [Sun, 1 Jul 2012 15:24:27 +0000 (17:24 +0200)]
use json_encode in search stuff as well

remove JSON_UNESCAPED_UNICODE, supported only by php >=5.3.3 and
clients should be able to handle the escaping

12 years agomore generalized javascript_renderData
Sarah Hoffmann [Sun, 1 Jul 2012 11:19:59 +0000 (13:19 +0200)]
more generalized javascript_renderData

- handles json/jsonp transparently (avoiding code duplication in templates)
- use php's internal json_encode functions (with JSON_UNESCAPED_UNICODE
  for backward compatibility)
- be more liberal with what is allowed as a callback identifier
- return a 400 for illegal callbacks
- return application/javascript type when jsonp is requested

fixes #16, fixes #17

12 years agomake sure invalid geometries are always deleted from place
Sarah Hoffmann [Fri, 29 Jun 2012 20:11:40 +0000 (22:11 +0200)]
make sure invalid geometries are always deleted from place

This solves a bug with updating large invalid geometries. These
geometries have an entry in place but not in placex. Thus, place_insert
tries to delete the place entry and reinsert it on update. Deletion would
fail because self-intersecting polygons still have an area and large
areas are not deleted.

12 years agobe less verbose
Sarah Hoffmann [Thu, 28 Jun 2012 20:09:44 +0000 (22:09 +0200)]
be less verbose

12 years agoignore railways, tunnels and bridges when reverse geocoding
Sarah Hoffmann [Thu, 28 Jun 2012 18:39:18 +0000 (20:39 +0200)]
ignore railways, tunnels and bridges when reverse geocoding

12 years agoMerge branch 'configure' of github.com:lonvia/Nominatim
Sarah Hoffmann [Wed, 27 Jun 2012 20:55:39 +0000 (22:55 +0200)]
Merge branch 'configure' of github.com:lonvia/Nominatim

12 years agoadd README stuff
Sarah Hoffmann [Wed, 27 Jun 2012 19:40:58 +0000 (21:40 +0200)]
add README stuff

12 years agoadd git commit version if applicable
Sarah Hoffmann [Tue, 26 Jun 2012 20:55:08 +0000 (22:55 +0200)]
add git commit version if applicable

12 years agoremove duplicate check for ZLIB
Sarah Hoffmann [Tue, 26 Jun 2012 20:19:04 +0000 (22:19 +0200)]
remove duplicate check for ZLIB

12 years agobe more strict with us state replacement hack
Sarah Hoffmann [Mon, 25 Jun 2012 06:46:14 +0000 (08:46 +0200)]
be more strict with us state replacement hack

replace il/al/la only if they are properly separated by a comma

12 years agoyet another autogenerated file removed
Sarah Hoffmann [Fri, 15 Jun 2012 23:38:27 +0000 (01:38 +0200)]
yet another autogenerated file removed

12 years agoremove autogenerated files
Sarah Hoffmann [Fri, 15 Jun 2012 23:36:13 +0000 (01:36 +0200)]
remove autogenerated files

12 years agocreate a globale configure/make
Sarah Hoffmann [Fri, 15 Jun 2012 23:25:16 +0000 (01:25 +0200)]
create a globale configure/make

- move the configure from nominatim out and add checks for all dependencies
- bring module under automake control
- add osm2pgsql as a submodule, configure and build with the others

12 years agosilently remove leading/trailing spaces
Sarah Hoffmann [Wed, 30 May 2012 20:19:49 +0000 (22:19 +0200)]
silently remove leading/trailing spaces

12 years agoavoid PHP notices
Sarah Hoffmann [Fri, 25 May 2012 21:45:59 +0000 (23:45 +0200)]
avoid PHP notices

12 years agoremove distinct, causes nearest feature results to be badly reordered
Sarah Hoffmann [Thu, 24 May 2012 20:47:34 +0000 (22:47 +0200)]
remove distinct, causes nearest feature results to be badly reordered

12 years agoUpdated reverse geocoding to improve handling of zoom=0
Brian Quinion [Thu, 24 May 2012 15:54:51 +0000 (16:54 +0100)]
Updated reverse geocoding to improve handling of zoom=0

12 years agoMerge branch 'master' of github.com:twain47/Nominatim
Brian Quinion [Wed, 23 May 2012 23:43:23 +0000 (01:43 +0200)]
Merge branch 'master' of github.com:twain47/Nominatim

12 years agotruncate road partition tables during load
Brian Quinion [Wed, 23 May 2012 23:42:59 +0000 (01:42 +0200)]
truncate road partition tables during load

12 years agomore verbose error messages
Sarah Hoffmann [Wed, 23 May 2012 22:26:16 +0000 (00:26 +0200)]
more verbose error messages

12 years agorename ambiguous variables to make postgresql 8.4 happy
Sarah Hoffmann [Wed, 23 May 2012 22:25:15 +0000 (00:25 +0200)]
rename ambiguous variables to make postgresql 8.4 happy

12 years agouse Overpass API by default to download OSM objects
Sarah Hoffmann [Tue, 22 May 2012 20:23:46 +0000 (22:23 +0200)]
use Overpass API by default to download OSM objects

12 years agomake index work and remove more hard-coded DB names
Sarah Hoffmann [Tue, 22 May 2012 19:05:31 +0000 (21:05 +0200)]
make index work and remove more hard-coded DB names

12 years agoeliminate php warning, remove setting aPipes (isn't used)
Datendelphin [Sat, 5 May 2012 08:56:31 +0000 (10:56 +0200)]
eliminate php warning, remove setting aPipes (isn't used)

12 years agomake .osc files with osmosis
Datendelphin [Fri, 20 Apr 2012 16:29:14 +0000 (18:29 +0200)]
make .osc files with osmosis

12 years agoMerge branch 'master' of github.com:twain47/Nominatim
Brian Quinion [Wed, 23 May 2012 17:26:01 +0000 (19:26 +0200)]
Merge branch 'master' of github.com:twain47/Nominatim

12 years agorevert to plain text dump for 8.4 compatibility (+ permissions fix)
Brian Quinion [Wed, 23 May 2012 17:25:43 +0000 (19:25 +0200)]
revert to plain text dump for 8.4 compatibility (+ permissions fix)

12 years agotypo
Sarah Hoffmann [Wed, 23 May 2012 17:15:15 +0000 (20:15 +0300)]
typo

12 years agocan't have a unique index on placex - only on place
Brian Quinion [Tue, 22 May 2012 18:25:18 +0000 (20:25 +0200)]
can't have a unique index on placex - only on place

12 years agofix broken field name / committed debug
Brian Quinion [Tue, 22 May 2012 18:21:58 +0000 (20:21 +0200)]
fix broken field name / committed debug

12 years agouse the new country data files
Brian Quinion [Tue, 22 May 2012 17:48:35 +0000 (19:48 +0200)]
use the new country data files

12 years agodeal with some indexing edge cases
Brian Quinion [Tue, 22 May 2012 17:43:49 +0000 (19:43 +0200)]
deal with some indexing edge cases

12 years agoMerge pull request #9 from andreek/master
Brian Quinion [Tue, 22 May 2012 17:34:04 +0000 (10:34 -0700)]
Merge pull request #9 from andreek/master

Postgis 2.0 compatibility
Seems to be compatible with all recent versions of postgis

12 years agoDB Scheme changes: alter table placex add column calculated_country_code varchar(2);
Brian Quinion [Tue, 22 May 2012 14:27:42 +0000 (16:27 +0200)]
DB Scheme changes: alter table placex add column calculated_country_code varchar(2);

function changes:
-----------------
Move to ST_PointOnSurface from ST_Centroid in various places to avoid looking up a point outside the polygon
Move to ST_Covers from ST_Contains to include points on admin boundaries
Re-order preference for get_country_code now our data is better. country_osm_grid is now the preffered source.
Fix code to calculate country code in placex_insert, rank_search test was too early
Add extra field to placex 'calculated_country_code' to improve structure of code
Move split_geometery function out of add_location into its own function
Rewrite split_geometery to be more efficient.
Change place_insert to do more updates and less delete/inserts (delete is slow)
Include wikipedia links in details.php ouput
Cleanup no longer used geometry validation (adding overhead)
Include debug statements in function.sql (--DEBUG: ) and add flag to setup.php to turn them on

setup.php:
----------
add flag --disable-token-precalc to speed up debuging
add flag --index-noanalyse to disable analysising DB at rank 4 and 26 (previously removed, but on my local DB it seems to be required)
add flag --enable-diff-updates (modifier to --create-functions) to turn on the code required for diff updates without having to modify functions.sql
add flag --enable-debug-statements (modifier to --create-functions) to turn on debug warning statements

update.php:
-----------
added flag --no-index to import osmosis changes without indexing them
extend the hack to allow import of JOSM generated osm files

country_grid.sql - reference copy of the sql used to generate the country_osm_grid table, needs cleanup

12 years agoSuport postgis 2.0 for search
Andree Klattenhoff [Tue, 22 May 2012 12:04:37 +0000 (14:04 +0200)]
Suport postgis 2.0 for search

12 years agoMerge branch 'master' of github.com:twain47/Nominatim
Brian Quinion [Tue, 15 May 2012 01:06:12 +0000 (03:06 +0200)]
Merge branch 'master' of github.com:twain47/Nominatim

12 years agomove index over nameaddress_vector back to delayed index creation
Sarah Hoffmann [Sun, 13 May 2012 09:38:50 +0000 (11:38 +0200)]
move index over nameaddress_vector back to delayed index creation

No longer needed for linking places.

12 years agoremove intermediate ANALYSE while indexing
Sarah Hoffmann [Sun, 13 May 2012 08:50:08 +0000 (10:50 +0200)]
remove intermediate ANALYSE while indexing

Autovacuum does a much better job.

12 years agomake sure nominatim.so is accessible for postgresql
Sarah Hoffmann [Sun, 13 May 2012 08:05:27 +0000 (10:05 +0200)]
make sure nominatim.so is accessible for postgresql

Even if the user has a very restrictive umask in place.

12 years agopre-create word list to avoid duplicates due to parallel indexing
Sarah Hoffmann [Sun, 13 May 2012 07:15:56 +0000 (09:15 +0200)]
pre-create word list to avoid duplicates due to parallel indexing

12 years agoCan't filter on rank_search before it has been assigned
Brian Quinion [Fri, 11 May 2012 17:23:44 +0000 (19:23 +0200)]
Can't filter on rank_search before it has been assigned

12 years agoupdated wikipedia article code to allow for mutliple languages and remove code duplic...
Brian Quinion [Sun, 6 May 2012 23:18:31 +0000 (00:18 +0100)]
updated wikipedia article code to allow for mutliple languages and remove code duplication

12 years agomodifiers to encourage use of indices
Sarah Hoffmann [Sat, 5 May 2012 09:38:26 +0000 (11:38 +0200)]
modifiers to encourage use of indices

12 years agodon't have an address property in the return if we have not got address data
Brian Quinion [Thu, 3 May 2012 23:59:26 +0000 (00:59 +0100)]
don't have an address property in the return if we have not got address data

12 years agocatch utf8 encoding errors and at least stop them aborting processing
Brian Quinion [Thu, 3 May 2012 23:58:26 +0000 (00:58 +0100)]
catch utf8 encoding errors and at least stop them aborting processing

12 years agoMerge branch 'master' of github.com:twain47/Nominatim
Brian Quinion [Mon, 30 Apr 2012 00:05:13 +0000 (01:05 +0100)]
Merge branch 'master' of github.com:twain47/Nominatim

12 years agocalculate importance from wikipedia
Brian Quinion [Mon, 30 Apr 2012 00:05:06 +0000 (01:05 +0100)]
calculate importance from wikipedia

12 years agomore name checks in point and poly mergeing, and put the index creation earlier in...
Brian Quinion [Sun, 29 Apr 2012 15:40:44 +0000 (16:40 +0100)]
more name checks in point and poly mergeing, and put the index creation earlier in the process

12 years agoadd licence file
Sarah Hoffmann [Fri, 27 Apr 2012 20:19:55 +0000 (22:19 +0200)]
add licence file

12 years agofix typos in mapicons
Sarah Hoffmann [Thu, 26 Apr 2012 21:23:27 +0000 (23:23 +0200)]
fix typos in mapicons

12 years agomake it run with 64bit and 32bit osm2pgsql
Sarah Hoffmann [Mon, 16 Apr 2012 22:17:05 +0000 (00:17 +0200)]
make it run with 64bit and 32bit osm2pgsql

Needs tweaking on the osm2pgsql side, too: the osmid column
needs to have the same format as in osm2pgsql. That means
that the changes are still not compatible with existing installations.

12 years agochange code to work with a 64-bit node size osm2pgsql
Sarah Hoffmann [Mon, 16 Apr 2012 20:26:44 +0000 (22:26 +0200)]
change code to work with a 64-bit node size osm2pgsql

This breaks the 32-bit node size version.

12 years agoMerge pull request #5 from mfn/improve_errmsg
Brian Quinion [Thu, 26 Apr 2012 13:50:58 +0000 (06:50 -0700)]
Merge pull request #5 from mfn/improve_errmsg

Do not swallow PEAR error during setup in import-data.

12 years agodepreciate place=region due to common miss-use
Brian Quinion [Thu, 26 Apr 2012 12:11:56 +0000 (13:11 +0100)]
depreciate place=region due to common miss-use

12 years agolink nodes and relations using name->'name' index lookup instead of search_name
Brian Quinion [Thu, 26 Apr 2012 12:01:26 +0000 (13:01 +0100)]
link nodes and relations using name->'name' index lookup instead of search_name

12 years agoDo not swallow PEAR error.
mfn [Thu, 26 Apr 2012 11:30:49 +0000 (13:30 +0200)]
Do not swallow PEAR error.

12 years agoset osm2pgsql cache memory to a default based on memory in the machine
Brian Quinion [Thu, 26 Apr 2012 00:35:06 +0000 (01:35 +0100)]
set osm2pgsql cache memory to a default based on memory in the machine

12 years agoMerge branch 'continent' of https://github.com/datendelphin/Nominatim
Sarah Hoffmann [Fri, 20 Apr 2012 21:19:52 +0000 (23:19 +0200)]
Merge branch 'continent' of https://github.com/datendelphin/Nominatim

12 years agoadd support for Irish townlands
Sarah Hoffmann [Fri, 20 Apr 2012 20:13:03 +0000 (22:13 +0200)]
add support for Irish townlands

To work properly, osm2pgsql needs to be updated to the latest version.

12 years agoonly calculate country for search ranks country and below
Datendelphin [Sun, 15 Apr 2012 21:05:31 +0000 (23:05 +0200)]
only calculate country for search ranks country and below

12 years agoallow slashes in house numbers
Sarah Hoffmann [Mon, 16 Apr 2012 13:33:13 +0000 (15:33 +0200)]
allow slashes in house numbers

12 years agoFormat of replicate-sequence URL has changed
Sarah Hoffmann [Sun, 15 Apr 2012 15:45:01 +0000 (17:45 +0200)]
Format of replicate-sequence URL has changed

Additionally update/init import_status in the DB. If this is not
initialized here, subsequent updates of the status won't work.

12 years agoignore postcode boundaries without postcode
Sarah Hoffmann [Sat, 14 Apr 2012 07:27:10 +0000 (09:27 +0200)]
ignore postcode boundaries without postcode

12 years agomissing brackets in default name assignment
Sarah Hoffmann [Sat, 14 Apr 2012 06:56:07 +0000 (08:56 +0200)]
missing brackets in default name assignment

12 years agoadd switch for osm2pgsql cache size
Sarah Hoffmann [Wed, 11 Apr 2012 21:39:07 +0000 (23:39 +0200)]
add switch for osm2pgsql cache size

also increased the default to 15GB to accaommodate growing planet

12 years agoMerge branch 'mountain_pass' of https://github.com/datendelphin/Nominatim
Sarah Hoffmann [Wed, 11 Apr 2012 20:21:06 +0000 (22:21 +0200)]
Merge branch 'mountain_pass' of https://github.com/datendelphin/Nominatim

12 years agoforce UTF-8 database
Sarah Hoffmann [Wed, 11 Apr 2012 20:16:35 +0000 (22:16 +0200)]
force UTF-8 database

12 years agoranking for mountain_pass
Datendelphin [Fri, 6 Apr 2012 16:34:45 +0000 (18:34 +0200)]
ranking for mountain_pass

12 years agoOnly link polygons on admin_centre is not already found a label AND if exactl search_...
Brian Quinion [Mon, 2 Apr 2012 11:48:51 +0000 (12:48 +0100)]
Only link polygons on admin_centre is not already found a label AND if exactl search_rank match

12 years agosearch_name.name_vector index is now required during initial index due to code to...
Brian Quinion [Sun, 1 Apr 2012 12:52:58 +0000 (13:52 +0100)]
search_name.name_vector index is now required during initial index due to code to merge relations and nodes

12 years agoUpdate details.php to show linked places
Brian Quinion [Sun, 1 Apr 2012 01:38:40 +0000 (02:38 +0100)]
Update details.php to show linked places

12 years agoMerge branch 'master' of github.com:twain47/Nominatim
Brian Quinion [Sun, 1 Apr 2012 00:48:45 +0000 (01:48 +0100)]
Merge branch 'master' of github.com:twain47/Nominatim

12 years agoAdds code to merge place polygon and points using:
Brian Quinion [Sun, 1 Apr 2012 00:40:50 +0000 (01:40 +0100)]
Adds code to merge place polygon and points using:
  label relation member
  admin_center, admin_centre relation member (with same name)
  exact name, search_rank and location match

Adding this requires a new column and index:
  SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
  CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id);

12 years agopostgresq 8.4 backward compatibility: count hash size with akeys instead of hash_to_array
Sarah Hoffmann [Thu, 29 Mar 2012 22:52:08 +0000 (00:52 +0200)]
postgresq 8.4 backward compatibility: count hash size with akeys instead of hash_to_array

12 years agodon't use column names for variable names, 8.4 fails on them
Sarah Hoffmann [Thu, 29 Mar 2012 21:48:29 +0000 (23:48 +0200)]
don't use column names for variable names, 8.4 fails on them

12 years agoMerge branch 'master' of github.com:twain47/Nominatim
Brian Quinion [Mon, 26 Mar 2012 22:57:24 +0000 (23:57 +0100)]
Merge branch 'master' of github.com:twain47/Nominatim

12 years agoUse GB postcode table as definitive source. resort by pressence of search word in...
Brian Quinion [Thu, 22 Mar 2012 00:33:28 +0000 (00:33 +0000)]
Use GB postcode table as definitive source. resort by pressence of search word in output address and other misc very minor changes not commited from MQ servers

12 years agocountries need language list as well
Sarah Hoffmann [Wed, 21 Mar 2012 19:59:35 +0000 (20:59 +0100)]
countries need language list as well

12 years agoBlack/whitelisting for special phrases
Sarah Hoffmann [Tue, 20 Mar 2012 23:40:35 +0000 (00:40 +0100)]
Black/whitelisting for special phrases

Allows to restrict the special phrases imported from the wiki.
Blacklist allows to exclude certain class/type combinations.
Whitelist allows to define an allowed subset of types for a class.
Adjust to your liking in settings/phrase_settings.php before running
the specialphrases script.

12 years agouse X/Y max/min functions instead of box making
Sarah Hoffmann [Sun, 18 Mar 2012 17:18:33 +0000 (18:18 +0100)]
use X/Y max/min functions instead of box making

There is a strange bug in postgis where for some coordinates
it does not make a proper box around a point.

12 years agoreturn a 500 on database error
Sarah Hoffmann [Sun, 18 Mar 2012 16:58:19 +0000 (17:58 +0100)]
return a 500 on database error

12 years agoonly re-index addressable places
Sarah Hoffmann [Sun, 18 Mar 2012 15:15:45 +0000 (16:15 +0100)]
only re-index addressable places

exclude places from hierarchical updates when they are only addressed
through their parent and do not have a name (thus no entry in search
name)

12 years agoremove array_agg
Sarah Hoffmann [Sun, 18 Mar 2012 15:12:41 +0000 (16:12 +0100)]
remove array_agg

shipped with postgresql in all supported versions

12 years agomunin graph for request counts
Sarah Hoffmann [Sat, 10 Mar 2012 21:53:38 +0000 (22:53 +0100)]
munin graph for request counts

12 years agosanity check for address interpolation
Sarah Hoffmann [Fri, 9 Mar 2012 23:08:06 +0000 (00:08 +0100)]
sanity check for address interpolation

12 years agoavoid deletes for new places
Sarah Hoffmann [Fri, 9 Mar 2012 23:06:28 +0000 (00:06 +0100)]
avoid deletes for new places

12 years agorestrict deferred delete to concerned place
Sarah Hoffmann [Fri, 9 Mar 2012 22:47:25 +0000 (23:47 +0100)]
restrict deferred delete to concerned place

Deleting by osm_type/osm_id goes wrong if the place was reimported
because of a change in geometry, admin_level etc. The newly created
place is deleted as well in this case.