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

@@ -29,23 +29,19 @@ jobs:
       # cite:
       #   image: docker.io/ogccite/ets-ogcapi-features10
       #   ports:
-      #     - 8080:8080
+      #     - 9080: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"
+        # env:
+        #   PUBLIC_URL: "http://host.docker.internal:8484"
 
       - name: Check running service
         run: |
@@ -55,15 +51,36 @@ jobs:
           do
             sleep 5
           done
+          curl -v http://localhost:8484/collections | jq
 
       - name: Downgrade click
         run: pip install ogc-cite-runner "click<8.2.0"
 
-      - 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
+      - name: Cite container
+        run: docker run --detach --rm --name teamengine --add-host=host.docker.internal:host-gateway --publish 9080:8080 ogccite/teamengine-production:1.0-SNAPSHOT
+
+      - name: Check running container
+        run: |
+          until [ \
+            "$(curl -s -w '%{http_code}' -o /dev/null "http://localhost:9080/teamengine")" \
+            -eq 200 ]
+            echo $http_code
+          do
+            sleep 5
+          done
+
+      - name: Docker
+        run: docker network ls && docker ps
 
+      - name: Validate
+        run: ogc-cite-runner execute-test-suite --with-passed --with-failed http://localhost:9080/teamengine ogcapi-features-1.0 --suite-input iut http://localhost:8484
+        # uses: OSGEO/[email protected]
+        # with:
+        #   test_suite_identifier: ogcapi-features-1.0
+        #   test_session_arguments: iut=http://host.docker.internal:8484
+        #   teamengine_url: "http://localhost:9080/teamengine"
+        #   teamengine_username: "ogctest"
+        #   teamengine_password: "ogctest"
+        #   with_failed: "true"
+        #   with_skipped: "true"
+        #   exit_with_error: "false"

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/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/routes/features.rs

@@ -23,9 +23,9 @@ use crate::{
     extractors::{Qs, RemoteUrl},
 };
 
-const CONFORMANCE: [&str; 3] = [
+const CONFORMANCE: [&str; 4] = [
     "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/core",
-    // "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/oas30",
+    "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/oas30",
     "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/geojson",
     "http://www.opengis.net/spec/ogcapi-features-2/1.0/conf/crs",
 ];
@@ -259,11 +259,15 @@ async fn items(
 
     // Limit
     if let Some(limit) = query.limit {
+        // TODO: sync with opanapi specification
         if limit > 10000 {
             query.limit = Some(10000);
         }
+        if limit == 0 {
+            query.limit = Some(1)
+        }
     } else {
-        query.limit = Some(100);
+        query.limit = Some(10);
     }
 
     let collection = state

ogcapi-types/src/common/bbox.rs

@@ -3,9 +3,6 @@ use std::{fmt, str};
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
-type Bbox2D = [f64; 4];
-type Bbox3D = [f64; 6];
-
 /// Each bounding box is provided as four or six numbers, depending on
 /// whether the coordinate reference system includes a vertical axis
 /// (height or depth):
@@ -41,9 +38,9 @@ type Bbox3D = [f64; 6];
 #[serde(untagged)]
 pub enum Bbox {
     #[schema(value_type = Vec<f64>)]
-    Bbox2D(Bbox2D),
+    Bbox2D([f64; 4]),
     #[schema(value_type = Vec<f64>)]
-    Bbox3D(Bbox3D),
+    Bbox3D([f64; 6]),
 }
 
 impl fmt::Display for Bbox {
@@ -79,10 +76,28 @@ impl str::FromStr for Bbox {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let numbers: Vec<f64> = s
             .split(',')
-            .map(|d| d.trim().parse::<f64>())
+            .map(|d| d.trim().trim_matches(&['[', ']']).parse::<f64>())
             .collect::<Result<Vec<f64>, std::num::ParseFloatError>>()
             .map_err(|_| "Unable to convert bbox coordinates to float")?;
 
+        let n = numbers.len();
+
+        // check number of coordinates
+        if !(n == 4 || n == 6) {
+            return Err("Expected 4 or 6 numbers");
+        }
+
+        // check lower <= upper on axis 2
+        if (n == 4 && numbers[1] > numbers[3]) || (n == 6 && numbers[1] > numbers[4]) {
+            // TODO: ensure this assumption is correct
+            return Err("Lower value of coordinate axis 2 must be larger than upper value!");
+        }
+
+        // check lower <= upper on axis 3
+        if n == 6 && numbers[2] > numbers[5] {
+            return Err("Lower value of coordinate axis 3 must be larger than upper value!");
+        }
+
         match numbers.len() {
             4 => Ok(Bbox::Bbox2D([
                 numbers[0], numbers[1], numbers[2], numbers[3],