]> git.openstreetmap.org Git - nominatim.git/blobdiff - lib/template/details-html.php
projects / nominatim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #436 from lonvia/remove-location-property-tables
[nominatim.git] / lib / template / details-html.php
diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 4cacb307c1c469db86c37faed79eaa0ec73df01b..3e9e39d75c4fa31a3734ba9546a701339f6c747d 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -1,216 +1,301 @@
 <?php
        header("content-type: text/html; charset=UTF-8");
 ?>
 <?php
        header("content-type: text/html; charset=UTF-8");
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>OpenStreetMap Nominatim: <?php echo $aPointDetails['localname'];?></title>
-    <link href="css/details.css" rel="stylesheet" type="text/css" />
-       <script src="js/OpenLayers.js" type="text/javascript"></script>
-       <script src="js/tiles.js" type="text/javascript"></script>
-       <script type="text/javascript">
-        
-               var map;
-
-    function init() {
-                       map = new OpenLayers.Map ("map", {
-                controls:[
-                                                                               new OpenLayers.Control.Permalink(),
-                                                                               new OpenLayers.Control.Navigation(),
-                                                                               new OpenLayers.Control.PanZoomBar(),
-                                                                               new OpenLayers.Control.MouseDefaults(),
-                                                                               new OpenLayers.Control.MousePosition(),
-                                                                               new OpenLayers.Control.Attribution()],
-                maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
-                maxResolution: 156543.0399,
-                numZoomLevels: 19,
-                units: 'm',
-                projection: new OpenLayers.Projection("EPSG:900913"),
-                displayProjection: new OpenLayers.Projection("EPSG:4326")
-               } );
-                       map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default"));
-
-                       var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
-                       layer_style.fillOpacity = 0.2;
-                       layer_style.graphicOpacity = 0.2;
-
-                       vectorLayer = new OpenLayers.Layer.Vector("Points", {style: layer_style});
-                       map.addLayer(vectorLayer);
-
-                       var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
-                       var proj_map = map.getProjectionObject();
-
-                       freader = new OpenLayers.Format.WKT({
-                               'internalProjection': proj_map,
-                               'externalProjection': proj_EPSG4326
-                       });
-
-                       var feature = freader.read('<?php echo $aPointDetails['outlinestring'];?>');
-                       if (feature) {
-                               map.zoomToExtent(feature.geometry.getBounds());
-
-                               feature.style = {
-                                       strokeColor: "#75ADFF",
-                                       fillColor: "#F0F7FF",
-                                       strokeWidth: <?php echo ($aPointDetails['isarea']=='t'?'2':'5');?>,
-                                       strokeOpacity: 0.75,
-                                       fillOpacity: 0.75,
-                                       pointRadius: 100
-                               };
-                               vectorLayer.addFeatures([feature]);
-                       }
-               }
-       </script>
-  </head>
-  <body onload="init();">
-    <div id="map"></div>
+<?php include(CONST_BasePath.'/lib/template/includes/html-header.php'); ?>
+       <link href="css/common.css" rel="stylesheet" type="text/css" />
+       <link href="css/details.css" rel="stylesheet" type="text/css" />
+</head>
+
+
+
 <?php
 <?php
-       echo '<h1>';
-       if ($aPointDetails['icon'])
+
+       function headline($sTitle)
        {
        {
-               echo '<img style="float:right;margin-right:40px;" src="'.CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png'.'">';
+               echo "<tr class='all-columns'><td colspan='6'><h2>".$sTitle."</h2></td></tr>\n";
        }
        }
-       echo $aPointDetails['localname'].'</h1>';
-       echo '<div class="locationdetails">';
-       echo ' <div>Name: ';
-       foreach($aPointDetails['aNames'] as $sKey => $sValue)
+
+       function headline3($sTitle)
        {
        {
-               echo ' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>';
+               echo "<tr class='all-columns'><td colspan='6'><h3>".$sTitle."</h3></td></tr>\n";
        }
        }
