Skip to content

Commit d9b50cb

Browse files
refactor: remove 4th impl of coordinate2d
1 parent 2e8280d commit d9b50cb

3 files changed

Lines changed: 16 additions & 31 deletions

File tree

services/src/api/model/processing_graphs/parameters.rs

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,13 @@
1-
use crate::api::model::processing_graphs::{RasterOperator, VectorOperator};
1+
use crate::api::model::{
2+
datatypes::Coordinate2D,
3+
processing_graphs::{RasterOperator, VectorOperator},
4+
};
25
use anyhow::Context;
36
use geoengine_macros::type_tag;
47
use serde::{Deserialize, Serialize, Serializer};
58
use std::collections::BTreeMap;
69
use utoipa::ToSchema;
710

8-
/// A 2D coordinate with `x` and `y` values.
9-
#[derive(Clone, Copy, Debug, Deserialize, PartialEq, PartialOrd, Serialize, Default, ToSchema)]
10-
#[serde(rename_all = "camelCase")]
11-
pub struct Coordinate2D {
12-
pub x: f64,
13-
pub y: f64,
14-
}
15-
impl From<Coordinate2D> for geoengine_datatypes::primitives::Coordinate2D {
16-
fn from(value: Coordinate2D) -> Self {
17-
geoengine_datatypes::primitives::Coordinate2D {
18-
x: value.x,
19-
y: value.y,
20-
}
21-
}
22-
}
23-
24-
impl From<geoengine_datatypes::primitives::Coordinate2D> for Coordinate2D {
25-
fn from(value: geoengine_datatypes::primitives::Coordinate2D) -> Self {
26-
Coordinate2D {
27-
x: value.x,
28-
y: value.y,
29-
}
30-
}
31-
}
32-
3311
/// A raster data type.
3412
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, ToSchema)]
3513
#[serde(rename_all = "camelCase")]

services/src/api/model/processing_graphs/processing.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,15 @@ impl TryFrom<RasterVectorJoin> for OperatorsRasterVectorJoin {
283283
mod tests {
284284

285285
use super::*;
286-
use crate::api::model::processing_graphs::{
287-
RasterOperator, VectorOperator,
288-
parameters::{Coordinate2D, SpatialBoundsDerive},
289-
source::{GdalSource, GdalSourceParameters, MockPointSource, MockPointSourceParameters},
286+
use crate::api::model::{
287+
datatypes::Coordinate2D,
288+
processing_graphs::{
289+
RasterOperator, VectorOperator,
290+
parameters::SpatialBoundsDerive,
291+
source::{
292+
GdalSource, GdalSourceParameters, MockPointSource, MockPointSourceParameters,
293+
},
294+
},
290295
};
291296

292297
#[test]

services/src/api/model/processing_graphs/source.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use crate::api::model::processing_graphs::parameters::{Coordinate2D, SpatialBoundsDerive};
1+
use crate::api::model::{
2+
datatypes::Coordinate2D, processing_graphs::parameters::SpatialBoundsDerive,
3+
};
24
use geoengine_datatypes::dataset::NamedData;
35
use geoengine_macros::type_tag;
46
use geoengine_operators::{

0 commit comments

Comments
 (0)