fix indentation and misc errors according to PSR2 coding style guide

lib/Geocode.php

@@ -48,6 +48,7 @@ class Geocode
     protected $sQuery = false;
     protected $aStructuredQuery = false;
 
+
     function Geocode(&$oDB)
     {
         $this->oDB =& $oDB;
@@ -397,7 +398,7 @@ class Geocode
         $sSQL .= ",extratags->'place' ";
 
         if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank) {
-            //only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines 
+            // only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines
             // with start- and endnumber, the common osm housenumbers are usually saved as points
             $sHousenumbers = "";
             $i = 0;
@@ -408,7 +409,7 @@ class Geocode
                 if ($i<$length) $sHousenumbers .= ", ";
             }
             if (CONST_Use_US_Tiger_Data) {
-                //Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
+                // Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
                 $sSQL .= " union";
                 $sSQL .= " select 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, 'us' as country_code";
                 $sSQL .= ", get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress ";
@@ -421,7 +422,7 @@ class Geocode
                 $sSQL .= ", (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance ";
                 $sSQL .= ", null as extra_place ";
                 $sSQL .= " from (select place_id";
-                //interpolate the Tiger housenumbers here
+                // interpolate the Tiger housenumbers here
                 $sSQL .= ", ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) as centroid, parent_place_id, housenumber_for_place";
                 $sSQL .= " from (location_property_tiger ";
                 $sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) ";
@@ -444,7 +445,7 @@ class Geocode
             $sSQL .= " where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance,";
             $sSQL .= " null as extra_place ";
             $sSQL .= " from (select place_id, calculated_country_code ";
-            //interpolate the housenumbers here
+            // interpolate the housenumbers here
             $sSQL .= ", CASE WHEN startnumber != endnumber THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) ";
             $sSQL .= " ELSE ST_LineInterpolatePoint(linegeo, 0.5) END as centroid";
             $sSQL .= ", parent_place_id, housenumber_for_place ";
@@ -476,7 +477,8 @@ class Geocode
 
         $sSQL .= " order by importance desc";
         if (CONST_Debug) {
-            echo "<hr>"; var_dump($sSQL);
+            echo "<hr>";
+            var_dump($sSQL);
         }
         $aSearchResults = chksql(
             $this->oDB->getAll($sSQL),
@@ -738,6 +740,8 @@ class Geocode
             name: full name (currently the same as langaddress)
             foundorder: secondary ordering for places with same importance
     */
+
+
     function lookup()
     {
         if (!$this->sQuery && !$this->aStructuredQuery) return false;
@@ -1413,7 +1417,8 @@ class Geocode
                     }
 
                     if (CONST_Debug) {
-                        echo "<br><b>Place IDs:</b> "; var_Dump($aPlaceIDs);
+                        echo "<br><b>Place IDs:</b> ";
+                        var_Dump($aPlaceIDs);
                     }
 
                     foreach ($aPlaceIDs as $iPlaceID) {
@@ -1495,7 +1500,8 @@ class Geocode
         }
 
         if (CONST_Debug) {
-            echo '<i>Recheck words:<\i>'; var_dump($aRecheckWords);
+            echo '<i>Recheck words:<\i>';
+            var_dump($aRecheckWords);
         }
 
         $oPlaceLookup = new PlaceLookup($this->oDB);
@@ -1625,9 +1631,5 @@ class Geocode
         }
 
         return $aSearchResults;
-
     } // end lookup()
-
-
 } // end class
-

lib/ParameterParser.php

@@ -4,9 +4,10 @@ class ParameterParser
 {
     private $aParams;
 
-    function __construct($aParams = NULL)
+
+    function __construct($aParams = null)
     {
-        $this->aParams = ($aParams === NULL) ? $_GET : $aParams;
+        $this->aParams = ($aParams === null) ? $_GET : $aParams;
     }
 
     function getBool($sName, $bDefault = false)
@@ -77,9 +78,9 @@ class ParameterParser
         return $aDefault;
     }
 
