osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2025-01-03 02:14:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,231 Commits 31 Branches 41 Tags 164 MiB
96ecee431b
Commit Graph

346 Commits

Author SHA1 Message Date
Markus Gail
f6127df15d add osm_type='tiger' to json, jsonv2 and xml output 2016-03-21 14:14:01 +01:00
Markus Gail
291fdd1894 Tested Version of new Tiger line storage format. 2016-03-21 14:14:01 +01:00
Markus Gail
46cef36184 Implement geocoding and reverse geocoding with tiger interpolation lines instead of points. 2016-03-21 14:14:01 +01:00
Markus Gail
bc449e10be change tiger housenumber format to save as lines instead of points and thus new interpolation 2016-03-21 14:07:12 +01:00
Markus Gail
d8703c223b adapt to code style conventions 2016-03-21 13:32:44 +01:00
Markus Gail
28166c5bb1 add osm_type='tiger' to json, jsonv2 and xml output 2016-03-21 13:32:44 +01:00
Markus Gail
df6b433066 Tested Version of new Tiger line storage format. 2016-03-21 13:32:44 +01:00
Markus Gail
26e30bf8e1 Implement geocoding and reverse geocoding with tiger interpolation lines instead of points. 2016-03-21 13:32:44 +01:00
Markus Gail
49d0ce1de4 change tiger housenumber format to save as lines instead of points and thus new interpolation 2016-03-21 13:32:44 +01:00
marc tobias
d020e05f5b query the last updated timestamp only if output format is HTML 2016-03-21 13:32:44 +01:00
marc tobias
c346c57341 corrected layout of keywords on HTML details page 2016-03-21 13:32:44 +01:00
Marc Tobias Metten
607fef2d8f moved bIncludePolygonAsPoints related logic into lib.php, added tests 2016-03-21 13:32:44 +01:00
Sarah Hoffmann
6fc32d9645 Merge branch 'cmake-port' into master 
Conflicts:
	CMakeLists.txt
	lib/init.php
	settings/settings.php
 2016-03-16 19:45:18 +01:00
Sarah Hoffmann
279ea25e7d Merge pull request #381 from lonvia/cmake-port 
Replace autotools with cmake and update osm2pgsql
 2016-03-13 21:40:38 +01:00
Marc Tobias Metten
22ebd1c7a9 second argument of array_merge can be empty 2016-03-13 03:01:19 +01:00
Sarah Hoffmann
5ccb499a6f install executables and call settings.php explicitly 
Executables (including websites) need to be installed in the
build directory, so that they can find the right settings.php.
settings now defines build and source dir.
 2016-03-12 09:40:43 +01:00
Sarah Hoffmann
5d7bd37ab2 introduce InstallPath, so that stuff can be executed from build dir 2016-03-12 09:40:43 +01:00
Marc Tobias Metten
71b3aa9cca Reverse geocode include geometry - added bounding box tests 2016-03-09 19:43:03 +01:00
Marc Tobias Metten
991bd0004a Reverse geocode include geometry 2016-03-04 20:29:09 +01:00
Sarah Hoffmann
df9850f5ca Merge pull request #385 from mtmail/query-lastupdated-only-for-html-output 
query the last updated timestamp only if output format is HTML
 2016-03-02 21:36:34 +01:00
marc tobias
8e2b5d7ce3 query the last updated timestamp only if output format is HTML 2016-03-02 01:22:19 +01:00
marc tobias
edaa1f7fcd corrected layout of keywords on HTML details page 2016-03-02 00:53:56 +01:00
Sarah Hoffmann
1ad6f4a1ce introduce InstallPath, so that stuff can be executed from build dir 2016-02-29 22:26:55 +01:00
Sarah Hoffmann
cb3af09ebd Merge pull request #380 from mtmail/geometryText2Points 
Geometry text2 points
 2016-02-29 20:53:49 +01:00
