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

Fix editoast /infra/{}/objects geometry response #7197

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Fix editoast /infra/{}/objects geometry response #7197

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
15 changes: 6 additions & 9 deletions editoast/src/views/infra/objects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ use diesel::sql_types::Text;
use diesel::QueryableByName;
use diesel_async::RunQueryDsl;
use editoast_derive::EditoastError;
use postgis_diesel::sql_types::Geometry;
use postgis_diesel::types::GeometryContainer;
use postgis_diesel::types::Point;
use serde::Deserialize;
use serde::Serialize;
use serde_json::Value as JsonValue;
Expand Down Expand Up @@ -54,10 +51,10 @@ struct ObjectQueryable {
obj_id: String,
#[diesel(sql_type = Jsonb)]
railjson: JsonValue,
#[diesel(sql_type = Nullable<Geometry>)]
geographic: Option<GeometryContainer<Point>>,
#[diesel(sql_type = Nullable<Geometry>)]
schematic: Option<GeometryContainer<Point>>,
#[diesel(sql_type = Nullable<Jsonb>)]
geographic: Option<diesel_json::Json<geos::geojson::Geometry>>,
#[diesel(sql_type = Nullable<Jsonb>)]
schematic: Option<diesel_json::Json<geos::geojson::Geometry>>,
}

/// Return the railjson list of a specific OSRD object
Expand All @@ -84,8 +81,8 @@ async fn get_objects(
SELECT
object_table.obj_id as obj_id,
object_table.data as railjson,
ST_Transform(geographic, 4326) as geographic,
ST_Transform(schematic, 4326) as schematic
ST_AsGeoJSON(ST_Transform(geographic, 4326))::jsonb as geographic,
ST_AsGeoJSON(ST_Transform(schematic, 4326))::jsonb as schematic
FROM {} AS object_table
LEFT JOIN {} AS geometry_table ON object_table.obj_id = geometry_table.obj_id AND object_table.infra_id = geometry_table.infra_id
WHERE object_table.infra_id = $1 AND object_table.obj_id = ANY($2)
Expand Down
Loading