fix geojson flag handling and introduce path object (#46)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "osm_extract_polygon"
-version = "0.5.5"
+version = "0.5.6"
 authors = ["Andreas <[email protected]>"]
 edition = "2018"
 

src/main.rs

@@ -119,7 +119,7 @@ fn main() {
         OverwriteConfiguration::Ask
     };
 
-    let geojson_output = matches.contains_id(GEOJSON_ARG);
+    let geojson_output = matches.get_flag(GEOJSON_ARG);
 
     let output_handler_config = OutputHandlerConfiguration {
         overwrite_configuration,

src/output/file_creator.rs

@@ -16,9 +16,9 @@ enum OverwriteOrSkip {
 }
 
 impl FileCreator {
-    pub fn create_file(&mut self, filename: &str) -> std::io::Result<File> {
-        if Path::new(filename).exists() {
-            match self.overwrite_handling(filename)? {
+    pub fn create_file(&mut self, filename: &Path) -> std::io::Result<File> {
+        if filename.exists() {
+            match self.overwrite_handling(filename.as_os_str().to_str().unwrap())? {
                 OverwriteOrSkip::Skip => {
                     return Err(Error::new(ErrorKind::AlreadyExists, "skipped"));
                 }

src/output/output_handler.rs

@@ -7,6 +7,7 @@ use crate::output::OverwriteConfiguration;
 use std::collections::HashSet;
 use std::fs::{create_dir_all, File};
 use std::io::Result;
+use std::path::{Path, PathBuf};
 use std::time::Instant;
 
 pub trait FileWriter {
@@ -54,11 +55,20 @@ impl OutputHandler {
         println!("writing output files...");
 
         for (name, polygon) in filename_polys {
-            let filename_wo_ext = format!("{}/{}", base_folder, name);
-            if self.write_poly && self.write_file(&filename_wo_ext, "poly", polygon, &poly_writer) {
+            let filename_wo_ext: PathBuf = [base_folder.to_string(), name].iter().collect();
+            if self.write_poly
+                && self.write_file(filename_wo_ext.with_extension("poly").as_path(), polygon, &poly_writer)
+            {
                 file_count += 1;
             }
-            if self.write_geojson && self.write_file(&filename_wo_ext, "geojson", polygon, &geojson_writer) {
+
+            if self.write_geojson
+                && self.write_file(
+                    filename_wo_ext.with_extension("geojson").as_path(),
+                    polygon,
+                    &geojson_writer,
+                )
+            {
                 file_count += 1;
             }
         }
@@ -67,27 +77,21 @@ impl OutputHandler {
         Ok(file_count)
     }
 
-    pub fn write_file(
-        &mut self,
-        filename_wo_ext: &str,
-        ext: &str,
-        polygon: &Polygon,
-        file_writer: &impl FileWriter,
-    ) -> bool {
-        let filename = format!("{}.{}", filename_wo_ext, ext);
-
+    pub fn write_file(&mut self, filename_wo_ext: &Path, polygon: &Polygon, file_writer: &impl FileWriter) -> bool {
         let result = self
             .file_creator
-            .create_file(&filename)
+            .create_file(filename_wo_ext)
             .and_then(|mut file| file_writer.write_to_file(&mut file, polygon));
 
+        let filename_str = filename_wo_ext.as_os_str().to_str().unwrap();
+
         match result {
             Err(e) => {
-                println!("{}: {}", filename, e);
+                println!("{}: {}", filename_str, e);
                 false
             }
             Ok(_) => {
-                println!("{}: successfully written ", filename);
+                println!("{}: successfully written ", filename_str);
                 true
             }
         }