Merge pull request #909 from mtmail/decimal-coord-parsing-with-sub-seconds

parsing coordinates allows second with floats

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 6c5fb23e2c3c4cd8d9f2e3d7ae460dbc1ee54190..f2b99bdbf4ca6ab382dddcb9ab0d84c5e8853fb9 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -225,14 +225,14 @@ class Geocode
         $aViewbox = $oParams->getStringList('viewboxlbrt');
         if ($aViewbox) {
             if (count($aViewbox) != 4) {
-                userError("Bad parmater 'viewboxlbrt'. Expected 4 coordinates.");
+                userError("Bad parameter 'viewboxlbrt'. Expected 4 coordinates.");
             }
             $this->setViewbox($aViewbox);
         } else {
             $aViewbox = $oParams->getStringList('viewbox');
             if ($aViewbox) {
                 if (count($aViewbox) != 4) {
-                    userError("Bad parmater 'viewbox'. Expected 4 coordinates.");
+                    userError("Bad parameter 'viewbox'. Expected 4 coordinates.");
                 }
                 $this->setViewBox($aViewbox);
             } else {

diff --git a/utils/update.php b/utils/update.php
index d34010c78eb3f9ab2faddbfef2a5a7ba42577359..d643e4bca72f7106ac845fed1a366113c38e89e1 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -263,7 +263,8 @@ if ($aResult['index']) {
 if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
     //
     if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {
-        fail("Error: Update interval too low for download.geofabrik.de.  Please check install documentation (http://nominatim.org/release-docs/latest/Import-and-Update#setting-up-the-update-process)\n");
+        fail('Error: Update interval too low for download.geofabrik.de. ' .
+             "Please check install documentation (http://nominatim.org/release-docs/latest/Import-and-Update#setting-up-the-update-process)\n");
     }
 
     $sImportFile = CONST_InstallPath.'/osmosischange.osc';