From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 5 Feb 2014 19:10:12 +0000 (+0100)
Subject: surpress output of osm_type/id for non-OSM objects in reverse xml
X-Git-Tag: v2.2.0~12
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/8286abbeb479a18df7b560daccad7673e3f77297

surpress output of osm_type/id for non-OSM objects in reverse xml
---

diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 0747844a..9eeb3b77 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -22,7 +22,8 @@
 	{
 		echo "<result";
 		if ($aPlace['place_id']) echo ' place_id="'.$aPlace['place_id'].'"';
-		if ($aPlace['osm_type'] && $aPlace['osm_id']) echo ' osm_type="'.($aPlace['osm_type']=='N'?'node':($aPlace['osm_type']=='W'?'way':'relation')).'"'.' osm_id="'.$aPlace['osm_id'].'"';
+		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
+		if ($sOSMType) echo ' osm_type="'.$sOSMType.'"'.' osm_id="'.$aPlace['osm_id'].'"';
 		if ($aPlace['ref']) echo ' ref="'.htmlspecialchars($aPlace['ref']).'"';
 		if (isset($aPlace['lat'])) echo ' lat="'.htmlspecialchars($aPlace['lat']).'"';
 		if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"';