osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-30 12:22:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,537 Commits 28 Branches 41 Tags 164 MiB
482f7fe3ba
Commit Graph

373 Commits

Author SHA1 Message Date
Sarah Hoffmann
98b93df83d recreate place objects when admin_level changes 
Also added a sanity check to ensure that accidental removal of admin_level
tags on large areas doesn't cause huge reindexing load. That can be disabled
by setting CONST_Limit_Reindexing to false.
 2014-02-07 23:37:54 +01:00
Sarah Hoffmann
e0b1e3b66d replace ST_Line_Interpolate_Point with ST_LineInterpolatePoint (DB adaption needed) 
Name of function was changed in postgis 2.1 and now prints ugly
deprecation warnings. For older versions of postgis, function
will be renamed to the new name during the setup of the DB.

To update existing databases with postgis < 2.1 run:

ALTER FUNCTION st_line_interpolate_point(geometry, double precision) RENAME TO ST_LineInterpolatePoint

and then reinstall the SQL functions:

./utils/setup.php --create-functions --enable-diff-updates --create-partition-functions
 2014-02-07 20:10:14 +01:00
Brian Quinion
edc5733715 Script to automatically warm the postgresql query before sending traffic 2014-02-06 16:50:41 +00:00
Kurt Roeckx
45c1e7582f Connect to the correct postgresql port from the settings. 2013-11-13 22:24:10 +01:00
Sarah Hoffmann
8675a2607a use postgis as an extension for versions >= 2.0 2013-10-10 23:13:58 +02:00
IrlJidel
dbd7f8fdae dont include polling time for batch duration for non-minutely updates, log name of each update step 2013-10-02 10:53:21 +01:00
IrlJidel
1c86275bad output date of steps during import-osmosis 2013-09-30 13:44:50 +01:00
IrlJidel
84d1e521aa show import_osmosis_log insert statements, print completed log after import_status inserts 2013-09-30 13:25:30 +01:00
IrlJidel
7471b09ed3 set start time for indexing step 2013-09-30 13:20:24 +01:00
Philippe
1c7afef1f2 added FIPS codes for 60xxx, 66xxx, 69xxx, 72xxx and 78xxx 2013-09-27 17:59:42 -04:00
Sarah Hoffmann
bf182ba2dc make import-osmosis(-all) fail with error code!=0 2013-09-25 23:05:47 +02:00
Sarah Hoffmann
8332fedfd6 make sleep interval dependent on date of last batch 2013-09-19 22:56:55 +02:00
Brian Quinion
65ea0efe68 Remove stray exit from debug 2013-09-19 15:19:31 +01:00
Brian Quinion
120d866e3e Sanity check on download.geofabrik.de update interval 2013-09-19 12:22:36 +01:00
Sarah Hoffmann
77b9edd1e9 allow osm2pgsql cache memory to be set for updates 2013-09-15 23:10:26 +02:00
Sarah Hoffmann
80b4121aca allow setup without partitions 2013-09-15 22:45:47 +02:00
Sarah Hoffmann
8fd7d319b7 Merge branch 'osmosis_error_return' of https://github.com/woodpeck/Nominatim 2013-09-09 13:46:59 +02:00
Sarah Hoffmann
12eb91b2bc Merge branch 'master' of https://github.com/spin0us/Nominatim 2013-09-09 13:45:41 +02:00
Brian Quinion
d8f9b27c93 make missing osmosis non-fatal for 'all' option - just skip it 2013-09-06 10:58:48 +01:00
Brian Quinion
62b5849528 script to compare to nominatim instances 2013-09-06 09:47:46 +01:00
Frederik Ramm
b8d4371395 re-run osmosis also on return codes other than 1 2013-08-30 10:42:21 +02:00
Spin0us
85f10f48fd Update update.php 2013-07-31 07:48:29 +02:00
Brian Quinion
5e6fdc467c Check to see if we can access the website at the configured CONST_Website_BaseURL 2013-06-13 18:07:19 +01:00
Frederik Ramm
87519de8ab fix indentation 2013-05-16 09:11:19 +02:00
Frederik Ramm
1f2a262ee0 Add osm2pgsql flat node support via settings.php 2013-05-16 09:03:16 +02:00
Sarah Hoffmann
ddc46acd26 add support for house numbers without street 2013-04-27 00:57:18 +02:00
Sarah Hoffmann
913341ee86 remove worldboundaries.sql 
fixes #22
 2013-04-20 10:27:56 +02:00
Sarah Hoffmann
01bcb59e44 update Tiger extract scripts for 2012 edition 2013-04-12 20:07:03 +02:00
Sarah Hoffmann
87ad4fb82f make osmosis-init also work for older planets 
Use planet_osm_nodes instead of places to get the very last node even if it is
untagged. Then ask for version 1 to avoid being mislead if the node has been
changed in the meantime.
 2013-04-07 15:34:29 +02:00
