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 d5c1825207f65396c0ad1b1d27995da1705a4bfd..3e9e39d75c4fa31a3734ba9546a701339f6c747d 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -6,7 +6,6 @@
         <link href="css/details.css" rel="stylesheet" type="text/css" />
  </head>
  
-<?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
  
  
  <?php
@@ -114,11 +113,25 @@
                 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";
+       }
+
  ?>
  
  
  
  <body id="details-page">
+       <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
         <div class="container">
                 <div class="row">
                         <div class="col-sm-10">
@@ -209,7 +222,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 +231,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']);
                 }
         }
         
@@ -262,13 +275,23 @@
         </div>
  
         <script type="text/javascript">
+       <?php
+
+               $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) . ';'; 
  
-               var nominatim_result = {
-                       outlinestring: '<?php echo $aPointDetails['outlinestring'];?>',
-                       lon: <?php echo $aPointDetails['lon'];?>,
-                       lat: <?php echo $aPointDetails['lat'];?>,
-               };
  
+       ?>
         </script>