]> 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
bring back area bboxes for nodes
[nominatim.git] / lib / template / details-html.php
diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 9c967fff0844ce640471b0c921d806c1da6aae5d..1da693014a393dbfc00607e1c25f2266d1745d34 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -1,40 +1,15 @@
 <?php
        header("content-type: text/html; charset=UTF-8");
 ?>
 <?php
        header("content-type: text/html; charset=UTF-8");
 ?>
-<html>
+<!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>
   <head>
     <title>OpenStreetMap Nominatim: <?php echo $aPointDetails['localname'];?></title>
-    <style>
-body {
-       margin:0px;
-       padding:16px;
-  background:#ffffff;
-  height: 100%;
-  font: normal 12px/15px arial,sans-serif;
-}
-.line{
-  margin-left:20px;
-}
-.name{
-  font-weight: bold;
-}
-.notused{
-  color:#ddd;
-}
-.noname{
-  color:#800;
-}
-#map {
-  width:500px;
-  height:500px;
-  border: 2px solid #666;
-  float: right;
-}
-    </style>
-       <script src="js/OpenLayers.js"></script>
-       <script src="js/tiles.js"></script>
+    <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">
        <script type="text/javascript">
-        
+
                var map;
 
     function init() {
                var map;
 
     function init() {
@@ -43,7 +18,6 @@ body {
                                                                                new OpenLayers.Control.Permalink(),
                                                                                new OpenLayers.Control.Navigation(),
                                                                                new OpenLayers.Control.PanZoomBar(),
                                                                                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),
                                                                                new OpenLayers.Control.MousePosition(),
                                                                                new OpenLayers.Control.Attribution()],
                 maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
@@ -53,24 +27,15 @@ body {
                 projection: new OpenLayers.Projection("EPSG:900913"),
                 displayProjection: new OpenLayers.Projection("EPSG:4326")
                } );
                 projection: new OpenLayers.Projection("EPSG:900913"),
                 displayProjection: new OpenLayers.Projection("EPSG:4326")
                } );
-                       map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default",
-                        { attribution : '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>'}));
+                       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;
+                       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);
 
 
                        vectorLayer = new OpenLayers.Layer.Vector("Points", {style: layer_style});
                        map.addLayer(vectorLayer);
 
-                       var pointList = [];
-                       var style = {
-                               strokeColor: "#75ADFF",
-                               fillColor: "#F0F7FF",
-                               strokeWidth: 2,
-                               strokeOpacity: 0.75,
-                               fillOpacity: 0.75
-                       };
                        var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
                        var proj_map = map.getProjectionObject();
 
                        var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
                        var proj_map = map.getProjectionObject();
 
@@ -80,18 +45,31 @@ body {
                        });
 
                        var feature = freader.read('<?php echo $aPointDetails['outlinestring'];?>');
                        });
 
                        var feature = freader.read('<?php echo $aPointDetails['outlinestring'];?>');
+                       var featureCentre = freader.read('POINT(<?php echo $aPointDetails['lon'];?> <?php echo $aPointDetails['lat'];?>)');
                        if (feature) {
                                map.zoomToExtent(feature.geometry.getBounds());
                        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,
                                feature.style = {
                                        strokeColor: "#75ADFF",
                                        fillColor: "#F0F7FF",
                                        strokeWidth: <?php echo ($aPointDetails['isarea']=='t'?'2':'5');?>,
                                        strokeOpacity: 0.75,
                                        fillOpacity: 0.75,
-                                       pointRadius: 100
+                                       pointRadius: 50
+                               };
+
+<?php if ($aPointDetails['isarea']=='t') {?>
+                               featureCentre.style = {
+                                       strokeColor: "#008800",
+                                       fillColor: "#338833",
+                                       strokeWidth: <?php echo ($aPointDetails['isarea']=='t'?'2':'5');?>,
+                                       strokeOpacity: 0.75,
+                                       fillOpacity: 0.75,
+                                       pointRadius: 8
                                };
                                };
+                               vectorLayer.addFeatures([feature,featureCentre]);
+<?php } else { ?>
                                vectorLayer.addFeatures([feature]);
                                vectorLayer.addFeatures([feature]);
+<?php } ?>
                        }
                }
        </script>
                        }
                }
        </script>
@@ -102,9 +80,9 @@ body {
        echo '<h1>';
        if ($aPointDetails['icon'])
        {
        echo '<h1>';
        if ($aPointDetails['icon'])
        {
-               echo '<img style="float:right;margin-right:40px;" src="'.CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png'.'">';
+               echo '<img style="float:right;margin-right:40px;" src="'.CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png'.'" alt="'.$aPointDetails['icon'].'" />';
        }
        }
-       echo $aPointDetails['localname'].'</h1>';
+       echo $aPointDetails['localname']."</h1>\n";
        echo '<div class="locationdetails">';
        echo ' <div>Name: ';
        foreach($aPointDetails['aNames'] as $sKey => $sValue)
        echo '<div class="locationdetails">';
        echo ' <div>Name: ';
        foreach($aPointDetails['aNames'] as $sKey => $sValue)
@@ -113,12 +91,14 @@ body {
        }
        echo ' </div>';
        echo ' <div>Type: <span class="type">'.$aPointDetails['class'].':'.$aPointDetails['type'].'</span></div>';
        }
        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>';
        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>';
