Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / output.php

diff --git a/lib/output.php b/lib/output.php
index 6b427cf4d6c0bc970b0eebb3f6b01f5ddd8c991e..8de8157623516db94c4ca3c8ca8df303326961a0 100644 (file)
--- a/lib/output.php
+++ b/lib/output.php
@@ -1,6 +1,7 @@
 <?php
 
-function formatOSMType($sType, $bIncludeExternal=true)
+
+function formatOSMType($sType, $bIncludeExternal = true)
 {
     if ($sType == 'N') return 'node';
     if ($sType == 'W') return 'way';
@@ -8,36 +9,10 @@ function formatOSMType($sType, $bIncludeExternal=true)
 
     if (!$bIncludeExternal) return '';
 
-    if ($sType == 'T') return 'tiger';
+    if ($sType == 'T') return 'way';
     if ($sType == 'I') return 'way';
 
-    return '';
-}
+    // not handled: P, L
 
-function osmLink($aFeature, $sRefText=false)
-{
-    $sOSMType = formatOSMType($aFeature['osm_type'], false);
-    if ($sOSMType)
-    {
-        return '<a href="//www.openstreetmap.org/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.($sRefText?$sRefText:$aFeature['osm_id']).'</a>';
-    }
     return '';
 }
-
-function wikipediaLink($aFeature)
-{
-    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 '';
-}
-
-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>';
-}
-