Commit Graph

147 Commits

Author SHA1 Message Date
Sarah Hoffmann
4e0e0c1797 replace new-style [] expression with old-style array()
Also removes some unused code.

fixes #444
2016-05-01 11:22:53 +02:00
Markus Gail
7879ad44cd Remove interpolation lines from placex and save them in an extra table. 2016-04-25 09:44:01 +02:00
Markus Gail
f6127df15d add osm_type='tiger' to json, jsonv2 and xml output 2016-03-21 14:14:01 +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
Marc Tobias Metten
9fb413a126 corrected layout of keywords on HTML details page 2016-02-29 13:59:16 +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
Sarah Hoffmann
5c187182a3 fix json output of empty arrays 2015-08-15 09:52:48 +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
Marc Tobias Metten
7c8c206818 new method /lookup.php - Reverse search by multiple osm ids 2015-06-16 21:11:21 +02:00
Sarah Hoffmann
b145dadd63 correctly quote display name in html search result 2015-02-03 23:12:21 +01:00
Sarah Hoffmann
fbc5ba13f8 show class instead of yes in html search output 2015-01-27 22:22:26 +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
369a0974bd make HTML validator happy with details page 2014-04-12 20:12:23 +02: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
17e2e95b53 properly quote quotes in type field 2013-10-21 18:28:10 +02:00
Sarah Hoffmann
528de055d1 make html validator happy 2013-09-25 22:57:45 +02: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
Brian Quinion
cdd129de70 fix viewbox issues 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
Sarah Hoffmann
eee6ed48f0 use correct viewbox variable in search XML 2013-04-10 20:33:10 +02: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
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
Sarah Hoffmann
fa1f23edfb more isset checks for PHP variables 2012-12-12 18:49:21 +01: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
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
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
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
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
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
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
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
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
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
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
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
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
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