Skip to content

Commit c168134

Browse files
committed
bump geo-types to 0.4.0
1 parent b3c236c commit c168134

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ keywords = ["geojson", "gis", "json", "geo"]
1414
[dependencies]
1515
serde = "~1.0"
1616
serde_json = "~1.0"
17-
geo-types = "0.3"
17+
geo-types = "0.4"
1818
num-traits = "0.2"
1919

2020
[dev-dependencies]

src/conversion.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ where
5757
T: Float,
5858
{
5959
let mut coords = vec![polygon
60-
.exterior
60+
.exterior()
6161
.points_iter()
6262
.map(|point| create_point_type(&point))
6363
.collect()];
6464

6565
coords.extend(
6666
polygon
67-
.interiors
67+
.interiors()
6868
.iter()
6969
.map(|line_string| create_line_string_type(&line_string)),
7070
);
@@ -767,7 +767,7 @@ mod tests {
767767
let geojson_polygon = Value::Polygon(geojson_multi_line_string_type1);
768768
let geo_polygon: geo_types::Polygon<f64> = geojson_polygon.try_into().unwrap();
769769

770-
let ref geo_line_string1 = geo_polygon.exterior;
770+
let ref geo_line_string1 = geo_polygon.exterior();
771771
assert_almost_eq!(geo_line_string1.0[0].x, coord1[0], 1e-6);
772772
assert_almost_eq!(geo_line_string1.0[0].y, coord1[1], 1e-6);
773773
assert_almost_eq!(geo_line_string1.0[1].x, coord2[0], 1e-6);
@@ -777,7 +777,7 @@ mod tests {
777777
assert_almost_eq!(geo_line_string1.0[3].x, coord1[0], 1e-6);
778778
assert_almost_eq!(geo_line_string1.0[3].y, coord1[1], 1e-6);
779779

780-
let ref geo_line_string2 = geo_polygon.interiors[0];
780+
let ref geo_line_string2 = geo_polygon.interiors()[0];
781781
assert_almost_eq!(geo_line_string2.0[0].x, coord4[0], 1e-6);
782782
assert_almost_eq!(geo_line_string2.0[0].y, coord4[1], 1e-6);
783783
assert_almost_eq!(geo_line_string2.0[1].x, coord5[0], 1e-6);
@@ -793,7 +793,7 @@ mod tests {
793793
let geojson_polygon = Value::Polygon(vec![]);
794794
let geo_polygon: geo_types::Polygon<f64> = geojson_polygon.try_into().unwrap();
795795

796-
assert!(geo_polygon.exterior.0.is_empty());
796+
assert!(geo_polygon.exterior().0.is_empty());
797797
}
798798

799799
#[test]
@@ -811,7 +811,7 @@ mod tests {
811811
let geojson_polygon = Value::Polygon(geojson_multi_line_string_type1);
812812
let geo_polygon: geo_types::Polygon<f64> = geojson_polygon.try_into().unwrap();
813813

814-
let ref geo_line_string1 = geo_polygon.exterior;
814+
let ref geo_line_string1 = geo_polygon.exterior();
815815
assert_almost_eq!(geo_line_string1.0[0].x, coord1[0], 1e-6);
816816
assert_almost_eq!(geo_line_string1.0[0].y, coord1[1], 1e-6);
817817
assert_almost_eq!(geo_line_string1.0[1].x, coord2[0], 1e-6);
@@ -821,7 +821,7 @@ mod tests {
821821
assert_almost_eq!(geo_line_string1.0[3].x, coord1[0], 1e-6);
822822
assert_almost_eq!(geo_line_string1.0[3].y, coord1[1], 1e-6);
823823

824-
assert_eq!(0, geo_polygon.interiors.len());
824+
assert_eq!(0, geo_polygon.interiors().len());
825825
}
826826

827827
#[test]
@@ -853,7 +853,7 @@ mod tests {
853853
let geo_multi_polygon: geo_types::MultiPolygon<f64> =
854854
geojson_multi_polygon.try_into().unwrap();
855855

856-
let ref geo_line_string1 = geo_multi_polygon.0[0].exterior;
856+
let ref geo_line_string1 = geo_multi_polygon.0[0].exterior();
857857
assert_almost_eq!(geo_line_string1.0[0].x, coord1[0], 1e-6);
858858
assert_almost_eq!(geo_line_string1.0[0].y, coord1[1], 1e-6);
859859
assert_almost_eq!(geo_line_string1.0[1].x, coord2[0], 1e-6);
@@ -863,7 +863,7 @@ mod tests {
863863
assert_almost_eq!(geo_line_string1.0[3].x, coord1[0], 1e-6);
864864
assert_almost_eq!(geo_line_string1.0[3].y, coord1[1], 1e-6);
865865

866-
let ref geo_line_string2 = geo_multi_polygon.0[1].exterior;
866+
let ref geo_line_string2 = geo_multi_polygon.0[1].exterior();
867867
assert_almost_eq!(geo_line_string2.0[0].x, coord4[0], 1e-6);
868868
assert_almost_eq!(geo_line_string2.0[0].y, coord4[1], 1e-6);
869869
assert_almost_eq!(geo_line_string2.0[1].x, coord5[0], 1e-6);

0 commit comments

Comments
 (0)