Merge pull request #614 from nicolas-f/importOsmFileExtension

About #613 handle wrong file extension with a more explicit error
Universite-Gustave-Eiffel · Sep 25, 2023 · 87594f5 · 87594f5
2 parents 7fbcbef + e41eb98
commit 87594f5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...s/src/main/groovy/org/noise_planet/noisemodelling/wps/Import_and_Export/Import_OSM.groovy b/...s/src/main/groovy/org/noise_planet/noisemodelling/wps/Import_and_Export/Import_OSM.groovy
@@ -215,13 +215,15 @@ def exec(Connection connection, input) {
 
  // Read the OSM file, depending on its extension
  def reader
- if (pathFile.endsWith(".pbf")) {
+ if (pathFile.toLowerCase(Locale.getDefault()).endsWith(".pbf")) {
  InputStream inputStream = new FileInputStream(pathFile);
  reader = new OsmosisReader(inputStream);
- } else if (pathFile.endsWith(".osm")) {
+ } else if (pathFile.toLowerCase(Locale.getDefault()).endsWith(".osm")) {
  reader = new XmlReader(new File(pathFile), true, CompressionMethod.None);
- } else if (pathFile.endsWith(".osm.gz")) {
+ } else if (pathFile.toLowerCase(Locale.getDefault()).endsWith(".osm.gz")) {
  reader = new XmlReader(new File(pathFile), true, CompressionMethod.GZip);
+ } else {
+ throw new IllegalArgumentException("File extension not known.Should be pbf, osm or osm.gz but got " + pathFile)
  }
 
  OsmHandler handler = new OsmHandler(logger, ignoreBuilding, ignoreRoads, ignoreGround, removeTunnels)