osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-19 02:52:09 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,039 Commits 31 Branches 41 Tags 164 MiB
7a194789bc
Commit Graph

646 Commits

Author SHA1 Message Date
Sarah Hoffmann
3eb21a7694 don't enlarge viewbox when bounded is requested 2014-05-01 14:20:23 +02:00
Sarah Hoffmann
9ac57c92ee fix formatting 2014-05-01 09:25:06 +02:00
Sarah Hoffmann
ac70726591 sanity check of house number format 
Add a penalty for house number search terms when they contain
too many non-numeric characters in an attempt to filter tokens
that ended up as house numbers in the word table as a result
of mapping errors.
 2014-05-01 09:18:10 +02:00
Sarah Hoffmann
34adfd5041 add penalty for special term searches 
abbreviations for some of the terms are too easily matched against
common address terms like 'street'
 2014-05-01 09:16:03 +02:00
Sarah Hoffmann
bafd92093b prefer place tag for address details 2014-04-30 23:31:28 +02:00
Sarah Hoffmann
2cc0fa341b remove New York hack 
Seems to work okay with current boundaries.
 2014-04-30 21:11:23 +02:00
Sarah Hoffmann
21adb3740e take viewbox into account for final result ranking 
fixes #12
 2014-04-30 21:04:46 +02:00
Sarah Hoffmann
7f95590a77 correct start time computation 
fixes #125
 2014-04-21 21:12:14 +02:00
Sarah Hoffmann
369a0974bd make HTML validator happy with details page 2014-04-12 20:12:23 +02:00
Sarah Hoffmann
346da9bc0d handle multiple results from gb_postcode table 2014-04-10 21:50:44 +02:00
Sarah Hoffmann
0b9618e349 prefer street results when doing house number search 
This is an experimental fix for #119.
 2014-03-13 20:40:02 +01:00
Sarah Hoffmann
a92907186b allow US state name abbreviations at beginning of search term 
fixes https://trac.openstreetmap.org/ticket/5136
 2014-03-11 00:32:54 +01:00
Sarah Hoffmann
e42ff1935f forgot the actual query script 2014-03-03 21:48:17 +01:00
Sarah Hoffmann
bc27cb2bd8 introduce util function to query db from command line 2014-03-03 20:02:24 +01:00
Sarah Hoffmann
236750eba4 always return bbox ccordinates as string 
fixes https://trac.openstreetmap.org/ticket/5132
 2014-03-02 17:52:09 +01:00
Sarah Hoffmann
29dfc0c259 allow to pass an additional config file via NOMINATIM_SETTINGS variable to command line tools 
needed for test environment
 2014-02-15 18:49:05 +01:00
Sarah Hoffmann
dbdf767030 fix syntax of route linestring 2014-02-07 21:31:26 +01:00
Brian Quinion
224836ce9a include rank and importance in reverse geocode output 2014-02-06 13:09:55 +00:00
Sarah Hoffmann
8286abbeb4 surpress output of osm_type/id for non-OSM objects in reverse xml 2014-02-05 20:10:12 +01:00
Sarah Hoffmann
b25ecf13db check correct variable for SQL error 2014-02-01 15:51:40 +01:00
Brian Quinion
8ecd32b7dd Return 429 Too Many Requests for rate limiting 2014-01-23 16:47:56 +00:00
Brian Quinion
e591269fd8 Merge branch 'master' of github.com:twain47/Nominatim 2014-01-23 14:40:42 +00:00
Brian Quinion
47fdb33adf nominatim fallback mode for structured queries 2014-01-23 14:40:37 +00:00
Sarah Hoffmann
0687065748 enable indexed_status check for all 2013-12-04 08:07:38 +01:00
Sarah Hoffmann
08eff3c482 further tweak secondary ordering of results 
- make address importance work for house number onjects
 - add number of exact matches
 - add importance of class/type
 2013-12-04 07:53:53 +01:00
Sarah Hoffmann
b544a8c590 fix indentation 2013-11-23 13:14:42 +01:00
Sarah Hoffmann
e9222ba4c6 explain results for Geocode::lookup() 2013-11-23 12:43:47 +01:00
Sarah Hoffmann
17e2e95b53 properly quote quotes in type field 2013-10-21 18:28:10 +02:00
Sarah Hoffmann
3470abad07 don't send blocked IPs to OSM's trac by default 2013-10-18 19:24:11 +02:00
Sarah Hoffmann
528de055d1 make html validator happy 2013-09-25 22:57:45 +02:00
Sarah Hoffmann
124032c27b use object properties in loadStructuredAddressElement() 2013-09-17 18:33:44 +02:00
Sarah Hoffmann
008407c2f7 move country to end of structured query 
Fixes https://trac.openstreetmap.org/ticket/4918
 2013-09-17 00:22:08 +02:00