Marc Tobias Metten
9fb413a126 corrected layout of keywords on HTML details page 2016-02-29 13:59:16 +01:00
Marc Tobias Metten
7f5fe8c877 moved bIncludePolygonAsPoints related logic into lib.php, added tests 2016-02-28 17:06:52 +01:00
Marc Tobias Metten
78a29b5a87 spaces-to-tabs for all *.php files 2016-02-27 00:02:20 +01:00
Sarah Hoffmann
8b491e8544 Merge pull request #361 from mtmail/detail-page-big-table2 
UI: columns nicer aligned in details table(s)
 2016-02-06 12:51:47 +01:00
marc tobias
c2b68c337b remove commented-out lines 2016-02-06 12:49:59 +01:00
marc tobias
634d04068d UI: columns nicer aligned in details table(s) 2016-02-06 12:39:51 +01:00
Marc Tobias Metten
21385f5e51 make map tile layer configurable 2016-01-27 19:42:49 +01:00
Sarah Hoffmann
4cade95b24 more detailed introduction 
fixes #261
 2016-01-24 09:22:49 +01:00
Sarah Hoffmann
a9b370fcb2 reverse webpage: don't choose zoom level 0 when none is given 2016-01-22 23:11:47 +01:00
Sarah Hoffmann
355d1efe21 add a short introduction text for the web interface 2016-01-22 23:01:03 +01:00
marc tobias
cd37227a3c user interface: zoom dropdown for debugging on reverse search page 2016-01-22 11:54:26 +00:00
marc tobias
ef1a7d9073 user interface: reverse search remembers zoom level after map click 2016-01-21 15:26:18 +00:00
marc tobias
513efecc34 user interface: less whitespace in header 2016-01-21 12:03:19 +00:00
Sarah Hoffmann
248588fbf3 make headers more compact 2016-01-20 21:14:30 +01:00
Marc Tobias Metten
016815eda2 new reverse HTML page incl leaflet map 2016-01-19 16:15:32 +01:00
Marc Tobias Metten
f2a2c29815 responsive details-error page. Shared header and footer 2016-01-19 12:29:07 +01:00
Marc Tobias Metten
851af3db7f details.php now also responsive 2016-01-15 17:11:12 +01:00
marc tobias
fc961c14fa status after hackweekend London 2016-01-15 17:11:12 +01:00
PhiRub
5cc1946dfc Fixed Lat/Long Example 2015-09-03 15:59:40 -05:00
Sarah Hoffmann
5c187182a3 fix json output of empty arrays 2015-08-15 09:52:48 +02:00
Sarah Hoffmann
95a681f128 make sure names/extratags is enabled for postgres > 9.2 only 
Support for hstore_to_json() needed.
 2015-08-10 21:53:13 +02:00
Sarah Hoffmann
a1f3bfb35a implement namedetails and extratags parameter for search 2015-08-10 21:42:40 +02:00
Sarah Hoffmann
86ca377b1a add extratags and name details to PlaceLookup (reverse) 2015-08-09 15:14:59 +02:00
Sarah Hoffmann
134553b184 ignore man_made objects in reverse search 
fixes https://trac.openstreetmap.org/ticket/5339
 2015-08-04 21:44:19 +02:00
Marc Tobias Metten
7c8c206818 new method /lookup.php - Reverse search by multiple osm ids 2015-06-16 21:11:21 +02:00
Sarah Hoffmann
1fcb712f00 also return bbox ccordinates as string for nodes 
fixes https://trac.openstreetmap.org/ticket/5132 again
 2015-06-12 23:26:38 +02:00
Sarah Hoffmann
80df4d3b56 fix parameter name 
Fixes trac ticket 5319.
 2015-05-28 21:25:55 +02:00
Sarah Hoffmann
3e871d6ee0 Merge branch 'http_proxy' of https://github.com/simonlopez/Nominatim 2015-05-22 21:20:51 +02:00
Sarah Hoffmann
c51ca976ed bring back area bboxes for nodes 2015-05-21 22:47:37 +02:00
Simon Lopez
c1f65ba7cf allow usage behind an HTTP Proxy. Fixes twain47/Nominatim#33 2015-05-21 19:51:04 +02:00
Sarah Hoffmann
68596436b1 set SQL statement timeout to php execution timeout 2015-05-06 21:27:12 +02:00
Sarah Hoffmann
79f1107391 increase relevance of class/type importance 
fixes #273
 2015-05-04 21:14:34 +02:00
