noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use custom string for geometries output

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2022-02-11 01:59:02 +00:00
parent 556a3db60e
commit 5e25435b9a
1 changed files with 104 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/sql/geometry.rs
View file

@ -253,8 +253,110 @@ impl Geometry {
impl fmt::Display for Geometry {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
Geometry::Point(v) => write!(f, "({}, {})", v.x(), v.y()),
_ => write!(f, "{}", serde_json::to_string(self).unwrap_or(String::from(""))),
Geometry::Point(v) => {
write!(f, "{{ type: 'Point', coordinates: [{}, {}] }}", v.x(), v.y())
}
Geometry::Line(v) => write!(
f,
"{{ type: 'LineString', coordinates: [{}] }}",
v.points_iter()
.map(|ref v| format!("[{}, {}]", v.x(), v.y()))
.collect::<Vec<_>>()
.join(", ")
),
Geometry::Polygon(v) => write!(
f,
"{{ type: 'Polygon', coordinates: [[{}]{}] }}",
v.exterior()
.points_iter()
.map(|ref v| format!("[{}, {}]", v.x(), v.y()))
.collect::<Vec<_>>()
.join(", "),
match v.interiors().len() {
0 => format!(""),
_ => format!(
", [{}]",
v.interiors()
.iter()
.map(|i| {
format!(
"[{}]",
i.points_iter()
.map(|ref v| format!("[{}, {}]", v.x(), v.y()))
.collect::<Vec<_>>()
.join(", ")
)
})
.collect::<Vec<_>>()
.join(", "),
),
}
),
Geometry::MultiPoint(v) => {
write!(
f,
"{{ type: 'MultiPoint', coordinates: [{}] }}",
v.iter()
.map(|v| format!("[{}, {}]", v.x(), v.y()))
.collect::<Vec<_>>()
.join(", ")
)
}
Geometry::MultiLine(v) => write!(
f,
"{{ type: 'MultiLineString', coordinates: [{}] }}",
v.iter()
.map(|v| format!(
"[{}]",
v.points_iter()
.map(|ref v| format!("[{}, {}]", v.x(), v.y()))
.collect::<Vec<_>>()
.join(", ")
))
.collect::<Vec<_>>()
.join(", ")
),
Geometry::MultiPolygon(v) => write!(
f,
"{{ type: 'MultiPolygon', coordinates: [{}] }}",
v.iter()
.map(|v| format!(
"[[{}]{}]",
v.exterior()
.points_iter()
.map(|ref v| format!("[{}, {}]", v.x(), v.y()))
.collect::<Vec<_>>()
.join(", "),
match v.interiors().len() {
0 => format!(""),
_ => format!(
", [{}]",
v.interiors()
.iter()
.map(|i| {
format!(
"[{}]",
i.points_iter()
.map(|ref v| format!("[{}, {}]", v.x(), v.y()))
.collect::<Vec<_>>()
.join(", ")
)
})
.collect::<Vec<_>>()
.join(", "),
),
}
))
.collect::<Vec<_>>()
.join(", "),
),
Geometry::Collection(v) => {
write!(
f,
"{{ type: 'GeometryCollection', geometries: [{}] }}",
v.iter().map(|v| format!("{}", v)).collect::<Vec<_>>().join(", ")
)
}
}
}
}