Sarah Hoffmann
c574c933e4 reenable reverse order queries, leave disabled for structured queries 2013-09-16 00:05:26 +02:00
Brian Quinion
8f2e089908 Fix missed local variable aAddressRankList in conversion 2013-09-13 17:45:23 +01:00
Brian Quinion
44262c1d4c Limit wordset combination explosion to 120 variants (1x2x3x4x5) 2013-09-13 14:24:16 +01:00
Brian Quinion
a974d25092 fix structured and batch mode. Add constant to disable batch mode by default 2013-09-12 16:16:08 +01:00
Sarah Hoffmann
27e6a24718 use object properties in getDetails() 2013-09-10 20:10:53 +02:00
Brian Quinion
9fd75fd7ce improve admin type labels 2013-09-09 16:18:40 +01:00
Brian Quinion
28a5ef899e Test code for creating osm breadcrumbs and hierarchy 2013-09-09 14:09:28 +01:00
Brian Quinion
624e135a83 errors in structured queries 2013-09-06 09:47:46 +01:00
Brian Quinion
6a337f13d0 XML and JSON map 'ploygon' param to AsPoints 2013-09-06 09:47:46 +01:00
Brian Quinion
d6b70c9b73 Fail clean for place lookups for null/invalid place_ids 2013-09-06 09:47:46 +01:00
Brian Quinion
5f941407b3 Allow for reverse geocode returning no results 2013-09-06 09:47:46 +01:00
Brian Quinion
cdd129de70 fix viewbox issues 2013-09-06 09:47:46 +01:00
Brian Quinion
eb793ae26e Fix for regressions: broken bounded search, error on country codes 2013-09-06 09:47:46 +01:00
Brian Quinion
662af78319 batch mode for json only 2013-09-06 09:47:45 +01:00
Brian Quinion
4429121341 move more code into library 2013-09-06 09:47:45 +01:00
Brian Quinion
54129a6f15 First run at turning search into a library 2013-09-06 09:47:45 +01:00
Brian Quinion
b30fd57733 refector reverse geocoding into its own class 2013-09-06 09:47:45 +01:00
Brian Quinion
aa8c6e5f13 Try alternative orderings of structured queries that include postal codes 2013-06-11 14:56:50 +01:00
Sarah Hoffmann
9cec989882 remove suggestion code, no longer works 2013-05-08 20:23:47 +02:00
Sarah Hoffmann
b4c87a09a1 restrict depth of word set calculation 2013-04-20 00:18:08 +02:00
Sarah Hoffmann
9e0a92a508 allow to disable default language 
If CONST_Default_Language is set to false, the fallback will be to
name tags without a language suffix. Make this the default.
 2013-04-12 23:12:03 +02:00
Sarah Hoffmann
fb0d219c7b harmonize formatting of frontend php 2013-04-12 22:45:24 +02:00
Sarah Hoffmann
eee6ed48f0 use correct viewbox variable in search XML 2013-04-10 20:33:10 +02:00
Sarah Hoffmann
777e1cdbd9 remove special handling of mountain passes 
clashes with use of place tags on same node,
needs updated osm2pgsql
 2013-02-17 14:53:22 +01:00
Brian Quinion
3852096c80 avoid dropping tokens completely just because they are expensive. Use ' ' token in preference to just dropping 2013-01-31 14:17:41 +00:00
Brian Quinion
fb76671ab9 expose 'importance' value of place in xml/json/jsonv2 output 2013-01-30 13:40:04 +00:00
Sarah Hoffmann
db2cfd3503 remove OL touch controls 
They interfere with Shift-Zoom.
 2013-01-26 21:03:28 +01:00
