Skip to content

Commit 8d8689d

Browse files
committed
Consolidate API definitions
1 parent 68421cf commit 8d8689d

File tree

10 files changed

+611
-14416
lines changed

10 files changed

+611
-14416
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@ jobs:
4444
runs-on: ubuntu-latest
4545

4646
steps:
47-
- name: Dependencies
48-
run: sudo apt-get update && sudo apt-get install -y libgdal-dev
49-
5047
- name: Checkout
5148
uses: actions/checkout@v4
5249

5350
- name: Setup
5451
run: docker compose up db -d
5552

53+
- name: Load data
54+
run: cargo run -p data-loader -- --input data/ne_110m_populated_places.geojson --collection places
55+
5656
- name: Start service
5757
run: |
58-
cargo run -p demo-service &
58+
cargo run -p cite-service &
5959
npx wait-on http://localhost:8484/
6060
6161
- name: Validate service
@@ -71,6 +71,6 @@ jobs:
7171
testJobCreationInputRef
7272
ogc-api-features: true
7373
ogc-api-features-container-tag: 1.9-teamengine-6.0.0-RC2
74-
ogc-api-features-ignore: |-
75-
featureOperation
76-
validateFeatureResponse
74+
# ogc-api-features-ignore: |-
75+
# featureOperation
76+
# validateFeatureResponse

.github/workflows/cite.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ services:
4747
command: tail -f /dev/null
4848
ports:
4949
- ${APP_PORT}:${APP_PORT}
50-
extra_hosts:
51-
- "host.docker.internal:host-gateway"
5250

5351
minio:
5452
image: docker.io/minio/minio

examples/cite-service/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ ogcapi = { path = "../../ogcapi", version = "0.3", default-features = false, fea
1616
"services",
1717
"common",
1818
"features",
19+
"processes",
1920
] }

examples/cite-service/src/main.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
use clap::Parser;
22
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
33

4-
use ogcapi::services::{AppState, Config, Service};
4+
use ogcapi::{
5+
processes::echo::Echo,
6+
services::{AppState, Config, Service},
7+
};
58

69
#[tokio::main]
710
async fn main() {
@@ -22,6 +25,9 @@ async fn main() {
2225
// Application state
2326
let state = AppState::new_from(&config).await;
2427

28+
// Register processes/processors
29+
let state = state.processors(vec![Box::new(Echo)]);
30+
2531
// Build & run with hyper
2632
Service::new_with(&config, state).await.serve().await;
2733
}

0 commit comments

Comments
 (0)