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 3e9e39d75c4fa31a3734ba9546a701339f6c747d..71fcc7b3e0a0aa67c61151ce496e2c5dd02bba10 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -7,7 +7,6 @@
 </head>
 
 
 </head>
 
 

-

 <?php
 
        function headline($sTitle)
 <?php
 
        function headline($sTitle)


@@ -20,30 +19,6 @@
                echo "<tr class='all-columns'><td colspan='6'><h3>".$sTitle."</h3></td></tr>\n";
        }
 
                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)
        {
 
        function format_distance($fDistance)
        {


@@ -78,18 +53,6 @@
                return $sHTML;
        }
 
                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){
        function map_icon($sIcon)
        {
                if ($sIcon){


@@ -104,12 +67,10 @@
                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 '<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['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>' . 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";
        }
 
                echo "</tr>\n";
        }
 


@@ -157,10 +118,10 @@
                                        }
                                        kv('Coverage'        , ($aPointDetails['isarea']=='t'?'Polygon':'Point') );
                                        kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
                                        }
                                        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'])
                                        {
                                        if ($aPointDetails['wikipedia'])
                                        {

-                                               kv('Wikipedia Calculated' , wikipedia_link($aPointDetails) );
+                                               kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );

                                        }
 
                                        kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );
                                        }
 
                                        kv('Extra Tags'      , hash_to_subtable($aPointDetails['aExtraTags']) );


@@ -187,7 +148,6 @@
                                          <td>Type</td>
                                          <td>OSM</td>
                                          <td>Admin level</td>
                                          <td>Type</td>
                                          <td>OSM</td>
                                          <td>Admin level</td>

-                                         <!-- <td>Search rank</td> -->

                                          <td>Distance</td>
                                          <td></td>
                                        </tr>
                                          <td>Distance</td>
                                          <td></td>
                                        </tr>


@@ -264,9 +224,6 @@
                }
        }
 
                }
        }
 

-       // headline('Other Parts');
-       // headline('Linked To');
-

        echo "</table>\n";
 ?>
 
        echo "</table>\n";
 ?>
 


@@ -277,17 +234,17 @@
        <script type="text/javascript">
        <?php
 
        <script type="text/javascript">
        <?php
 

-               $aNominatimMapInit = [
+               $aNominatimMapInit = array(

                  'tile_url' => $sTileURL,
                  'tile_attribution' => $sTileAttribution
                  'tile_url' => $sTileURL,
                  'tile_attribution' => $sTileAttribution

-               ];
+               );

                echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 
                echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
 

-               $aPlace = [
+               $aPlace = array(

                                'outlinestring' => $aPointDetails['outlinestring'],
                                'lon' => $aPointDetails['lon'],
                                'lat' => $aPointDetails['lat'],
                                'outlinestring' => $aPointDetails['outlinestring'],
                                'lon' => $aPointDetails['lon'],
                                'lat' => $aPointDetails['lat'],

-               ];
+               );

                echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
 
 
                echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';';