Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 45272d3540dc822511148b3bd1b5bcfb6ef80075..542e37afdc39b6d9a54b32239e0064b47b9c6d03 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -1,4 +1,6 @@
 <?php
+       header("content-type: application/json; charset=UTF-8");
+
        $aFilteredPlaces = array();
        foreach($aSearchResults as $iResNum => $aPointDetails)
        {
@@ -49,24 +51,24 @@
                        $aPlace['address'] = $aPointDetails['address'];
                 }
 
-                if (isset($aResult['asgeojson']))
+                if (isset($aPointDetails['asgeojson']))
                 {
-                        $aPlace['geojson'] = json_decode($aResult['asgeojson']);
+                        $aPlace['geojson'] = json_decode($aPointDetails['asgeojson']);
                 }
 
-                if (isset($aResult['assvg']))
+                if (isset($aPointDetails['assvg']))
                 {
-                        $aPlace['svg'] = $aResult['assvg'];
+                        $aPlace['svg'] = $aPointDetails['assvg'];
                 }
 
-                if (isset($aResult['astext']))
+                if (isset($aPointDetails['astext']))
                 {
-                        $aPlace['geotext'] = $aResult['astext'];
+                        $aPlace['geotext'] = $aPointDetails['astext'];
                 }
 
-               if (isset($aResult['askml']))
+               if (isset($aPointDetails['askml']))
                {
-                       $aPlace['geokml'] = $aResult['askml'];
+                       $aPlace['geokml'] = $aPointDetails['askml'];
                }
 
                $aFilteredPlaces[] = $aPlace;