Sarah Hoffmann
cf36e8d2fb Merge branch 'reverse-lookup-including-tiger-lookup' of https://github.com/mtmail/Nominatim 2015-04-30 21:48:25 +02:00
Sarah Hoffmann
a7e1b3b1ee Merge branch 'feature/polygon-simplification' of https://github.com/a1exsh/Nominatim 2015-04-30 21:26:11 +02:00
Oleksandr Shulgin
46e64bd933 Check for positive polygon simplification threshold 
Don't run the simplification function if no threshold was given
(or in case of a negative one).  Also process the query string
parameter in case of html out format.
 2015-04-29 16:13:39 +02:00
Marc Tobias Metten
2e1590ed89 apply Sarah's pull request feedback 2015-04-29 01:34:32 +02:00
Sarah Hoffmann
27753fb8db remove check for class/type shortcuts which were never implemented 
fixes #266
 2015-04-28 21:37:51 +02:00
Marc Tobias Metten
2a3672c19b postgres coalesce() looks for null values, not 0. Result remains in this case 0 2015-04-28 21:14:36 +02:00
Marc Tobias Metten
9746629fd3 during reverse geocode lookup we also check the (optional) Tiger data for house numbers 2015-04-28 21:07:34 +02:00
Oleksandr Shulgin
ab47773604 Add polygon simplification 
New query string parameter polygon_threshold=<0.0..1> is introduced.
The float value of this parameter (defaults to 0) is passed to
ST_SimplifyPreserveTopology() on geometry we're about to output in
one (or many) requested formats such as GeoJSON, KML, etc.

This is useful when getting border polygons for whole countries, but
rendering them at large scale, when most of the high resolution details
cannot be seen anyway.  For example, the unsimplified polygon data for
Germany in GeoJSON format currently makes for about 3 MB response body.
With use of this new parameter, the application can greatly reduce the
amount of downloaded data and server response time while providing its
users with the same picture.  On a typical laptop screen resolution,
zooming out to fit the whole country borders on screen, only 1/100 amount
of details could be well enough.
 2015-04-27 15:16:38 +02:00
Brian Quinion
a5a0e1dd0b Various places where conversion from to ->aStructuredQuery had been missed 2015-04-07 14:04:08 +01:00
Sarah Hoffmann
eb1d8894b9 correctly handle comma-only exclude_place_ids 2015-03-29 18:17:52 +02:00
Sarah Hoffmann
aaabf70a1c correctly quote regular expression 2015-03-29 17:23:06 +02:00
Sarah Hoffmann
987b6a70c9 use unescaped unicode in json where supported by PHP 2015-03-29 13:02:21 +02:00
Sarah Hoffmann
555362eabe simplify bounding box computation 
Makes highlighting of points reappear.
 2015-03-06 20:58:09 +01:00
Marc Tobias Metten
3c2c3ab674 check database results before using variable 2015-02-18 17:53:49 +01:00
Sarah Hoffmann
2b2b6ffadc drop special handling of short exact terms in address 
There is a double check against exact terms, so that results with
a matching exact short term will float to the top.
 2015-02-15 19:36:39 +01:00
Sarah Hoffmann
c9f3d7d08b disable housenumber-specific search when no address details are provided 2015-02-05 21:13:33 +01:00
Sarah Hoffmann
cf5ced6618 order search results by existance of housenumbers 
When searching for an address with housenumber, include the house
number lookup already when searching in search_name so that we do
not cut away relevant results in cases where there are too many
street pieces.
 2015-02-04 20:31:30 +01:00
