spacing changes after lonvia PR feedback

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index e2a8a031e02a4c67a224bea5e7df4855b5195ce2..6c7fa8d3546aa1fc46cd42ab0ac8c0d6b55c96dd 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -9,22 +9,34 @@ ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
 
 
 $oParams = new Nominatim\ParameterParser();
 

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

 $aLangPrefOrder = $oParams->getPreferredLanguages();
 $sLanguagePrefArraySQL = 'ARRAY['.join(',', array_map('getDBQuoted', $aLangPrefOrder)).']';
 
 $sPlaceId = $oParams->getString('place_id');
 $sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R'));
 $iOsmId = $oParams->getInt('osmid', -1);
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 $sLanguagePrefArraySQL = 'ARRAY['.join(',', array_map('getDBQuoted', $aLangPrefOrder)).']';
 
 $sPlaceId = $oParams->getString('place_id');
 $sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R'));
 $iOsmId = $oParams->getInt('osmid', -1);

+$sClass = $oParams->getString('class');
+
+$bIncludeAddressDetails = $oParams->getBool('addressdetails', $sOutputFormat == 'html');
+$bIncludeLinkedPlaces = $oParams->getBool('linkedplaces', $sOutputFormat == 'html');
+$bIncludeChildPlaces = $oParams->getBool('childplaces', $sOutputFormat == 'html');
+$bGroupParents = $oParams->getBool('group_parents', false);

 
 $oDB =& getDB();
 
 if ($sOsmType && $iOsmId > 0) {
     $sSQL = sprintf(
 
 $oDB =& getDB();
 
 if ($sOsmType && $iOsmId > 0) {
     $sSQL = sprintf(

-        "SELECT place_id FROM placex WHERE osm_type='%s' AND osm_id=%d ORDER BY type='postcode' ASC",
+        "SELECT place_id FROM placex WHERE osm_type='%s' AND osm_id=%d",

         $sOsmType,
         $iOsmId
     );
         $sOsmType,
         $iOsmId
     );

+    // osm_type and osm_id are not unique enough
+    if ($sClass) {
+        $sSQL .= " AND class='".$sClass."'";
+    }
+    $sSQL .= ' ORDER BY class ASC';

     $sPlaceId = chksql($oDB->getOne($sSQL));
 
     // Be nice about our error messages for broken geometry
     $sPlaceId = chksql($oDB->getOne($sSQL));
 
     // Be nice about our error messages for broken geometry


@@ -127,83 +139,102 @@ if (isset($aClassType[$sPointClassType]) && $aClassType[$sPointClassType]['icon'
 }
 
 // Get all alternative names (languages, etc)
 }
 
 // Get all alternative names (languages, etc)

-$sSQL = "SELECT (each(name)).key,(each(name)).value FROM placex WHERE place_id = $iPlaceID ORDER BY (each(name)).key";
+$sSQL = 'SELECT (each(name)).key,(each(name)).value FROM placex ';
+$sSQL .= "WHERE place_id = $iPlaceID ORDER BY (each(name)).key";

 $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
 if (PEAR::isError($aPointDetails['aNames'])) { // possible timeout
     $aPointDetails['aNames'] = [];
 }
 
 // Address tags
 $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
 if (PEAR::isError($aPointDetails['aNames'])) { // possible timeout
     $aPointDetails['aNames'] = [];
 }
 
 // Address tags

-$sSQL = "SELECT (each(address)).key as key,(each(address)).value FROM placex WHERE place_id = $iPlaceID ORDER BY key";
+$sSQL = 'SELECT (each(address)).key as key,(each(address)).value FROM placex ';
+$sSQL .= "WHERE place_id = $iPlaceID ORDER BY key";

 $aPointDetails['aAddressTags'] = $oDB->getAssoc($sSQL);
 if (PEAR::isError($aPointDetails['aAddressTags'])) { // possible timeout
     $aPointDetails['aAddressTags'] = [];
 }
 
 // Extra tags
 $aPointDetails['aAddressTags'] = $oDB->getAssoc($sSQL);
 if (PEAR::isError($aPointDetails['aAddressTags'])) { // possible timeout
     $aPointDetails['aAddressTags'] = [];
 }
 
 // Extra tags

-$sSQL = "SELECT (each(extratags)).key,(each(extratags)).value FROM placex WHERE place_id = $iPlaceID ORDER BY (each(extratags)).key";
+$sSQL = 'SELECT (each(extratags)).key,(each(extratags)).value FROM placex ';
+$sSQL .= "WHERE place_id = $iPlaceID ORDER BY (each(extratags)).key";

 $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
 if (PEAR::isError($aPointDetails['aExtraTags'])) { // possible timeout
     $aPointDetails['aExtraTags'] = [];
 }
 
 // Address
 $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
 if (PEAR::isError($aPointDetails['aExtraTags'])) { // possible timeout
     $aPointDetails['aExtraTags'] = [];
 }
 
 // Address

-$aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], -1, true);
+$aAddressLines = false;
+if ($bIncludeAddressDetails) {
+    $aAddressLines = getAddressDetails(
+        $oDB,
+        $sLanguagePrefArraySQL,
+        $iPlaceID,
+        $aPointDetails['country_code'],
+        -1,
+        true
+    );
+}

 
 // Linked places
 
 // Linked places

