add proj datumgrid cdn

Co-authored-by: Anton Bakker <anton.bakker@kadaster.nl>

Author: roelarents

Dockerfile

@@ -175,6 +175,12 @@ RUN apt-get -y update && \
     rm -rf /var/lib/apt/lists/*
 RUN apt-get clean
 
+# Mirror the PROJ.org Datumgrid CDN.
+WORKDIR /usr/local/share/proj
+RUN wget --no-verbose -e robots=off --content-on-error --mirror https://cdn.proj.org/ || [ $? -eq 8 ]
+RUN cd cdn.proj.org && rm -fv *.js *.css *.html favicon* && mv * .. && cd .. && rmdir cdn.proj.org
+WORKDIR /
+
 COPY --from=builder  /usr/local/share/proj/ /usr/local/share/proj/
 COPY --from=builder /usr/include/ /usr/include/
 COPY --from=builder /usr/local/bin/ /usr/local/bin/

ETRS89andRDNAP/README.md

@@ -30,23 +30,28 @@ docker build --target NL -t pdok/mapserver:8-local-NL .
 serving etrs89 source
 
 ```docker
-docker run --rm -p 80:80 --name etrs89-new -v `pwd`/ETRS89andRDNAP:/srv/data:rw -e DEBUG=0 -e MAPSERVER_CONFIG_FILE=/srv/data/etrs89.conf -e SERVICE_TYPE=wfs -e MS_MAPFILE=/srv/data/etrs89.map pdok/mapserver:8-local-NL
+docker run --rm -p 80:80 -v `pwd`/ETRS89andRDNAP:/srv/data -e MAPSERVER_CONFIG_FILE=/srv/data/etrs89.conf -e SERVICE_TYPE=wfs -e MS_MAPFILE=/srv/data/etrs89.map pdok/mapserver:8-local-NL
 ```
 
 serving rd source
 
 ```docker
-docker run --rm -p 80:80 --name rdnap-new -v `pwd`/ETRS89andRDNAP:/srv/data -e DEBUG=0 -e MIN_PROCS=1 -e MAX_PROCS=3 -e MAX_LOAD_PER_PROC=4 -e IDLE_TIMEOUT=20 -e MAPSERVER_CONFIG_FILE=/srv/data/rd.conf -e MS_MAPFILE=/srv/data/rd.map pdok/mapserver:8.0.0-lighttpd-nl
+docker run --rm -p 80:80 -v `pwd`/ETRS89andRDNAP:/srv/data -e MAPSERVER_CONFIG_FILE=/srv/data/rd.conf -e SERVICE_TYPE=wfs -e MS_MAPFILE=/srv/data/rd.map pdok/mapserver:8-local-NL
 ```
 
 ## Verify the output
 
-reverse below env vars when serving rd
+reverse below env vars when serving etrs89
 
 ```shell
-SOURCE_NAME=etrs89 && \
-OUT_NAME=rd && \
-OUT_EPSG=28992 && \
-curl -sS "localhost/mapserver?service=WFS&version=2.0.0&request=GetFeature&count=100&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 )} + .'
+IMAGE=pdok/mapserver:8-local-NL && \
+SOURCE_NAME=rd && \
+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 \
+  "${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}'
 ```