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

Also removes some unused code.

fixes #444

diff --git a/lib/template/address-html.php b/lib/template/address-html.php
index b943c5302f9125928d0a60e2c06152c628aebddd..ed5c39eb83ab5e0c81486d4ec481802cfd990ba8 100644 (file)
--- a/lib/template/address-html.php
+++ b/lib/template/address-html.php
@@ -111,13 +111,13 @@
        <script type="text/javascript">
        <?php
 
-               $aNominatimMapInit = [
+               $aNominatimMapInit = array(
                        'zoom' => isset($_GET['zoom']) ? htmlspecialchars($_GET['zoom']) : CONST_Default_Zoom,
-                       'lat'  => isset($_GET['lat'] ) ? htmlspecialchars($_GET['lat'] ) : CONST_Default_Lat,
-                       'lon'  => isset($_GET['lon'] ) ? htmlspecialchars($_GET['lon'] ) : CONST_Default_Lon,
+                       'lat'  => isset($_GET['lat']) ? htmlspecialchars($_GET['lat']) : CONST_Default_Lat,
+                       'lon'  => isset($_GET['lon']) ? htmlspecialchars($_GET['lon']) : CONST_Default_Lon,
                        'tile_url' => $sTileURL,
                        'tile_attribution' => $sTileAttribution
-               ];
+               );
                echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
                echo 'var nominatim_results = ' . json_encode([$aPlace], JSON_PRETTY_PRINT) . ';'; 

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 3e9e39d75c4fa31a3734ba9546a701339f6c747d..ae36b411b5ae69e6ed10f96d6b0e684bd3b24249 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -78,18 +78,6 @@
                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)
        {
                if ($sIcon){
@@ -106,8 +94,6 @@
                echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n";
                echo '  <td>' . osm_link($aAddressLine) . "</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>' . nominatim_link($aAddressLine,'details &gt;') . "</td>\n";
                echo "</tr>\n";
@@ -187,7 +173,6 @@
                                          <td>Type</td>
                                          <td>OSM</td>
                                          <td>Admin level</td>
-                                         <!-- <td>Search rank</td> -->
                                          <td>Distance</td>
                                          <td></td>
                                        </tr>
@@ -264,9 +249,6 @@
                }
        }
 
-       // headline('Other Parts');
-       // headline('Linked To');
-
        echo "</table>\n";
 ?>
 
@@ -277,17 +259,17 @@
        <script type="text/javascript">
        <?php
 
-               $aNominatimMapInit = [
+               $aNominatimMapInit = array(
                  'tile_url' => $sTileURL,
                  'tile_attribution' => $sTileAttribution
-               ];
+               );
                echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
-               $aPlace = [
+               $aPlace = array(
                                'outlinestring' => $aPointDetails['outlinestring'],
                                'lon' => $aPointDetails['lon'],
                                'lat' => $aPointDetails['lat'],
-               ];
+               );
                echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
 
 

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index 8b995b626faa70832b2bd4a2848a38866408e03c..dc4dcc748929f00cbb4110d57f2d42e87ce633d7 100644 (file)
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -96,13 +96,13 @@
        <script type="text/javascript">
        <?php
 
-               $aNominatimMapInit = [
-                       'zoom' => $iZoom,
-                       'lat' => $fLat,
-                       'lon' => $fLon,
-                       'tile_url' => $sTileURL,
-                       'tile_attribution' => $sTileAttribution
-               ];
+               $aNominatimMapInit = array(
+                       'zoom' => CONST_Default_Zoom,
+                       'lat' => CONST_Default_Lat,
+                       'lon' => CONST_Default_Lon,
+                       'tile_url' => CONST_Map_Tile_URL,
+                       'tile_attribution' => CONST_Map_Tile_Attribution
+               );
                echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
                echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';'; 

diff --git a/website/search.php b/website/search.php
index 8b160f8f72d98d435b69dd1eb4523ec4773d1b68..31944974070007e8aca276c287c2c0a48cc9f90b 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -10,11 +10,6 @@
 
        $oDB =& getDB();
 
-       // Display defaults
-       $fLat = CONST_Default_Lat;
-       $fLon = CONST_Default_Lon;
-       $iZoom = CONST_Default_Zoom;
-
        $oGeocode = new Geocode($oDB);
 
        $aLangPrefOrder = getPreferredLanguages();
@@ -120,8 +115,6 @@
        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));