Merge remote-tracking branch 'upstream/master' into move-mouse-position-info-on-map

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

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 463eb4aa7e22f8498932de6da634fb690fb45c0b..71fcc7b3e0a0aa67c61151ce496e2c5dd02bba10 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -7,7 +7,6 @@
 </head>
 
 
-
 <?php
 
        function headline($sTitle)
@@ -20,30 +19,6 @@
                echo "<tr class='all-columns'><td colspan='6'><h3>".$sTitle."</h3></td></tr>\n";
        }
 
-       function osm_link($aFeature)
-       {
-               $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 '';
-       }
-
-       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)
-       {
-               return '<a href="details.php?place_id='.$aFeature['place_id'].'">'.$sTitle.'</a>';
-       }
 
        function format_distance($fDistance)
        {
@@ -78,18 +53,6 @@
                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){
@@ -104,15 +67,26 @@
                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>' . osmLink($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 '  <td>' . detailsLink($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";
+       }
+
 ?>
 
 
@@ -144,10 +118,10 @@
                                        }
                                        kv('Coverage'        , ($aPointDetails['isarea']=='t'?'Polygon':'Point') );
                                        kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
-                                       kv('OSM'             , osm_link($aPointDetails) );
+                                       kv('OSM'             , osmLink($aPointDetails) );
                                        if ($aPointDetails['wikipedia'])
                                        {
-                                               kv('Wikipedia Calculated' , wikipedia_link($aPointDetails) );
+                                               kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );
                                        }
 
                                        kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );
@@ -174,7 +148,6 @@
                                          <td>Type</td>
                                          <td>OSM</td>
                                          <td>Admin level</td>
-                                         <!-- <td>Search rank</td> -->
                                          <td>Distance</td>
                                          <td></td>
                                        </tr>
@@ -209,7 +182,7 @@
                headline('Name Keywords');
                foreach($aPlaceSearchNameKeywords as $aRow)
                {
-                       echo '<div>'.$aRow['word_token']."</div>\n";
+                       _one_keyword_row($aRow['word_token'], $aRow['word_id']);
                }
        }
 
@@ -218,7 +191,7 @@
                headline('Address Keywords');
                foreach($aPlaceSearchAddressKeywords as $aRow)
                {
-                       echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."</div>\n";
+                       _one_keyword_row($aRow['word_token'], $aRow['word_id']);
                }
        }
        
@@ -251,9 +224,6 @@
                }
        }
 
-       // headline('Other Parts');
-       // headline('Linked To');
-
        echo "</table>\n";
 ?>
 
@@ -264,17 +234,17 @@
        <script type="text/javascript">
        <?php
 
-               $aNominatimMapInit = [
+               $aNominatimMapInit = array(
                  'tile_url' => $sTileURL,
                  'tile_attribution' => $sTileAttribution
-               ];
+               );
                echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
-               $aPlace = [
+               $aPlace = array(
                                'outlinestring' => $aPointDetails['outlinestring'],
                                'lon' => $aPointDetails['lon'],
                                'lat' => $aPointDetails['lat'],
-               ];
+               );
                echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';';