Merge pull request #1898 from lonvia/show-housenumber-with-housename

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

index b4c7533e190f52890fbeb2f154e548cfdcf6c1cf..165b2a9d3493b8d18abc2477d968ea2c105184ee 100644 (file)
--- a/lib/template/address-html.php
+++ b/lib/template/address-html.php
@@ -9,17 +9,19 @@
  <body id="reverse-page">
  
      <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
  <body id="reverse-page">
  
      <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
-
+    <div class="top-bar">
      <form class="form-inline" role="search" accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>reverse.php">
          <div class="form-group">
              <input name="format" type="hidden" value="html">
      <form class="form-inline" role="search" accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>reverse.php">
          <div class="form-group">
              <input name="format" type="hidden" value="html">
-            <input name="lat" type="text" class="form-control input-sm" placeholder="latitude"  value="<?php echo htmlspecialchars($_GET['lat']); ?>" >
-            <span id="switch-coords">&lt;&gt;</span>
-            <input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="<?php echo htmlspecialchars($_GET['lon']); ?>" >
+            lat
+            <input name="lat" type="text" class="form-control input-sm" placeholder="latitude" value="<?php echo $fLat; ?>" >
+            <a href="#" class="btn btn-default btn-xs" id="switch-coords" title="switch lat and lon">&lt;&gt;</a>
+            lon
+            <input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="<?php echo $fLon; ?>" >
              max zoom
  
              max zoom
  
-            <select name="zoom" class="form-control input-sm" value="<?php echo htmlspecialchars($_GET['zoom']); ?>">
-                <option value="" <?php echo $_GET['zoom']==''?'selected':'' ?> >--</option>
+            <select name="zoom" class="form-control input-sm">
+                <option value="" <?php if ($iZoom === false) echo 'selected="selected"' ?> >--</option>
                  <?php
  
                      $aZoomLevels = array(
                  <?php
  
                      $aZoomLevels = array(
@@ -49,8 +51,8 @@
  
                      foreach($aZoomLevels as $iZoomLevel => $sLabel)
                      {
  
                      foreach($aZoomLevels as $iZoomLevel => $sLabel)
                      {
-                        $bSel = isset($_GET['zoom']) && ($_GET['zoom'] == (string)$iZoomLevel);
-                        echo '<option value="'.$iZoomLevel.'"'.($bSel?'selected':'').'>'.$iZoomLevel.' '.$sLabel.'</option>'."\n";
+                        $bSel = $iZoom === $iZoomLevel;
+                        echo '<option value="'.$iZoomLevel.'"'.($bSel?' selected="selected"':'').'>'.$iZoomLevel.' '.$sLabel.'</option>'."\n";
                      }
                  ?>
              </select>
                      }
                  ?>
              </select>
@@ -62,11 +64,11 @@
              <a href="<?php echo CONST_Website_BaseURL; ?>search.php">forward search</a>
          </div>
      </form>
              <a href="<?php echo CONST_Website_BaseURL; ?>search.php">forward search</a>
          </div>
      </form>
-
+</div>
  
      <div id="content">
  
  
      <div id="content">
  
-<?php if ($aPlace) { ?>
+<?php if (count($aPlace)>0) { ?>
  
          <div id="searchresults" class="sidebar">
          <?php
  
          <div id="searchresults" class="sidebar">
          <?php
@@ -83,7 +85,7 @@
              else
                  echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
              echo '<p>'.$aResult['lat'].','.$aResult['lon'].'</p>';
              else
                  echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
              echo '<p>'.$aResult['lat'].','.$aResult['lon'].'</p>';
-            echo ' <a class="btn btn-default btn-xs details" href="details.php?place_id='.$aResult['place_id'].'">details</a>';
+            echo detailsPermaLink($aResult, 'details', 'class="btn btn-default btn-xs details"');
              echo '</div>';
          ?>
          </div>
              echo '</div>';
          ?>
          </div>
@@ -116,9 +118,9 @@
      <?php
  
          $aNominatimMapInit = array(
      <?php
  
          $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,
+            'zoom' => $iZoom !== false ? $iZoom : CONST_Default_Zoom,
+            'lat'  => $fLat !== false ? $fLat : CONST_Default_Lat,
+            'lon'  => $fLon !== false ? $fLon : CONST_Default_Lon,
              'tile_url' => $sTileURL,
              'tile_attribution' => $sTileAttribution
          );
              'tile_url' => $sTileURL,
              'tile_attribution' => $sTileAttribution
          );