Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index 02c338cd8cfe334a18018c4308b8ea195da9b0f2..53c6c88cfa88552134a4ffff5dbb2523cf936641 100644 (file)
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -17,17 +17,16 @@
         <div class="form-group search-button-group">
             <button type="submit" class="btn btn-primary btn-sm">Search</button>
             <?php if (CONST_Search_AreaPolygons) { ?>
         <div class="form-group search-button-group">
             <button type="submit" class="btn btn-primary btn-sm">Search</button>
             <?php if (CONST_Search_AreaPolygons) { ?>

-                <!-- <input type="checkbox" value="1" name="polygon" <?php if ($bAsText) echo "checked='checked'"; ?>/> Highlight -->
-                <input type="hidden" value="1" name="polygon" />
+                <input type="hidden" value="1" name="polygon_geojson" />

             <?php } ?>
             <?php } ?>

-            <input type="hidden" name="viewbox" value="<?php echo $sViewBox; ?>" />
+            <input type="hidden" name="viewbox" value="<?php if (isset($aMoreParams['viewbox'])) echo ($aMoreParams['viewbox']); ?>" />

             <div class="checkbox-inline">
             <div class="checkbox-inline">

-                <input type="checkbox" id="use_viewbox" <?php if ($sViewBox) echo "checked='checked'"; ?>>
+                <input type="checkbox" id="use_viewbox" <?php if (isset($aMoreParams['viewbox'])) echo "checked='checked'"; ?>>

                 <label for="use_viewbox">apply viewbox</label>
             </div>
         </div>
         <div class="search-type-link">
                 <label for="use_viewbox">apply viewbox</label>
             </div>
         </div>
         <div class="search-type-link">

-            <a href="<?php echo CONST_Website_BaseURL; ?>reverse.php?format=html">reverse search</a>
+            <a id="switch-to-reverse" href="<?php echo CONST_Website_BaseURL; ?>reverse.php?format=html">reverse search</a>

         </div>
     </form>
 
         </div>
     </form>
 


@@ -58,7 +57,7 @@
                 echo '</div>';
                 $i = $i+1;
             }
                 echo '</div>';
                 $i = $i+1;
             }

-            if (sizeof($aSearchResults) && $sMoreURL)
+            if (!empty($aSearchResults) && $sMoreURL)

             {
                 echo '<div class="more"><a class="btn btn-primary" href="'.htmlentities($sMoreURL).'">Search for more results</a></div>';
             }
             {
                 echo '<div class="more"><a class="btn btn-primary" href="'.htmlentities($sMoreURL).'">Search for more results</a></div>';
             }