Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / template / address-html.php

diff --git a/lib/template/address-html.php b/lib/template/address-html.php
index 1f18e96c04e5c357a11cf8edd01ee59a6158c49e..f8d425e20808f93e2e10d789f42fe9507eb4aa08 100644 (file)
--- a/lib/template/address-html.php
+++ b/lib/template/address-html.php
@@ -48,7 +48,7 @@
 
           foreach($aZoomLevels as $iZoomLevel => $sLabel)
           {
-            $bSel = isset($_GET['zoom']) && ($_GET['zoom'] == $iZoomLevel);
+            $bSel = isset($_GET['zoom']) && ($_GET['zoom'] == (string)$iZoomLevel);
             echo '<option value="'.$iZoomLevel.'"'.($bSel?'selected':'').'>'.$iZoomLevel.' '.$sLabel.'</option>'."\n";
           }
         ?>
@@ -112,9 +112,11 @@
   <?php
 
     $aNominatimMapInit = [
-      'zoom' => isset($_GET['zoom'])?htmlspecialchars($_GET['zoom']):NULL,
-      'lat'  => isset($_GET['lat'] )?htmlspecialchars($_GET['lat']):NULL,
-      'lon'  => isset($_GET['lon'] )?htmlspecialchars($_GET['lon']):NULL
+      '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,
+      'tile_url' => $sTileURL,
+      'tile_attribution' => $sTileAttribution
     ];
     echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';