Sarah Hoffmann
1d836f6c5c update to OpenLayers 2.12 2013-01-22 21:06:29 +01:00
Brian Quinion
7a47abe947 little bit more space to make the design work in chrome 2013-01-14 22:29:54 +00:00
Brian Quinion
ae7f676b73 wrong variable name in json output 2012-12-20 01:28:10 +00:00
Brian Quinion
d1f266509a Include the centre point on the details page 2012-12-17 15:28:37 +00:00
Brian Quinion
490190b873 only add Access-Control-Allow-Headers if needed 2012-12-17 15:00:49 +00:00
Brian Quinion
0dd10c3fff Change access control to implement more of CORS. Change so OPTIONS requests don't do an actual search/reverse request 2012-12-17 00:25:06 +00:00
Brian Quinion
b86d5c6a42 Merge branch 'master' of github.com:twain47/Nominatim 2012-12-14 20:48:33 +00:00
Brian Quinion
1965f423dc add support for boundary:postal_code, handle fallback address elements more elegantly 2012-12-14 20:48:27 +00:00
Sarah Hoffmann
fa1f23edfb more isset checks for PHP variables 2012-12-12 18:49:21 +01:00
Brian Quinion
ad89c1f0ca better fallback for address component names (avoid labeling mutliple values 'boundary') and handle situation where a place doesn't have a valid name tag for fallback. 2012-12-12 02:09:18 +00:00
Brian Quinion
c98e59be03 included calculated importance on details. Change importance calc to prefer places with a wikipedia tag now that the code is better tested 2012-12-12 01:44:39 +00: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
af8a44c4fe move memcache bucket functions to their own file 2012-12-08 21:41:09 +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
fa90ece530 add an option for max number of sleeping threads 2012-12-08 18:55:17 +00:00
Brian Quinion
02e7cfd6f4 sort output of blocked list by block timestamp 2012-12-08 17:58:24 +00:00
Brian Quinion
a723b94291 remove debug 2012-12-08 17:43:18 +00:00
Brian Quinion
e03ae6d7eb rate limiting using memcache 2012-12-08 17:38:10 +00:00
Brian Quinion
bde251f2a2 jsonv2 returns wrong place_rank 2012-12-05 15:34:27 +00:00
Brian Quinion
72fc234c50 Include the Last Updated timestamp in details 2012-11-18 14:58:46 +00:00
Sarah Hoffmann
e02c9b6e69 clean up details page 
Make it pass as valid XHTML and move CSS into its own file.
 2012-11-16 23:04:25 +01:00
Sarah Hoffmann
0c9630b24a clean up html for search form 
- move CSS to its own file
- make it pass as valid XHTML
- move attribution into Mapnik layer definition
- remove Osmarender layer
 2012-11-16 22:35:53 +01:00
Sarah Hoffmann
f03b4012f0 wrap KML polygon in XML output with geokml element 2012-11-11 22:46:22 +01:00
Sarah Hoffmann
cc3e4aa532 use geometry WKT for highlighting in search view 
also cleans up unused code in details view
 2012-11-09 22:35:45 +01:00
Sarah Hoffmann
77bbbd2498 forgot some brackets 2012-11-08 23:03:00 +01:00
Sarah Hoffmann
4bb56d98a8 simplify geometry handling in details page 
Hand the WKT directly to OpenLayers and let the client do the parsing,
it will be able to handle multipolygons as well as line strings.
Simplify geometries if they have too many points.

Also limit the number of child objects listed to 500.
 2012-11-08 22:21:20 +01:00
Sarah Hoffmann
df3202017e avoid matching of error message twice 2012-11-08 20:37:23 +01:00
Brian Quinion
ec4cf9efd0 include edit links for errors 2012-11-08 00:46:39 +00:00
Brian Quinion
9f7844ec7a make selfintersections a link 2012-11-07 23:46:50 +00:00
Sarah Hoffmann
0e3ac756c9 extend error reporting for invalid geometries 2012-11-08 00:06:47 +01:00
Brian Quinion
e5909cc78a Remove '(named features only)' because it isn't true any more 2012-11-07 16:51:41 +00:00
Brian Quinion
e70dfa18fa move error messages to consistent 'userError' function and return 400 Bad Request 2012-11-06 13:16:19 +00:00
Brian Quinion
753d2ac79f Add options to output polygon in various formats: polygon_geojson=1&polygon_svg=1&polygon_kml=1&polygon_text=1 They can be all used at the same time if prefered. Where format and polygon type are compatible output is as native type e.g. format=json&polygon_geojson=1 2012-11-06 00:08:01 +00:00
Brian Quinion
a0e39b67d5 Allow option of structured search queries (params amenity,street,city,county,state,country) 2012-11-02 17:52:33 +00:00
Brian Quinion
f87ea067ca fix some php warnings for cleaner output 2012-11-02 17:42:05 +00:00
Sarah Hoffmann
6b65b9086b switch attributions to ODbL 2012-09-12 19:14:28 +02:00
Sarah Hoffmann
fbc93d0c45 fix format error in polygon output 2012-08-27 23:17:17 +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
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
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
a44e21de49 avoid PHP notices 2012-05-25 23:45:59 +02:00
Sarah Hoffmann
8204a8b13a typo 2012-05-23 20:15:15 +03: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
4d0693ea69 don't have an address property in the return if we have not got address data 2012-05-04 00:59:26 +01:00
Sarah Hoffmann
820b075026 fix typos in mapicons 2012-04-26 23:23:27 +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
Brian Quinion
bfe5119742 Update details.php to show linked places 2012-04-01 02:38:40 +01:00
Brian Quinion
041b3edf89 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);
 2012-04-01 01:40:50 +01: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