Brian Quinion
6ec5a40c82 better osmosis error message 2013-04-03 17:03:39 +01:00
IrlJidel
3eea62363d fix typo for baseUrl when configuring configuration.txt 
use osmosis --read-replication-lag to determine if there are changes before trying to process updates, useful when we are tracking hourly or daily replication updates

set CONST_Replication_Recheck_Interval to 60

skip lag check if CONST_Replication_Update_Interval > 60, for minutelies there's always new diffs to process

use tabs for indent

change sleep for non-minutely updates so that we dont drift tto much or poll excessively

unset $aReplicationLag before each exec attempt

unset $aReplicationLag inside while loop
 2013-04-02 21:30:12 +01:00
IrlJidel
7cb27dc881 make planet replication url configurable so we can use geofabrik's awesome daily country diffs 2013-03-22 12:44:21 +00:00
Brian Quinion
a8608e2b79 calculate the importance value 2013-03-19 19:44:33 +00:00
Brian Quinion
5ae905b20a download dbpedia attempt at geocoords 2013-03-19 19:29:39 +00:00
Brian Quinion
0070817ba5 first draft of wikipedia article/importance import script 2013-03-18 23:57:10 +01:00
Sarah Hoffmann
ea2cf36b12 switch to main overpass server 2013-02-26 20:42:57 +01:00
Brian Quinion
fca2d00617 Basic status page for monitoring nominatim is working 2013-01-24 12:42:42 +00:00
Sarah Hoffmann
87b250e739 split partition.sql into table and function parts 
Makes it easier to patch partition functions on an already existing
database.
 2013-01-19 17:23:21 +01:00
