Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / output.php

diff --git a/lib/output.php b/lib/output.php
index 6b427cf4d6c0bc970b0eebb3f6b01f5ddd8c991e..9d4b7502c855044c6859bae36f1d291897ab20c7 100644 (file)
--- a/lib/output.php
+++ b/lib/output.php
@@ -1,6 +1,7 @@
 <?php
 
 <?php
 

-function formatOSMType($sType, $bIncludeExternal=true)
+
+function formatOSMType($sType, $bIncludeExternal = true)

 {
     if ($sType == 'N') return 'node';
     if ($sType == 'W') return 'way';
 {
     if ($sType == 'N') return 'node';
     if ($sType == 'W') return 'way';


@@ -8,17 +9,16 @@ function formatOSMType($sType, $bIncludeExternal=true)
 
     if (!$bIncludeExternal) return '';
 
 
     if (!$bIncludeExternal) return '';
 

-    if ($sType == 'T') return 'tiger';
+    if ($sType == 'T') return 'way';

     if ($sType == 'I') return 'way';
 
     return '';
 }
 
     if ($sType == 'I') return 'way';
 
     return '';
 }
 

-function osmLink($aFeature, $sRefText=false)
+function osmLink($aFeature, $sRefText = false)

 {
     $sOSMType = formatOSMType($aFeature['osm_type'], false);
 {
     $sOSMType = formatOSMType($aFeature['osm_type'], false);

-    if ($sOSMType)
-    {
+    if ($sOSMType) {

         return '<a href="//www.openstreetmap.org/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.($sRefText?$sRefText:$aFeature['osm_id']).'</a>';
     }
     return '';
         return '<a href="//www.openstreetmap.org/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.($sRefText?$sRefText:$aFeature['osm_id']).'</a>';
     }
     return '';


@@ -26,18 +26,27 @@ function osmLink($aFeature, $sRefText=false)
 
 function wikipediaLink($aFeature)
 {
 
 function wikipediaLink($aFeature)
 {

-    if ($aFeature['wikipedia'])
-    {
-        list($sLanguage, $sArticle) = explode(':',$aFeature['wikipedia']);
+    if ($aFeature['wikipedia']) {
+        list($sLanguage, $sArticle) = explode(':', $aFeature['wikipedia']);

         return '<a href="https://'.$sLanguage.'.wikipedia.org/wiki/'.urlencode($sArticle).'" target="_blank">'.$aFeature['wikipedia'].'</a>';
     }
     return '';
 }
 
         return '<a href="https://'.$sLanguage.'.wikipedia.org/wiki/'.urlencode($sArticle).'" target="_blank">'.$aFeature['wikipedia'].'</a>';
     }
     return '';
 }
 

-function detailsLink($aFeature, $sTitle=false)
+function detailsLink($aFeature, $sTitle = false)

 {
     if (!$aFeature['place_id']) return '';
 
     return '<a href="details.php?place_id='.$aFeature['place_id'].'">'.($sTitle?$sTitle:$aFeature['place_id']).'</a>';
 }
 
 {
     if (!$aFeature['place_id']) return '';
 
     return '<a href="details.php?place_id='.$aFeature['place_id'].'">'.($sTitle?$sTitle:$aFeature['place_id']).'</a>';
 }
 

+function detailsPermaLink($aFeature, $sRefText = false)
+{
+    $sOSMType = formatOSMType($aFeature['osm_type'], false);
+
+    if ($sOSMType) {
+        $sLabel = $sRefText ? $sRefText : $sOSMType.' '.$aFeature['osm_id'];
+        return '<a href="details.php?osmtype='.$aFeature['osm_type'].'&osmid='.$aFeature['osm_id'].'&class='.$aFeature['class'].'">'.$sLabel.'</a>';
+    }
+    return '';
+}