factor out link formatting function and osm type translation

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

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 83c8b57cb523944e739901f5994895e72db0858e..bf6c700bf580acaec788671cbf734a8167613db0 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -3,25 +3,52 @@
 
        if (!sizeof($aPlace))
        {
 
        if (!sizeof($aPlace))
        {

-               if ($sError)
+               if (isset($sError))

                        $aFilteredPlaces['error'] = $sError;
                else
                        $aFilteredPlaces['error'] = 'Unable to geocode';
        }
        else
        {
                        $aFilteredPlaces['error'] = $sError;
                else
                        $aFilteredPlaces['error'] = 'Unable to geocode';
        }
        else
        {

-               if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
-               $aFilteredPlaces['licence'] = "Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.";
-               $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'];
+               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'];
                $aFilteredPlaces['display_name'] = $aPlace['langaddress'];

-               if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aAddress;
+               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);
        }
 
        javascript_renderData($aFilteredPlaces);