-
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* made sure that geodata is queryable * made sure that geodata is queryable * linting fixes
- Loading branch information
1 parent
002caea
commit 7c9a207
Showing
6 changed files
with
239 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
use actix_web::{post, web, HttpResponse}; | ||
use geo_types::Geometry; | ||
use reqwest::Url; | ||
use serde::{Deserialize, Serialize}; | ||
use sqlx::{PgPool, Row}; | ||
use tracing::{error, info}; | ||
|
||
#[tracing::instrument(skip(pool))] | ||
pub async fn fetch_indoor_maps_inside_of( | ||
pool: &PgPool, | ||
geom: Geometry, | ||
) -> anyhow::Result<Vec<i64>> { | ||
let filtered_groups = sqlx::query("SELECT group_id from indoor_features where ST_Contains(convex_hull::geometry, $1::geometry)") | ||
.bind(geozero::wkb::Encode(geom)) | ||
.fetch_all(pool) | ||
.await?; | ||
let mut filtered_group_ids = Vec::<i64>::new(); | ||
for group in filtered_groups { | ||
let group_id = group.get_unchecked(0); | ||
filtered_group_ids.push(group_id); | ||
} | ||
|
||
Ok(filtered_group_ids) | ||
} | ||
#[tracing::instrument(skip(pool))] | ||
pub async fn fetch_indoor_map(pool: &PgPool, id: i64) -> anyhow::Result<Geometry> { | ||
let row = sqlx::query("SELECT features from indoor_features where group_id = $1") | ||
.bind(id) | ||
.fetch_one(pool) | ||
.await?; | ||
let value: geozero::wkb::Decode<Geometry> = row.get(0); | ||
|
||
Ok(value.geometry.unwrap()) | ||
} | ||
|
||
#[derive(Deserialize)] | ||
struct Arguments { | ||
bbox: geo::Rect, | ||
} | ||
|
||
#[post("/api/maps/indoor/{id}")] | ||
pub async fn get_indoor_map( | ||
params: web::Path<i64>, | ||
data: web::Data<crate::AppData>, | ||
) -> HttpResponse { | ||
let id = params.into_inner(); | ||
let map = fetch_indoor_map(&data.pool, id).await; | ||
let geometry = match map { | ||
Ok(g) => g, | ||
Err(err) => { | ||
error!("Failed to fetch indoor map {id} because {err:?}"); | ||
return HttpResponse::InternalServerError().finish(); | ||
} | ||
}; | ||
info!("fetched {geometry:?}"); | ||
HttpResponse::Ok().finish() | ||
} | ||
|
||
#[derive(Serialize)] | ||
struct RemoteMap { | ||
name: String, | ||
url: Url, | ||
} | ||
|
||
#[post("/api/maps/indoor")] | ||
pub async fn list_indoor_maps( | ||
web::Query(args): web::Query<Arguments>, | ||
data: web::Data<crate::AppData>, | ||
) -> HttpResponse { | ||
let maps = fetch_indoor_maps_inside_of(&data.pool, args.bbox.into()).await; | ||
let maps = match maps { | ||
Ok(m) => m, | ||
Err(e) => { | ||
error!("could not list maps because {e:?}"); | ||
return HttpResponse::InternalServerError() | ||
.body("could not get indoor maps, please try again later"); | ||
} | ||
}; | ||
let mut response = Vec::new(); | ||
for map in maps { | ||
response.push(RemoteMap { | ||
name: map.to_string(), | ||
url: format!("https://nav.tum.de/api/maps/indoor/{map}") | ||
.parse() | ||
.unwrap(), | ||
}) | ||
} | ||
|
||
HttpResponse::Ok().json(response) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
mod fetch_tile; | ||
pub(crate) mod indoor; | ||
pub(crate) mod overlay_map; | ||
pub(crate) mod overlay_text; |