Add GeosOpEngine

Author: BenMorel

.docker/.env.dist

@@ -8,6 +8,7 @@ POSTGIS_VERSION=3
 
 # Paths.
 SOURCES_PATH=/application
+GEOSOP_PATH=/usr/local/bin/geosop
 
 # Postgres credentials.
 POSTGRES_HOST=postgres

.docker/compose.yaml

@@ -17,6 +17,7 @@ services:
             - MYSQL_PORT
             - MYSQL_USER
             - MYSQL_PASSWORD
+            - GEOSOP_PATH
         working_dir: ${SOURCES_PATH}
         cap_drop:
             - ALL

.docker/php/Dockerfile

@@ -1,11 +1,15 @@
 ARG PHP_VERSION
 FROM php:${PHP_VERSION}-cli
 
-RUN apt update && apt install --yes git libpq-dev libgeos-dev libsqlite3-mod-spatialite
+SHELL ["/bin/sh", "-e", "-c"]
+
+RUN apt update && apt install --yes git cmake libpq-dev libgeos-dev libsqlite3-mod-spatialite
 RUN docker-php-ext-install pdo pdo_pgsql pdo_mysql
 
+# SQLite3 configuration
 RUN echo "[sqlite3]\nsqlite3.extension_dir = /usr/lib/x86_64-linux-gnu"> /usr/local/etc/php/conf.d/sqlite3.ini
 
+# GEOS PHP extension
 RUN <<EOF
 git clone https://git.osgeo.org/gitea/geos/php-geos.git
 cd php-geos
@@ -14,8 +18,23 @@ cd php-geos
 make
 mv modules/geos.so $(php -r "echo ini_get('extension_dir');")
 echo "extension=geos.so" > /usr/local/etc/php/conf.d/geos.ini
+cd ..
+rm -rf php-geos
+EOF
+
+# geosop CLI
+RUN <<EOF
+git clone --depth 1 --branch 3.13.1 https://github.com/libgeos/geos.git
+mkdir geos/build
+cd geos/build
+cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_EXE_LINKER_FLAGS="-static -static-libstdc++ -static-libgcc"
+cmake --build . -- -j$(nproc)
+make install
+cd ../..
+rm -rf geos
 EOF
 
+# Composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
 CMD sleep infinity

.github/workflows/ci.yml

@@ -269,3 +269,49 @@ jobs:
         run: vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  phpunit-geosop:
+    name: PHPUnit geosop
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        php-version:
+          - "8.1"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: geos
+          coverage: xdebug
+
+      - name: Install composer dependencies
+        uses: ramsey/composer-install@v3
+
+      - name: Install geosop
+        run: |
+          sudo apt update
+          sudo apt install geos-bin
+
+      - name: Test geosop
+        run: |
+          geosop
+          geosop -a "MULTILINESTRING ((1 1, 2 2))" length
+
+      - name: Run PHPUnit with coverage
+        run: |
+          mkdir -p mkdir -p build/logs
+          vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+        env:
+          ENGINE: geosop
+          GEOSOP_PATH: /usr/bin/geosop
+
+      - name: Upload coverage report to Coveralls
+        run: vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

phpunit-bootstrap.php

@@ -1,5 +1,6 @@
 <?php
 
+use Brick\Geo\Engine\GeosOpEngine;
 use Brick\Geo\Engine\PDOEngine;
 use Brick\Geo\Engine\SQLite3Engine;
 use Brick\Geo\Engine\GEOSEngine;
@@ -127,6 +128,13 @@ function getRequiredEnv(string $name): string
                 $engine = new GEOSEngine();
                 break;
 
+            case 'geosop':
+                echo 'Using GeosOpEngine', PHP_EOL;
+
+                $geosopPath = getRequiredEnv('GEOSOP_PATH');
+                $engine = new GeosOpEngine($geosopPath);
+                break;
+
             default:
                 echo 'Unknown engine: ', $engine, PHP_EOL;
                 exit(1);