Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

csv writer #33

Closed
wants to merge 3 commits into from
Closed

csv writer #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d605a3
csv writer
michaelkirk May 10, 2022
094995c
CONTROVERSIAL: Geometry should have index 0 if its the first geometry in
michaelkirk May 12, 2022
31656d7
alphabetize by extension
michaelkirk May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions geozero-cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use clap::Parser;
use flatgeobuf::*;
use geozero::csv::CsvReader;
use geozero::csv::{CsvReader, CsvWriter};
use geozero::error::Result;
use geozero::geojson::{GeoJsonReader, GeoJsonWriter};
use geozero::svg::SvgWriter;
Expand Down Expand Up @@ -57,6 +57,17 @@ fn transform<P: FeatureProcessor>(args: Cli, processor: &mut P) -> Result<()> {
let pathin = Path::new(&args.input);
let mut filein = BufReader::new(File::open(pathin)?);
match pathin.extension().and_then(OsStr::to_str) {
Some("csv") => {
let geometry_column_name = args
.csv_geometry_column
.expect("must specify --csv-geometry-column=<column name> when parsing CSV");
let mut ds = CsvReader::new(&geometry_column_name, &mut filein);
GeozeroDatasource::process(&mut ds, processor)?;
}
Some("json") | Some("geojson") => {
let mut ds = GeoJsonReader(&mut filein);
GeozeroDatasource::process(&mut ds, processor)?;
}
Some("fgb") => {
let ds = FgbReader::open(&mut filein)?;
let mut ds = if let Some(bbox) = &args.extent {
Expand All @@ -66,21 +77,10 @@ fn transform<P: FeatureProcessor>(args: Cli, processor: &mut P) -> Result<()> {
};
ds.process_features(processor)?;
}
Some("json") | Some("geojson") => {
let mut ds = GeoJsonReader(&mut filein);
GeozeroDatasource::process(&mut ds, processor)?;
}
Some("wkt") => {
let mut ds = WktReader(&mut filein);
GeozeroDatasource::process(&mut ds, processor)?;
}
Some("csv") => {
let geometry_column_name = args
.csv_geometry_column
.expect("must specify --csv-geometry-column=<column name> when parsing CSV");
let mut ds = CsvReader::new(&geometry_column_name, &mut filein);
GeozeroDatasource::process(&mut ds, processor)?;
}
_ => panic!("Unkown input file extension"),
};
Ok(())
Expand All @@ -89,6 +89,15 @@ fn transform<P: FeatureProcessor>(args: Cli, processor: &mut P) -> Result<()> {
fn process(args: Cli) -> Result<()> {
let mut fout = BufWriter::new(File::create(&args.dest)?);
match args.dest.extension().and_then(OsStr::to_str) {
Some("csv") => {
let mut processor = CsvWriter::new(&mut fout);
transform(args, &mut processor)?;
}
Some("fgb") => {
let mut fgb = FgbWriter::create("fgb", GeometryType::Unknown)?;
transform(args, &mut fgb)?;
fgb.write(&mut fout)?;
}
Some("json") | Some("geojson") => {
let mut processor = GeoJsonWriter::new(&mut fout);
transform(args, &mut processor)?;
Expand All @@ -110,11 +119,6 @@ fn process(args: Cli) -> Result<()> {
}
transform(args, &mut processor)?;
}
Some("fgb") => {
let mut fgb = FgbWriter::create("fgb", GeometryType::Unknown)?;
transform(args, &mut fgb)?;
fgb.write(&mut fout)?;
}
Some("wkt") => {
let mut processor = WktWriter::new(&mut fout);
transform(args, &mut processor)?;
Expand Down
Loading