Adds code to merge place polygon and points using:

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

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 4ae41116e42ba792710b722f01bacd78305dd182..3c7327a32465dc0c568005b1b41d867e2d997c1d 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -1,37 +1,39 @@
-<?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['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
+       header ("Content-Type: application/json; charset=UTF-8");
+       header("Access-Control-Allow-Origin: *");
+
+       $aFilteredPlaces = array();
+
+       if (!sizeof($aPlace))
+       {
+               if ($sError)
+                       $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'];
+               $aFilteredPlaces['display_name'] = $aPlace['langaddress'];
+               if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aAddress;
+       }
+
+       if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_.]+$/',$_GET['json_callback']))
+       {
+               echo $_GET['json_callback'].'('.javascript_renderData($aFilteredPlaces).')';
+       }
+       else
+       {
+               echo javascript_renderData($aFilteredPlaces);
+       }
+
+