Skip to content

Commit

Permalink
Update to LiDAR tool messages
Browse files Browse the repository at this point in the history
Update to LiDAR tool messages. They are now more generic with "reading input LAS file" => "reading input LiDAR file". This makes sense now that LAZ is supported.
  • Loading branch information
jblindsay committed Aug 30, 2021
1 parent 78a3a00 commit 645b09f
Show file tree
Hide file tree
Showing 31 changed files with 31 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"short_description": "This tool evaluates hydrologic connectivity within a DEM",
"toolbox": "Geomorphometric Analysis",
"license": "MIT",
"example": ".*EXE_NAME -r=ExposureTowardsWindFlux -i=input.tif -s=streams.tif -o=new.tif",
"example": ".*EXE_NAME -r=ExposureTowardsWindFlux -dem=input.tif -o=exposure.tif --azimuth=35.0 --max_dist=500.0",
"parameters": [
{
"name": "Input DEM Raster",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ impl WhiteboxTool for LidarBlockMaximum {
}

if verbose && inputs.len() == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ impl WhiteboxTool for LidarBlockMinimum {
}

if verbose && inputs.len() == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ impl WhiteboxTool for ClassifyOverlapPoints {
println!("{}", "*".repeat(welcome_len));
}

println!("Reading input LAS file...");
println!("reading input LiDAR file...");
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Err(err) => panic!("Error reading file {}: {}", input_file, err),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ impl WhiteboxTool for FilterLidarClasses {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ impl WhiteboxTool for FilterLidarScanAngles {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl WhiteboxTool for FindFlightlineEdgePoints {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ impl WhiteboxTool for FlightlineOverlap {
}

if verbose && inputs.len() == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ impl WhiteboxTool for LasToMultipointShapefile {
.replace(".ZLIDAR", ".shp");

if verbose && num_tiles == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}

let path = path::Path::new(&input_file);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ impl WhiteboxTool for LasToShapefile {
.replace(".ZLIDAR", ".shp");

if verbose && num_tiles == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}

let path = path::Path::new(&input_file);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ impl WhiteboxTool for LidarConstructVectorTIN {
let mut z_values = vec![];

if verbose && inputs.len() == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}

let mut progress: usize;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ impl WhiteboxTool for LidarElevationSlice {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input: LasFile = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ impl WhiteboxTool for LidarGroundPointFilter {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ impl WhiteboxTool for LidarHillshade {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ impl WhiteboxTool for LidarHistogram {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ impl WhiteboxTool for LidarIdwInterpolation {
FixedRadiusSearch2D::new(search_radius, DistanceMetric::Euclidean);

if verbose && inputs.len() == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}

let mut progress: i32;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ impl WhiteboxTool for LidarNearestNeighbourGridding {
FixedRadiusSearch2D::new(search_radius, DistanceMetric::SquaredEuclidean);

if verbose && inputs.len() == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}

let mut progress: i32;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ impl WhiteboxTool for LidarRemoveOutliers {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ impl WhiteboxTool for LidarPointDensity {
FixedRadiusSearch2D::new(search_radius, DistanceMetric::SquaredEuclidean);

if verbose && inputs.len() == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}

let mut progress: i32;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ impl WhiteboxTool for LidarPointStats {

let input_file = inputs[tile].replace("\"", "").clone();
if verbose && inputs.len() == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ impl WhiteboxTool for LidarRbfInterpolation {
let mut z: f64;

if verbose && inputs.len() == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}

let mut progress: i32;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ impl WhiteboxTool for LidarRansacPlanes {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ impl WhiteboxTool for LidarRooftopAnalysis {
println!("Clipping lidar to building footprints...")
};

// let input = LasFile::new(&inputs[0], "r").expect("Error reading input LAS file");
// let input = LasFile::new(&inputs[0], "r").expect("Error reading input LiDAR file");
// let mut output_lidar = LasFile::initialize_using_file(&output_lidar_file, &input);
// output_lidar.header.system_id = "EXTRACTION".to_string();
// output_lidar.header.point_format = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ impl WhiteboxTool for LidarSegmentation {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ impl WhiteboxTool for LidarSegmentationBasedFilter {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
2 changes: 1 addition & 1 deletion whitebox-tools-app/src/tools/lidar_analysis/lidar_thin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ impl WhiteboxTool for LidarThin {
println!("{}", "*".repeat(welcome_len));
}

println!("Reading input LAS file...");
println!("reading input LiDAR file...");
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Err(err) => panic!("Error reading file {}: {}", input_file, err),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ impl WhiteboxTool for LidarThinHighDensity {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ impl WhiteboxTool for LidarTileFootprint {
let input_file = inputs[tile].replace("\"", "").clone();

if verbose && num_tiles == 1 {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}

let path = path::Path::new(&input_file);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ impl WhiteboxTool for LidarTophatTransform {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ impl WhiteboxTool for NormalVectors {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ impl WhiteboxTool for LidarRemoveDuplicates {
}

if verbose {
println!("Reading input LAS file...");
println!("reading input LiDAR file...");
}
let input = match LasFile::new(&input_file, "r") {
Ok(lf) => lf,
Expand Down

0 comments on commit 645b09f

Please sign in to comment.