-       echo ' </div>';
-       echo ' <div>Type: <span class="type">'.$aPointDetails['class'].':'.$aPointDetails['type'].'</span></div>';
-       echo ' <div>Last Updated: <span class="type">'.$aPointDetails['indexed_date'].'</span></div>';
-       echo ' <div>Admin Level: <span class="adminlevel">'.$aPointDetails['admin_level'].'</span></div>';
-       echo ' <div>Rank: <span class="rankaddress">'.$aPointDetails['rank_search_label'].'</span></div>';
-       if ($aPointDetails['importance']) echo ' <div>Importance: <span class="rankaddress">'.$aPointDetails['importance'].'</span></div>';
-       echo ' <div>Coverage: <span class="area">'.($aPointDetails['isarea']=='t'?'Polygon':'Point').'</span></div>';
-       $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
-       if ($sOSMType) echo ' <div>OSM: <span class="osm">'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aPointDetails['osm_id'].'">'.$aPointDetails['osm_id'].'</a></span></div>';
-       if ($aPointDetails['wikipedia'])
+
+       function osm_link($aFeature)
        {
        {
-               list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aPointDetails['wikipedia']);
-               echo ' <div>Wikipedia Calculated: <span class="wikipedia"><a href="http://'.$sWikipediaLanguage.'.wikipedia.org/wiki/'.urlencode($sWikipediaArticle).'">'.$aPointDetails['wikipedia'].'</a></span></div>';
+               $sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
+               if ($sOSMType)
+               {
+                       return '<a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.$aFeature['osm_id'].'</a>';
+               }
+               return '';
        }
        }
-       echo ' <div>Extra Tags: ';
-       foreach($aPointDetails['aExtraTags'] as $sKey => $sValue)
+
+       function wikipedia_link($aFeature)
+       {
+               if ($aFeature['wikipedia'])
+               {
+                       list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aFeature['wikipedia']);
+                       return '<a href="https://'.$sWikipediaLanguage.'.wikipedia.org/wiki/'.urlencode($sWikipediaArticle).'" target="_blank">'.$aFeature['wikipedia'].'</a>';
+               }
+               return '';
+       }
+
+       function nominatim_link($aFeature, $sTitle)
        {
        {
-               echo ' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>';
+               return '<a href="details.php?place_id='.$aFeature['place_id'].'">'.$sTitle.'</a>';
        }
        }
-       echo ' </div>';
-       echo '</div>';
-
-       echo '<h2>Address</h2>';
-       echo '<div class="address">';
-       $iPrevRank = 1000000;
-       $sPrevLocalName = '';
-       foreach($aAddressLines as $aAddressLine)
-       {       
-               $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
-
-               echo '<div class="line'.($aAddressLine['isaddress']=='f'?' notused':'').'">';
-               if (!($iPrevRank<=$aAddressLine['rank_address'] || $sPrevLocalName == $aAddressLine['localname']))
+
+       function format_distance($fDistance)
+       {
+               // $fDistance is in meters
+               if ($fDistance < 1)
                {
                {
-                       $iPrevRank = $aAddressLine['rank_address'];
-                       $sPrevLocalName = $aAddressLine['localname'];
+                       return '0';
+               }
+               elseif ($fDistance < 1000)
+               {
+                       return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance,0)).' m</abbr>';
+               }
+               else
+               {
+                       return'<abbr class="distance" title="'.$fDistance.'">~'.(round($fDistance/1000,1)).' km</abbr>';
+               }
+       }
+
+       function kv($sKey,$sValue)
+       {
+               echo ' <tr><td>' . $sKey . '</td><td>'.$sValue.'</td></tr>'. "\n";
+       }
+
+
+       function hash_to_subtable($aAssociatedList)
+       {
+               $sHTML = '';
+               foreach($aAssociatedList as $sKey => $sValue)
+               {
+                       $sHTML = $sHTML.' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>'."\n";
+               }
+               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){
+                       echo '<img id="mapicon" src="'.CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.n.32.png'.'" alt="'.$sIcon.'" />';
                }
                }
-               echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
-               echo ' (';
-               echo '<span class="type"><span class="label">Type: </span>'.$aAddressLine['class'].':'.$aAddressLine['type'].'</span>';
-               if ($sOSMType) echo ', <span class="osm">'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
-               if (isset($aAddressLine['admin_level'])) echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
-               if (isset($aAddressLine['rank_search_label'])) echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</span>';
-//             echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
-               echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
-               echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
-               echo ')';
-               echo '</div>';
        }
        }
