Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / output.php

diff --git a/lib/output.php b/lib/output.php
index 823a6631e08cfeab2b134d803784cf77beb985d8..8de8157623516db94c4ca3c8ca8df303326961a0 100644 (file)
--- a/lib/output.php
+++ b/lib/output.php
@@ -16,58 +16,3 @@ function formatOSMType($sType, $bIncludeExternal = true)
 
     return '';
 }
 
     return '';
 }

-
-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, $sExtraProperties = false)
-{
-    if (!$aFeature['place_id']) return '';
-
-    $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);
-}