Merge branch 'patch-1' of https://github.com/Firefishy/Nominatim

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

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index a02d3abf979143a8a934217805469c77ceb91fc3..c54c3c225f6442336256d22a1ade2a1d0e001511 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -33,7 +33,6 @@ body {
     </style>
        <script src="js/OpenLayers.js"></script>
        <script src="js/tiles.js"></script>
-       <script src="prototype-1.6.0.3.js"></script>
        <script type="text/javascript">
         
                var map;
@@ -52,7 +51,7 @@ body {
                 numZoomLevels: 19,
                 units: 'm',
                 projection: new OpenLayers.Projection("EPSG:900913"),
-                displayProjection: new OpenLayers.Projection("EPSG:4326"),
+                displayProjection: new OpenLayers.Projection("EPSG:4326")
                } );
                        map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default"));
 
@@ -69,15 +68,18 @@ body {
                                fillColor: "#F0F7FF",
                                strokeWidth: 2,
                                strokeOpacity: 0.75,
-                               fillOpacity: 0.75,
+                               fillOpacity: 0.75
                        };
                        var proj_EPSG4326 = new OpenLayers.Projection("EPSG:4326");
                        var proj_map = map.getProjectionObject();
                        var latlon;
 <?php
-foreach($aPolyPoints as $aPolyPoint)
+if (isset($aPolyPoints))
 {
-       echo "                        pointList.push(new OpenLayers.Geometry.Point(".$aPolyPoint[1].",".$aPolyPoint[2]."));\n";
+       foreach($aPolyPoints as $aPolyPoint)
+       {
+               echo "                        pointList.push(new OpenLayers.Geometry.Point(".$aPolyPoint[1].",".$aPolyPoint[2]."));\n";
+       }
 }
 ?>
                        var linearRing = new OpenLayers.Geometry.LinearRing(pointList).transform(proj_EPSG4326, proj_map);;
@@ -112,6 +114,11 @@ foreach($aPolyPoints as $aPolyPoint)
        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"><span class="label"></span>'.$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']);
+               echo ' <div>Wikipedia Calculated: <span class="wikipedia"><a href="http://'.$sWikipediaLanguage.'.wikipedia.org/wiki/'.urlencode($sWikipediaArticle).'">'.$aPointDetails['wikipedia'].'</a></span></div>';
+       }
        echo ' <div>Extra Tags: ';
        foreach($aPointDetails['aExtraTags'] as $sKey => $sValue)
        {
@@ -140,7 +147,7 @@ foreach($aPolyPoints as $aPolyPoint)
                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="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 ')';
@@ -148,6 +155,30 @@ foreach($aPolyPoints as $aPolyPoint)
        }
        echo '</div>';
 
+       if ($aLinkedLines)
+       {
+               echo '<h2>Linked Places</h2>';
+               echo '<div class=\"linked\">';
+               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>';
+               }
+               echo '</div>';
+       }
+
        if ($aPlaceSearchNameKeywords)
        {
                echo '<h2>Name Keywords</h2>';