4d7e0d97b2 return a 500 on database error 2012-03-18 17:58:19 +01:00
Sarah Hoffmann
a517dd0ccf send fail messages to error log 2012-03-04 19:06:20 +01:00
Sarah Hoffmann
d88778a561 respect addressdetails parameter in json output 2012-03-04 17:45:53 +01:00
Sarah Hoffmann
c3233cb951 convert CRLF to make git happy 2012-03-04 16:41:43 +01:00
Sarah Hoffmann
0005dc0a0f configurable file logging 
Respect CONST_Log_File setting and add two new configuration
variables CONST_Log_File_SearchLog and CONST_Log_File_ReverseLog
for the log file names.
 2012-03-04 12:50:45 +01:00
Sarah Hoffmann
6f9d3a9d80 return a marginally better error message when query string is not in UTF-8, 
force UTF-8 in search formular
 2012-02-12 12:01:24 +00:00
Sarah Hoffmann
e081983bcd enable exact search of GB postcodes in aux postcode data, 
partial search still disabled due to performance problems
 2012-02-11 09:19:42 +00:00
Sarah Hoffmann
7239687e5b avoid warnings when geometry of object cannot be determined 2012-02-06 23:14:21 +00:00
Sarah Hoffmann
3abbeb5f08 don't print address details if they are not requested 2012-02-06 22:26:08 +00:00
Sarah Hoffmann
c9d51fe7b8 remove unused protolib 2012-02-04 08:20:51 +00:00
Sarah Hoffmann
d3c883f1b5 remove trailing commas in HTML to make IE happy (thanks to TomH) 2012-02-04 07:53:02 +00:00
Brian Quinion
4d16677d2e update place_id to BIGINT 2011-06-14 13:42:46 +00:00
Brian Quinion
c988be1ddf handle pure lat,lon search by passing to reverse geocoding and returning first match as a search result 2011-05-03 17:34:51 +00:00
Brian Quinion
2eccb0e69d return actual centroid lat,lon of reverse geocoding result 2011-04-07 15:57:57 +00:00
Brian Quinion
942ed125d4 consider possibility that values with number in near start of search might be a house number (even if we have never seen them before). Also add better label for building:yes 2011-04-05 14:51:32 +00:00
Brian Quinion
b67b60f7d9 don't classify region as a type of state in address details output 2011-03-31 16:02:37 +00:00
Brian Quinion
6e56919962 option to get list of search keywords 2011-03-25 11:53:17 +00:00
Brian Quinion
b0ed31b6d4 configure tile set 2011-03-23 12:16:57 +00:00
Brian Quinion
2767821cb0 output importance on details.php page 2011-03-20 23:34:36 +00:00
Brian Quinion
2148d81474 calculate search position based to 'importance' rather than address rank 2011-03-18 09:52:16 +00:00
Brian Quinion
52d6f55ea6 fix search by just country code. Re-order some search results (admin boundaries always ended up at the top) 2011-02-08 14:21:39 +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
Frederik Ramm
bb9f0d81c0 fix line end 2011-02-02 14:31:50 +00:00
Brian Quinion
10620c71bb lots of little bug fixes and missing files 2011-02-02 12:01:26 +00:00
Brian Quinion
550578b359 final result ordering, remove GB postcode hacks 2011-01-24 11:24:47 +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
631e8d09ab postcode/zipcode improvements, finish work on handling extratags 2010-12-07 13:41:02 +00:00
Brian Quinion
7df80bbc6f tigger data import 2010-11-15 16:34:27 +00:00
Brian Quinion
75ec3326e1 output templates 2010-11-01 15:21:15 +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
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