-       echo '</div>';
+
+
+       function _one_row($aAddressLine){
+               $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
+
+               echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
+               echo '  <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
+               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";
+       }
+
+       function _one_keyword_row($keyword_token,$word_id){
+               echo "<tr>\n";
+               echo '<td>';
+               // mark partial tokens (those starting with a space) with a star for readability
+               echo ($keyword_token[0]==' '?'*':'');
+               echo $keyword_token;
+               if (isset($word_id))
+               {
+                       echo '</td><td>word id: '.$word_id;
+               }
+               echo "</td></tr>\n";
+       }
+
+?>
+
+
+
+<body id="details-page">
+       <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
+       <div class="container">
+               <div class="row">
+                       <div class="col-sm-10">
+                               <h1><?php echo $aPointDetails['localname'] ?></h1>
+                       </div>
+                       <div class="col-sm-2 text-right">
+                               <?php map_icon($aPointDetails['icon']) ?>
+                       </div>
+               </div>
+               <div class="row">
+                       <div class="col-md-6">
+                               <table id="locationdetails" class="table table-striped">
+
+                               <?php
+
+                                       kv('Name'            , hash_to_subtable($aPointDetails['aNames']) );
+                                       kv('Type'            , $aPointDetails['class'].':'.$aPointDetails['type'] );
+                                       kv('Last Updated'    , $aPointDetails['indexed_date'] );
+                                       kv('Admin Level'     , $aPointDetails['admin_level'] );
+                                       kv('Rank'            , $aPointDetails['rank_search_label'] );
+                                       if ($aPointDetails['calculated_importance']) {
+                                               kv('Importance'    , $aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)') );
+                                       }
+                                       kv('Coverage'        , ($aPointDetails['isarea']=='t'?'Polygon':'Point') );
+                                       kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
+                                       kv('OSM'             , osm_link($aPointDetails) );
+                                       if ($aPointDetails['wikipedia'])
+                                       {
+                                               kv('Wikipedia Calculated' , wikipedia_link($aPointDetails) );
+                                       }
+
+                                       kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );
+
+                               ?>
+
+                               </table>
+                       </div>
+
+                       <div class="col-md-6">
+                               <div id="map"></div>
+                       </div>
+
+               </div>
+               <div class="row">
+                       <div class="col-md-12">
+
+                       <h2>Address</h2>
+
+                       <table id="address" class="table table-striped table-responsive">
+                               <thead>
+                                       <tr>
+                                         <td>Local name</td>
+                                         <td>Type</td>
+                                         <td>OSM</td>
+                                         <td>Admin level</td>
+                                         <!-- <td>Search rank</td> -->
+                                         <td>Distance</td>
+                                         <td></td>
+                                       </tr>
+                               </thead>
+                               <tbody>
+
+                               <?php
+
+                                       foreach($aAddressLines as $aAddressLine)
+                                       {       
+                                               _one_row($aAddressLine);
+                                       }
+                               ?>
+       
+
+
+<?php
 
        if ($aLinkedLines)
        {
 
        if ($aLinkedLines)
        {
-               echo '<h2>Linked Places</h2>';
-               echo '<div class=\"linked\">';
+               headline('Linked Places');
                foreach($aLinkedLines as $aAddressLine)
                {       
                foreach($aLinkedLines as $aAddressLine)
                {       
-                       $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
-
-                       echo '<div class="line">';
-                       echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
-                       echo ' (';
-                       echo '<span class="type"><span class="label">Type: </span>'.$aAddressLine['class'].':'.$aAddressLine['type'].'</span>';
-                       if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
-                       echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
-                       echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</span>';
-//                     echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
-                       echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
-                       echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
-                       echo ')';
-                       echo '</div>';
+                       _one_row($aAddressLine);
                }
                }
-               echo '</div>';
        }
 
        }
 
