diff --git a/Cargo.toml b/Cargo.toml index c80ee8e9e..2756d22b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,4 +10,4 @@ documentation = "https://georust.github.io/rust-geo/" keywords = ["gis", "geo", "geography", "geospatial"] [dependencies] -num = "0.1" +num-traits = "0.1" diff --git a/src/algorithm/area.rs b/src/algorithm/area.rs index 1164c84e7..cf0ba2b98 100644 --- a/src/algorithm/area.rs +++ b/src/algorithm/area.rs @@ -1,4 +1,4 @@ -use num::Float; +use num_traits::Float; use types::{LineString, Polygon, MultiPolygon, Bbox}; /// Calculation of the area. @@ -59,7 +59,7 @@ impl Area for Bbox #[cfg(test)] mod test { - use num::Float; + use num_traits::Float; use types::{Coordinate, Point, LineString, Polygon, MultiPolygon, Bbox}; use algorithm::area::Area; use test_helpers::within_epsilon; diff --git a/src/algorithm/boundingbox.rs b/src/algorithm/boundingbox.rs index 306e54838..2b0d86d9b 100644 --- a/src/algorithm/boundingbox.rs +++ b/src/algorithm/boundingbox.rs @@ -1,4 +1,4 @@ -use num::Float; +use num_traits::Float; use types::{Bbox, Point, MultiPoint, LineString, MultiLineString, Polygon, MultiPolygon}; diff --git a/src/algorithm/centroid.rs b/src/algorithm/centroid.rs index aeedb62f3..aff651a4a 100644 --- a/src/algorithm/centroid.rs +++ b/src/algorithm/centroid.rs @@ -1,4 +1,4 @@ -use num::{Float, FromPrimitive}; +use num_traits::{Float, FromPrimitive}; use types::{Point, LineString, Polygon, MultiPolygon, Bbox}; use algorithm::area::Area; diff --git a/src/algorithm/contains.rs b/src/algorithm/contains.rs index 99db76f75..952fdaf3d 100644 --- a/src/algorithm/contains.rs +++ b/src/algorithm/contains.rs @@ -1,4 +1,4 @@ -use num::{Float, ToPrimitive}; +use num_traits::{Float, ToPrimitive}; use types::{COORD_PRECISION, Point, LineString, Polygon, MultiPolygon, Bbox}; use algorithm::intersects::Intersects; diff --git a/src/algorithm/distance.rs b/src/algorithm/distance.rs index 6b98672f5..b6302915f 100644 --- a/src/algorithm/distance.rs +++ b/src/algorithm/distance.rs @@ -1,9 +1,9 @@ use std::cmp::Ordering; use std::collections::BinaryHeap; -use num::{Float, ToPrimitive}; +use num_traits::{Float, ToPrimitive}; use types::{Point, LineString, Polygon}; use algorithm::contains::Contains; -use num::pow::pow; +use num_traits::pow::pow; /// Returns the distance between two geometries. diff --git a/src/algorithm/intersects.rs b/src/algorithm/intersects.rs index 10f2efabc..845cc1519 100644 --- a/src/algorithm/intersects.rs +++ b/src/algorithm/intersects.rs @@ -1,4 +1,4 @@ -use num::Float; +use num_traits::Float; use types::{LineString, Polygon, Bbox, Point}; use algorithm::contains::Contains; diff --git a/src/algorithm/length.rs b/src/algorithm/length.rs index 2d445383c..67dcc9e42 100644 --- a/src/algorithm/length.rs +++ b/src/algorithm/length.rs @@ -1,4 +1,4 @@ -use num::Float; +use num_traits::Float; use types::{LineString, MultiLineString}; use algorithm::distance::Distance; diff --git a/src/algorithm/simplify.rs b/src/algorithm/simplify.rs index 79026fb61..a541bae5d 100644 --- a/src/algorithm/simplify.rs +++ b/src/algorithm/simplify.rs @@ -1,4 +1,4 @@ -use num::Float; +use num_traits::Float; use types::{Point, LineString}; use algorithm::distance::Distance; diff --git a/src/algorithm/simplifyvw.rs b/src/algorithm/simplifyvw.rs index 63936a102..f18cbd93a 100644 --- a/src/algorithm/simplifyvw.rs +++ b/src/algorithm/simplifyvw.rs @@ -1,6 +1,6 @@ use std::cmp::Ordering; use std::collections::BinaryHeap; -use num::Float; +use num_traits::Float; use types::{Point, LineString}; // A helper struct for `visvalingam`, defined out here because diff --git a/src/lib.rs b/src/lib.rs index 7b4ab8137..14a2882d5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -extern crate num; +extern crate num_traits; pub use traits::ToGeo; pub use types::*; diff --git a/src/test_helpers.rs b/src/test_helpers.rs index 39052e4e4..def424633 100644 --- a/src/test_helpers.rs +++ b/src/test_helpers.rs @@ -1,4 +1,4 @@ -use num::Float; +use num_traits::Float; pub fn within_epsilon(x: F, y: F, epsilon: F) -> bool { let a = x.abs(); diff --git a/src/traits.rs b/src/traits.rs index ae0eb8434..79e538462 100644 --- a/src/traits.rs +++ b/src/traits.rs @@ -1,6 +1,6 @@ pub use ::Geometry; -use num::Float; +use num_traits::Float; pub trait ToGeo { diff --git a/src/types.rs b/src/types.rs index 693f01c9c..597ad5f98 100644 --- a/src/types.rs +++ b/src/types.rs @@ -3,7 +3,7 @@ use std::ops::AddAssign; use std::ops::Neg; use std::ops::Sub; -use num::{Float, ToPrimitive}; +use num_traits::{Float, ToPrimitive}; pub static COORD_PRECISION: f32 = 1e-1; // 0.1m