Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 3f062f46bff8b870eaff8a4194cb0990dea89f24..d70a11e9e2a1a0f3639711f9522273a5865bab5a 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -33,10 +33,8 @@
                $oPlaceLookup->setOSMID($_GET['osm_type'], $_GET['osm_id']);
 
                $aPlace = $oPlaceLookup->lookup();
-
-               //if (!$iPlaceID) $sError = 'OSM ID Not Found';
        }
-       else
+       else if (isset($_GET['lat']) && isset($_GET['lon']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lat']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lon']))
        {
                $oReverseGeocode = new ReverseGeocode($oDB);
                $oReverseGeocode->setLanguagePreference($aLangPrefOrder);
@@ -47,6 +45,10 @@
 
                $aPlace = $oReverseGeocode->lookup();
        }
+       else
+       {
+               $aPlace = null;
+       }
 
        logEnd($oDB, $hLog, sizeof($aPlace)?1:0);