Commit Graph

86 Commits

Author SHA1 Message Date
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
Brian Quinion
9eb5b62382 Accidentally used the same variable name for 2 things - broken search by class&type 2012-11-15 17:27:08 +00: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
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
0e3ac756c9 extend error reporting for invalid geometries 2012-11-08 00:06:47 +01:00
Brian Quinion
2b6a163ef9 Get route param working again after recent changes (implies bounded=1) 2012-11-07 01:22:17 +00:00
Brian Quinion
a44f9c6aab Missing some exact name matches when searching for 'special' phrases 2012-11-07 00:48:20 +00:00
Brian Quinion
3c1b21d61c mising string concatenation (.) 2012-11-06 20:04:31 +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
9d8ee88591 make number of polygon outputs allowed a constant 2012-11-06 13:10:25 +00:00
Brian Quinion
f942f7c3bf limit polygon output to one type as a time 2012-11-06 13:06:46 +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
c0d9ba7e0c Handle multipolygon geometry a little bit (return first outer ring) 2012-11-05 22:47:42 +00:00
Brian Quinion
9fcec31000 remove accidentally committed exit command 2012-11-05 14:04:14 +00:00
Brian Quinion
a5d5a92304 include a bit of extra details for polygon errors in output on details.php page 2012-11-05 14:00:54 +00:00
Brian Quinion
f67b1c20e1 don't include linked_place_id places in the sql output (causes errors on paging / number of results returned) 2012-11-05 13:57:02 +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
Sarah Hoffmann
9d7c51a813 correct penalty for multi-word countries
Country name needs to be the final one within the wordset, not
in the final of all wordsets.
2012-10-14 16:13:22 +02:00
Sarah Hoffmann
a960cf6b71 use geometry column for special phrase queries
It has an index, centroid does not.
2012-10-09 23:57:54 +02:00
Sarah Hoffmann
7b78507ef9 lift restriction on special search term class
All too frequent classes are already filtered out on import of the
special search term tables.
2012-09-30 10:40:44 +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
Brian Quinion
030873e0fb reduce effect of missing world now importance is better quality 2012-08-25 20:05:05 +01:00
Sarah Hoffmann
55d3f5a4b9 fix 500 on search for bounded and class query terms
Ignore bounded=1 if no viewbox parameter was given.

New centroid column in placex makes it necessary to name the table
when joining with classtype tables.
2012-08-25 01:09:52 +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
419f90ed75 ignore railways, tunnels and bridges when reverse geocoding 2012-06-28 20:39:18 +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
a44e21de49 avoid PHP notices 2012-05-25 23:45:59 +02:00
Brian Quinion
946f35e7ff Updated reverse geocoding to improve handling of zoom=0 2012-05-24 16:54:51 +01: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
Sarah Hoffmann
820b075026 fix typos in mapicons 2012-04-26 23:23:27 +02:00
Sarah Hoffmann
aaca88d5a6 allow slashes in house numbers 2012-04-16 15:33:13 +02: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
b1e10bce0d use X/Y max/min functions instead of box making
There is a strange bug in postgis where for some coordinates
it does not make a proper box around a point.
2012-03-18 18:18:33 +01:00
Sarah Hoffmann
4d7e0d97b2 return a 500 on database error 2012-03-18 17:58:19 +01:00
Sarah Hoffmann
fa3fe7d056 restrict detection of lat/lon pairs
Only interpret numbers as geo coordinates if they are in the
actual range for latitude and longitude.
2012-03-04 14:50:26 +01:00
Sarah Hoffmann
fec4c3c301 create proper token array for unknown housenumbers 2012-03-04 14:40:13 +01:00
Sarah Hoffmann
d7e91469b7 add script to list broken polygons 2012-03-04 10:54:07 +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
Brian Quinion
5e2b901106 fix miss-parsed regex with - sign in lat,lon query 2011-08-02 19:39:32 +00:00
Brian Quinion
c115a53df7 over tokenising 'la' 2011-06-07 12:31:46 +00:00