+
+
        if ($aPlaceSearchNameKeywords)
        {
        if ($aPlaceSearchNameKeywords)
        {
-               echo '<h2>Name Keywords</h2>';
+               headline('Name Keywords');
                foreach($aPlaceSearchNameKeywords as $aRow)
                {
                foreach($aPlaceSearchNameKeywords as $aRow)
                {
-                       echo '<div>'.$aRow['word_token'].'</div>';
+                       _one_keyword_row($aRow['word_token'], $aRow['word_id']);
                }
        }
 
        if ($aPlaceSearchAddressKeywords)
        {
                }
        }
 
        if ($aPlaceSearchAddressKeywords)
        {
-               echo '<h2>Address Keywords</h2>';
+               headline('Address Keywords');
                foreach($aPlaceSearchAddressKeywords as $aRow)
                {
                foreach($aPlaceSearchAddressKeywords as $aRow)
                {
-                       echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'.'</div>';
+                       _one_keyword_row($aRow['word_token'], $aRow['word_id']);
                }
        }
                }
        }
-
+       
        if (sizeof($aParentOfLines))
        {
        if (sizeof($aParentOfLines))
        {
-               echo '<h2>Parent Of:</h2>';
+               headline('Parent Of');
 
                $aGroupedAddressLines = array();
                foreach($aParentOfLines as $aAddressLine)
                {
 
                $aGroupedAddressLines = array();
                foreach($aParentOfLines as $aAddressLine)
                {
-                       if (!isset($aGroupedAddressLines[$aAddressLine['type']])) $aGroupedAddressLines[$aAddressLine['type']] = array();
-                       $aGroupedAddressLines[$aAddressLine['type']][] = $aAddressLine;
+                       if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];
+                       else $sType = $aAddressLine['type'];
+
+                       if (!isset($aGroupedAddressLines[$sType]))
+                               $aGroupedAddressLines[$sType] = array();
+                       $aGroupedAddressLines[$sType][] = $aAddressLine;
                }
                foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
                {
                        $sGroupHeading = ucwords($sGroupHeading);
                }
                foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
                {
                        $sGroupHeading = ucwords($sGroupHeading);
-                       echo "<h3>$sGroupHeading</h3>";
-               foreach($aParentOfLines as $aAddressLine)
-               {
-                       $aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber'];
-                       $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
-       
-                       echo '<div class="line">';
-                       echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
-                       echo ' (';
-//                     echo '<span class="type"><span class="label">Type: </span>'.$aAddressLine['class'].':'.$aAddressLine['type'].'</span>';
-//                     echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
-//                     echo ', <span class="rankaddress">'.$aAddressLine['rank_address'].'</span>';
-                       echo '<span class="area">'.($aAddressLine['isarea']=='t'?'Polygon':'Point').'</span>';
-                       echo ', <span class="distance">~'.(round($aAddressLine['distance']*69,1)).'&nbsp;miles</span>';
-                       if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
-                       echo ', <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
-                       echo ')';
-                       echo '</div>';
-               }
+                       headline3($sGroupHeading);
+
+                       foreach($aParentOfLines as $aAddressLine)
+                       {
+                               _one_row($aAddressLine);
+                       }
                }
                if (sizeof($aParentOfLines) >= 500) {
                        echo '<p>There are more child objects which are not shown.</p>';
                }
                }
                if (sizeof($aParentOfLines) >= 500) {
                        echo '<p>There are more child objects which are not shown.</p>';
                }
-               echo '</div>';
        }
 
        }
 
-//     echo '<h2>Other Parts:</h2>';
-//     echo '<h2>Linked To:</h2>';
+       // headline('Other Parts');
+       // headline('Linked To');
+
+       echo "</table>\n";
 ?>
 
 ?>
 
-  </body>
+                       </div>
+               </div>
+       </div>
+
+       <script type="text/javascript">
+       <?php
+
+               $aNominatimMapInit = [
+                 'tile_url' => $sTileURL,
+                 'tile_attribution' => $sTileAttribution
+               ];
+               echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
+
+               $aPlace = [
+                               'outlinestring' => $aPointDetails['outlinestring'],
+                               'lon' => $aPointDetails['lon'],
+                               'lat' => $aPointDetails['lat'],
+               ];
+               echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
+
+
+       ?>
+       </script>
+
+
+
+       <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
+</body>
 </html>
 </html>
Open Source search based on OpenStreetMap data