Merge remote-tracking branch 'upstream/main' into feat/frechet-in-var…

…ious-spaces
georust · Jan 7, 2025 · dbdafdf · dbdafdf
2 parents 314c0e2 + e5dddd6
commit dbdafdf
Show file tree

Hide file tree

Showing 69 changed files with 2,535 additions and 637 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,6 +26,7 @@ jobs:
       - geo_postgis
       - geo_fuzz
       - bench
+      - docs
     if: success()
     steps:
       - name: Mark the job as a success
@@ -53,7 +54,7 @@ jobs:
       matrix:
         container_image:
           # Use the latest stable version. No need for older versions.
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.83"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -79,8 +80,8 @@ jobs:
           # Minimum supported rust version (MSRV)
           - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.75"
           # Two most recent releases - we omit older ones for expedient CI
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.78"
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.82"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.83"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -107,8 +108,8 @@ jobs:
           # Minimum supported rust version (MSRV)
           - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.75"
           # Two most recent releases - we omit older ones for expedient CI
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.78"
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.82"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.83"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -134,8 +135,8 @@ jobs:
           # Minimum supported rust version (MSRV)
           - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.75"
           # Two most recent releases - we omit older ones for expedient CI
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.78"
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.82"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.83"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -160,8 +161,8 @@ jobs:
           # Minimum supported rust version (MSRV)
           - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.75"
           # Two most recent releases - we omit older ones for expedient CI
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.78"
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.82"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.83"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -181,7 +182,7 @@ jobs:
       matrix:
         container_image:
           # Fuzz only on latest
-          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.83"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -194,7 +195,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     container:
-      image: ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79
+      image: ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.83
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -205,7 +206,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     container:
-      image: ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79
+      image: ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.83
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/geo-test-fixtures/fixtures/nl_plots_epsg_28992.wkt b/geo-test-fixtures/fixtures/nl_plots_epsg_28992.wkt
diff --git a/geo-test-fixtures/src/lib.rs b/geo-test-fixtures/src/lib.rs
@@ -126,13 +126,21 @@ where
 }
 
 // From https://afnemers.ruimtelijkeplannen.nl/afnemers/services?request=GetFeature&service=WFS&srsName=EPSG:4326&typeName=Enkelbestemming&version=2.0.0&bbox=165618,480983,166149,481542";
-pub fn nl_plots<T>() -> MultiPolygon<T>
+pub fn nl_plots_wgs84<T>() -> MultiPolygon<T>
 where
     T: WktFloat + Default + FromStr,
 {
     multi_polygon("nl_plots.wkt")
 }
 
+pub fn nl_plots_epsg_28992<T>() -> MultiPolygon<T>
+where
+    T: WktFloat + Default + FromStr,
+{
+    // https://epsg.io/28992
+    multi_polygon("nl_plots_epsg_28992.wkt")
+}
+
 fn line_string<T>(name: &str) -> LineString<T>
 where
     T: WktFloat + Default + FromStr,