+       if ($aPointDetails['calculated_importance']) echo ' <div>Importance: <span class="rankaddress">'.$aPointDetails['calculated_importance'].($aPointDetails['importance']?'':' (estimated)').'</span></div>';
        echo ' <div>Coverage: <span class="area">'.($aPointDetails['isarea']=='t'?'Polygon':'Point').'</span></div>';
        echo ' <div>Coverage: <span class="area">'.($aPointDetails['isarea']=='t'?'Polygon':'Point').'</span></div>';
+       echo ' <div>Centre Point: <span class="area">'.$aPointDetails['lat'].','.$aPointDetails['lon'].'</span></div>';
        $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
        $sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
-       if ($sOSMType) echo ' <div>OSM: <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aPointDetails['osm_id'].'">'.$aPointDetails['osm_id'].'</a></span></div>';
+       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'])
        {
                list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aPointDetails['wikipedia']);
        if ($aPointDetails['wikipedia'])
        {
                list($sWikipediaLanguage,$sWikipediaArticle) = explode(':',$aPointDetails['wikipedia']);
@@ -130,10 +110,10 @@ body {
                echo ' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>';
        }
        echo ' </div>';
                echo ' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>';
        }
        echo ' </div>';
-       echo '</div>';
+       echo "</div>\n";
 
 
-       echo '<h2>Address</h2>';
-       echo '<div class=\"address\">';
+       echo "<h2>Address</h2>\n";
+       echo '<div class="address">';
        $iPrevRank = 1000000;
        $sPrevLocalName = '';
        foreach($aAddressLines as $aAddressLine)
        $iPrevRank = 1000000;
        $sPrevLocalName = '';
        foreach($aAddressLines as $aAddressLine)
@@ -149,21 +129,21 @@ body {
                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="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>';
+               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 ')';
                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>\n";
        }
        }
-       echo '</div>';
+       echo "</div>\n";
 
        if ($aLinkedLines)
        {
 
        if ($aLinkedLines)
        {
-               echo '<h2>Linked Places</h2>';
-               echo '<div class=\"linked\">';
+               echo "<h2>Linked Places</h2>\n";
+               echo '<div class="linked">';
                foreach($aLinkedLines as $aAddressLine)
                {       
                        $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
                foreach($aLinkedLines as $aAddressLine)
                {       
                        $sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
@@ -172,16 +152,16 @@ body {
                        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="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>';
+                       if ($sOSMType) echo ', <span class="osm">'.$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="adminlevel">'.$aAddressLine['admin_level'].'</span>';
-                       echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</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 ', <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>\n";
                }
                }
-               echo '</div>';
+               echo "</div>\n";
        }
 
        if ($aPlaceSearchNameKeywords)
        }
 
        if ($aPlaceSearchNameKeywords)
@@ -189,7 +169,7 @@ body {
                echo '<h2>Name Keywords</h2>';
                foreach($aPlaceSearchNameKeywords as $aRow)
                {
                echo '<h2>Name Keywords</h2>';
                foreach($aPlaceSearchNameKeywords as $aRow)
                {
-                       echo '<div>'.$aRow['word_token'].'</div>';
+                       echo '<div>'.$aRow['word_token']."</div>\n";
                }
        }
 
                }
        }
 
@@ -198,24 +178,28 @@ body {
                echo '<h2>Address Keywords</h2>';
                foreach($aPlaceSearchAddressKeywords as $aRow)
                {
                echo '<h2>Address Keywords</h2>';
                foreach($aPlaceSearchAddressKeywords as $aRow)
                {
-                       echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'.'</div>';
+                       echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."</div>\n";
                }
        }
 
        if (sizeof($aParentOfLines))
        {
                }
        }
 
        if (sizeof($aParentOfLines))
        {
-               echo '<h2>Parent Of:</h2>';
+               echo "<h2>Parent Of:</h2>\n<div>\n";
 
                $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>";
+                       echo "<h3>$sGroupHeading</h3>\n";
                foreach($aParentOfLines as $aAddressLine)
                {
                        $aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber'];
                foreach($aParentOfLines as $aAddressLine)
                {
                        $aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber'];
@@ -224,15 +208,12 @@ body {
                        echo '<div class="line">';
                        echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
                        echo ' (';
                        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>';
                        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>';
+                       if ($sOSMType) echo ', <span class="osm">'.$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 ', <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
                        echo ')';
-                       echo '</div>';
+                       echo "</div>\n";
                }
                }
                if (sizeof($aParentOfLines) >= 500) {
                }
                }
                if (sizeof($aParentOfLines) >= 500) {
Open Source search based on OpenStreetMap data