-    function getPreferredLanguages($sFallback = NULL)
+    function getPreferredLanguages($sFallback = null)
     {
-        if ($sFallback === NULL && isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+        if ($sFallback === null && isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
             $sFallback = $_SERVER["HTTP_ACCEPT_LANGUAGE"];
         }
 

lib/PlaceLookup.php

@@ -237,15 +237,18 @@ class PlaceLookup
 
 
 
-    // returns an array which will contain the keys
-    //   aBoundingBox
-    // and may also contain one or more of the keys
-    //   asgeojson
-    //   askml
-    //   assvg
-    //   astext
-    //   lat
-    //   lon
+    /* returns an array which will contain the keys
+     *   aBoundingBox
+     * and may also contain one or more of the keys
+     *   asgeojson
+     *   askml
+     *   assvg
+     *   astext
+     *   lat
+     *   lon
+     */
+
+
     function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null)
     {
 
@@ -301,7 +304,7 @@ class PlaceLookup
                                                    (string)$aPointPolygon['maxlon']
                                                   );
             }
-        } // CONST_Search_AreaPolygons
+        }
 
         // as a fallback we generate a bounding box without knowing the size of the geometry
         if ((!isset($aOutlineResult['aBoundingBox'])) && isset($fLon)) {

lib/ReverseGeocode.php

@@ -5,11 +5,13 @@ class ReverseGeocode
     protected $oDB;
     protected $iMaxRank = 28;
 
+
     function ReverseGeocode(&$oDB)
     {
         $this->oDB =& $oDB;
     }
 
+
     function setZoom($iZoom)
     {
         // Zoom to rank, this could probably be calculated but a lookup gives fine control
@@ -38,8 +40,13 @@ class ReverseGeocode
         $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
     }
 
-    // returns { place_id =>, type => '(osm|tiger)' }
-    // fails if no place was found
+
+    /* lookup()
+     * returns { place_id =>, type => '(osm|tiger)' }
+     * fails if no place was found
+     */
+
+
     function lookup($fLat, $fLon, $bDoInterpolation = true)
     {
         $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';
@@ -204,5 +211,4 @@ class ReverseGeocode
                 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1
                );
     }
-    
 }

lib/cmd.php

@@ -1,5 +1,6 @@
 <?php
 
