]> git.openstreetmap.org Git - nominatim.git/blobdiff - lib/template/search-html.php
projects / nominatim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 88ca5f7a96576543cb3644a2df9383b2c7d4dc8c..8b995b626faa70832b2bd4a2848a38866408e03c 100644 (file)
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -1,46 +1,20 @@
 <?php
        header("content-type: text/html; charset=UTF-8");
 ?>
 <?php
        header("content-type: text/html; charset=UTF-8");
 ?>
-<body id="search-page">
-
 <?php include(CONST_BasePath.'/lib/template/includes/html-header.php'); ?>
 <?php include(CONST_BasePath.'/lib/template/includes/html-header.php'); ?>
+       <link href="css/common.css" rel="stylesheet" type="text/css" />
+       <link href="css/search.css" rel="stylesheet" type="text/css" />
+</head>
 
 
-       <header class="container-fluid">
-               <div class="row">
-                       <div class="col-xs-4">
-                               <div class="brand">
-                                       <a href="<?php echo CONST_Website_BaseURL;?>">
-                                       <img alt="logo" src="images/osm_logo.120px.png" width="40" height="40"/>
-                                       <h1>Nominatim</h1>
-                                       </a>
-                               </div>
-                       </div>
-                       <div id="last-updated" class="col-xs-4 text-center">
-                               Data last updated:
-                               <br>
-                               <?php echo $sDataDate; ?>
-                       </div>
-                       <div class="col-xs-4 text-right">
-                               <div class="btn-group">
-                                       <button class="dropdown-toggle btn btn-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-                                               About &amp; Help <span class="caret"></span>
-                                       </button>
-                                       <ul class="dropdown-menu dropdown-menu-right">
-                                               <li><a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Documentation</a></li>
-                                               <li><a href="http://wiki.openstreetmap.org/wiki/Nominatim/FAQ" target="_blank">FAQ</a></li>
-                                               <li role="separator" class="divider"></li>
-                                               <li><a href="#" class="" data-toggle="modal" data-target="#report-modal">Report problem with results</a></li>
-                                       </ul>
-                               </div>
-                       </div>
-               </div>
-       </header>
+<body id="search-page">
+
+       <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
 
        <form class="form-inline" role="search" accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php">
                <div class="form-group">
                        <input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="<?php echo htmlspecialchars($sQuery); ?>" >
                </div>
 
        <form class="form-inline" role="search" accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php">
                <div class="form-group">
                        <input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="<?php echo htmlspecialchars($sQuery); ?>" >
                </div>
-               <div class="form-group">
+               <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 -->
                        <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 -->
@@ -54,92 +28,67 @@
                                </label>
                        </div>
                </div>
                                </label>
                        </div>
                </div>
+               <div class="search-type-link">
+                       <a href="<?php echo CONST_Website_BaseURL; ?>reverse.php?format=html">reverse search</a>
+               </div>
        </form>
 
 
        <div id="content">
        </form>
 
 
        <div id="content">
