Skip to content

Commit 4f2f353

Browse files
committed
support legacy Web Merc Google EPSG:900913 for proj
1 parent f56b35d commit 4f2f353

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
username: ${{ secrets.DOCKER_USERNAME }}
2626
password: ${{ secrets.DOCKER_PASSWORD }}
2727
repository: justb4/mapproxy
28-
tags: latest,1.12.0-1
28+
tags: latest,1.12.0-2
2929
tag_with_ref: false
3030
tag_with_sha: false

Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ FROM debian:buster-slim
1616
# Upgrade notes: in bullseye: use libproj19 uwsgi-plugin-python3 (i.s.o. pip3 uwsgi)
1717
# --plugin /usr/lib/uwsgi/plugins/python3_plugin.so in uwsgi command and remove --wsgi-disable-file-wrapper
1818
#
19+
# Nasty fix: added Google Web Merc projection EPSG:900913 for legacy MP configs (clients use /EPSG:900913/ in URLs!)
20+
# Upgrade notes: Debian bullseye-slim and proj.6: will need SQLite for proj.db i.s.o. /usr/share/proj/epsg!!
21+
1922
LABEL original_developer="Arne Schubert <atd.schubert@gmail.com>"
2023
LABEL contributor="Just van den Broecke <justb4@gmail.com>"
2124

2225
# Build ARGS
23-
ARG TIMEZONE="Europe/Amsterdam"
26+
ARG TZ="Europe/Amsterdam"
2427
ARG LOCALE="en_US.UTF-8"
2528
# Only adds 1MB and handy tools
2629
ARG ADD_DEB_PACKAGES="curl xsltproc libxml2-utils"
@@ -33,11 +36,13 @@ ENV MAPPROXY_PROCESSES="4" \
3336
DEBIAN_FRONTEND="noninteractive" \
3437
DEB_BUILD_DEPS="python3-pip build-essential python3-dev python3-setuptools python3-wheel" \
3538
DEB_PACKAGES="python3-pil python3-yaml python3-gdal libproj13 python3-lxml python3-shapely libgeos-dev uwsgi-plugin-python3 ${ADD_DEB_PACKAGES}" \
36-
PIP_PACKAGES="uwsgi requests geojson MapProxy==${MAPPROXY_VERSION} ${ADD_PIP_PACKAGES}"
39+
PIP_PACKAGES="uwsgi requests geojson MapProxy==${MAPPROXY_VERSION} ${ADD_PIP_PACKAGES}" \
40+
GOOGLE_WEB_MERC_EPSG="<900913> +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs <>"
3741

3842
RUN set -x \
3943
&& apt-get update \
4044
&& apt-get install --no-install-recommends -y ${DEB_BUILD_DEPS} ${DEB_PACKAGES} ${ADD_DEB_PACKAGES} \
45+
&& echo ${GOOGLE_WEB_MERC_EPSG} >> /usr/share/proj/epsg \
4146
&& useradd -ms /bin/bash mapproxy \
4247
&& mkdir -p /mapproxy \
4348
&& chown mapproxy /mapproxy \

0 commit comments

Comments
 (0)