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 6845cbb22821df791093d0ce3b5d4a187faa2ec5..3e9e39d75c4fa31a3734ba9546a701339f6c747d 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -113,6 +113,19 @@
                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";
+       }
+

 ?>
 
 
 ?>
 
 


@@ -209,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']);

                }
        }
 
                }
        }
 


@@ -218,7 +231,7 @@
                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']);

                }
        }
        
                }
        }
        


@@ -264,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>