Merge #214

214: Use the proj crate r=urschrei a=lnicola Fixes #211. Co-authored-by: Laurentiu Nicola <lnicola@dend.ro>
georust · May 12, 2018 · cebb504 · cebb504
2 parents 2771d3b + 3cc1cbe
commit cebb504
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 437 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,8 @@
 
 * Make serde an optional dependency for `geo`, rename feature to `use-serde`
   * <https://github.com/georust/rust-geo/pull/209>
+* Use the `proj` crate, rename feature to `use-proj`
+  * <https://github.com/georust/rust-geo/pull/214>
 * Fix compilation errors when using the `proj` feature
   * <https://github.com/georust/rust-geo/commit/0924f3179c95bfffb847562ee91675d7aa8454f5>
 

diff --git a/geo/Cargo.toml b/geo/Cargo.toml
@@ -18,14 +18,13 @@ serde = { version = "1.0", optional = true, features = ["derive"] }
 spade = "1.3.0"
 failure = "0.1.1"
 postgis = { version = "0.5", optional = true }
-proj-sys = { version = "0.6.1", optional = true }
-libc = { version = "0.2.39", optional = true }
+proj = { version = "0.5", optional = true }
 geo-types = { version = "0.1.0", features = ["spade"] }
 
 [features]
 default = []
 postgis-integration = ["postgis"]
-proj = ["proj-sys", "libc"]
+use-proj = ["proj"]
 use-serde = ["serde", "geo-types/serde"]
 
 [dev-dependencies]

diff --git a/geo/src/algorithm/map_coords.rs b/geo/src/algorithm/map_coords.rs
@@ -588,7 +588,7 @@ mod test {
         assert_eq!(p2.y(), 2f32);
     }
 
-    #[cfg(feature = "proj")]
+    #[cfg(feature = "use-proj")]
     #[test]
     fn test_fallible() {
         let f = |x: f64, y: f64| {

diff --git a/geo/src/algorithm/mod.rs b/geo/src/algorithm/mod.rs
@@ -47,5 +47,5 @@ pub mod haversine_length;
 /// Calculate, and work with, the winding order of Linestrings
 pub mod winding_order;
 /// Coordinate projections and transformations using [PROJ](http://proj4.org) v5.0.x
-#[cfg(feature = "proj")]
+#[cfg(feature = "use-proj")]
 pub mod proj;