+
 function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnknown = false)
 {
     $aQuick = array();

lib/db.php

@@ -2,6 +2,7 @@
 
 require_once('DB.php');
 
+
 function &getDB($bNew = false, $bPersistent = false)
 {
     // Get the database object

lib/init-website.php

@@ -9,6 +9,7 @@ require_once('ParameterParser.php');
  *
  */
 
+
 function chksql($oSql, $sMsg = "Database request failed")
 {
     if (!PEAR::isError($oSql)) return $oSql;
@@ -95,4 +96,3 @@ if (CONST_NoAccessControl) {
 if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;
 
 if (CONST_Debug) header('Content-type: text/html; charset=utf-8');
-

lib/lib.php

@@ -1,5 +1,6 @@
 <?php
 
+
 function fail($sError, $sUserError = false)
 {
     if (!$sUserError) $sUserError = $sError;
@@ -98,10 +99,6 @@ function getTokensFromSets($aSets)
 }
 
 
-/*
-   GB Postcode functions
- */
-
 function gbPostcodeCalculate($sPostcode, $sPostcodeSector, $sPostcodeEnd, &$oDB)
 {
     // Try an exact match on the gb_postcode table
@@ -599,72 +596,78 @@ function addQuotes($s)
     return "'".$s."'";
 }
 
-// returns boolean
 function validLatLon($fLat, $fLon)
 {
     return ($fLat <= 90.1 && $fLat >= -90.1 && $fLon <= 180.1 && $fLon >= -180.1);
 }
 
-// Do we have anything that looks like a lat/lon pair?
-// returns array(lat,lon,query_with_lat_lon_removed)
-// or null
 function looksLikeLatLonPair($sQuery)
 {
+    // Do we have anything that looks like a lat/lon pair?
+    // returns array(lat,lon,query_with_lat_lon_removed)
+    // or null
     $sFound    = null;
     $fQueryLat = null;
     $fQueryLon = null;
 
     if (preg_match('/\\b([NS])[ ]+([0-9]+[0-9.]*)[° ]+([0-9.]+)?[′\']*[, ]+([EW])[ ]+([0-9]+)[° ]+([0-9]+[0-9.]*)[′\']*?\\b/', $sQuery, $aData)) {
-        //              1         2                   3                  4         5            6
-        // degrees decimal minutes
-        // N 40 26.767, W 79 58.933
-        // N 40°26.767′, W 79°58.933′
+        /*              1         2                   3                  4         5            6
+         * degrees decimal minutes
+         * N 40 26.767, W 79 58.933
+         * N 40°26.767′, W 79°58.933′
+         */
         $sFound    = $aData[0];
         $fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60);
         $fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[5] + $aData[6]/60);
     } elseif (preg_match('/\\b([0-9]+)[° ]+([0-9]+[0-9.]*)?[′\']*[ ]+([NS])[, ]+([0-9]+)[° ]+([0-9]+[0-9.]*)?[′\' ]+([EW])\\b/', $sQuery, $aData)) {
-        //                    1             2                      3          4            5                    6
-        // degrees decimal minutes
-        // 40 26.767 N, 79 58.933 W
-        // 40° 26.767′ N 79° 58.933′ W
+        /*                    1             2                      3          4            5                    6
+         * degrees decimal minutes
+         * 40 26.767 N, 79 58.933 W
+         * 40° 26.767′ N 79° 58.933′ W
+         */
         $sFound    = $aData[0];
         $fQueryLat = ($aData[3]=='N'?1:-1) * ($aData[1] + $aData[2]/60);
         $fQueryLon = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60);
     } elseif (preg_match('/\\b([NS])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*[, ]+([EW])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*\\b/', $sQuery, $aData)) {
-        //                    1        2            3            4                5        6            7            8
-        // degrees decimal seconds
-        // N 40 26 46 W 79 58 56
-        // N 40° 26′ 46″, W 79° 58′ 56″
+        /*                    1        2            3            4                5        6            7            8
+         * degrees decimal seconds
+         * N 40 26 46 W 79 58 56
+         * N 40° 26′ 46″, W 79° 58′ 56″
+         */
         $sFound    = $aData[0];
         $fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60 + $aData[4]/3600);
         $fQueryLon = ($aData[5]=='E'?1:-1) * ($aData[6] + $aData[7]/60 + $aData[8]/3600);
     } elseif (preg_match('/\\b([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″" ]+([NS])[, ]+([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″" ]+([EW])\\b/', $sQuery, $aData)) {
-        //                    1            2            3            4          5            6            7            8
-        // degrees decimal seconds
-        // 40 26 46 N 79 58 56 W
-        // 40° 26′ 46″ N, 79° 58′ 56″ W
+        /*                    1            2            3            4          5            6            7            8
+         * degrees decimal seconds
+         * 40 26 46 N 79 58 56 W
+         * 40° 26′ 46″ N, 79° 58′ 56″ W
+         */
         $sFound    = $aData[0];
         $fQueryLat = ($aData[4]=='N'?1:-1) * ($aData[1] + $aData[2]/60 + $aData[3]/3600);
         $fQueryLon = ($aData[8]=='E'?1:-1) * ($aData[5] + $aData[6]/60 + $aData[7]/3600);
     } elseif (preg_match('/\\b([NS])[ ]([0-9]+[0-9]*\\.[0-9]+)[°]*[, ]+([EW])[ ]([0-9]+[0-9]*\\.[0-9]+)[°]*\\b/', $sQuery, $aData)) {
-        //                    1        2                               3        4
-        // degrees decimal
-        // N 40.446° W 79.982°
+        /*                    1        2                               3        4
+         * degrees decimal
+         * N 40.446° W 79.982°
+         */
         $sFound    = $aData[0];
         $fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2]);
         $fQueryLon = ($aData[3]=='E'?1:-1) * ($aData[4]);
     } elseif (preg_match('/\\b([0-9]+[0-9]*\\.[0-9]+)[° ]+([NS])[, ]+([0-9]+[0-9]*\\.[0-9]+)[° ]+([EW])\\b/', $sQuery, $aData)) {
-        //                    1                           2          3                           4
-        // degrees decimal
-        // 40.446° N 79.982° W
+        /*                    1                           2          3                           4
+         * degrees decimal
+         * 40.446° N 79.982° W
+         */
         $sFound    = $aData[0];
         $fQueryLat = ($aData[2]=='N'?1:-1) * ($aData[1]);
         $fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[3]);
     } elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9]*\\.[0-9]+)[, ]+(-?[0-9]+[0-9]*\\.[0-9]+)(\\]|$|\\b)/', $sQuery, $aData)) {
-        //                 1          2                             3                        4
-        // degrees decimal
-        // 12.34, 56.78
-        // [12.456,-78.90]
+        /*                 1          2                             3                        4
+         * degrees decimal
+         * 12.34, 56.78
+         * [12.456,-78.90]
+         */
         $sFound    = $aData[0];
         $fQueryLat = $aData[2];
         $fQueryLon = $aData[3];