-<?php
-       if ($sQuery)
-       {
-?>
-       <div id="searchresults" class="sidebar">
-<?php
-       $i = 0;
-       foreach($aSearchResults as $iResNum => $aResult)
-       {
-
-               echo '<div class="result" data-position=' . $i . '>';
-
-               echo (isset($aResult['icon'])?'<img alt="icon" src="'.$aResult['icon'].'"/>':'');
-               echo ' <span class="name">'.htmlspecialchars($aResult['name']).'</span>';
-               // echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lon'],3).'</span>';
-               // echo ' <span class="place_id">'.$aResult['place_id'].'</span>';
-               if (isset($aResult['label']))
-                       echo ' <span class="type">('.$aResult['label'].')</span>';
-               else if ($aResult['type'] == 'yes')
-                       echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['class'])).')</span>';
-               else
-                       echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
-               echo ' <a class="btn btn-default btn-xs details" href="details.php?place_id='.$aResult['place_id'].'">details</a>';
-               echo '</div>';
-               $i = $i+1;
-       }
-       if (sizeof($aSearchResults) && $sMoreURL)
-       {
-               echo '<div class="more"><a class="btn btn-primary" href="'.htmlentities($sMoreURL).'">Search for more results</a></div>';
-       }
-       else
-       {
-               echo '<div class="noresults">No search results found</div>';
-       }
 
 
-?>
-       </div>
-<?php
-       }
-       else
-       {
-?>
-       <div id="intro" class="sidebar">
-       </div>
+<?php if ($sQuery) { ?>
+
+               <div id="searchresults" class="sidebar">
+               <?php
+                       $i = 0;
+                       foreach($aSearchResults as $iResNum => $aResult)
+                       {
+
+                               echo '<div class="result" data-position=' . $i . '>';
+
+                               echo (isset($aResult['icon'])?'<img alt="icon" src="'.$aResult['icon'].'"/>':'');
+                               echo ' <span class="name">'.htmlspecialchars($aResult['name']).'</span>';
+                               // echo ' <span class="latlon">'.round($aResult['lat'],3).','.round($aResult['lon'],3).'</span>';
+                               // echo ' <span class="place_id">'.$aResult['place_id'].'</span>';
+                               if (isset($aResult['label']))
+                                       echo ' <span class="type">('.$aResult['label'].')</span>';
+                               else if ($aResult['type'] == 'yes')
+                                       echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['class'])).')</span>';
+                               else
+                                       echo ' <span class="type">('.ucwords(str_replace('_',' ',$aResult['type'])).')</span>';
+                               echo ' <a class="btn btn-default btn-xs details" href="details.php?place_id='.$aResult['place_id'].'">details</a>';
+                               echo '</div>';
+                               $i = $i+1;
+                       }
+                       if (sizeof($aSearchResults) && $sMoreURL)
+                       {
+                               echo '<div class="more"><a class="btn btn-primary" href="'.htmlentities($sMoreURL).'">Search for more results</a></div>';
+                       }
+                       else
+                       {
+                               echo '<div class="noresults">No search results found</div>';
+                       }
+
+               ?>
+               </div>
 
 
-<?php
+<?php } else { ?>
 
 
-       }
-?>
-                       <div id="map-wrapper">
-                               <div id="map-position"></div>
-                               <div id="map"></div>
-                       </div>
+               <div id="intro" class="sidebar">
+                       <?php include(CONST_BasePath.'/lib/template/includes/introduction.php'); ?>
                </div>
 
                </div>
 
-       </div>
-
-       <footer>
-               <p class="disclaimer">
-                       Addresses and postcodes are approximate
-               </p>
-               <p class="copyright">
-                       &copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors
-               </p>
-       </footer>
-
-       <div class="modal fade" id="report-modal">
-               <div class="modal-dialog">
-                       <div class="modal-content">
-                               <div class="modal-header">
-                                       <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                       <h4 class="modal-title">Report a problem</h4>
-                               </div>
-                               <div class="modal-body">
-                                       <?php include(CONST_BasePath.'/lib/template/includes/report-errors.php'); ?>
-                               </div>
-                               <div class="modal-footer">
-                                       <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
-                               </div>
-                       </div>
+<?php } ?>
+
+               <div id="map-wrapper">
+                       <div id="map-position"></div>
+                       <div id="map"></div>
                </div>
                </div>
-       </div>
+
+       </div> <!-- /content -->
+
+
+
 
 
 
 
 
 
@@ -150,11 +99,12 @@
                $aNominatimMapInit = [
                        'zoom' => $iZoom,
                        'lat' => $fLat,
                $aNominatimMapInit = [
                        'zoom' => $iZoom,
                        'lat' => $fLat,
-                       'lon' => $fLon
+                       'lon' => $fLon,
+                       'tile_url' => $sTileURL,
+                       '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) . ';';
 
-               $aNominatimResults = [];
                echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';'; 
        ?>
        </script>
                echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';'; 
        ?>
        </script>
Open Source search based on OpenStreetMap data