From: Marc Tobias Metten <mtmail@gmx.net>
Date: Fri, 4 Mar 2016 14:42:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v3.0.0~201^2~2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/d3ff9600b5e345239f4dc1b5d1b7244f5a25d051?hp=131b06fec3d82ec3538147efa9de401dad26cc2c

Merge remote-tracking branch 'upstream/master'
---

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 404450c0..3e9e39d7 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -121,7 +121,7 @@
 		echo $keyword_token;
 		if (isset($word_id))
 		{
-			echo '</td><td>('.$word_id.')';
+			echo '</td><td>word id: '.$word_id;
 		}
 		echo "</td></tr>\n";
 	}
@@ -222,7 +222,7 @@
 		headline('Name Keywords');
 		foreach($aPlaceSearchNameKeywords as $aRow)
 		{
-			_one_keyword_row($aRow['word_token']);
+			_one_keyword_row($aRow['word_token'], $aRow['word_id']);
 		}
 	}
 
diff --git a/lib/template/includes/html-top-navigation.php b/lib/template/includes/html-top-navigation.php
index 61bec19a..d72fcb7c 100644
--- a/lib/template/includes/html-top-navigation.php
+++ b/lib/template/includes/html-top-navigation.php
@@ -9,7 +9,7 @@
 				</div>
 			</div>
 			<div id="last-updated" class="col-xs-4 text-center">
-				<?php if ($sDataDate){ ?>
+				<?php if (isset($sDataDate)){ ?>
 					Data last updated:
 					<br>
 					<?php echo $sDataDate; ?>
diff --git a/website/details.php b/website/details.php
index ad753a82..3a0fee82 100755
--- a/website/details.php
+++ b/website/details.php
@@ -159,7 +159,12 @@
 
 	logEnd($oDB, $hLog, 1);
 
-	$sTileURL = CONST_Map_Tile_URL;
-	$sTileAttribution = CONST_Map_Tile_Attribution;
+	if ($sOutputFormat=='html')
+	{
+		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
+		$sTileURL = CONST_Map_Tile_URL;
+		$sTileAttribution = CONST_Map_Tile_Attribution;
+	}
+
 	
 	include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');
diff --git a/website/reverse.php b/website/reverse.php
index e2dfaef8..f760dc09 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -76,6 +76,10 @@
 		exit;
 	}
 
-	$sTileURL = CONST_Map_Tile_URL;
-	$sTileAttribution = CONST_Map_Tile_Attribution;
+	if ($sOutputFormat=='html')
+	{
+		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
+		$sTileURL = CONST_Map_Tile_URL;
+		$sTileAttribution = CONST_Map_Tile_Attribution;
+	}
 	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
diff --git a/website/search.php b/website/search.php
index f2c327c0..c216c884 100755
--- a/website/search.php
+++ b/website/search.php
@@ -13,8 +13,6 @@
 	$fLat = CONST_Default_Lat;
 	$fLon = CONST_Default_Lon;
 	$iZoom = CONST_Default_Zoom;
-	$sTileURL = CONST_Map_Tile_URL;
-	$sTileAttribution = CONST_Map_Tile_Attribution;
 
 	$oGeocode =& new Geocode($oDB);
 
@@ -99,17 +97,17 @@
 	{
 		if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
 		{
-				$sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
+			$sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
 
-				// reverse order of '/' separated string
-				$aPhrases = explode('/', $sQuery);
-				$aPhrases = array_reverse($aPhrases);
-				$sQuery = join(', ',$aPhrases);
-				$oGeocode->setQuery($sQuery);
+			// reverse order of '/' separated string
+			$aPhrases = explode('/', $sQuery);
+			$aPhrases = array_reverse($aPhrases);
+			$sQuery = join(', ',$aPhrases);
+			$oGeocode->setQuery($sQuery);
 		}
 		else
 		{
-				$oGeocode->setQueryFromParams($_GET);
+			$oGeocode->setQueryFromParams($_GET);
 		}
 	}
 
@@ -118,8 +116,12 @@
 	$aSearchResults = $oGeocode->lookup();
 	if ($aSearchResults === false) $aSearchResults = array();
 
-	$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-
+	if ($sOutputFormat=='html')
+	{
+		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
+		$sTileURL = CONST_Map_Tile_URL;
+		$sTileAttribution = CONST_Map_Tile_Attribution;
+	}
 	logEnd($oDB, $hLog, sizeof($aSearchResults));
 
 	$bAsText = $oGeocode->getIncludePolygonAsText();