Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 29e6e90176c29937bd6d348f76b1444ecec79b5a..9cefe3ef15a6b6effab46118295f95d66c493f28 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -1,39 +1,56 @@
-<?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
-                if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];\r
-                if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];\r
-               $aFilteredPlaces['display_name'] = $aPlace['langaddress'];\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 (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
+    $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
+    $sOSMType = formatOSMType($aPlace['osm_type']);
+    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['display_name'] = $aPlace['langaddress'];
+    if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress'];
+    if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags'];
+    if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails'];
+
+    if (isset($aPlace['aBoundingBox']))
+    {
+        $aFilteredPlaces['boundingbox'] = $aPlace['aBoundingBox'];
+    }
+
+    if (isset($aPlace['asgeojson']))
+    {
+        $aFilteredPlaces['geojson'] = json_decode($aPlace['asgeojson']);
+    }
+
+    if (isset($aPlace['assvg']))
+    {
+        $aFilteredPlaces['svg'] = $aPlace['assvg'];
+    }
+
+    if (isset($aPlace['astext']))
+    {
+        $aFilteredPlaces['geotext'] = $aPlace['astext'];
+    }
+
+    if (isset($aPlace['askml']))
+    {
+        $aFilteredPlaces['geokml'] = $aPlace['askml'];
+    }
+}
+
+javascript_renderData($aFilteredPlaces);
+