@@ -679,7 +682,7 @@ function looksLikeLatLonPair($sQuery)
 
 function geometryText2Points($geometry_as_text, $fRadius)
 {
-    $aPolyPoints = NULL;
+    $aPolyPoints = null;
     if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) {
         //
         preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);

lib/log.php

@@ -1,5 +1,6 @@
 <?php
 
+
 function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
 {
     $fStartTime = microtime(true);
@@ -70,5 +71,4 @@ function logEnd(&$oDB, $hLog, $iNumResults)
         );
         file_put_contents(CONST_Log_File, $aOutdata, FILE_APPEND | LOCK_EX);
     }
-
 }

lib/output.php

@@ -1,5 +1,6 @@
 <?php
 
+
 function formatOSMType($sType, $bIncludeExternal = true)
 {
     if ($sType == 'N') return 'node';
@@ -38,4 +39,3 @@ function detailsLink($aFeature, $sTitle = false)
 
     return '<a href="details.php?place_id='.$aFeature['place_id'].'">'.($sTitle?$sTitle:$aFeature['place_id']).'</a>';
 }
-

utils/importWikipedia.php

@@ -90,12 +90,14 @@ EOD;
     $oDB->query($sSQL);
 }
 
+
 function degreesAndMinutesToDecimal($iDegrees, $iMinutes = 0, $fSeconds = 0, $sNSEW = 'N')
 {
     $sNSEW = strtoupper($sNSEW);
     return ($sNSEW == 'S' || $sNSEW == 'W'?-1:1) * ((float)$iDegrees + (float)$iMinutes/60 + (float)$fSeconds/3600);
 }
 
