bracket spacing for if/else/for/foreach/while/switch according to PSR2 standard

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index c73b4cf3ef58615d7b1e997ed0d4a4d5d1716a49..165d489a3884cd8dab30cbdc52aa260aeda32058 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -19,23 +19,18 @@ $iOsmId = $oParams->getInt('osmid', -1);
 
 $oDB =& getDB();
 
 
 $oDB =& getDB();
 

-if ($sOsmType && $iOsmId > 0)
-{
+if ($sOsmType && $iOsmId > 0) {

     $sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc"));
 
     // Be nice about our error messages for broken geometry
 
     $sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc"));
 
     // Be nice about our error messages for broken geometry
 

-    if (!$sPlaceId)
-    {
+    if (!$sPlaceId) {

         $aPointDetails = chksql($oDB->getRow("select osm_type, osm_id, errormessage, class, type, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom from import_polygon_error where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by updated desc limit 1"));
         if (!PEAR::isError($aPointDetails) && $aPointDetails) {
         $aPointDetails = chksql($oDB->getRow("select osm_type, osm_id, errormessage, class, type, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom from import_polygon_error where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by updated desc limit 1"));
         if (!PEAR::isError($aPointDetails) && $aPointDetails) {

-            if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches))
-            {
+            if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches)) {

                 $aPointDetails['error_x'] = $aMatches[1];
                 $aPointDetails['error_y'] = $aMatches[2];
                 $aPointDetails['error_x'] = $aMatches[1];
                 $aPointDetails['error_y'] = $aMatches[2];

-            }
-            else
-            {
+            } else {

                 $aPointDetails['error_x'] = 0;
                 $aPointDetails['error_y'] = 0;
             }
                 $aPointDetails['error_x'] = 0;
                 $aPointDetails['error_y'] = 0;
             }


@@ -50,14 +45,12 @@ if (!$sPlaceId) userError("Please select a place id");
 
 $iPlaceID = (int)$sPlaceId;
 
 
 $iPlaceID = (int)$sPlaceId;
 

-if (CONST_Use_US_Tiger_Data)
-{
+if (CONST_Use_US_Tiger_Data) {

     $iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID));
     if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
 }
 
     $iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID));
     if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
 }
 

-if (CONST_Use_Aux_Location_data)
-{
+if (CONST_Use_Aux_Location_data) {

     $iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID));
     if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
 }
     $iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID));
     if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
 }


@@ -83,16 +76,14 @@ $aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails[
 // 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";
 $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
 // 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";
 $aPointDetails['aNames'] = $oDB->getAssoc($sSQL);

-if (PEAR::isError($aPointDetails['aNames'])) // possible timeout
-{
+if (PEAR::isError($aPointDetails['aNames'])) { // possible timeout

     $aPointDetails['aNames'] = [];
 }
 
 // Extra tags
 $sSQL = "select (each(extratags)).key,(each(extratags)).value from placex where place_id = $iPlaceID order by (each(extratags)).key";
 $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
     $aPointDetails['aNames'] = [];
 }
 
 // Extra tags
 $sSQL = "select (each(extratags)).key,(each(extratags)).value from placex where place_id = $iPlaceID order by (each(extratags)).key";
 $aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);

-if (PEAR::isError($aPointDetails['aExtraTags'])) // possible timeout
-{
+if (PEAR::isError($aPointDetails['aExtraTags'])) { // possible timeout

     $aPointDetails['aExtraTags'] = [];
 }
 
     $aPointDetails['aExtraTags'] = [];
 }
 


@@ -106,8 +97,7 @@ $sSQL .= " from placex, (select centroid as placegeometry from placex where plac
 $sSQL .= " where linked_place_id = $iPlaceID";
 $sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";
 $aLinkedLines = $oDB->getAll($sSQL);
 $sSQL .= " where linked_place_id = $iPlaceID";
 $sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";
 $aLinkedLines = $oDB->getAll($sSQL);

-if (PEAR::isError($aLinkedLines)) // possible timeout
-{
+if (PEAR::isError($aLinkedLines)) { // possible timeout

     $aLinkedLines = [];
 }
 
     $aLinkedLines = [];
 }
 


@@ -119,43 +109,36 @@ $sSQL .= " where parent_place_id = $iPlaceID order by rank_address asc,rank_sear
 $sSQL .= " (select centroid as placegeometry from placex where place_id = $iPlaceID) as x";
 $sSQL .= " order by rank_address asc,rank_search asc,localname,housenumber";
 $aParentOfLines = $oDB->getAll($sSQL);
 $sSQL .= " (select centroid as placegeometry from placex where place_id = $iPlaceID) as x";
 $sSQL .= " order by rank_address asc,rank_search asc,localname,housenumber";
 $aParentOfLines = $oDB->getAll($sSQL);

-if (PEAR::isError($aParentOfLines)) // possible timeout
-{
+if (PEAR::isError($aParentOfLines)) { // possible timeout

     $aParentOfLines = [];
 }
 
 $aPlaceSearchNameKeywords = false;
 $aPlaceSearchAddressKeywords = false;
     $aParentOfLines = [];
 }
 
 $aPlaceSearchNameKeywords = false;
 $aPlaceSearchAddressKeywords = false;

-if ($oParams->getBool('keywords'))
-{
+if ($oParams->getBool('keywords')) {

     $sSQL = "select * from search_name where place_id = $iPlaceID";
     $aPlaceSearchName = $oDB->getRow($sSQL);
     $sSQL = "select * from search_name where place_id = $iPlaceID";
     $aPlaceSearchName = $oDB->getRow($sSQL);

-    if (PEAR::isError($aPlaceSearchName)) // possible timeout
-    {
+    if (PEAR::isError($aPlaceSearchName)) { // possible timeout

         $aPlaceSearchName = [];
     }
 
     $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'],1,-1).")";
     $aPlaceSearchNameKeywords = $oDB->getAll($sSQL);
         $aPlaceSearchName = [];
     }
 
     $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'],1,-1).")";
     $aPlaceSearchNameKeywords = $oDB->getAll($sSQL);

-    if (PEAR::isError($aPlaceSearchNameKeywords)) // possible timeout
-    {
+    if (PEAR::isError($aPlaceSearchNameKeywords)) { // possible timeout

         $aPlaceSearchNameKeywords = [];
     }
 
 
     $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'],1,-1).")";
     $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);
         $aPlaceSearchNameKeywords = [];
     }
 
 
     $sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'],1,-1).")";
     $aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);

-    if (PEAR::isError($aPlaceSearchAddressKeywords)) // possible timeout
-    {
+    if (PEAR::isError($aPlaceSearchAddressKeywords)) { // possible timeout

         $aPlaceSearchAddressKeywords = [];
     }
         $aPlaceSearchAddressKeywords = [];
     }

-

 }
 
 logEnd($oDB, $hLog, 1);
 
 }
 
 logEnd($oDB, $hLog, 1);
 

-if ($sOutputFormat=='html')
-{
+if ($sOutputFormat=='html') {

     $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
     $sTileURL = CONST_Map_Tile_URL;
     $sTileAttribution = CONST_Map_Tile_Attribution;
     $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
     $sTileURL = CONST_Map_Tile_URL;
     $sTileAttribution = CONST_Map_Tile_Attribution;