Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to geo-types 0.7.8 #153

Merged
merged 1 commit into from
Feb 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- <https://github.com/georust/proj/pull/146>

- Run clippy and apply fixes
- Update to geo-types 0.7.8

## 0.27.0
- Inline the functionality of the legacy `Info` trait directly into `Proj`/`ProjBuilder` and remove the `Info` trait.
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ edition = "2018"

[dependencies]
proj-sys = { version = "0.23.1", path = "proj-sys" }
geo-types = { version = "0.7.3", optional = true }
geo-types = { version = "0.7.8", optional = true }
libc = "0.2.119"
num-traits = "0.2.14"
thiserror = "1.0.30"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# PROJ

Coordinate transformation via bindings to the [PROJ](https://proj.org) v9.0 API.
Coordinate transformation via bindings to the [PROJ](https://proj.org) v9.1 API.

Two coordinate transformation operations are currently provided: _projection_ (and inverse
projection) and _conversion_.
Expand All @@ -12,7 +12,7 @@ vice versa (inverse projection), while _conversion_ is intended for transformati
projected coordinate systems. The PROJ [documentation](https://proj.org/operations/index.html)
explains the distinction between these operations in more detail.

This crate depends on [`libproj v9.0.x`](https://proj.org), accessed via the
This crate depends on [`libproj v9.1.x`](https://proj.org), accessed via the
[`proj-sys`](https://docs.rs/proj-sys) crate. By default, `proj-sys` will try to find a
pre-existing installation of libproj on your system. If an appropriate version of libproj
cannot be found, the build script will attempt to build libproj from source. You may specify a
Expand Down Expand Up @@ -118,7 +118,7 @@ There are two options for creating a transformation:

## Requirements

By default, the crate requires `libproj` 9.0.x to be present on your system. While it may be
By default, the crate requires `libproj` 9.1.x to be present on your system. While it may be
backwards-compatible with older PROJ 6 versions, this is neither tested nor supported. If a suitable library can't be found, `proj` will attempt to build `libproj` from source.

## Feature Flags
Expand Down
4 changes: 2 additions & 2 deletions src/geo_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use geo_types::{coord, Geometry};
/// assert_relative_eq!(result.x, 1450880.29f64, epsilon=1.0e-2);
/// assert_relative_eq!(result.y, 1141263.01f64, epsilon=1.0e-2);
/// ```
impl<T: crate::proj::CoordinateType> crate::Coord<T> for geo_types::Coordinate<T> {
impl<T: crate::proj::CoordinateType> crate::Coord<T> for geo_types::Coord<T> {
fn x(&self) -> T {
self.x
}
Expand Down Expand Up @@ -83,7 +83,7 @@ where
}
}

impl<T> Transform<T> for geo_types::Coordinate<T>
impl<T> Transform<T> for geo_types::Coord<T>
where
T: crate::proj::CoordinateType,
{
Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![doc(html_logo_url = "https://raw.githubusercontent.com/georust/meta/master/logo/logo.png")]
//! Coordinate transformation via bindings to the [PROJ](https://proj.org) v9.0.x API.
//! Coordinate transformation via bindings to the [PROJ](https://proj.org) v9.1.x API.
//!
//! Two coordinate transformation operations are currently provided: _projection_ (and inverse
//! projection) and _conversion_.
Expand All @@ -9,7 +9,7 @@
//! projected coordinate systems. The PROJ [documentation](https://proj.org/operations/index.html)
//! explains the distinction between these operations in more detail.
//!
//! This crate depends on [`libproj v9.0.x`](https://proj.org), accessed via the
//! This crate depends on [`libproj v9.1.x`](https://proj.org), accessed via the
//! [`proj-sys`](https://docs.rs/proj-sys) crate. By default, `proj-sys` will try to find a
//! pre-existing installation of libproj on your system. If an appropriate version of libproj
//! cannot be found, the build script will attempt to build libproj from source. You may specify a
Expand Down Expand Up @@ -98,7 +98,7 @@
//!
//! # Requirements
//!
//! By default, the crate requires `libproj` 9.0.x to be present on your system and will use `pkg-config`
//! By default, the crate requires `libproj` 9.1.x to be present on your system and will use `pkg-config`
//! to attempt to locate it. If this fails, the crate will attempt to build libproj from its bundled source.
//!
//! # Feature Flags
Expand Down