+
 function _parseWikipediaContent($sPageText)
 {
     $sPageText = str_replace("\n", ' ', $sPageText);
@@ -201,7 +203,7 @@ function _templatesToProperties($aTemplates)
     foreach ($aTemplates as $iTemplate => $aTemplate) {
         $aParams = array();
         foreach (array_reverse($aTemplate[1]) as $iParam => $sParam) {
-            if (($iPos = strpos($sParam, '=')) === FALSE) {
+            if (($iPos = strpos($sParam, '=')) === false) {
                 $aParams[] = trim($sParam);
             } else {
                 $aParams[trim(substr($sParam, 0, $iPos))] = trim(substr($sParam, $iPos+1));
@@ -224,7 +226,7 @@ function _templatesToProperties($aTemplates)
         if (!isset($aPageProperties['sWebsite']) && isset($aParams['website']) && $aParams['website']) {
             if (preg_match('#^\\[?([^ \\]]+)[^\\]]*\\]?$#', $aParams['website'], $aMatch)) {
                 $aPageProperties['sWebsite'] = $aMatch[1];
-                if (strpos($aPageProperties['sWebsite'], ':/'.'/') === FALSE) {
+                if (strpos($aPageProperties['sWebsite'], ':/'.'/') === false) {
                     $aPageProperties['sWebsite'] = 'http:/'.'/'.$aPageProperties['sWebsite'];
                 }
             }
@@ -306,7 +308,7 @@ function _templatesToProperties($aTemplates)
 if (isset($aCMDResult['parse-wikipedia'])) {
     $oDB =& getDB();
     $aArticleNames = $oDB->getCol('select page_title from content where page_namespace = 0 and page_id %10 = '.$aCMDResult['parse-wikipedia'].' and (page_content ilike \'%{{Coord%\' or (page_content ilike \'%lat%\' and page_content ilike \'%lon%\'))');
-//      $aArticleNames = $oDB->getCol($sSQL = 'select page_title from content where page_namespace = 0 and (page_content ilike \'%{{Coord%\' or (page_content ilike \'%lat%\' and page_content ilike \'%lon%\')) and page_title in (\'Virginia\')');
+    // $aArticleNames = $oDB->getCol($sSQL = 'select page_title from content where page_namespace = 0 and (page_content ilike \'%{{Coord%\' or (page_content ilike \'%lat%\' and page_content ilike \'%lon%\')) and page_title in (\'Virginia\')');
     foreach ($aArticleNames as $sArticleName) {
         $sPageText = $oDB->getOne('select page_content from content where page_namespace = 0 and page_title = \''.pg_escape_string($sArticleName).'\'');
         $aP = _templatesToProperties(_parseWikipediaContent($sPageText));
@@ -342,6 +344,7 @@ if (isset($aCMDResult['parse-wikipedia'])) {
     }
 }
 
+
 function nominatimXMLStart($hParser, $sName, $aAttr)
 {
     global $aNominatRecords;
@@ -352,6 +355,7 @@ function nominatimXMLStart($hParser, $sName, $aAttr)
     }
 }
 
+
 function nominatimXMLEnd($hParser, $sName)
 {
 }
@@ -466,7 +470,7 @@ if (isset($aCMDResult['link'])) {
                 $bUnknown = true;
                 $fMaxDist = 0.005;
                 $sURL .= "&viewbox=".($aRecord['lon']-0.01).",".($aRecord['lat']+0.01).",".($aRecord['lon']+0.01).",".($aRecord['lat']-0.01);
-//              $sURL .= "&bounded=1";
+                // $sURL .= "&bounded=1";
                 $sURL .= "&nearlat=".$aRecord['lat'];
                 $sURL .= "&nearlon=".$aRecord['lon'];
                 echo "-- Unknown: ".$aRecord['infobox_type']."\n";
@@ -494,7 +498,7 @@ if (isset($aCMDResult['link'])) {
                 $hXMLParser = xml_parser_create();
                 xml_set_element_handler($hXMLParser, 'nominatimXMLStart', 'nominatimXMLEnd');
                 xml_parse($hXMLParser, $sXML, true);
-                xml_parser_free($hXMLParser);#
+                xml_parser_free($hXMLParser);
             }
         }
 
@@ -522,9 +526,15 @@ if (isset($aCMDResult['link'])) {
             } else {
                 $sSQL = "update wikipedia_article set osm_type=";
                 switch ($aNominatRecords[$i]['OSM_TYPE']) {
-                case 'relation': $sSQL .= "'R'"; break;
-                case 'way': $sSQL .= "'W'"; break;
-                case 'node': $sSQL .= "'N'"; break;
+                    case 'relation':
+                        $sSQL .= "'R'";
+                        break;
+                    case 'way':
+                        $sSQL .= "'W'";
+                        break;
+                    case 'node':
+                        $sSQL .= "'N'";
+                        break;
                 }
                 $sSQL .= ", osm_id=".$aNominatRecords[$i]['OSM_ID']." where language = '".pg_escape_string($aRecord['language'])."' and title = '".pg_escape_string($aRecord['title'])."'";
                 $oDB->query($sSQL);

utils/server_compare.php

@@ -1,8 +1,7 @@
 #!/usr/bin/php -Cq
 <?php
 
-// Apache log file
-$sFile = "sample.log.txt";
+$sFile = "sample.log.txt"; // Apache log file
 $sHost1 = 'http://mq-open-search-lm02.ihost.aol.com:8000/nominatim/v1';
 $sHost2 = 'http://mq-open-search-lm03.ihost.aol.com:8000/nominatim/v1';
 

utils/setup.php

@@ -94,8 +94,9 @@ if ($aCMDResult['create-db'] || $aCMDResult['all']) {
 if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
     echo "Setup DB\n";
     $bDidSomething = true;
-    // TODO: path detection, detection memory, etc.
 
+    // TODO: path detection, detection memory, etc.
+    //
     $oDB =& getDB();
 
     $fPostgresVersion = getPostgresVersion($oDB);
@@ -649,6 +650,7 @@ if (!$bDidSomething) {
     echo "Setup finished.\n";
 }
 
+
 function pgsqlRunScriptFile($sFilename)
 {
     if (!file_exists($sFilename)) fail('unable to find '.$sFilename);
@@ -698,7 +700,6 @@ function pgsqlRunScriptFile($sFilename)
         fclose($ahGzipPipes[1]);
         proc_close($hGzipProcess);
     }
-
 }
 
 function pgsqlRunScript($sScript, $bfatal = true)
@@ -844,6 +845,4 @@ function create_sql_functions($aCMDResult)
         $sTemplate = str_replace('-- %NOAUXDATA% ', '', $sTemplate);
     }
     pgsqlRunScript($sTemplate);
-
 }
-

utils/specialphrases.php

@@ -42,24 +42,24 @@ if ($aCMDResult['wiki-import']) {
                 $sLabel = trim($aMatch[1]);
                 $sClass = trim($aMatch[2]);
                 $sType = trim($aMatch[3]);
-                # hack around a bug where building=yes was imported with
-                # quotes into the wiki
+                // hack around a bug where building=yes was imported with
+                // quotes into the wiki
                 $sType = preg_replace('/"/', '', $sType);
-                # sanity check, in case somebody added garbage in the wiki
+                // sanity check, in case somebody added garbage in the wiki
                 if (preg_match('/^\\w+$/', $sClass) < 1
                     || preg_match('/^\\w+$/', $sType) < 1
                 ) {
                     trigger_error("Bad class/type for language $sLanguage: $sClass=$sType");
                     exit;
                 }
-                # blacklisting: disallow certain class/type combinations
+                // blacklisting: disallow certain class/type combinations
                 if (isset($aTagsBlacklist[$sClass]) && in_array($sType, $aTagsBlacklist[$sClass])) {
-                    # fwrite(STDERR, "Blacklisted: ".$sClass."/".$sType."\n");
+                    // fwrite(STDERR, "Blacklisted: ".$sClass."/".$sType."\n");
                     continue;
                 }
-                # whitelisting: if class is in whitelist, allow only tags in the list
+                // whitelisting: if class is in whitelist, allow only tags in the list
                 if (isset($aTagsWhitelist[$sClass]) && !in_array($sType, $aTagsWhitelist[$sClass])) {
-                    # fwrite(STDERR, "Non-Whitelisted: ".$sClass."/".$sType."\n");
+                    // fwrite(STDERR, "Non-Whitelisted: ".$sClass."/".$sType."\n");
                     continue;
                 }
                 $aPairs[$sClass.'|'.$sType] = array($sClass, $sType);

utils/update.php

@@ -326,6 +326,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
     }
 }
 
+
 function getosmosistimestamp($sOsmosisConfigDirectory)
 {
     $sStateFile = file_get_contents($sOsmosisConfigDirectory.'/state.txt');

utils/warm.php

@@ -67,4 +67,3 @@ if (!$aResult['reverse-only']) {
         else echo ".";
     }
 }
-

website/deletable.php

@@ -1,21 +1,23 @@
 <?php
-    require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
-    require_once(CONST_BasePath.'/lib/init-website.php');
-    require_once(CONST_BasePath.'/lib/log.php');
-    require_once(CONST_BasePath.'/lib/output.php');
-    ini_set('memory_limit', '200M');
 
-    $sOutputFormat = 'html';
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+require_once(CONST_BasePath.'/lib/init-website.php');
+require_once(CONST_BasePath.'/lib/log.php');
+require_once(CONST_BasePath.'/lib/output.php');
+ini_set('memory_limit', '200M');
 
-    $oDB =& getDB();
+$sOutputFormat = 'html';
 
-    $sSQL = "select placex.place_id, calculated_country_code as country_code, name->'name' as name, i.* from placex, import_polygon_delete i where placex.osm_id = i.osm_id and placex.osm_type = i.osm_type and placex.class = i.class and placex.type = i.type";
-    $aPolygons = chksql($oDB->getAll($sSQL), "Could not get list of deleted OSM elements.");
+$oDB =& getDB();
 
-    if (CONST_DEBUG) {
+$sSQL = "select placex.place_id, calculated_country_code as country_code, name->'name' as name, i.* from placex, import_polygon_delete i where placex.osm_id = i.osm_id and placex.osm_type = i.osm_type and placex.class = i.class and placex.type = i.type";
+$aPolygons = chksql($oDB->getAll($sSQL), "Could not get list of deleted OSM elements.");
+
+if (CONST_DEBUG) {
     var_dump($aPolygons);
     exit;
-    }
+}
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -66,14 +68,15 @@ table td {
 
 <table>
 <?php
-    if (!$aPolygons) exit;
-    echo "<tr>";
-//var_dump($aPolygons[0]);
-    foreach ($aPolygons[0] as $sCol => $sVal) {
+
+if (!$aPolygons) exit;
+echo "<tr>";
+// var_dump($aPolygons[0]);
+foreach ($aPolygons[0] as $sCol => $sVal) {
     echo "<th>".$sCol."</th>";
-    }
-    echo "</tr>";
-    foreach ($aPolygons as $aRow) {
+}
+echo "</tr>";
+foreach ($aPolygons as $aRow) {
     echo "<tr>";
     foreach ($aRow as $sCol => $sVal) {
         switch ($sCol) {
@@ -89,7 +92,8 @@ table td {
         }
     }
     echo "</tr>";
-    }
+}
+
 ?>
 </table>
 

website/lookup.php

@@ -35,7 +35,7 @@ if (count($aOsmIds) > CONST_Places_Max_ID_count) {
     userError('Bulk User: Only ' . CONST_Places_Max_ID_count . " ids are allowed in one request.");
 }
 
-foreach ($aOsmIds AS $sItem) {
+foreach ($aOsmIds as $sItem) {
     // Skip empty sItem
     if (empty($sItem)) continue;
     

website/polygons.php

@@ -1,23 +1,24 @@
 <?php
-    require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
-    require_once(CONST_BasePath.'/lib/init-website.php');
-    require_once(CONST_BasePath.'/lib/log.php');
-    require_once(CONST_BasePath.'/lib/output.php');
-    ini_set('memory_limit', '200M');
 
-    $oParams = new ParameterParser();
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+require_once(CONST_BasePath.'/lib/init-website.php');
+require_once(CONST_BasePath.'/lib/log.php');
+require_once(CONST_BasePath.'/lib/output.php');
+ini_set('memory_limit', '200M');
 
-    $sOutputFormat = 'html';
-    $iDays = $oParams->getInt('days', 1);
-    $bReduced = $oParams->getBool('reduced', false);
-    $sClass = $oParams->getString('class', false);
+$oParams = new ParameterParser();
 
-    $oDB =& getDB();
+$sOutputFormat = 'html';
+$iDays = $oParams->getInt('days', 1);
+$bReduced = $oParams->getBool('reduced', false);
+$sClass = $oParams->getString('class', false);
 
-    $iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error'));
+$oDB =& getDB();
 
-    $aPolygons = array();
-    while ($iTotalBroken && !sizeof($aPolygons)) {
+$iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error'));
+
+$aPolygons = array();
+while ($iTotalBroken && !sizeof($aPolygons)) {
     $sSQL = 'select osm_type as "type",osm_id as "id",class as "key",type as "value",name->\'name\' as "name",';
     $sSQL .= 'country_code as "country",errormessage as "error message",updated';
     $sSQL .= " from import_polygon_error";
@@ -28,12 +29,13 @@
     if ($sClass) $sSQL .= " and class = '".pg_escape_string($sClass)."'";
     $sSQL .= " order by updated desc limit 1000";
     $aPolygons = chksql($oDB->getAll($sSQL));
-    }
+}
 
-    if (CONST_Debug) {
+if (CONST_Debug) {
     var_dump($aPolygons);
     exit;
-    }
+}
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -82,19 +84,19 @@ table td {
 
 <?php
 
-    echo "<p>Total number of broken polygons: $iTotalBroken</p>";
-    if (!$aPolygons) exit;
-    echo "<table>";
-    echo "<tr>";
+echo "<p>Total number of broken polygons: $iTotalBroken</p>";
+if (!$aPolygons) exit;
+echo "<table>";
+echo "<tr>";
 //var_dump($aPolygons[0]);
-    foreach ($aPolygons[0] as $sCol => $sVal) {
+foreach ($aPolygons[0] as $sCol => $sVal) {
     echo "<th>".$sCol."</th>";
-    }
-    echo "<th>&nbsp;</th>";
-    echo "<th>&nbsp;</th>";
-    echo "</tr>";
-    $aSeen = array();
-    foreach ($aPolygons as $aRow) {
+}
+echo "<th>&nbsp;</th>";
+echo "<th>&nbsp;</th>";
+echo "</tr>";
+$aSeen = array();
+foreach ($aPolygons as $aRow) {
     if (isset($aSeen[$aRow['type'].$aRow['id']])) continue;
     $aSeen[$aRow['type'].$aRow['id']] = 1;
     echo "<tr>";
@@ -124,8 +126,9 @@ table td {
         echo "<td>&nbsp;</td>";
     }
     echo "</tr>";
-    }
-    echo "</table>";
+}
+echo "</table>";
+
 ?>
 </body>
 </html>

website/status.php

@@ -4,6 +4,7 @@
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 
+
 function statusError($sMsg)
 {
     header("HTTP/1.0 500 Internal Server Error");
@@ -34,4 +35,3 @@ if (!$iWordID) {
 
 echo "OK";
 exit;
-