hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-25 18:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

query the last updated timestamp only if output format is HTML

Browse Source
This commit is contained in:
marc tobias
2016-03-02 01:22:19 +01:00
committed by Sarah Hoffmann
parent 5b4c7b7f7e
commit 83ce6e12e7
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/template/includes/html-top-navigation.php
View File

@@ -9,7 +9,7 @@
</div> </div>
</div> </div>
<div id="last-updated" class="col-xs-4 text-center"> <div id="last-updated" class="col-xs-4 text-center">
<?php if ($sDataDate){ ?> <?php if (isset($sDataDate)){ ?>
Data last updated: Data last updated:
<br> <br>
<?php echo $sDataDate; ?> <?php echo $sDataDate; ?>

9
website/details.php
View File

@@ -159,7 +159,12 @@
logEnd($oDB, $hLog, 1); logEnd($oDB, $hLog, 1);
$sTileURL = CONST_Map_Tile_URL; if ($sOutputFormat=='html')
$sTileAttribution = CONST_Map_Tile_Attribution; {
$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'); include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');

8
website/reverse.php
View File

@@ -76,6 +76,10 @@
exit; exit;
} }
$sTileURL = CONST_Map_Tile_URL; if ($sOutputFormat=='html')
$sTileAttribution = CONST_Map_Tile_Attribution; {
$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'); include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');

24
website/search.php
View File

@@ -13,8 +13,6 @@
$fLat = CONST_Default_Lat; $fLat = CONST_Default_Lat;
$fLon = CONST_Default_Lon; $fLon = CONST_Default_Lon;
$iZoom = CONST_Default_Zoom; $iZoom = CONST_Default_Zoom;
$sTileURL = CONST_Map_Tile_URL;
$sTileAttribution = CONST_Map_Tile_Attribution;
$oGeocode =& new Geocode($oDB); $oGeocode =& new Geocode($oDB);
@@ -99,17 +97,17 @@
{ {
if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/') 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 // reverse order of '/' separated string
$aPhrases = explode('/', $sQuery); $aPhrases = explode('/', $sQuery);
$aPhrases = array_reverse($aPhrases); $aPhrases = array_reverse($aPhrases);
$sQuery = join(', ',$aPhrases); $sQuery = join(', ',$aPhrases);
$oGeocode->setQuery($sQuery); $oGeocode->setQuery($sQuery);
} }
else else
{ {
$oGeocode->setQueryFromParams($_GET); $oGeocode->setQueryFromParams($_GET);
} }
} }
@@ -118,8 +116,12 @@
$aSearchResults = $oGeocode->lookup(); $aSearchResults = $oGeocode->lookup();
if ($aSearchResults === false) $aSearchResults = array(); 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)); logEnd($oDB, $hLog, sizeof($aSearchResults));
$bAsText = $oGeocode->getIncludePolygonAsText(); $bAsText = $oGeocode->getIncludePolygonAsText();