Merge pull request #1899 from mtmail/use-new-dsn-format-in-vagrant-md

[nominatim.git] / lib / output.php

diff --git a/lib/output.php b/lib/output.php
index 0a548500d23b19c0dc43eef361cb322da372c270..823a6631e08cfeab2b134d803784cf77beb985d8 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,13 +9,15 @@ 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';
 
     if ($sType == 'I') return 'way';
 

+    // not handled: P, L
+

     return '';
 }
 
     return '';
 }
 

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

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


@@ -26,16 +29,45 @@ function osmLink($aFeature, $sRefText=false)
 function wikipediaLink($aFeature)
 {
     if ($aFeature['wikipedia']) {
 function wikipediaLink($aFeature)
 {
     if ($aFeature['wikipedia']) {

-        list($sLanguage, $sArticle) = explode(':',$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, $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, $sExtraProperties = false)
+{
+    $sOSMType = formatOSMType($aFeature['osm_type'], false);
+
+    if ($sOSMType) {
+        $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, $sExtraProperties);
+}