Update to use proj 0.23.1, using libproj 8.1.0

[skip coverage]
thehappycheese · Nov 2, 2021 · e0aa25f · e0aa25f
1 parent 2ebbc7f
commit e0aa25f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -101,7 +101,7 @@ jobs:
   coverage:
     name: coverage
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip coverage]')"
     container:
       image: georust/geo-ci
       options: --security-opt seccomp=unconfined

diff --git a/geo/CHANGES.md b/geo/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+* Bump proj crate to 0.23.0, using PROJ 8.1.0
 * Add `ChaikinSmoothing` algorithm
 * Fix `rotate` for multipolygons to rotate around the collection's centroid, instead of rotating each individual polygon around its own centroid.
   * <https://github.com/georust/geo/pull/651>

diff --git a/geo/Cargo.toml b/geo/Cargo.toml
@@ -21,7 +21,7 @@ rstar = { version = "0.8" }
 geographiclib-rs = { version = "0.2" }
 log = "0.4.11"
 
-proj = { version = "0.20.3", optional = true }
+proj = { version = "0.23.1", optional = true }
 
 geo-types = { version = "0.7.2", features = ["approx", "use-rstar"] }
 

diff --git a/geo/src/algorithm/map_coords.rs b/geo/src/algorithm/map_coords.rs
@@ -8,7 +8,7 @@
 //! # #[cfg(feature = "use-proj")]
 //! use geo::algorithm::map_coords::TryMapCoords;
 //! # #[cfg(feature = "use-proj")]
-//! use proj::Proj;
+//! use proj::{Coord, Proj};
 //! // GeoJSON uses the WGS 84 coordinate system
 //! # #[cfg(feature = "use-proj")]
 //! let from = "EPSG:4326";
@@ -109,7 +109,7 @@ pub trait TryMapCoords<T, NT> {
     /// # #[cfg(feature = "use-proj")]
     /// use geo::algorithm::map_coords::TryMapCoords;
     /// # #[cfg(feature = "use-proj")]
-    /// use proj::Proj;
+    /// use proj::{Coord, Proj};
     /// // GeoJSON uses the WGS 84 coordinate system
     /// # #[cfg(feature = "use-proj")]
     /// let from = "EPSG:4326";
@@ -829,7 +829,7 @@ mod test {
     #[cfg(feature = "use-proj")]
     #[test]
     fn test_fallible_proj() {
-        use proj::Proj;
+        use proj::{Coord, Proj};
         let from = "EPSG:4326";
         let to = "EPSG:2230";
         let to_feet = Proj::new_known_crs(&from, &to, None).unwrap();

diff --git a/geo/src/algorithm/proj.rs b/geo/src/algorithm/proj.rs
@@ -1 +1 @@
-pub use proj::{Area, Info, Proj, ProjBuilder, ProjError, Projinfo};
+pub use proj::{Area, Coord, Info, Proj, ProjBuilder, ProjError, Projinfo};
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pub use proj::{Area, Info, Proj, ProjBuilder, ProjError, Projinfo};
		pub use proj::{Area, Coord, Info, Proj, ProjBuilder, ProjError, Projinfo};