Sarah Hoffmann
0f84371748 actually write back the reversed final phrase when reversing the query 2015-02-04 20:29:38 +01:00
Sarah Hoffmann
b145dadd63 correctly quote display name in html search result 2015-02-03 23:12:21 +01:00
Sarah Hoffmann
7769b0a823 junctions should not appear as roads in addresses 
fixes #228
 2015-01-30 22:25:08 +01:00
Sarah Hoffmann
330f147b02 use _st_intersects when dealing with countries, it does not use index 2015-01-28 21:40:08 +01:00
Sarah Hoffmann
fbc5ba13f8 show class instead of yes in html search output 2015-01-27 22:22:26 +01:00
Sarah Hoffmann
c798577f70 remove hack for fixing adminitrative typo 2015-01-26 22:33:56 +01:00
Sarah Hoffmann
4c2fa68c55 details view: use class name if type is yes 
fixes #209
 2015-01-26 22:27:33 +01:00
Sarah Hoffmann
d1552b0904 don't use tokens from country parameter in address field of searches 
fixes #218
 2015-01-26 21:59:36 +01:00
Sarah Hoffmann
b121da0ca3 need phrase types in getGroupedSearches 2015-01-26 21:34:21 +01:00
Sarah Hoffmann
e16fcf879d fully evaluate reverse order of queries 
Factors out computation of search group and calls the code once
for forward evaluation and wants with reversed word order.
 2015-01-21 21:40:38 +01:00
Sarah Hoffmann
d6e7bbaad9 add underscore back to derelict canal 
fixes #212 (again)
 2014-12-20 14:55:08 +01:00
Sarah Hoffmann
1217083146 remove duplicate derelict canal 
fixes #212
 2014-12-20 00:02:26 +01:00
Marc Tobias Metten
52265a33ba for PlaceLookup if we look for nodes then the centroid does not exist in the placex table 2014-10-28 14:27:40 +01:00
Sarah Hoffmann
e62ae5b090 respect bounded in country searches 
fixes trac 5238
 2014-10-08 23:31:33 +02:00
Sarah Hoffmann
4d6da459da experimental tweaking of ranks of searches 
- completely removes partial words with spaces from addresses
- ensure that frequent partial search terms appear in NonAddress
- higher penalty for partial words consisting of numbers
 2014-09-29 19:11:59 +02:00
Marc Tobias Metten
d6f298f033 move looksLikeLatLonPair into lib.php, basic PHP test suite using phpunit 2014-09-23 22:53:20 +02:00
Sarah Hoffmann
aae90ea5cb fix adding of spaces in GB postcode 
Based on https://github.com/twain47/Nominatim/pull/180 by arunkmp.
 2014-09-21 22:44:06 +02:00
Sarah Hoffmann
e7ee9c2d84 fix coordinate order for route parameter 
fixes #174
 2014-09-03 21:08:26 +02:00
Sarah Hoffmann
5f79cca558 apply rank restrictions already when scanning search_name table 
fixes #176
 2014-09-03 21:00:37 +02:00
Sarah Hoffmann
0b545ba093 experimental ordering of searches within same rank 
giving preference to those without operator and housenumber
 2014-09-03 20:46:41 +02:00
Brian Quinion
fcc731dcd4 Add aeroway as alias for airport 2014-08-22 14:11:01 +01:00
Sarah Hoffmann
be1d7f38ca return with non-zero exit code on error 2014-05-18 22:58:58 +02:00
Sarah Hoffmann
ea48e50c60 Merge branch 'place-in-addressdetails' of https://github.com/lonvia/Nominatim 2014-05-16 11:23:05 +02:00
Sarah Hoffmann
defb809b83 normalize house numbers in placex when searching 2014-05-10 19:41:11 +02:00
Sarah Hoffmann
70deb7883e fix PHP warnings about undefined variables 2014-05-01 15:38:31 +02:00
Sarah Hoffmann
7b24f72870 give slight preference to full-word matches when reranking 
fixes https://trac.openstreetmap.org/ticket/5094
 2014-05-01 15:19:24 +02:00
Sarah Hoffmann
11153633ff remove some dead code 2014-05-01 14:21:57 +02:00
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