status after hackweekend London

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

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index a38ee1bc2a22102384cb8d8df5d151c996610332..1da693014a393dbfc00607e1c25f2266d1745d34 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -19,9 +19,6 @@
                                                                                new OpenLayers.Control.Navigation(),
                                                                                new OpenLayers.Control.PanZoomBar(),
                                                                                new OpenLayers.Control.MousePosition(),
-                                                                               new OpenLayers.Control.TouchNavigation({
-                                                                                       dragPanOptions: { enableKinetic: true }
-                                                                               }),
                                                                                new OpenLayers.Control.Attribution()],
                 maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
                 maxResolution: 156543.0399,
@@ -83,9 +80,9 @@
        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)
@@ -113,9 +110,9 @@
                echo ' <div class="line"><span class="name">'.$sValue.'</span> ('.$sKey.')</div>';
        }
        echo ' </div>';
-       echo '</div>';
+       echo "</div>\n";
 
-       echo '<h2>Address</h2>';
+       echo "<h2>Address</h2>\n";
        echo '<div class="address">';
        $iPrevRank = 1000000;
        $sPrevLocalName = '';
@@ -139,14 +136,14 @@
                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)
        {
-               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':'')));
@@ -155,16 +152,16 @@
                        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="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 '</div>';
+                       echo "</div>\n";
                }
-               echo '</div>';
+               echo "</div>\n";
        }
 
        if ($aPlaceSearchNameKeywords)
@@ -172,7 +169,7 @@
                echo '<h2>Name Keywords</h2>';
                foreach($aPlaceSearchNameKeywords as $aRow)
                {
-                       echo '<div>'.$aRow['word_token'].'</div>';
+                       echo '<div>'.$aRow['word_token']."</div>\n";
                }
        }
 
@@ -181,24 +178,28 @@
                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))
        {
-               echo '<h2>Parent Of:</h2>';
+               echo "<h2>Parent Of:</h2>\n<div>\n";
 
                $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);
-                       echo "<h3>$sGroupHeading</h3>";
+                       echo "<h3>$sGroupHeading</h3>\n";
                foreach($aParentOfLines as $aAddressLine)
                {
                        $aAddressLine['localname'] = $aAddressLine['localname']?$aAddressLine['localname']:$aAddressLine['housenumber'];
@@ -207,15 +208,12 @@
                        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>';
+                       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 '</div>';
+                       echo "</div>\n";
                }
                }
                if (sizeof($aParentOfLines) >= 500) {