Sarah Hoffmann
1424e8e29b
use Result class in reverse geocoding
...
Also simplifies the reverse algorithm slightly by no longer
having an additional distance lookup.
2017-10-23 23:30:53 +02:00
Sarah Hoffmann
42f079c355
introduce Result class in Geocode and SearchDescription
2017-10-23 23:30:53 +02:00
Sarah Hoffmann
cdf8c67898
fix CodeSniffer offences
2017-10-13 23:11:09 +02:00
Sarah Hoffmann
00265af528
move word recheck into token collection
...
Drop tokens for special and postcode searches already when
collecting them for ValidTokens when they cannot be found
in the normalized query.
2017-10-13 23:04:12 +02:00
Sarah Hoffmann
77b76ae51b
simplify cross-check of country tokens
...
Drop country tokens that do not match the country code list
early. Remove in turn the special country code check for
structured phrases. It is sufficient to do this during
word list building.
2017-10-13 22:23:39 +02:00
Sarah Hoffmann
9ef2370a2a
remove unused $aPossibleMainWordIDs array
2017-10-13 21:34:13 +02:00
Sarah Hoffmann
77abe882ab
take frequency scores from token description
...
No need to hand them in separately.
2017-10-12 22:59:07 +02:00
Sarah Hoffmann
023f94b066
convert phrase array to class
2017-10-12 22:37:44 +02:00
Sarah Hoffmann
3da4c9c384
Sort results for near searches by proximity
...
If a reference coordinate is given, results really should be
sorted by distance to this point ignoring importance completely.
Fixes #796 .
2017-10-10 23:03:28 +02:00
Sarah Hoffmann
c02bf4986f
coding style and some documentation
2017-10-09 23:13:04 +02:00
Sarah Hoffmann
9a5d5d9aec
move complete search query code into SearchDescription
2017-10-09 22:55:50 +02:00
Sarah Hoffmann
55629a4891
move country list to SearchContext
2017-10-08 23:33:54 +02:00
Sarah Hoffmann
907133a38c
move excluded place list to SearchContext
2017-10-08 23:15:06 +02:00
Sarah Hoffmann
86c0858130
move viewbox sql to new SearchContext
2017-10-08 22:44:01 +02:00
Sarah Hoffmann
30511fd3ab
replace NearPoint with a more generic context object
...
The NearPoint is actually common to all SearchDescriptions
and there is other context data as well. like viewbox, that
needs to be available to the search object but is common.
2017-10-08 21:23:31 +02:00
Sarah Hoffmann
8e0ffde3e0
fix CodeSniffer violations
2017-10-08 17:00:59 +02:00
Sarah Hoffmann
795153b213
fix more syntax issues
2017-10-08 16:42:04 +02:00
Sarah Hoffmann
75e35f3832
fix syntax errors from introduction of SearchDescription
2017-10-08 15:26:14 +02:00
Sarah Hoffmann
16268f92cc
convert getGroupedSearches to SearchDescription class
2017-10-08 12:57:22 +02:00
Sarah Hoffmann
d72c863353
add function to convert array to SQL
2017-10-08 10:06:17 +02:00
Sarah Hoffmann
96b6a1a418
use SearchDescription class in query loop
2017-10-08 09:54:12 +02:00
Sarah Hoffmann
0067555c38
move initial search setup to new class type
2017-10-07 12:24:21 +02:00
Sarah Hoffmann
c563c2bfec
drop searches with excluded country codes earlier
2017-10-07 12:23:46 +02:00
Sarah Hoffmann
266153f218
remove code for dropping address terms
...
This code has been inactive in quite a while and is a suboptimal
solution. We need to be much more selective in what gets dropped.
2017-10-07 11:53:33 +02:00
Sarah Hoffmann
73e737d775
fix variable names
2017-10-06 22:01:52 +02:00
Sarah Hoffmann
5029101048
further restrict use of partial terms in names
2017-10-06 21:36:28 +02:00
Sarah Hoffmann
0c9a241487
housenumbers may only appear before or after the name
2017-10-06 21:16:35 +02:00
Sarah Hoffmann
41d2cd318d
penalize search order where a country comes first
2017-10-06 21:07:33 +02:00
Sarah Hoffmann
0d2cdb5c2f
allow postcodes and housenumbers together
...
Fixes #805 .
2017-10-06 20:48:35 +02:00
Sarah Hoffmann
f8d55b5448
sanitize special search term before normalizing
2017-10-06 00:22:27 +02:00
Sarah Hoffmann
00a3a8834b
fix postcode search
...
Name token must be fully replaced with the postcode and
postcode search must be done only once.
2017-10-04 23:33:29 +02:00
Sarah Hoffmann
32f6ddf6db
only allow either postcode or special search
...
Fixes #804 .
2017-10-04 20:15:06 +02:00
Sarah Hoffmann
e3323e8888
fix search for postcode via structured query
...
Results from the artifical postcode table were dropped
when reevaluating rank of results.
2017-10-03 12:10:27 +02:00
Sarah Hoffmann
2deac34648
remove unnecessary size check
2017-10-02 22:31:52 +02:00
Sarah Hoffmann
e8c52c6780
be more strict with searches involving house numbers
...
Housenumber searches without a name cannot exist per
definition. Searches with only a name but no address
should not fall back on a search without house number.
This should improve postcode only search.
2017-10-02 22:22:50 +02:00
Sarah Hoffmann
e7e7ae0104
avoid unnecessary SQL when rechecking rank restrictions
2017-10-02 20:42:37 +02:00
Sarah Hoffmann
749091bf3a
order of viewbox coordinates does not matter
2017-10-01 22:48:57 +02:00
Sarah Hoffmann
a88527b2a0
fix index when rechecking postcode name
2017-09-30 12:19:16 +02:00
Sarah Hoffmann
b1e8db7ca7
return unchanged term if normalizer was not found
2017-09-30 09:39:47 +02:00
Sarah Hoffmann
15a215729e
fix handling of near queries with special search
...
Make sure to use the classtype tables with near search and
allow to search for arbitrary key/values (forbidding it
for viewbox searches).
Add tests for near queries.
2017-09-19 00:07:11 +02:00
Sarah Hoffmann
8eb066c692
reinstate key-value amenity search
...
Reenable search by the secret special term [key=value]
matching against the given main tag. Note that for most
cases that works only for tags that also have a special
search table.
2017-09-18 22:09:06 +02:00
Sarah Hoffmann
a0de20e9bc
more API tests for code coverage
...
Also fixes two minor issues related to structured queries.
2017-09-17 23:30:08 +02:00
Sarah Hoffmann
88610b1b74
further restrict results for <postcode>, <term>
...
Disallow postcode operator together with housenumbers
and force results around a postcode when no address is
given.
2017-08-21 22:29:51 +02:00
Sarah Hoffmann
86a8900e21
fix subqueries when getting details for postcodes
2017-08-19 19:37:06 +02:00
Sarah Hoffmann
67bb885900
throw away searches with two postcodes
2017-08-19 19:37:06 +02:00
Sarah Hoffmann
50c5abf6bb
fix API tests wrt postcodes
2017-08-19 19:37:06 +02:00
Sarah Hoffmann
5237f44c4a
remove lat/lon check for search terms
...
Was only used with GB postcodes which were removed.
2017-08-19 19:37:06 +02:00
Sarah Hoffmann
99e9abe843
require postcodes to match exactly in normalised form
2017-08-19 19:37:06 +02:00
Sarah Hoffmann
5b4bbab9be
include GB CodePoint data into location_postcode table
2017-08-19 19:37:06 +02:00
Sarah Hoffmann
3714b7ea7d
take postcode into account for other searches
...
Existence of postcode is still optional but if a matching
result is found, then non-matching ones will be discarded.
2017-08-19 19:37:05 +02:00
