safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Marc Tobias Metten
2016-03-04 15:42:29 +01:00
parent 131b06fec3 df9850f5ca
commit d3ff9600b5
5 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/template/details-html.php
View File

@@ -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']);
}
}

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

@@ -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; ?>

9
website/details.php
View File

@@ -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');

8
website/reverse.php
View File

@@ -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');

24
website/search.php
View File

@@ -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();