Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index ec4a21086c67ec855e54a7c1f1fb351dfd350652..3e9e39d75c4fa31a3734ba9546a701339f6c747d 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -12,7 +12,12 @@
 
        function headline($sTitle)
        {
 
        function headline($sTitle)
        {

-               echo "<h2>".$sTitle."</h2>\n";
+               echo "<tr class='all-columns'><td colspan='6'><h2>".$sTitle."</h2></td></tr>\n";
+       }
+
+       function headline3($sTitle)
+       {
+               echo "<tr class='all-columns'><td colspan='6'><h3>".$sTitle."</h3></td></tr>\n";

        }
 
        function osm_link($aFeature)
        }
 
        function osm_link($aFeature)


@@ -96,18 +101,31 @@
        function _one_row($aAddressLine){
                $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
 
        function _one_row($aAddressLine){
                $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
 

-               echo '<tr class="' . ($bNotUsed?'notused':'') . '">';
-               echo '  <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</td>';
-               echo '  <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . '</td>';
-               echo '  <td>' . osm_link($aAddressLine) . '</td>';
-               echo '  <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . '</td>';
-               // echo '<td>' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') .'</td>';
+               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>' . (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 ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';

-               echo '  <td>' . format_distance($aAddressLine['distance']).'</td>';;
-               echo '  <td>' . nominatim_link($aAddressLine,'details &gt;') . '</td>';;
+               echo '  <td>' . format_distance($aAddressLine['distance'])."</td>\n";
+               echo '  <td>' . nominatim_link($aAddressLine,'details &gt;') . "</td>\n";

                echo "</tr>\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";
+       }
+

 ?>
 
 
 ?>
 
 


@@ -184,8 +202,6 @@
                                        }
                                ?>
        
                                        }
                                ?>
        

-                               </tbody>
-                       </table>

 
 
 <?php
 
 
 <?php


@@ -193,12 +209,10 @@
        if ($aLinkedLines)
        {
                headline('Linked Places');
        if ($aLinkedLines)
        {
                headline('Linked Places');

-               echo '<table id="linked" class="table table-striped table-responsive">';

                foreach($aLinkedLines as $aAddressLine)
                {       
                        _one_row($aAddressLine);
                }
                foreach($aLinkedLines as $aAddressLine)
                {       
                        _one_row($aAddressLine);
                }

-               echo '</table>';

        }
 
 
        }
 
 


@@ -208,7 +222,7 @@
                headline('Name Keywords');
                foreach($aPlaceSearchNameKeywords as $aRow)
                {
                headline('Name Keywords');
                foreach($aPlaceSearchNameKeywords as $aRow)
                {

-                       echo '<div>'.$aRow['word_token']."</div>\n";
+                       _one_keyword_row($aRow['word_token'], $aRow['word_id']);

                }
        }
 
                }
        }
 


@@ -217,10 +231,10 @@
                headline('Address Keywords');
                foreach($aPlaceSearchAddressKeywords as $aRow)
                {
                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']);

                }
        }
                }
        }

-
+       

        if (sizeof($aParentOfLines))
        {
                headline('Parent Of');
        if (sizeof($aParentOfLines))
        {
                headline('Parent Of');


@@ -238,14 +252,12 @@
                foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
                {
                        $sGroupHeading = ucwords($sGroupHeading);
                foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
                {
                        $sGroupHeading = ucwords($sGroupHeading);

-                       echo "<h3>$sGroupHeading</h3>\n";
+                       headline3($sGroupHeading);

 
 

-                       echo '<table id="linked" class="table table-striped table-responsive">';

                        foreach($aParentOfLines as $aAddressLine)
                        {
                                _one_row($aAddressLine);
                        }
                        foreach($aParentOfLines as $aAddressLine)
                        {
                                _one_row($aAddressLine);
                        }

-                       echo '</table>';

                }
                if (sizeof($aParentOfLines) >= 500) {
                        echo '<p>There are more child objects which are not shown.</p>';
                }
                if (sizeof($aParentOfLines) >= 500) {
                        echo '<p>There are more child objects which are not shown.</p>';


@@ -254,6 +266,8 @@
 
        // headline('Other Parts');
        // headline('Linked To');
 
        // headline('Other Parts');
        // headline('Linked To');

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

 ?>
 
                        </div>
 ?>
 
                        </div>


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

-    $aNominatimMapInit = [
-      'tile_url' => $sTileURL,
-      'tile_attribution' => $sTileAttribution
-    ];
-    echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
+               $aNominatimMapInit = [
+                 'tile_url' => $sTileURL,
+                 'tile_attribution' => $sTileAttribution
+               ];
+               echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';

 
 

-    $aPlace = [
-                       'outlinestring' => $aPointDetails['outlinestring'],
-                       'lon' => $aPointDetails['lon'],
-                       'lat' => $aPointDetails['lat'],
-    ];
-         echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
+               $aPlace = [
+                               'outlinestring' => $aPointDetails['outlinestring'],
+                               'lon' => $aPointDetails['lon'],
+                               'lat' => $aPointDetails['lat'],
+               ];
+               echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 

 
 
 
 

-  ?>
+       ?>

        </script>
 
 
        </script>