Merge pull request #2115 from lonvia/use-dotenv

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index cb371e6b09d2cd8d3e21d463731dce8dea552820..91440b542a863c0c294337c174af54c9678bc115 100644 (file)
--- a/website/details.php
+++ b/website/details.php
@@ -1,14 +1,14 @@
 <?php
 
 <?php
 

-require_once(CONST_BasePath.'/lib/init-website.php');
-require_once(CONST_BasePath.'/lib/log.php');
-require_once(CONST_BasePath.'/lib/output.php');
-require_once(CONST_BasePath.'/lib/AddressDetails.php');
+require_once(CONST_LibDir.'/init-website.php');
+require_once(CONST_LibDir.'/log.php');
+require_once(CONST_LibDir.'/output.php');
+require_once(CONST_LibDir.'/AddressDetails.php');

 ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
 
 ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
 

-$sOutputFormat = $oParams->getSet('format', array('html', 'json'), 'html');
+$sOutputFormat = $oParams->getSet('format', array('json'), 'json');

 set_exception_handler_by_format($sOutputFormat);
 
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 set_exception_handler_by_format($sOutputFormat);
 
 $aLangPrefOrder = $oParams->getPreferredLanguages();


@@ -19,25 +19,37 @@ $iOsmId = $oParams->getInt('osmid', -1);
 $sClass = $oParams->getString('class');
 
 $bIncludeKeywords = $oParams->getBool('keywords', false);
 $sClass = $oParams->getString('class');
 
 $bIncludeKeywords = $oParams->getBool('keywords', false);

-$bIncludeAddressDetails = $oParams->getBool('addressdetails', $sOutputFormat == 'html');
+$bIncludeAddressDetails = $oParams->getBool('addressdetails', false);

 $bIncludeLinkedPlaces = $oParams->getBool('linkedplaces', true);
 $bIncludeLinkedPlaces = $oParams->getBool('linkedplaces', true);

-$bIncludeHierarchy = $oParams->getBool('hierarchy', $sOutputFormat == 'html');
+$bIncludeHierarchy = $oParams->getBool('hierarchy', false);

 $bGroupHierarchy = $oParams->getBool('group_hierarchy', false);
 $bGroupHierarchy = $oParams->getBool('group_hierarchy', false);

-$bIncludePolygonAsGeoJSON = $oParams->getBool('polygon_geojson', $sOutputFormat == 'html');
+$bIncludePolygonAsGeoJSON = $oParams->getBool('polygon_geojson', false);

 
 

-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);

 $oDB->connect();
 
 $sLanguagePrefArraySQL = $oDB->getArraySQL($oDB->getDBQuotedList($aLangPrefOrder));
 
 if ($sOsmType && $iOsmId > 0) {
     $sSQL = 'SELECT place_id FROM placex WHERE osm_type = :type AND osm_id = :id';
 $oDB->connect();
 
 $sLanguagePrefArraySQL = $oDB->getArraySQL($oDB->getDBQuotedList($aLangPrefOrder));
 
 if ($sOsmType && $iOsmId > 0) {
     $sSQL = 'SELECT place_id FROM placex WHERE osm_type = :type AND osm_id = :id';

+    $aSQLParams = array(':type' => $sOsmType, ':id' => $iOsmId);

     // osm_type and osm_id are not unique enough
     if ($sClass) {
     // osm_type and osm_id are not unique enough
     if ($sClass) {

-        $sSQL .= " AND class='".$sClass."'";
+        $sSQL .= ' AND class= :class';
+        $aSQLParams[':class'] = $sClass;

     }
     $sSQL .= ' ORDER BY class ASC';
     }
     $sSQL .= ' ORDER BY class ASC';

-    $sPlaceId = $oDB->getOne($sSQL, array(':type' => $sOsmType, ':id' => $iOsmId));
+    $sPlaceId = $oDB->getOne($sSQL, $aSQLParams);
+
+
+    // Nothing? Maybe it's an interpolation.
+    // XXX Simply returns the first parent street it finds. It should
+    //     get a house number and get the right interpolation.
+    if (!$sPlaceId && $sOsmType == 'W' && (!$sClass || $sClass == 'place')) {
+        $sSQL = 'SELECT place_id FROM location_property_osmline'
+                .' WHERE osm_id = :id LIMIT 1';
+        $sPlaceId = $oDB->getOne($sSQL, array(':id' => $iOsmId));
+    }

 
     // Be nice about our error messages for broken geometry
 
 
     // Be nice about our error messages for broken geometry
 


@@ -65,7 +77,7 @@ if ($sOsmType && $iOsmId > 0) {
                 $aPointDetails['error_x'] = 0;
                 $aPointDetails['error_y'] = 0;
             }
                 $aPointDetails['error_x'] = 0;
                 $aPointDetails['error_y'] = 0;
             }

-            include(CONST_BasePath.'/lib/template/details-error-'.$sOutputFormat.'.php');
+            include(CONST_LibDir.'/template/details-error-'.$sOutputFormat.'.php');

             exit;
         }
     }
             exit;
         }
     }


@@ -132,7 +144,6 @@ if (!$aPointDetails) {
 }
 
 $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
 }
 
 $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];

-$aPointDetails['icon'] = Nominatim\ClassTypes\getProperty($aPointDetails, 'icon', false);

 $aPointDetails['rank_search_label'] = getSearchRankLabel($aPointDetails['rank_search']); // only used in HTML format
 
 // Get all alternative names (languages, etc)
 $aPointDetails['rank_search_label'] = getSearchRankLabel($aPointDetails['rank_search']); // only used in HTML format
 
 // Get all alternative names (languages, etc)


@@ -236,11 +247,4 @@ if ($bIncludeKeywords) {
 
 logEnd($oDB, $hLog, 1);
 
 
 logEnd($oDB, $hLog, 1);
 

-if ($sOutputFormat=='html') {
-    $sSQL = "SELECT TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' FROM import_status LIMIT 1";
-    $sDataDate = $oDB->getOne($sSQL);
-    $sTileURL = CONST_Map_Tile_URL;
-    $sTileAttribution = CONST_Map_Tile_Attribution;
-}
-
-include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');
+include(CONST_LibDir.'/template/details-'.$sOutputFormat.'.php');