Skip to content

Commit

Permalink
Merge #10
Browse files Browse the repository at this point in the history
10: Create valid error r=urschrei a=urschrei

See discussion at #8 
Error taken from
https://github.com/OSGeo/proj.4/blob/master/test/gie/4D-API_cs2cs-style.gie#L194

5.0.1 now accepts certain nonsensical input, but returns inf, inf
instead of an error. See: OSGeo/PROJ#992 (comment)

Co-authored-by: Stephan Hügel <urschrei@gmail.com>
  • Loading branch information
bors[bot] and urschrei committed May 12, 2018
2 parents 65e3022 + da9ce64 commit 94d44d9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "proj"
description = "Rust bindings for proj.4"
version = "0.4.0"
version = "0.4.1"
authors = [
"Corey Farwell <coreyf@rwell.org>",
"Alex Morega <alex@grep.ro>",
"Stephan Hügel <urschrei@gmail.com>"
]
repository = "https://github.com/georust/rust-proj"
keywords = ["proj", "projection", "osgeo", "geo"]
Expand Down
9 changes: 1 addition & 8 deletions src/proj.rs
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,7 @@ mod test {
fn test_conversion_error() {
// because step 1 isn't an inverse conversion, it's expecting lon lat input
let nad83_m = Proj::new("
+proj=pipeline
+step +proj=lcc +lat_1=33.88333333333333
+lat_2=32.78333333333333 +lat_0=32.16666666666666
+lon_0=-116.25 +x_0=2000000.0001016 +y_0=500000.0001016001 +ellps=GRS80
+towgs84=0,0,0,0,0,0,0 +units=us-ft +no_defs
+step +proj=lcc +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lat_0=32.16666666666666
+lon_0=-116.25 +x_0=2000000 +y_0=500000
+ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs
+proj=geos +lon_0=0.00 +lat_0=0.00 +a=6378169.00 +b=6356583.80 +h=35785831.0
").unwrap();
let err = nad83_m
.convert(Point::new(4760096.421921, 3744293.729449))
Expand Down

0 comments on commit 94d44d9

Please sign in to comment.