Update proj to 0.14.4

nmaarnio · Jan 10, 2020 · 9b43ce5 · 9b43ce5
1 parent 79b5d2a
commit 9b43ce5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,8 @@
 # Changes
 
 ## geo (unreleased)
-
+* Bump proj to 0.14.4
+  * <https://github.com/georust/geo/pull/412>
 * Add `BoundingRect` implementation for `Rect`
   * <https://github.com/georust/geo/pull/355>
 * Add Chamberlain–Duquette area algorithm

diff --git a/geo/Cargo.toml b/geo/Cargo.toml
@@ -19,7 +19,7 @@ num-traits = "0.2"
 serde = { version = "1.0", optional = true, features = ["derive"] }
 rstar = { version = "0.7" }
 postgis = { version = "0.6", optional = true }
-proj = { version = "0.12.2", optional = true }
+proj = { version = "0.14.4", optional = true }
 
 # Swap the next two lines when publishing
 # geo-types = { version = "0.4.2", features = ["rstar"] }

diff --git a/geo/src/algorithm/map_coords.rs b/geo/src/algorithm/map_coords.rs
@@ -85,9 +85,8 @@ pub trait TryMapCoords<T, NT> {
     /// // 👽
     /// # #[cfg(feature = "use-proj")]
     /// let usa_m = Point::new(-115.797615, 37.2647978);
-    /// // PROJ expects coordinates in EPSG:4326 order: i.e. Lat, Lon
     /// # #[cfg(feature = "use-proj")]
-    /// let usa_ft = usa_m.try_map_coords(|&(x, y)| f(y, x)).unwrap();
+    /// let usa_ft = usa_m.try_map_coords(|&(x, y)| f(x, y)).unwrap();
     /// # #[cfg(feature = "use-proj")]
     /// assert_eq!(6693625.67217475, usa_ft.x());
     /// # #[cfg(feature = "proj")]
@@ -750,8 +749,7 @@ mod test {
         };
         // 👽
         let usa_m = Point::new(-115.797615, 37.2647978);
-        // PROJ expects coordinates in EPSG:4326 order: i.e. Lat, Lon
-        let usa_ft = usa_m.try_map_coords(|&(x, y)| f(y, x)).unwrap();
+        let usa_ft = usa_m.try_map_coords(|&(x, y)| f(x, y)).unwrap();
         assert_eq!(6693625.67217475, usa_ft.x());
         assert_eq!(3497301.5918027186, usa_ft.y());
     }