Sarah Hoffmann
20a852b554 support custom psql port in setup.php 
patch by b3nn0 (see http://trac.openstreetmap.org/ticket/4736)
 2013-01-14 22:48:52 +01:00
Brian Quinion
4a3121b52f release in postgis version string is optional 2012-12-18 17:39:01 +00:00
Brian Quinion
96d3cb61c8 add constant to define postgis version. Verify definted version constants are correct during database creation. 2012-12-18 13:09:50 +00:00
Sarah Hoffmann
e9535b3607 check return of DB creation command 2012-12-15 11:31:25 +01:00
Brian Quinion
01ea772255 restrict to one sleep per bucket. A second sleep while already sleeping results in a block. 2012-12-10 01:36:33 +00:00
Brian Quinion
661338ff25 Use Etc/UTC timezone for updates for reliability 2012-12-08 21:42:12 +00:00
Brian Quinion
274f381052 prune list of blocked items if too large, different costs for different page types 2012-12-08 21:39:24 +00:00
Brian Quinion
539d187b5c tiny formating change to utils/blocks.php 2012-12-08 18:56:59 +00:00
Brian Quinion
fa90ece530 add an option for max number of sleeping threads 2012-12-08 18:55:17 +00:00
Brian Quinion
e03ae6d7eb rate limiting using memcache 2012-12-08 17:38:10 +00:00
Brian Quinion
cc24d998e4 move deletable and polygons into default website 2012-12-03 14:26:29 +00:00
Brian Quinion
4f49ef07e6 Merge branch 'master' of github.com:twain47/Nominatim 2012-11-28 14:50:02 +00:00
IrlJidel
74f5929c2a Add css dir to create-website 2012-11-19 16:00:19 +00:00
Brian Quinion
84a5f2779a script to pull language list from openstreetmap wiki 2012-11-14 23:50:52 +00:00
Brian Quinion
678dcbd82a hstore in 9.2 replaces k=>v with hstore(k,v). Update sql to reflect change and introduce compatability function for pre 9.1 postgresql 2012-11-01 01:47:30 +00:00
Brian Quinion
6db3b2328d don't exit during osmosis setup 2012-10-29 14:23:05 +00:00
Brian Quinion
7dbbc43a85 Automatically calculate the state file for replication from the last node in the db 2012-10-22 03:09:38 +01:00
Sarah Hoffmann
c691217901 typo 2012-10-09 22:20:05 +02:00
Sarah Hoffmann
b0242c7901 use calculated_country_code for postcodes 2012-10-09 22:05:37 +02:00
Sarah Hoffmann
8fc2f9551b delete more hardcoded rules for special phrases 
both cases are now sufficiently covered by settings/phrase_settings.php
 2012-09-30 11:46:00 +02:00
Sarah Hoffmann
e73e67001e ignore frequent partial search terms 
Adds word counts from a full planet to the word table. There is a
new configuration option CONST_Max_Word_Frequency which allows to
take into account the word count: the value that was set on import
is used to determine if a word is added to the search_name table.
The value during runtime determines if a single term should be
used for partial search or simply be ignored.
 2012-09-25 00:36:34 +02:00
Sarah Hoffmann
c37a145dc6 patch replication path on --osmosis-init 
planet server layout has changed. Patch in the new path to
minute replications after having osmosis initialise configuration.txt.
 2012-09-23 22:03:28 +02:00
sprengm
7ff1395b96 make setup.php fail early on missing osm-file 
make setup.php fail early if:
  - no osm-file argument was supplied for --all or --import-data
  - the supplied osm-file is not existing or not readable (file permissions)
 2012-08-25 10:00:46 +02:00
Sarah Hoffmann
55b59ea139 import TIGER data into temporary table 
Import TIGER data into a temporary table first that later replaces
the current location_property_tiger table. This way index creation
on the table can be delayed until after the import which should
speed up the import and result in significantly smaller indexes.

Also removed index on parent_place_id as it is covered by
idx_location_property_tiger_housenumber_parent_place_id.
 2012-08-18 10:30:42 +02:00
Sarah Hoffmann
b11718699e fail on error 
- stop indexing if there is any other error than deadlock from the DB
- stop import if osm2pgsql or indexing fails
 2012-07-31 00:31:38 +02:00
Daniele Forsi
38e40cd014 Fix more typos 2012-07-10 15:47:21 +02:00
Sarah Hoffmann
43ce82d08e silently remove leading/trailing spaces 2012-05-30 22:19:49 +02:00
Brian Quinion
c325e1b039 Merge branch 'master' of github.com:twain47/Nominatim 2012-05-24 01:43:23 +02:00
Brian Quinion
a32fe96e16 truncate road partition tables during load 2012-05-24 01:42:59 +02:00
Sarah Hoffmann
35fdb7af0f more verbose error messages 2012-05-24 00:26:16 +02:00
Sarah Hoffmann
410ce603f7 use Overpass API by default to download OSM objects 2012-05-23 23:32:12 +02:00
Sarah Hoffmann
e54bd028ee make index work and remove more hard-coded DB names 2012-05-23 23:32:12 +02:00
Datendelphin
8be76da629 eliminate php warning, remove setting aPipes (isn't used) 2012-05-23 23:32:12 +02:00
Datendelphin
1461dc603e make .osc files with osmosis 2012-05-23 23:32:11 +02:00
Brian Quinion
4be160bd4b revert to plain text dump for 8.4 compatibility (+ permissions fix) 2012-05-23 19:25:43 +02:00
Brian Quinion
f1e381fdd4 fix broken field name / committed debug 2012-05-22 20:21:58 +02:00
Brian Quinion
d74cf03492 use the new country data files 2012-05-22 19:48:35 +02:00
Brian Quinion
8d221e2c82 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
 2012-05-22 16:27:42 +02:00
Brian Quinion
f17c5345ec Merge branch 'master' of github.com:twain47/Nominatim 2012-05-15 03:06:12 +02:00
Sarah Hoffmann
fd448170c5 remove intermediate ANALYSE while indexing 
Autovacuum does a much better job.
 2012-05-13 10:50:08 +02:00
Sarah Hoffmann
c32fa2172d pre-create word list to avoid duplicates due to parallel indexing 2012-05-13 09:15:56 +02:00
Brian Quinion
0ab9c90708 Can't filter on rank_search before it has been assigned 2012-05-11 19:23:44 +02:00
Brian Quinion
7164fd310d Merge branch 'master' of github.com:twain47/Nominatim 2012-04-30 01:05:13 +01:00
Brian Quinion
1c0fa81d88 calculate importance from wikipedia 2012-04-30 01:05:06 +01:00
mfn
fd3fcea539 Do not swallow PEAR error. 2012-04-26 13:30:49 +02:00
Brian Quinion
9b01ddd641 set osm2pgsql cache memory to a default based on memory in the machine 2012-04-26 01:35:06 +01:00
Sarah Hoffmann
653c05329d 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.
 2012-04-15 17:45:01 +02:00
Sarah Hoffmann
3f8fcd4055 add switch for osm2pgsql cache size 
also increased the default to 15GB to accaommodate growing planet
 2012-04-11 23:39:07 +02:00
Sarah Hoffmann
7ed4c28405 force UTF-8 database 2012-04-11 22:16:35 +02:00
Brian Quinion
80cf5df1cd Merge branch 'master' of github.com:twain47/Nominatim 2012-03-26 23:57:24 +01:00
Brian Quinion
b99a043c78 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 2012-03-22 00:34:56 +00:00
Sarah Hoffmann
b6db7c17f9 countries need language list as well 2012-03-21 20:59:35 +01:00
Sarah Hoffmann
248b6ec90f 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.
 2012-03-21 00:40:35 +01:00
Sarah Hoffmann
88b07b8fc2 creation of special phrases for country codes (forwardported from gazeteer) 2012-02-26 20:32:40 +00:00
Sarah Hoffmann
01f4723b7b update classtype tables for special phrases along with the places 2012-02-19 10:33:21 +00:00
Sarah Hoffmann
c186a4ead0 extend scripts for Tiger 2011 data 2012-02-17 20:34:28 +00:00
Sarah Hoffmann
5d10d538a5 hack around yes quotes in wiki and add a simple sanity check against wiki accidents 2012-02-13 22:37:03 +00:00
Sarah Hoffmann
8c7bd6beab during initial setup defer creation of non-vital until after nominatim indexing, 
analyse DB during nominatim indexing so the query planer uses indexes correctly
 2012-02-10 21:01:35 +00:00
Sarah Hoffmann
c5e69fadd0 improve import performance for special phrases 
- create a temporary index on placex
- create indices on place_classtype_* tables after insert
- grant www-data permission to tables
 2012-01-28 23:27:25 +00:00
Sarah Hoffmann
acadfcb2c5 extensions where introduced in postgresql in 9.1, not in 9.0 2012-01-21 12:09:43 +00:00
Sarah Hoffmann
cc564e2f31 - remove dependency on intarray extension 
- new config options for postgresql version and 
  location of osm2pgsql and osmosis binaries
- new option --no-npi for update.php that supresses writing of NPIs in
  osmosis update mode
- add more GRANTs for www-data
 2012-01-21 10:21:42 +00:00
Frederik Ramm
89a365787f bugfix nominatim 2011-09-09 16:00:34 +00:00
Brian Quinion
4d16677d2e update place_id to BIGINT 2011-06-14 13:42:46 +00:00
Brian Quinion
5f97080c73 retry loop on osmosis 2011-04-27 12:14:33 +00:00
Brian Quinion
1028c2444c move partiondef config file to settings, add --create-website option to build symlinks automatically 2011-04-06 18:19:40 +00:00
Brian Quinion
981649bf83 diff updates and npi diff updates 2011-03-18 12:36:17 +00:00
Frederik Ramm
b83af9c248 fix potential deadlock when writing a lot of data to a psql pipe and not reading what comes back; 
stdout/stderr weren't used anyway so just connect them through
 2011-02-21 00:02:17 +00:00
Frederik Ramm
a4c63c094f * use osm2pgsql from $PATH if none present locally 
* do not display usage() on successful postcode generation
 2011-02-18 09:18:37 +00:00
Brian Quinion
3ea1b35b32 add logging of broken polygons, improve address export, better diff output in export, bug in address calculation(#3522), reaply #3520, lost in migration 2011-02-07 11:13:18 +00:00
Brian Quinion
31273a42bd aux properties, memory leaks, tweaks to search order 2011-01-21 10:40:44 +00:00
Brian Quinion
2be00f37c1 finally fix adminitrative spelling error, disable fast_update on indexes by default (performance), fixes for incremental updates on new codebase 2011-01-05 14:07:26 +00:00
Brian Quinion
d95a434127 pull in the special phrases from the wiki 2010-12-13 15:55:52 +00:00
Brian Quinion
8193757427 tiger import code 2010-12-07 13:44:48 +00:00
Brian Quinion
631e8d09ab postcode/zipcode improvements, finish work on handling extratags 2010-12-07 13:41:02 +00:00
Brian Quinion
a6453a808d remove the road buffer code - made things slower. Plus some more tiger import code 2010-11-17 15:19:25 +00:00
Brian Quinion
1663dd49a4 more tiger import code 2010-11-16 13:24:52 +00:00
Brian Quinion
d4625e7741 rename to fix spelling mistake 2010-11-16 12:01:03 +00:00
Brian Quinion
1bcf91e336 add in missing county codes for TIGER 2009 2010-11-16 12:00:16 +00:00
Brian Quinion
7df80bbc6f tigger data import 2010-11-15 16:34:27 +00:00
Brian Quinion
bfe56e6a45 change partition from char to int, partition search_name on country 2010-11-09 10:19:36 +00:00
Brian Quinion
cb40aa41d5 more partitioning work, os open data postcodes, country list fixes 2010-11-01 15:09:10 +00:00
Brian Quinion
57583f09e3 hstore names / refactoring 2010-10-27 14:05:42 +00:00
Brian Quinion
e6d983474b data partitioning 2010-10-26 15:22:41 +00:00
Brian Quinion
4c2c499860 default path fixes 2010-10-25 12:22:22 +00:00
Brian Quinion
ab6a996772 nominatim refactoring 2010-10-23 23:12:37 +00:00