Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / setup_functions.php

diff --git a/lib-php/setup_functions.php b/lib-php/setup_functions.php
index dc84cf92852df0a98765cad45f2adfd39d261571..400834dd28b8e27e6f0f57b60b7588ed1539800c 100755 (executable)
--- a/lib-php/setup_functions.php
+++ b/lib-php/setup_functions.php
@@ -1,19 +1,12 @@
 <?php
 <?php

-
-function checkInFile($sOSMFile)
-{
-    if (!isset($sOSMFile)) {
-        fail('missing --osm-file for data import');
-    }
-
-    if (!file_exists($sOSMFile)) {
-        fail('the path supplied to --osm-file does not exist');
-    }
-
-    if (!is_readable($sOSMFile)) {
-        fail('osm-file "' . $aCMDResult['osm-file'] . '" not readable');
-    }
-}
+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 function getOsm2pgsqlBinary()
 {
 
 function getOsm2pgsqlBinary()
 {


@@ -27,7 +20,7 @@ function getImportStyle()
     $sStyle = getSetting('IMPORT_STYLE');
 
     if (in_array($sStyle, array('admin', 'street', 'address', 'full', 'extratags'))) {
     $sStyle = getSetting('IMPORT_STYLE');
 
     if (in_array($sStyle, array('admin', 'street', 'address', 'full', 'extratags'))) {

-        return CONST_DataDir.'/settings/import-'.$sStyle.'.style';
+        return CONST_ConfigDir.'/import-'.$sStyle.'.style';

     }
 
     return $sStyle;
     }
 
     return $sStyle;