Commit Graph

3156 Commits

Author SHA1 Message Date
Sarah Hoffmann
5c3cb8f2f8 don't create index idx_placex_sector twice 2012-07-31 00:42:55 +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
Sarah Hoffmann
fe7137990b send place_rank in jsonv2 format 2012-07-23 23:34:13 +02:00
Sarah Hoffmann
d396505786 Merge branch 'patch-1' of https://github.com/Firefishy/Nominatim 2012-07-22 09:02:55 +02:00
Grant
a7c8e8897b Fix repeating lat twice in span instead of lat, lon. 2012-07-22 04:45:45 +02:00
Sarah Hoffmann
f5dfd93c5c Merge remote-tracking branch 'lonvia/address-order' 2012-07-21 00:53:53 +02:00
Sarah Hoffmann
21b0bac4e7 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.
2012-07-21 00:41:18 +02:00
Sarah Hoffmann
4423592de0 gracefully fail if nodes from an address interpolation are missing 2012-07-13 22:33:09 +02:00
Daniele Forsi
38e40cd014 Fix more typos 2012-07-10 15:47:21 +02:00
Daniele Forsi
f082611e25 Fix typos found with codespell in comments 2012-07-10 15:31:01 +02:00
Daniele Forsi
ca5305661e Fix typos in function name
perl -p -e s/getPrefferedLangauges/getPreferredLanguages/ -i */*.php
2012-07-09 19:07:09 +02:00
Daniele Forsi
9549bda474 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
2012-07-09 18:16:54 +02:00
Sarah Hoffmann
afc429fd92 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.
2012-07-03 22:44:06 +02:00
Sarah Hoffmann
980632053f put libraries in right place when linking 2012-07-03 16:09:00 +03:00
Sarah Hoffmann
e598e2ceed 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
2012-07-01 17:24:27 +02:00
Sarah Hoffmann
1cb55c6e31 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
2012-07-01 15:55:26 +02:00
Sarah Hoffmann
8ff0aabaf3 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.
2012-06-29 22:11:40 +02:00
Sarah Hoffmann
bd529c1f9d be less verbose 2012-06-28 22:09:44 +02:00
Sarah Hoffmann
419f90ed75 ignore railways, tunnels and bridges when reverse geocoding 2012-06-28 20:39:18 +02:00
Sarah Hoffmann
55c1a68dbc Merge branch 'configure' of github.com:lonvia/Nominatim 2012-06-27 22:55:39 +02:00
Sarah Hoffmann
d062312eaa add README stuff 2012-06-27 21:40:58 +02:00
Sarah Hoffmann
6493efa073 add git commit version if applicable 2012-06-26 22:55:08 +02:00
Sarah Hoffmann
80750c0a54 remove duplicate check for ZLIB 2012-06-26 22:19:04 +02:00
Sarah Hoffmann
f7a21d1bb7 be more strict with us state replacement hack
replace il/al/la only if they are properly separated by a comma
2012-06-25 08:46:14 +02:00
Sarah Hoffmann
f52038d010 yet another autogenerated file removed 2012-06-16 01:38:27 +02:00
Sarah Hoffmann
69ed04a441 remove autogenerated files 2012-06-16 01:36:13 +02:00
Sarah Hoffmann
de46b62186 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
2012-06-16 01:25:16 +02:00
Sarah Hoffmann
43ce82d08e silently remove leading/trailing spaces 2012-05-30 22:19:49 +02:00
Sarah Hoffmann
a44e21de49 avoid PHP notices 2012-05-25 23:45:59 +02:00
Sarah Hoffmann
c433a2d739 remove distinct, causes nearest feature results to be badly reordered 2012-05-24 22:47:34 +02:00
Brian Quinion
946f35e7ff Updated reverse geocoding to improve handling of zoom=0 2012-05-24 16:54:51 +01: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
1e307392b2 rename ambiguous variables to make postgresql 8.4 happy 2012-05-24 00:25:15 +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
3af2a44a3c Merge branch 'master' of github.com:twain47/Nominatim 2012-05-23 19:26:01 +02:00
Brian Quinion
4be160bd4b revert to plain text dump for 8.4 compatibility (+ permissions fix) 2012-05-23 19:25:43 +02:00
Sarah Hoffmann
8204a8b13a typo 2012-05-23 20:15:15 +03:00
Brian Quinion
c36e3d9c7e can't have a unique index on placex - only on place 2012-05-22 20:25:18 +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
77f646410e deal with some indexing edge cases 2012-05-22 19:43:49 +02:00
Brian Quinion
85ab12c471 Merge pull request #9 from andreek/master
Postgis 2.0 compatibility
Seems to be compatible with all recent versions of postgis
2012-05-22 10:34:04 -07: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
Andree Klattenhoff
444f485541 Suport postgis 2.0 for search 2012-05-22 14:04:37 +02:00
Brian Quinion
f17c5345ec Merge branch 'master' of github.com:twain47/Nominatim 2012-05-15 03:06:12 +02:00