Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / output.php

diff --git a/lib/output.php b/lib/output.php
index 8715efbc49b61d5fa83aa7d37c9f4d27955634dc..823a6631e08cfeab2b134d803784cf77beb985d8 100644 (file)
--- a/lib/output.php
+++ b/lib/output.php
@@ -12,6 +12,8 @@ function formatOSMType($sType, $bIncludeExternal = true)
     if ($sType == 'T') return 'way';
     if ($sType == 'I') return 'way';
 
     if ($sType == 'T') return 'way';
     if ($sType == 'I') return 'way';
 

+    // not handled: P, L
+

     return '';
 }
 
     return '';
 }
 


@@ -33,20 +35,39 @@ function wikipediaLink($aFeature)
     return '';
 }
 
     return '';
 }
 

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

 {
     if (!$aFeature['place_id']) return '';
 
 {
     if (!$aFeature['place_id']) return '';
 

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

 }
 
 }
 

-function detailsPermaLink($aFeature, $sRefText = false)
+function detailsPermaLink($aFeature, $sRefText = false, $sExtraProperties = false)

 {
     $sOSMType = formatOSMType($aFeature['osm_type'], false);
 
     if ($sOSMType) {
 {
     $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>';
+        $sHtml = '<a ';
+        if ($sExtraProperties) {
+            $sHtml .= $sExtraProperties.' ';
+        }
+        $sHtml .= 'href="details.php?osmtype='.$aFeature['osm_type']
+                  .'&osmid='.$aFeature['osm_id'].'&class='.$aFeature['class'].'">';
+
+        if ($sRefText) {
+            $sHtml .= $sRefText.'</a>';
+        } else {
+            $sHtml .= $sOSMType.' '.$aFeature['osm_id'].'</a>';
+        }
+
+        return $sHtml;

     }
     }

-    return detailsLink($aFeature, $sRefText);
+    return detailsLink($aFeature, $sRefText, $sExtraProperties);

 }
 }