Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / template / address-jsonv2.php

diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index b6fa58fee398484b10e8b8ee58b189880d7183ab..00f8750db3f97430f4975707a1ec6421762be796 100644 (file)
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.php
@@ -1,42 +1,32 @@
-<?php\r
-       header ("Content-Type: application/json; charset=UTF-8");\r
-       header("Access-Control-Allow-Origin: *");\r
-\r
-       $aFilteredPlaces = array();\r
-\r
-       if (!sizeof($aPlace))\r
-       {\r
-               if ($sError)\r
-                       $aFilteredPlaces['error'] = $sError;\r
-               else\r
-                       $aFilteredPlaces['error'] = 'Unable to geocode';\r
-       }\r
-       else\r
-       {\r
-               if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];\r
-               $aFilteredPlaces['licence'] = "Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.";\r
-               $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));\r
-                if ($sOSMType)\r
-                {\r
-                        $aFilteredPlaces['osm_type'] = $sOSMType;\r
-                        $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];\r
-                }\r
-                $aFilteredPlaces['category'] = $aPlace['class'];\r
-                $aFilteredPlaces['type'] = $aPlace['type'];\r
-                $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);\r
-\r
-               $aFilteredPlaces['display_name'] = $aPlace['langaddress'];\r
-                $aFilteredPlaces['name'] = $aPlace['placename'];\r
-               $aFilteredPlaces['address'] = $aAddress;\r
-       }\r
-\r
-       if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_]+$/',$_GET['json_callback']))\r
-       {\r
-               echo $_GET['json_callback'].'('.javascript_renderData($aFilteredPlaces).')';\r
-       }\r
-       else\r
-       {\r
-               echo javascript_renderData($aFilteredPlaces);\r
-       }\r
-\r
-\r
+<?php
+       $aFilteredPlaces = array();
+
+       if (!sizeof($aPlace))
+       {
+               if (isset($sError))
+                       $aFilteredPlaces['error'] = $sError;
+               else
+                       $aFilteredPlaces['error'] = 'Unable to geocode';
+       }
+       else
+       {
+               if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
+               $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
+               $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
+                if ($sOSMType)
+                {
+                        $aFilteredPlaces['osm_type'] = $sOSMType;
+                        $aFilteredPlaces['osm_id'] = $aPlace['osm_id'];
+                }
+               if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
+               if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
+                $aFilteredPlaces['category'] = $aPlace['class'];
+                $aFilteredPlaces['type'] = $aPlace['type'];
+                $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']);
+
+               $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
+                $aFilteredPlaces['name'] = $aPlace['placename'];
+               if ($bShowAddressDetails && $aAddress && sizeof($aAddress)) $aFilteredPlaces['address'] = $aAddress;
+       }
+
+       javascript_renderData($aFilteredPlaces);