-$sSQL = 'SELECT placex.place_id, osm_type, osm_id, class, type, housenumber,';
-$sSQL .= ' admin_level, rank_address, ';
-$sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,";
-$sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, ";
-$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, ";
-$sSQL .= ' length(name::text) AS namelength ';
-$sSQL .= ' FROM ';
-$sSQL .= '    placex, ';
-$sSQL .= '    ( ';
-$sSQL .= '      SELECT centroid AS placegeometry ';
-$sSQL .= '      FROM placex ';
-$sSQL .= "      WHERE place_id = $iPlaceID ";
-$sSQL .= '    ) AS x';
-$sSQL .= " WHERE linked_place_id = $iPlaceID";
-$sSQL .= ' ORDER BY ';
-$sSQL .= '   rank_address ASC, ';
-$sSQL .= '   rank_search ASC, ';
-$sSQL .= "   get_name_by_language(name, $sLanguagePrefArraySQL), ";
-$sSQL .= '   housenumber';
-$aLinkedLines = $oDB->getAll($sSQL);
-if (PEAR::isError($aLinkedLines)) { // possible timeout
-    $aLinkedLines = [];
+$aLinkedLines = false;
+if ($bIncludeLinkedPlaces) {
+    $sSQL = 'SELECT placex.place_id, osm_type, osm_id, class, type, housenumber,';
+    $sSQL .= ' admin_level, rank_address, ';
+    $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,";
+    $sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, ";
+    $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, ";
+    $sSQL .= ' length(name::text) AS namelength ';
+    $sSQL .= ' FROM ';
+    $sSQL .= '    placex, ';
+    $sSQL .= '    ( ';
+    $sSQL .= '      SELECT centroid AS placegeometry ';
+    $sSQL .= '      FROM placex ';
+    $sSQL .= "      WHERE place_id = $iPlaceID ";
+    $sSQL .= '    ) AS x';
+    $sSQL .= " WHERE linked_place_id = $iPlaceID";
+    $sSQL .= ' ORDER BY ';
+    $sSQL .= '   rank_address ASC, ';
+    $sSQL .= '   rank_search ASC, ';
+    $sSQL .= "   get_name_by_language(name, $sLanguagePrefArraySQL), ";
+    $sSQL .= '   housenumber';
+    $aLinkedLines = $oDB->getAll($sSQL);
+    if (PEAR::isError($aLinkedLines)) { // possible timeout
+        $aLinkedLines = [];
+    }

 }
 
 // All places this is an imediate parent of
 }
 
 // All places this is an imediate parent of

-$sSQL = 'SELECT obj.place_id, osm_type, osm_id, class, type, housenumber,';
-$sSQL .= " admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,";
-$sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, ";
-$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, ";
-$sSQL .= ' length(name::text) AS namelength ';
-$sSQL .= ' FROM ';
-$sSQL .= '    ( ';
-$sSQL .= '      SELECT placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name ';
-$sSQL .= '      FROM placex ';
-$sSQL .= "      WHERE parent_place_id = $iPlaceID ";
-$sSQL .= '      ORDER BY ';
-$sSQL .= '         rank_address ASC, ';
-$sSQL .= '         rank_search ASC ';
-$sSQL .= '      LIMIT 500 ';
-$sSQL .= '    ) AS obj,';
-$sSQL .= '    ( ';
-$sSQL .= '      SELECT centroid AS placegeometry ';
-$sSQL .= '      FROM placex ';
-$sSQL .= "      WHERE place_id = $iPlaceID ";
-$sSQL .= '    ) AS x';
-$sSQL .= ' ORDER BY ';
-$sSQL .= '    rank_address ASC, ';
-$sSQL .= '    rank_search ASC, ';
-$sSQL .= '    localname, ';
-$sSQL .= '    housenumber';
-$aParentOfLines = $oDB->getAll($sSQL);
-if (PEAR::isError($aParentOfLines)) { // possible timeout
-    $aParentOfLines = [];
+$aParentOfLines = false;
+if ($bIncludeChildPlaces) {
+    $sSQL = 'SELECT obj.place_id, osm_type, osm_id, class, type, housenumber,';
+    $sSQL .= " admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') AS isarea,";
+    $sSQL .= " ST_DistanceSpheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') AS distance, ";
+    $sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) AS localname, ";
+    $sSQL .= ' length(name::text) AS namelength ';
+    $sSQL .= ' FROM ';
+    $sSQL .= '    ( ';
+    $sSQL .= '      SELECT placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name ';
+    $sSQL .= '      FROM placex ';
+    $sSQL .= "      WHERE parent_place_id = $iPlaceID ";
+    $sSQL .= '      ORDER BY ';
+    $sSQL .= '         rank_address ASC, ';
+    $sSQL .= '         rank_search ASC ';
+    $sSQL .= '      LIMIT 500 ';
+    $sSQL .= '    ) AS obj,';
+    $sSQL .= '    ( ';
+    $sSQL .= '      SELECT centroid AS placegeometry ';
+    $sSQL .= '      FROM placex ';
+    $sSQL .= "      WHERE place_id = $iPlaceID ";
+    $sSQL .= '    ) AS x';
+    $sSQL .= ' ORDER BY ';
+    $sSQL .= '    rank_address ASC, ';
+    $sSQL .= '    rank_search ASC, ';
+    $sSQL .= '    localname, ';
+    $sSQL .= '    housenumber';
+    $aParentOfLines = $oDB->getAll($sSQL);
+    if (PEAR::isError($aParentOfLines)) { // possible timeout
+        $aParentOfLines = [];
+    }

 }
 
 $aPlaceSearchNameKeywords = false;
 }
 
 $aPlaceSearchNameKeywords = false;