hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace new-style [] expression with old-style array()

Browse Source 
Also removes some unused code.

fixes #444
This commit is contained in:
Sarah Hoffmann
2016-05-01 11:17:18 +02:00
parent 54ef9105d0
commit 4e0e0c1797
4 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/template/address-html.php
View File

@@ -111,13 +111,13 @@
<script type="text/javascript"> <script type="text/javascript">
<?php <?php
$aNominatimMapInit = [ $aNominatimMapInit = array(
'zoom' => isset($_GET['zoom']) ? htmlspecialchars($_GET['zoom']) : CONST_Default_Zoom, 'zoom' => isset($_GET['zoom']) ? htmlspecialchars($_GET['zoom']) : CONST_Default_Zoom,
'lat' => isset($_GET['lat'] ) ? htmlspecialchars($_GET['lat'] ) : CONST_Default_Lat, 'lat' => isset($_GET['lat']) ? htmlspecialchars($_GET['lat']) : CONST_Default_Lat,
'lon' => isset($_GET['lon'] ) ? htmlspecialchars($_GET['lon'] ) : CONST_Default_Lon, 'lon' => isset($_GET['lon']) ? htmlspecialchars($_GET['lon']) : CONST_Default_Lon,
'tile_url' => $sTileURL, 'tile_url' => $sTileURL,
'tile_attribution' => $sTileAttribution 'tile_attribution' => $sTileAttribution
]; );
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
echo 'var nominatim_results = ' . json_encode([$aPlace], JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_results = ' . json_encode([$aPlace], JSON_PRETTY_PRINT) . ';';

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

@@ -78,18 +78,6 @@
return $sHTML; return $sHTML;
} }
// function hash_to_subtable($aAssociatedList)
// {
// $sHTML = '<table class="table">';
// foreach($aAssociatedList as $sKey => $sValue)
// {
// $sHTML = $sHTML . '<tr><td>'.$sKey.'</td><td class="name">'.$sValue.'</td></tr>'."\n";
// }
// $sHTML = $sHTML . '</table>';
// return $sHTML;
// }
function map_icon($sIcon) function map_icon($sIcon)
{ {
if ($sIcon){ if ($sIcon){
@@ -106,8 +94,6 @@
echo ' <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n"; echo ' <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n";
echo ' <td>' . osm_link($aAddressLine) . "</td>\n"; echo ' <td>' . osm_link($aAddressLine) . "</td>\n";
echo ' <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . "</td>\n"; echo ' <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . "</td>\n";
// echo '<td>' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') ."</td>\n";
// echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
echo ' <td>' . format_distance($aAddressLine['distance'])."</td>\n"; echo ' <td>' . format_distance($aAddressLine['distance'])."</td>\n";
echo ' <td>' . nominatim_link($aAddressLine,'details &gt;') . "</td>\n"; echo ' <td>' . nominatim_link($aAddressLine,'details &gt;') . "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
@@ -187,7 +173,6 @@
<td>Type</td> <td>Type</td>
<td>OSM</td> <td>OSM</td>
<td>Admin level</td> <td>Admin level</td>
<!-- <td>Search rank</td> -->
<td>Distance</td> <td>Distance</td>
<td></td> <td></td>
</tr> </tr>
@@ -264,9 +249,6 @@
} }
} }
// headline('Other Parts');
// headline('Linked To');
echo "</table>\n"; echo "</table>\n";
?> ?>
@@ -277,17 +259,17 @@
<script type="text/javascript"> <script type="text/javascript">
<?php <?php
$aNominatimMapInit = [ $aNominatimMapInit = array(
'tile_url' => $sTileURL, 'tile_url' => $sTileURL,
'tile_attribution' => $sTileAttribution 'tile_attribution' => $sTileAttribution
]; );
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
$aPlace = [ $aPlace = array(
'outlinestring' => $aPointDetails['outlinestring'], 'outlinestring' => $aPointDetails['outlinestring'],
'lon' => $aPointDetails['lon'], 'lon' => $aPointDetails['lon'],
'lat' => $aPointDetails['lat'], 'lat' => $aPointDetails['lat'],
]; );
echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';';

14
lib/template/search-html.php
View File

@@ -96,13 +96,13 @@
<script type="text/javascript"> <script type="text/javascript">
<?php <?php
$aNominatimMapInit = [ $aNominatimMapInit = array(
'zoom' => $iZoom, 'zoom' => CONST_Default_Zoom,
'lat' => $fLat, 'lat' => CONST_Default_Lat,
'lon' => $fLon, 'lon' => CONST_Default_Lon,
'tile_url' => $sTileURL, 'tile_url' => CONST_Map_Tile_URL,
'tile_attribution' => $sTileAttribution 'tile_attribution' => CONST_Map_Tile_Attribution
]; );
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';'; echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';';

7
website/search.php
View File

@@ -10,11 +10,6 @@
$oDB =& getDB(); $oDB =& getDB();
// Display defaults
$fLat = CONST_Default_Lat;
$fLon = CONST_Default_Lon;
$iZoom = CONST_Default_Zoom;
$oGeocode = new Geocode($oDB); $oGeocode = new Geocode($oDB);
$aLangPrefOrder = getPreferredLanguages(); $aLangPrefOrder = getPreferredLanguages();
@@ -120,8 +115,6 @@
if ($sOutputFormat=='html') if ($sOutputFormat=='html')
{ {
$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"); $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));