Added testcase and fixed warning from lighttpd

Author: Daimanta

.github/workflows/regression-test.yml

@@ -151,3 +151,27 @@ jobs:
           docker stop mapserver-rdnap-wfs
 
           exit $exit_code
+      - name: Regression test => Different CRS (RDNAPTRANS -> EPSG:4258)
+        run: |
+          # start mapserver
+          docker run --rm -d -p 8181:80 --name mapserver-crs -v `pwd`/testdata/crs:/srv/data -e MAPSERVER_CONFIG_FILE=/srv/data/natpark.conf -e SERVICE_TYPE=wfs -e MS_MAPFILE=/srv/data/natpark.map pdok/mapserver:local-nl
+
+          # execute request
+          mkdir -p `pwd`/testdata/crs/actual
+          curl "http://localhost:8181/mapserver?service=WFS&request=GetFeature&count=1&version=2.0.0&outputFormat=application/json&typeName=nationaleparken&srsName=EPSG:4258" -sL > `pwd`/testdata/crs/actual/output.json
+
+          # assert results are as expected
+          exit_code=0
+          [ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.crs.properties.name') == "urn:ogc:def:crs:EPSG::4258" ] || exit_code=1;
+          [ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.bbox[0]' | xargs -I '{}' echo "scale=5;" "({}-4.3646379084)/1 == 0" | bc) ] || exit_code=1;
+          [ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.bbox[1]' | xargs -I '{}' echo "scale=5;" "({}-51.3620482342678)/1 == 0" | bc) ] || exit_code=1;
+          [ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.bbox[2]' | xargs -I '{}' echo "scale=5;" "({}-4.46528581228022)/1 == 0" | bc) ] || exit_code=1;
+          [ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.bbox[3]' | xargs -I '{}' echo "scale=5;" "({}-51.4268875774673)/1 == 0" | bc) ] || exit_code=1;
+          
+          # cleanup
+          rm -rf `pwd`/testdata/crs/actual
+
+          # stop mapserver
+          docker stop mapserver-crs
+
+          exit $exit_code

config/lighttpd.conf

@@ -1,8 +1,8 @@
 server.modules += ( "mod_setenv" )
+server.modules += ( "mod_indexfile" )
 server.modules += ( "mod_fastcgi" )
 server.modules += ( "mod_rewrite" )
 server.modules += ( "mod_magnet" )
-server.modules += ( "mod_indexfile" )
 
 index-file.names = ( "index.html" )
 server.document-root = "/var/www/"

testdata/crs/README.md

@@ -7,44 +7,51 @@ This tests projecting WFS features in different coordinate systems, in particula
 - EPSG:4326
 - CRS:84
 
-TODO automate this test in the build
+This dataset has only 1 feature to have a reduced size in the Git repository.
 
 ## Run mapserver
 
 ### existing 7.6.4-patch5-2-buster-lighttpd
 
-serving etrs89 source
-
 ```docker
 docker run --rm -p 80:80 -v `pwd`/testdata/crs:/srv/data -e MAPSERVER_CONFIG_FILE=/srv/data/natpark.conf -e SERVICE_TYPE=wfs -e MS_MAPFILE=/srv/data/natpark.map pdok/mapserver:7.6.4-patch5-2-buster-lighttpd
 
 ```
 
+The server then can be contact at `http://localhost:80/mapserver?request=GetCapabilities&service=WFS`
+
 ### local built 8
 
 Warning: This docker build compiles dependencies and will take a long time when running for the first time
 ```docker
 docker build --target NL -t pdok/mapserver:8-local-NL .
 ```
 
-serving natpark source
+Serving Nationale Parken source
 
 ```docker
 docker run --rm -p 80:80 -v `pwd`/testdata/crs:/srv/data -e MAPSERVER_CONFIG_FILE=/srv/data/natpark.conf -e SERVICE_TYPE=wfs -e MS_MAPFILE=/srv/data/natpark.map pdok/mapserver:8-local-NL
 ```
 
+The server then can be contact at `http://localhost:80/mapserver?request=GetCapabilities&service=WFS`
+
 ## Verify the output
 
 
 ```shell
+exit_code=0
+mkdir -p `pwd`/testdata/crs/actual/;
 IMAGE=pdok/mapserver:8-local-NL && \
-SOURCE_NAME=rd && \
+SOURCE_NAME=natpark && \
 OUT_NAME=etrs89 && \
 OUT_EPSG=4258 && \
-docker run --rm -p 80:80 -v `pwd`/ETRS89andRDNAP:/srv/data \
-  -e MAPSERVER_CONFIG_FILE=/srv/data/${SOURCE_NAME}.conf -e SERVICE_TYPE=wfs -e MS_MAPFILE=/srv/data/${SOURCE_NAME}.map --entrypoint=mapserv \
+docker run --rm -p 80:80 -v `pwd`/testdata/crs:/srv/data -e MAPSERVER_CONFIG_FILE=/srv/data/natpark.conf -e SERVICE_TYPE=wfs -e MS_MAPFILE=/srv/data/natpark.map --entrypoint=mapserv \
   "${IMAGE}" \
-  -nh "QUERY_STRING=service=WFS&version=2.0.0&request=GetFeature&typeName=${SOURCE_NAME}&outputFormat=geojson&srsName=EPSG:${OUT_EPSG}" | \
- jq --arg crs "${OUT_NAME}" '.features | .[] | { id, x_dev: (.geometry.coordinates[0] - (.properties[$crs+"_x"]|tonumber)), y_dev: (.geometry.coordinates[1] - (.properties[$crs+"_y"]|tonumber)) } | {error: ((.x_dev|abs) > 0.001 or (.y_dev|abs) > 0.001 )} + .' | \
- jq -s 'group_by (.error)[] | {error: .[0].error, count: length}'
+  -nh "QUERY_STRING=service=WFS&request=GetFeature&count=1&version=2.0.0&outputFormat=application/json&typeName=nationaleparken&srsName=EPSG:${OUT_EPSG}" > `pwd`/testdata/crs/actual/output.json;
+[ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.crs.properties.name') == "urn:ogc:def:crs:EPSG::4258" ] || exit_code=1;
+[ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.bbox[0]' | xargs -I '{}' echo "scale=5;" "({}-4.3646379084)/1 == 0" | bc) ] || exit_code=1;
+[ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.bbox[1]' | xargs -I '{}' echo "scale=5;" "({}-51.3620482342678)/1 == 0" | bc) ] || exit_code=1;
+[ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.bbox[2]' | xargs -I '{}' echo "scale=5;" "({}-4.46528581228022)/1 == 0" | bc) ] || exit_code=1;
+[ $(cat `pwd`/testdata/crs/actual/output.json | jq -r '.bbox[3]' | xargs -I '{}' echo "scale=5;" "({}-51.4268875774673)/1 == 0" | bc) ] || exit_code=1;
+echo $exit_code
 ```