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.

Sign up for GitHub

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

Jump to bottom

For Discussion: Using tinyvec::ArrayVec for Position without allocating #218

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

For Discussion: Using tinyvec::ArrayVec for Position without allocating #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ serde_json = "~1.0"
geo-types = { version = "0.7", features = ["serde"], optional = true }
thiserror = "1.0.20"
log = "0.4.17"
tinyvec = { version = "1", features=["rustc_1_57", "serde"] }

[dev-dependencies]
num-traits = "0.2"
Expand Down
3 changes: 2 additions & 1 deletion src/conversion/from_geo_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use geo_types::{self, CoordFloat};
use tinyvec::array_vec;

use crate::{geometry, Feature, FeatureCollection};

Expand Down Expand Up @@ -186,7 +187,7 @@ where
let x: f64 = point.x().to_f64().unwrap();
let y: f64 = point.y().to_f64().unwrap();

vec![x, y]
array_vec![x, y]
}

fn create_line_string_type<T>(line_string: &geo_types::LineString<T>) -> LineStringType
Expand Down
71 changes: 36 additions & 35 deletions src/conversion/to_geo_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,13 @@ fn mismatch_geom_err(expected_type: &'static str, found: &geometry::Value) -> Er
mod tests {
use crate::{Geometry, Value};
use serde_json::json;
use tinyvec::array_vec;

use std::convert::TryInto;

#[test]
fn geojson_point_conversion_test() {
let coords = vec![100.0, 0.2];
let coords = array_vec![100.0, 0.2];
let geojson_point = Value::Point(coords.clone());
let geo_point: geo_types::Point<f64> = geojson_point.try_into().unwrap();

Expand All @@ -378,8 +379,8 @@ mod tests {

#[test]
fn geojson_multi_point_conversion_test() {
let coord1 = vec![100.0, 0.2];
let coord2 = vec![101.0, 1.0];
let coord1 = array_vec![100.0, 0.2];
let coord2 = array_vec![101.0, 1.0];
let geojson_multi_point = Value::MultiPoint(vec![coord1.clone(), coord2.clone()]);
let geo_multi_point: geo_types::MultiPoint<f64> = geojson_multi_point.try_into().unwrap();

Expand All @@ -391,8 +392,8 @@ mod tests {

#[test]
fn geojson_line_string_conversion_test() {
let coord1 = vec![100.0, 0.2];
let coord2 = vec![101.0, 1.0];
let coord1 = array_vec![100.0, 0.2];
let coord2 = array_vec![101.0, 1.0];
let geojson_line_string = Value::LineString(vec![coord1.clone(), coord2.clone()]);
let geo_line_string: geo_types::LineString<f64> = geojson_line_string.try_into().unwrap();

Expand All @@ -404,9 +405,9 @@ mod tests {

#[test]
fn geojson_multi_line_string_conversion_test() {
let coord1 = vec![100.0, 0.2];
let coord2 = vec![101.0, 1.0];
let coord3 = vec![102.0, 0.8];
let coord1 = array_vec![100.0, 0.2];
let coord2 = array_vec![101.0, 1.0];
let coord3 = array_vec![102.0, 0.8];
let geojson_multi_line_string = Value::MultiLineString(vec![
vec![coord1.clone(), coord2.clone()],
vec![coord2.clone(), coord3.clone()],
Expand All @@ -429,12 +430,12 @@ mod tests {

#[test]
fn geojson_polygon_conversion_test() {
let coord1 = vec![100.0, 0.0];
let coord2 = vec![101.0, 1.0];
let coord3 = vec![101.0, 1.0];
let coord4 = vec![104.0, 0.2];
let coord5 = vec![100.9, 0.2];
let coord6 = vec![100.9, 0.7];
let coord1 = array_vec![100.0, 0.0];
let coord2 = array_vec![101.0, 1.0];
let coord3 = array_vec![101.0, 1.0];
let coord4 = array_vec![104.0, 0.2];
let coord5 = array_vec![100.9, 0.2];
let coord6 = array_vec![100.9, 0.7];

let geojson_multi_line_string_type1 = vec![
vec![
Expand Down Expand Up @@ -484,9 +485,9 @@ mod tests {

#[test]
fn geojson_polygon_without_interiors_conversion_test() {
let coord1 = vec![100.0, 0.0];
let coord2 = vec![101.0, 1.0];
let coord3 = vec![101.0, 1.0];
let coord1 = array_vec![100.0, 0.0];
let coord2 = array_vec![101.0, 1.0];
let coord3 = array_vec![101.0, 1.0];

let geojson_multi_line_string_type1 = vec![vec![
coord1.clone(),
Expand All @@ -512,12 +513,12 @@ mod tests {

#[test]
fn geojson_multi_polygon_conversion_test() {
let coord1 = vec![100.0, 0.0];
let coord2 = vec![101.0, 1.0];
let coord3 = vec![101.0, 1.0];
let coord4 = vec![104.0, 0.2];
let coord5 = vec![100.9, 0.2];
let coord6 = vec![100.9, 0.7];
let coord1 = array_vec![100.0, 0.0];
let coord2 = array_vec![101.0, 1.0];
let coord3 = array_vec![101.0, 1.0];
let coord4 = array_vec![104.0, 0.2];
let coord5 = array_vec![100.9, 0.2];
let coord6 = array_vec![100.9, 0.7];

let geojson_line_string_type1 = vec![
coord1.clone(),
Expand Down Expand Up @@ -562,11 +563,11 @@ mod tests {

#[test]
fn geojson_geometry_collection_conversion_test() {
let coord1 = vec![100.0, 0.0];
let coord2 = vec![100.0, 1.0];
let coord3 = vec![101.0, 1.0];
let coord4 = vec![102.0, 0.0];
let coord5 = vec![101.0, 0.0];
let coord1 = array_vec![100.0, 0.0];
let coord2 = array_vec![100.0, 1.0];
let coord3 = array_vec![101.0, 1.0];
let coord4 = array_vec![102.0, 0.0];
let coord5 = array_vec![101.0, 0.0];

let geojson_multi_point = Value::MultiPoint(vec![coord1.clone(), coord2.clone()]);
let geojson_multi_line_string = Value::MultiLineString(vec![
Expand Down Expand Up @@ -602,7 +603,7 @@ mod tests {

#[test]
fn geojson_geometry_conversion() {
let coords = vec![100.0, 0.2];
let coords = array_vec![100.0, 0.2];
let geojson_geometry = Geometry::from(Value::Point(coords.clone()));
let geo_geometry: geo_types::Geometry<f64> = geojson_geometry
.try_into()
Expand All @@ -615,8 +616,8 @@ mod tests {

#[test]
fn geojson_mismatch_geometry_conversion_test() {
let coord1 = vec![100.0, 0.2];
let coord2 = vec![101.0, 1.0];
let coord1 = array_vec![100.0, 0.2];
let coord2 = array_vec![101.0, 1.0];
let geojson_line_string = Value::LineString(vec![coord1.clone(), coord2.clone()]);
use std::convert::TryFrom;
let error = geo_types::Point::<f64>::try_from(geojson_line_string).unwrap_err();
Expand Down Expand Up @@ -678,10 +679,10 @@ mod tests {

#[test]
fn borrowed_value_conversions_test() -> crate::Result<()> {
let coord1 = vec![100.0, 0.2];
let coord2 = vec![101.0, 1.0];
let coord3 = vec![102.0, 0.8];
let coord4 = vec![104.0, 0.2];
let coord1 = array_vec![100.0, 0.2];
let coord2 = array_vec![101.0, 1.0];
let coord3 = array_vec![102.0, 0.8];
let coord4 = array_vec![104.0, 0.2];

let geojson_point = Value::Point(coord1.clone());
let _: geo_types::Point<f64> = (&geojson_point).try_into()?;
Expand Down
9 changes: 5 additions & 4 deletions src/feature.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ mod tests {
use crate::JsonObject;
use crate::{feature, Error, Feature, GeoJson, Geometry, Value};
use serde_json::json;
use tinyvec::array_vec;

use std::str::FromStr;

Expand Down Expand Up @@ -252,7 +253,7 @@ mod tests {
}

fn value() -> Value {
Value::Point(vec![1.1, 2.1])
Value::Point(array_vec![1.1, 2.1])
}

fn geometry() -> Geometry {
Expand Down Expand Up @@ -347,7 +348,7 @@ mod tests {
let feature_json_str = "{\"geometry\":{\"coordinates\":[1.1,2.1],\"type\":\"Point\"},\"id\":0,\"properties\":{},\"type\":\"Feature\"}";
let feature = crate::Feature {
geometry: Some(Geometry {
value: Value::Point(vec![1.1, 2.1]),
value: Value::Point(array_vec![1.1, 2.1]),
bbox: None,
foreign_members: None,
}),
Expand All @@ -373,7 +374,7 @@ mod tests {
let feature_json_str = "{\"geometry\":{\"coordinates\":[1.1,2.1],\"type\":\"Point\"},\"id\":\"foo\",\"properties\":{},\"type\":\"Feature\"}";
let feature = crate::Feature {
geometry: Some(Geometry {
value: Value::Point(vec![1.1, 2.1]),
value: Value::Point(array_vec![1.1, 2.1]),
bbox: None,
foreign_members: None,
}),
Expand Down Expand Up @@ -424,7 +425,7 @@ mod tests {
);
let feature = crate::Feature {
geometry: Some(Geometry {
value: Value::Point(vec![1.1, 2.1]),
value: Value::Point(array_vec![1.1, 2.1]),
bbox: None,
foreign_members: None,
}),
Expand Down
5 changes: 3 additions & 2 deletions src/feature_collection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,20 +255,21 @@ impl FromIterator<Feature> for FeatureCollection {
mod tests {
use crate::{Error, Feature, FeatureCollection, Value};
use serde_json::json;
use tinyvec::array_vec;

use std::str::FromStr;

#[test]
fn test_fc_from_iterator() {
let features: Vec<Feature> = vec![
{
let mut feat: Feature = Value::Point(vec![0., 0., 0.]).into();
let mut feat: Feature = Value::Point(array_vec![0., 0., 0.]).into();
feat.bbox = Some(vec![-1., -1., -1., 1., 1., 1.]);
feat
},
{
let mut feat: Feature =
Value::MultiPoint(vec![vec![10., 10., 10.], vec![11., 11., 11.]]).into();
Value::MultiPoint(vec![array_vec![10., 10., 10.], array_vec![11., 11., 11.]]).into();
feat.bbox = Some(vec![10., 10., 10., 11., 11., 11.]);
feat
},
Expand Down
21 changes: 11 additions & 10 deletions src/feature_iterator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ where
mod tests {
use super::*;
use crate::{Geometry, Value};
use tinyvec::array_vec;

use std::io::BufReader;

Expand Down Expand Up @@ -187,7 +188,7 @@ mod tests {
assert_eq!(
Geometry {
bbox: None,
value: Value::Point(vec![102.0, 0.5]),
value: Value::Point(array_vec![102.0, 0.5]),
foreign_members: None,
},
fi.next().unwrap().unwrap().geometry.unwrap()
Expand All @@ -196,10 +197,10 @@ mod tests {
Geometry {
bbox: None,
value: Value::LineString(vec![
vec![102.0, 0.0],
vec![103.0, 1.0],
vec![104.0, 0.0],
vec![105.0, 1.0]
array_vec![102.0, 0.0],
array_vec![103.0, 1.0],
array_vec![104.0, 0.0],
array_vec![105.0, 1.0]
]),
foreign_members: None,
},
Expand All @@ -209,11 +210,11 @@ mod tests {
Geometry {
bbox: None,
value: Value::Polygon(vec![vec![
vec![100.0, 0.0],
vec![101.0, 0.0],
vec![101.0, 1.0],
vec![100.0, 1.0],
vec![100.0, 0.0]
array_vec![100.0, 0.0],
array_vec![101.0, 0.0],
array_vec![101.0, 1.0],
array_vec![100.0, 1.0],
array_vec![100.0, 0.0]
]]),
foreign_members: None,
},
Expand Down
9 changes: 5 additions & 4 deletions src/feature_writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ mod tests {
use crate::JsonValue;

use serde_json::json;
use tinyvec::array_vec;

// an example struct that we want to serialize
#[derive(Serialize)]
Expand Down Expand Up @@ -284,7 +285,7 @@ mod tests {

Feature {
bbox: None,
geometry: Some(crate::Geometry::from(crate::Value::Point(vec![1.1, 1.2]))),
geometry: Some(crate::Geometry::from(crate::Value::Point(array_vec![1.1, 1.2]))),
id: None,
properties: Some(props),
foreign_members: None,
Expand All @@ -298,7 +299,7 @@ mod tests {

Feature {
bbox: None,
geometry: Some(crate::Geometry::from(crate::Value::Point(vec![2.1, 2.2]))),
geometry: Some(crate::Geometry::from(crate::Value::Point(array_vec![2.1, 2.2]))),
id: None,
properties: Some(props),
foreign_members: None,
Expand Down Expand Up @@ -340,12 +341,12 @@ mod tests {
{
let mut writer = FeatureWriter::from_writer(&mut buffer);
let record_1 = MyRecord {
geometry: crate::Geometry::from(crate::Value::Point(vec![1.1, 1.2])),
geometry: crate::Geometry::from(crate::Value::Point(array_vec![1.1, 1.2])),
name: "Mishka".to_string(),
age: 12,
};
let record_2 = MyRecord {
geometry: crate::Geometry::from(crate::Value::Point(vec![2.1, 2.2])),
geometry: crate::Geometry::from(crate::Value::Point(array_vec![2.1, 2.2])),
name: "Jane".to_string(),
age: 22,
};
Expand Down
5 changes: 3 additions & 2 deletions src/geojson.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ mod tests {
use serde_json::json;
use std::convert::TryInto;
use std::str::FromStr;
use tinyvec::array_vec;

#[test]
fn test_geojson_from_reader() {
Expand Down Expand Up @@ -443,7 +444,7 @@ mod tests {
geojson,
GeoJson::Feature(Feature {
bbox: None,
geometry: Some(Geometry::new(Value::Point(vec![102.0, 0.5]))),
geometry: Some(Geometry::new(Value::Point(array_vec![102.0, 0.5]))),
id: None,
properties: None,
foreign_members: None,
Expand All @@ -468,7 +469,7 @@ mod tests {
geojson,
GeoJson::Feature(Feature {
bbox: None,
geometry: Some(Geometry::new(Value::Point(vec![102.0, 0.5]))),
geometry: Some(Geometry::new(Value::Point(array_vec![102.0, 0.5]))),
id: None,
properties: None,
foreign_members: None,
Expand Down
Loading