try

Author: b4l

.env

@@ -3,13 +3,15 @@ RUST_LOG=ogcapi=debug,ogcapi_services=debug,ogcapi_client=debug,tower_http=debug
 APP_HOST=0.0.0.0
 APP_PORT=8484
 
+# PUBLIC_URL=http://example.org
+
 DB_USER=postgres
 DB_PASSWORD=password
 DB_HOST=localhost
-DB_PORT=5433
+DB_PORT=5432
 DB_NAME=ogcapi
 
-DATABASE_URL=postgresql://postgres:password@localhost:5433/ogcapi
+DATABASE_URL=postgresql://postgres:password@localhost:5432/ogcapi
 
 AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMPLE
 AWS_SECRET_ACCESS_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY

.github/workflows/cite.yml

@@ -26,26 +26,22 @@ jobs:
           --health-retries 5
         ports:
           - 5432:5432
-      # cite:
-      #   image: docker.io/ogccite/ets-ogcapi-features10
-      #   ports:
-      #     - 8080:8080
+      cite:
+        image: docker.io/ogccite/ets-ogcapi-features10
+        ports:
+          - 8080:8080
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Load
-        run: cargo run -p data-loader -- --input data/ne_110m_admin_0_countries.geojson --collection countries
-        env:
-          DATABASE_URL: "postgresql://postgres:password@localhost:5432/ogcapi"
+        run: cargo run -p data-loader -- --input data/ne_110m_populated_places.geojson --collection places
 
       - name: Run
         run: RUNNER_TRACKING_ID="" && cargo run -p cite-service &
         env:
-          APP_HOST: "0.0.0.0"
-          APP_PORT: "8484"
-          DATABASE_URL: "postgresql://postgres:password@localhost:5432/ogcapi"
+          PUBLIC_URL: "http://host.docker.internal:8484"
 
       - name: Check running service
         run: |
@@ -55,15 +51,29 @@ jobs:
           do
             sleep 5
           done
+          curl -v http://localhost:8484/ | jq
 
       - name: Downgrade click
         run: pip install ogc-cite-runner "click<8.2.0"
 
+      # - name: Cite container
+      #   run: docker run -d --network host docker.io/ogccite/ets-ogcapi-features10
+
+      - name: Check running container
+        run: |
+          until [ \
+            "$(curl -s -w '%{http_code}' -o /dev/null "http://localhost:8080/teamengine")" \
+            -eq 200 ]
+            echo $http_code
+          do
+            sleep 5
+          done
+      
       - name: Validate
-        run: docker run -d --network host docker.io/ogccite/ets-ogcapi-features10 && sleep 20 && ogc-cite-runner execute-test-suite http://localhost:8080/teamengine ogcapi-features-1.0 --suite-input iut http://host.docker.internal:8484
-      #   uses: OSGEO/[email protected]
-      #   with:
-      #     test_suite_identifier: ogcapi-features-1.0
-      #     test_session_arguments: >-
-      #       iut=http://host.docker.internal:8484
+        # run: ogc-cite-runner execute-test-suite http://localhost:8080/teamengine ogcapi-features-1.0 --suite-input iut http://host.docker.internal:8484
+        uses: OSGEO/[email protected]
+        with:
+          test_suite_identifier: ogcapi-features-1.0
+          test_session_arguments: >-
+            iut=http://host.docker.internal:8484
 

examples/cite-service/Cargo.toml

@@ -12,7 +12,7 @@ tokio = { version = "1.47", features = ["full"] }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 
-ogcapi = { path = "../../ogcapi", version = "0.3", features = [
+ogcapi = { path = "../../ogcapi", version = "0.3", default-features = false, features = [
     "services",
     "common",
     "features",

ogcapi-drivers/src/postgres/collection.rs

@@ -107,7 +107,6 @@ impl CollectionTransactions for Db {
     }
 
     async fn list_collections(&self, _query: &Query) -> anyhow::Result<Collections> {
-        println!("Query collections");
         let collections: Option<sqlx::types::Json<Vec<Collection>>> = if cfg!(feature = "stac") {
             sqlx::query_scalar(
                 r#"

ogcapi-drivers/src/postgres/feature.rs

@@ -153,6 +153,7 @@ impl FeatureTransactions for Db {
                 .unwrap_or_default()
                 .as_srid();
 
+            // TODO: handle antimeridian (lower > upper on axis 1)
             let intersection = match bbox {
                 Bbox::Bbox2D(bbox) => format!(
                     "ST_Intersects(geom, ST_Transform(ST_MakeEnvelope({}, {}, {}, {}, {}), {storage_srid}))",

ogcapi-processes/src/gdal_loader.rs

@@ -372,7 +372,7 @@ mod tests {
             collection: "streets-gdal".to_string(),
             filter: None,
             s_srs: None,
-            database_url: "postgresql://postgres:password@localhost:5433/ogcapi".to_string(),
+            database_url: "postgresql://postgres:password@localhost:5432/ogcapi".to_string(),
         };
 
         let execute = Execute {

ogcapi-processes/src/geojson_loader.rs

@@ -249,7 +249,7 @@ mod tests {
             input: "../data/ne_10m_railroads_north_america.geojson".to_owned(),
             collection: "streets-geojson".to_string(),
             s_srs: None,
-            database_url: "postgresql://postgres:password@localhost:5433/ogcapi".to_string(),
+            database_url: "postgresql://postgres:password@localhost:5432/ogcapi".to_string(),
         };
 
         let execute = Execute {

ogcapi-services/assets/openapi/openapi.yaml

@@ -14,6 +14,8 @@ info:
 servers:
   - url: http://localhost:8484
     description: "Development server"
+  - url: http://host.docker.internal:8484
+    description: "CI server"
 tags:
   - name: server
   - name: Capabilities

ogcapi-services/src/extractors.rs

@@ -20,7 +20,13 @@ where
     async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
         let uri = OriginalUri::from_request_parts(parts, state).await.unwrap();
 
-        let url = if uri.0.scheme().is_some() {
+        let url = if let Ok(url) = std::env::var("PUBLIC_URL") {
+            format!(
+                "{}{}",
+                url.trim_end_matches('/'),
+                uri.path_and_query().unwrap()
+            )
+        } else if uri.0.scheme().is_some() {
             uri.0.to_string()
         } else {
             let host = Host::from_request_parts(parts, state)

ogcapi-services/src/openapi.rs

@@ -2,7 +2,7 @@ use utoipa::OpenApi;
 
 /// TODO: remove once Open API 3.1 is supported
 #[cfg(all(feature = "features", not(feature = "edr")))]
-pub(crate) static OPENAPI: &[u8; 29696] = include_bytes!("../assets/openapi/openapi.yaml");
+pub(crate) static OPENAPI: &[u8; 29767] = include_bytes!("../assets/openapi/openapi.yaml");
 
 /// TODO: remove once Open API 3.1 is supported
 #[cfg(feature = "edr")]