Mercator/mercator_service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated imports

Browse Source 
* Reorganised so that each module part imports from the mod.rs
   This allows for coherent types within the module to be updated
   simply.
 * Updated imports to the new mercator_db organisation
This commit is contained in:
Lionel Sambuc
2020-01-13 11:03:35 +01:00
parent 16ac1ea7d1
commit eba485519c
11 changed files with 61 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@@ -34,8 +34,7 @@ memmap = "^0.7"
mercator_db = "^0.1"
mercator_parser = "^0.1"
serde = "^1.0"
serde_derive = "^1.0"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0"
bincode = "^1.1"

8
src/main.rs
View File

@@ -1,20 +1,16 @@
#[macro_use]
extern crate measure_time;
#[macro_use]
extern crate serde_derive;
mod rest_api;
mod shared_state;
use std::process::exit;
use std::sync::RwLock;
use actix_web::web::Data;
use glob::glob;
use mercator_db::json::model;
use mercator_db::DataBase;
use rest_api::Data;
use rest_api::DataBase;
use shared_state::SharedState;
/*

14
src/rest_api/actions.rs
View File

@@ -1,16 +1,16 @@
use std::sync::RwLock;
use actix_web::web;
use actix_web::web::Data;
use actix_web::web::Json;
use actix_web::HttpResponse;
use crate::model::to_spatial_objects;
use crate::shared_state::SharedState;
use serde::Deserialize;
use super::error_422;
use super::ok_200;
use super::to_spatial_objects;
use super::web;
use super::web::Data;
use super::web::Json;
use super::HandlerResult;
use super::HttpResponse;
use super::SharedState;
#[derive(Debug, Deserialize)]
pub struct Query {

10
src/rest_api/core.rs
View File

@@ -1,16 +1,14 @@
use std::sync::RwLock;
use actix_web::web;
use actix_web::web::Data;
use actix_web::web::Path;
use crate::shared_state::SharedState;
use super::error_400;
use super::error_404;
use super::ok_200;
use super::web;
use super::web::Data;
use super::web::Path;
use super::Core;
use super::HandlerResult;
use super::SharedState;
fn put(path: Path<String>) -> HandlerResult {
trace!("PUT Triggered on {}", path);

10
src/rest_api/cores.rs
View File

@@ -1,18 +1,16 @@
use std::collections::HashSet;
use std::sync::RwLock;
use actix_web::web;
use actix_web::web::Data;
use actix_web::web::Json;
use crate::shared_state::SharedState;
use super::error_400;
use super::error_422;
use super::ok_200;
use super::web;
use super::web::Data;
use super::web::Json;
use super::Core;
use super::Filters;
use super::HandlerResult;
use super::SharedState;
fn post((parameters, state): (Json<Filters>, Data<RwLock<SharedState>>)) -> HandlerResult {
trace!("POST '{:?}'", parameters);

10
src/rest_api/helpers.rs
View File

@@ -2,13 +2,15 @@ use std::fmt::Debug;
use std::io::Error;
use std::io::ErrorKind;
use actix_files::NamedFile;
use actix_web::Either;
use actix_web::HttpResponse;
use serde::Serialize;
use super::error_404;
use super::web::Path;
use super::Either;
use super::HandlerResult;
use super::*;
use super::HttpResponse;
use super::NamedFile;
use super::StatusCode;
pub fn ok_200<T>(data: &T) -> HandlerResult
where

20
src/rest_api/mod.rs
View File

@@ -23,23 +23,29 @@ use actix_web::http;
use actix_web::http::StatusCode;
use actix_web::middleware;
use actix_web::web;
use actix_web::web::Data;
use actix_web::web::Path;
pub use actix_web::web::Data;
use actix_web::App;
use actix_web::Either;
use actix_web::HttpResponse;
use actix_web::HttpServer;
use mercator_db::space::Shape;
use mercator_db::storage::model;
use mercator_db::storage::model::v2::to_spatial_objects;
use mercator_db::CoreQueryParameters;
pub use mercator_db::DataBase;
use mercator_db::Properties;
use serde::Deserialize;
use serde::Serialize;
#[cfg(feature = "static-error-pages")]
pub use helpers_static_pages::*;
use crate::SharedState;
pub use helpers::*;
#[cfg(not(feature = "static-error-pages"))]
pub use helpers_dynamic_pages::*;
pub use helpers::*;
use crate::SharedState;
#[cfg(feature = "static-error-pages")]
pub use helpers_static_pages::*;
pub type HandlerResult = Result<Either<HttpResponse, NamedFile>, Error>;

12
src/rest_api/space.rs
View File

@@ -1,16 +1,14 @@
use std::sync::RwLock;
use actix_web::web;
use actix_web::web::Data;
use actix_web::web::Path;
use crate::model;
use crate::shared_state::SharedState;
use super::error_400;
use super::error_404;
use super::model;
use super::ok_200;
use super::web;
use super::web::Data;
use super::web::Path;
use super::HandlerResult;
use super::SharedState;
fn put(path: Path<String>) -> HandlerResult {
trace!("POST '{:?}'", path);

12
src/rest_api/spaces.rs
View File

@@ -1,18 +1,16 @@
use std::collections::HashSet;
use std::sync::RwLock;
use actix_web::web;
use actix_web::web::Data;
use actix_web::web::Json;
use crate::model;
use crate::shared_state::SharedState;
use super::error_400;
use super::error_422;
use super::model;
use super::ok_200;
use super::web;
use super::web::Data;
use super::web::Json;
use super::Filters;
use super::HandlerResult;
use super::SharedState;
fn post((parameters, state): (Json<Filters>, Data<RwLock<SharedState>>)) -> HandlerResult {
trace!("POST '{:?}'", parameters);

16
src/rest_api/spatial_object.rs
View File

@@ -1,18 +1,16 @@
use std::sync::RwLock;
use actix_web::web;
use actix_web::web::Data;
use actix_web::web::Path;
use mercator_db::CoreQueryParameters;
use mercator_db::Properties;
use crate::model::to_spatial_objects;
use crate::shared_state::SharedState;
use super::error_400;
use super::error_404;
use super::ok_200;
use super::to_spatial_objects;
use super::web;
use super::web::Data;
use super::web::Path;
use super::CoreQueryParameters;
use super::HandlerResult;
use super::Properties;
use super::SharedState;
fn put(path: Path<String>) -> HandlerResult {
trace!("PUT '{:?}'", path);

16
src/rest_api/spatial_objects.rs
View File

@@ -2,21 +2,19 @@ use std::collections::HashMap;
use std::collections::HashSet;
use std::sync::RwLock;
use actix_web::web;
use actix_web::web::Data;
use actix_web::web::Json;
use actix_web::web::Path;
use mercator_db::CoreQueryParameters;
use crate::model::to_spatial_objects;
use crate::shared_state::SharedState;
use super::error_400;
use super::error_404;
use super::error_422;
use super::ok_200;
use super::to_spatial_objects;
use super::web;
use super::web::Data;
use super::web::Json;
use super::web::Path;
use super::CoreQueryParameters;
use super::Filters;
use super::HandlerResult;
use super::SharedState;
fn post(
(core_id, parameters, state): (Path<String>, Json<Filters>, Data<RwLock<SharedState>>),