Skip to content
Snippets Groups Projects
Commit 2632ece2 authored by Lyn Elisa Goltz's avatar Lyn Elisa Goltz
Browse files

Merged in feature/mapProxy3857AndPixelsize-XPLANBOX-2574-2575 (pull request #135) 

Cache für EPSG:3857 (XPLANBOX-2574), PIXELSIZE parameter (XPLANBOX-2575)

Approved-by: stenger
parents f9ea8678 5dc6bc64
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
xplan-configuration/xplan-mapproxy-config/src/main/resources/mapproxy.yaml
+ 132
− 86
View file @ 2632ece2
...@@ -8,13 +8,20 @@ parts: ...@@ -8,13 +8,20 @@ parts:
coverage: coverage:
bbox: [${XPLAN_SERVICES_BBOX_4326}] bbox: [${XPLAN_SERVICES_BBOX_4326}]
srs: 'EPSG:4326' srs: 'EPSG:4326'
cache_cfg: &cache_cfg cache_cfg_25832: &cache_cfg_25832
format: image/png format: image/png
grids: [gdi_de_25832] grids: [gdi_de_25832]
disable_storage: ${XPLAN_MAPPROXY_CACHE_DISABLE} disable_storage: ${XPLAN_MAPPROXY_CACHE_DISABLE}
cache: cache:
type: s3 type: s3
directory_layout: reverse_tms directory_layout: reverse_tms
cache_cfg_3857: &cache_cfg_3857
format: image/png
grids: [GoogleMapsCompatible]
disable_storage: ${XPLAN_MAPPROXY_CACHE_DISABLE}
cache:
type: s3
directory_layout: reverse_tms
md_cfg: &md_cfg md_cfg: &md_cfg
online_resource: ${XPLAN_SERVICES_PROVIDER_ONLINERESOURCE} online_resource: ${XPLAN_SERVICES_PROVIDER_ONLINERESOURCE}
contact: contact:
...@@ -60,14 +67,14 @@ layers: ...@@ -60,14 +67,14 @@ layers:
layers: layers:
- name: bplan_raster - name: bplan_raster
title: Rasterdarstellung der Bebauungspläne title: Rasterdarstellung der Bebauungspläne
sources: [bplan_raster_cache] sources: [bplan_raster_cache_25832,bplan_raster_cache_3857]
tile_sources: [bplan_raster_cache, bplan_raster_cache_3857] tile_sources: [bplan_raster_cache_25832,bplan_raster_cache_3857]
min_res: 1.4 min_res: 1.4
max_res: 0.28 max_res: 0.28
- name: bplan_vektor - name: bplan_vektor
title: Vektordarstellung der Bebauungspläne title: Vektordarstellung der Bebauungspläne
sources: [bplan_vektor_cache] sources: [bplan_vektor_cache_25832,bplan_vektor_cache_3857]
tile_sources: [bplan_vektor_cache, bplan_vektor_cache_3857] tile_sources: [bplan_vektor_cache_25832,bplan_vektor_cache_3857]
min_res: 1.4 min_res: 1.4
max_res: 0.28 max_res: 0.28
- name: xplan_fplan - name: xplan_fplan
...@@ -75,14 +82,14 @@ layers: ...@@ -75,14 +82,14 @@ layers:
layers: layers:
- name: fplan_raster - name: fplan_raster
title: Rasterdarstellung der Flächennutzungspläne title: Rasterdarstellung der Flächennutzungspläne
sources: [fplan_raster_cache] sources: [fplan_raster_cache_25832,fplan_raster_cache_3857]
tile_sources: [fplan_raster_cache, fplan_raster_cache_3857] tile_sources: [fplan_raster_cache_25832,fplan_raster_cache_3857]
min_res: 7.0 min_res: 7.0
max_res: 1.4 max_res: 1.4
- name: fplan_vektor - name: fplan_vektor
title: Vektordarstellung der Flächennutzungspläne title: Vektordarstellung der Flächennutzungspläne
sources: [fplan_vektor_cache] sources: [fplan_vektor_cache_25832,fplan_vektor_cache_3857]
tile_sources: [fplan_vektor_cache, fplan_vektor_cache_3857] tile_sources: [fplan_vektor_cache_25832,fplan_vektor_cache_3857]
min_res: 7.0 min_res: 7.0
max_res: 1.4 max_res: 1.4
- name: xplan_lplan - name: xplan_lplan
...@@ -90,14 +97,14 @@ layers: ...@@ -90,14 +97,14 @@ layers:
layers: layers:
- name: lplan_raster - name: lplan_raster
title: Rasterdarstellung der Landschaftspläne title: Rasterdarstellung der Landschaftspläne
sources: [lplan_raster_cache] sources: [lplan_raster_cache_25832,lplan_raster_cache_3857]
tile_sources: [lplan_raster_cache, lplan_raster_cache_3857] tile_sources: [lplan_raster_cache_25832,lplan_raster_cache_3857]
min_res: 7.0 min_res: 7.0
max_res: 1.4 max_res: 1.4
- name: lplan_vektor - name: lplan_vektor
title: Vektordarstellung der Landschaftspläne title: Vektordarstellung der Landschaftspläne
sources: [lplan_vektor_cache] sources: [lplan_vektor_cache_25832,lplan_vektor_cache_3857]
tile_sources: [lplan_vektor_cache, lplan_vektor_cache_3857] tile_sources: [lplan_vektor_cache_25832,lplan_vektor_cache_3857]
min_res: 7.0 min_res: 7.0
max_res: 1.4 max_res: 1.4
- name: xplan_rplan - name: xplan_rplan
...@@ -105,14 +112,14 @@ layers: ...@@ -105,14 +112,14 @@ layers:
layers: layers:
- name: rplan_raster - name: rplan_raster
title: Rasterdarstellung der Regionalpläne title: Rasterdarstellung der Regionalpläne
sources: [rplan_raster_cache] sources: [rplan_raster_cache_25832,rplan_raster_cache_3857]
tile_sources: [rplan_raster_cache, rplan_raster_cache_3857] tile_sources: [rplan_raster_cache_25832,rplan_raster_cache_3857]
min_res: 7.0 min_res: 7.0
max_res: 1.4 max_res: 1.4
- name: rplan_vektor - name: rplan_vektor
title: Vektordarstellung der Regionalpläne title: Vektordarstellung der Regionalpläne
sources: [rplan_vektor_cache] sources: [rplan_vektor_cache_25832,rplan_vektor_cache_3857]
tile_sources: [rplan_vektor_cache, rplan_vektor_cache_3857] tile_sources: [rplan_vektor_cache_25832,rplan_vektor_cache_3857]
min_res: 7.0 min_res: 7.0
max_res: 1.4 max_res: 1.4
- name: xplan_soplan - name: xplan_soplan
...@@ -120,107 +127,137 @@ layers: ...@@ -120,107 +127,137 @@ layers:
layers: layers:
- name: soplan_raster - name: soplan_raster
title: Rasterdarstellung der sonstigen raumbezogenen Pläne title: Rasterdarstellung der sonstigen raumbezogenen Pläne
sources: [soplan_raster_cache] sources: [soplan_raster_cache_25832,soplan_raster_cache_3857]
tile_sources: [soplan_raster_cache, soplan_raster_cache_3857] tile_sources: [soplan_raster_cache_25832,soplan_raster_cache_3857]
min_res: 1.4 min_res: 1.4
max_res: 0.28 max_res: 0.28
- name: soplan_vektor - name: soplan_vektor
title: Vektordarstellung der sonstigen raumbezogenen Pläne title: Vektordarstellung der sonstigen raumbezogenen Pläne
sources: [soplan_vektor_cache] sources: [soplan_vektor_cache_25832,soplan_vektor_cache_3857]
tile_sources: [soplan_vektor_cache, soplan_vektor_cache_3857] tile_sources: [soplan_vektor_cache_25832,soplan_vektor_cache_3857]
min_res: 1.4 min_res: 1.4
max_res: 0.28 max_res: 0.28
caches: caches:
bplan_raster_cache_3857: bplan_raster_cache_25832:
grids: [GLOBAL_WEBMERCATOR] <<: *cache_cfg_25832
sources: [bplan_raster_cache]
bplan_vektor_cache_3857:
grids: [GLOBAL_WEBMERCATOR]
sources: [bplan_vektor_cache]
fplan_raster_cache_3857:
grids: [GLOBAL_WEBMERCATOR]
sources: [fplan_raster_cache]
fplan_vektor_cache_3857:
grids: [GLOBAL_WEBMERCATOR]
sources: [fplan_vektor_cache]
lplan_raster_cache_3857:
grids: [GLOBAL_WEBMERCATOR]
sources: [lplan_raster_cache]
lplan_vektor_cache_3857:
grids: [GLOBAL_WEBMERCATOR]
sources: [lplan_vektor_cache]
rplan_raster_cache_3857:
grids: [GLOBAL_WEBMERCATOR]
sources: [rplan_raster_cache]
rplan_vektor_cache_3857:
grids: [GLOBAL_WEBMERCATOR]
sources: [rplan_vektor_cache]
soplan_raster_cache_3857:
grids: [GLOBAL_WEBMERCATOR]
sources: [soplan_raster_cache]
soplan_vektor_cache_3857:
grids: [GLOBAL_WEBMERCATOR]
sources: [soplan_vektor_cache]
bplan_raster_cache:
<<: *cache_cfg
cache: cache:
directory: /bplan_raster/ directory: /bplan_raster/25832/
type: s3 type: s3
sources: ['xplan-mapserver:bplanraster'] sources: ['xplan-mapserver:bplanraster']
bplan_vektor_cache: bplan_vektor_cache_25832:
<<: *cache_cfg <<: *cache_cfg_25832
cache: cache:
directory: /bplan_vektor/ directory: /bplan_vektor/25832/
type: s3 type: s3
sources: ['bplan-wms:BP_Planvektor'] sources: ['bplan-wms:BP_Planvektor']
fplan_raster_cache: fplan_raster_cache_25832:
<<: *cache_cfg <<: *cache_cfg_25832
cache: cache:
directory: /fplan_raster/ directory: /fplan_raster/25832/
type: s3 type: s3
sources: ['xplan-mapserver:fplanraster'] sources: ['xplan-mapserver:fplanraster']
fplan_vektor_cache: fplan_vektor_cache_25832:
<<: *cache_cfg <<: *cache_cfg_25832
cache: cache:
directory: /fplan_vektor/ directory: /fplan_vektor/25832/
type: s3 type: s3
sources: ['fplan-wms:FP_Planvektor'] sources: ['fplan-wms:FP_Planvektor']
lplan_raster_cache: lplan_raster_cache_25832:
<<: *cache_cfg <<: *cache_cfg_25832
cache: cache:
directory: /lplan_raster/ directory: /lplan_raster/25832/
type: s3 type: s3
sources: ['xplan-mapserver:lplanraster'] sources: ['xplan-mapserver:lplanraster']
lplan_vektor_cache: lplan_vektor_cache_25832:
<<: *cache_cfg <<: *cache_cfg_25832
cache: cache:
directory: /lplan_vektor/ directory: /lplan_vektor/25832/
type: s3 type: s3
sources: ['lplan-wms:LP_Planvektor'] sources: ['lplan-wms:LP_Planvektor']
rplan_raster_cache: rplan_raster_cache_25832:
<<: *cache_cfg <<: *cache_cfg_25832
cache: cache:
directory: /rplan_raster/ directory: /rplan_raster/25832/
type: s3 type: s3
sources: ['xplan-mapserver:rplanraster'] sources: ['xplan-mapserver:rplanraster']
rplan_vektor_cache: rplan_vektor_cache_25832:
<<: *cache_cfg <<: *cache_cfg_25832
cache: cache:
directory: /rplan_vektor/ directory: /rplan_vektor/25832/
type: s3 type: s3
sources: ['rplan-wms:RP_Planvektor'] sources: ['rplan-wms:RP_Planvektor']
soplan_raster_cache: soplan_raster_cache_25832:
<<: *cache_cfg <<: *cache_cfg_25832
cache: cache:
directory: /soplan_raster/ directory: /soplan_raster/25832/
type: s3 type: s3
sources: ['xplan-mapserver:soplanraster'] sources: ['xplan-mapserver:soplanraster']
soplan_vektor_cache: soplan_vektor_cache_25832:
<<: *cache_cfg <<: *cache_cfg_25832
cache: cache:
directory: /soplan_vektor/ directory: /soplan_vektor/25832/
type: s3 type: s3
sources: ['soplan-wms:SO_Planvektor'] sources: ['soplan-wms:SO_Planvektor']
bplan_raster_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /bplan_raster/3857/
type: s3
sources: [ 'xplan-mapserver:bplanraster' ]
bplan_vektor_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /bplan_vektor/3857/
type: s3
sources: [ 'bplan-wms:BP_Planvektor' ]
fplan_raster_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /fplan_raster/3857/
type: s3
sources: [ 'xplan-mapserver:fplanraster' ]
fplan_vektor_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /fplan_vektor/3857/
type: s3
sources: [ 'fplan-wms:FP_Planvektor' ]
lplan_raster_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /lplan_raster/3857/
type: s3
sources: [ 'xplan-mapserver:lplanraster' ]
lplan_vektor_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /lplan_vektor/3857/
type: s3
sources: [ 'lplan-wms:LP_Planvektor' ]
rplan_raster_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /rplan_raster/3857/
type: s3
sources: [ 'xplan-mapserver:rplanraster' ]
rplan_vektor_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /rplan_vektor/3857/
type: s3
sources: [ 'rplan-wms:RP_Planvektor' ]
soplan_raster_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /soplan_raster/3857/
type: s3
sources: [ 'xplan-mapserver:soplanraster' ]
soplan_vektor_cache_3857:
<<: *cache_cfg_3857
cache:
directory: /soplan_vektor/3857/
type: s3
sources: [ 'soplan-wms:SO_Planvektor' ]
sources: sources:
xplan-mapserver: xplan-mapserver:
<<: *wms_cfg <<: *wms_cfg
...@@ -230,27 +267,27 @@ sources: ...@@ -230,27 +267,27 @@ sources:
bplan-wms: bplan-wms:
<<: *wms_cfg <<: *wms_cfg
req: req:
url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/bpwms? url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/bpwms?PIXELSIZE=0.28001
transparent: true transparent: true
fplan-wms: fplan-wms:
<<: *wms_cfg <<: *wms_cfg
req: req:
url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/fpwms? url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/fpwms?PIXELSIZE=0.28001
transparent: true transparent: true
lplan-wms: lplan-wms:
<<: *wms_cfg <<: *wms_cfg
req: req:
url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/lpwms? url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/lpwms?PIXELSIZE=0.28001
transparent: true transparent: true
rplan-wms: rplan-wms:
<<: *wms_cfg <<: *wms_cfg
req: req:
url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/rpwms? url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/rpwms?PIXELSIZE=0.28001
transparent: true transparent: true
soplan-wms: soplan-wms:
<<: *wms_cfg <<: *wms_cfg
req: req:
url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/sowms? url: ${XPLAN_SERVICES_URL_INTERNAL}/xplan-wms/services/sowms?PIXELSIZE=0.28001
transparent: true transparent: true
grids: grids:
gdi_de_25832: gdi_de_25832:
...@@ -260,6 +297,15 @@ grids: ...@@ -260,6 +297,15 @@ grids:
bbox: [${XPLAN_SERVICES_BBOX_4326}] bbox: [${XPLAN_SERVICES_BBOX_4326}]
bbox_srs: 'EPSG:4326' bbox_srs: 'EPSG:4326'
origin: 'ul' origin: 'ul'
GoogleMapsCompatible:
srs: 'EPSG:3857'
tile_size: [512, 512]
num_levels: 9
min_res: 38.21851414258813
max_res: 0.1492910708694849
bbox: [${XPLAN_SERVICES_BBOX_4326}]
bbox_srs: 'EPSG:4326'
origin: 'ul'
globals: globals:
cache: cache:
lock_dir: "./cache_data/locks" lock_dir: "./cache_data/locks"
......
xplan-configuration/xplan-mapproxy-config/src/main/resources/seed.yaml
+ 42
− 18
View file @ 2632ece2
seeds: seeds:
bpreseed: bpreseed_25832:
caches: [bplan_raster_cache,bplan_vektor_cache] caches: [bplan_raster_cache_25832,bplan_vektor_cache_25832]
grids: [gdi_de_25832]
coverages: [bpchanges] coverages: [bpchanges]
refresh_before: refresh_before:
days: 0 days: 0
fpreseed: fpreseed_25832:
caches: [fplan_raster_cache,fplan_vektor_cache] caches: [fplan_raster_cache_25832,fplan_vektor_cache_25832]
grids: [gdi_de_25832]
coverages: [fpchanges] coverages: [fpchanges]
refresh_before: refresh_before:
days: 0 days: 0
lpreseed: lpreseed_25832:
caches: [lplan_raster_cache,lplan_vektor_cache] caches: [lplan_raster_cache_25832,lplan_vektor_cache_25832]
grids: [gdi_de_25832]
coverages: [lpchanges] coverages: [lpchanges]
refresh_before: refresh_before:
days: 0 days: 0
rpreseed: rpreseed_25832:
caches: [rplan_raster_cache,rplan_vektor_cache] caches: [rplan_raster_cache_25832,rplan_vektor_cache_25832]
grids: [gdi_de_25832]
coverages: [rpchanges] coverages: [rpchanges]
refresh_before: refresh_before:
days: 0 days: 0
soreseed: soreseed_25832:
caches: [soplan_raster_cache,soplan_vektor_cache] caches: [soplan_raster_cache_25832,soplan_vektor_cache_25832]
grids: [gdi_de_25832] coverages: [sochanges]
refresh_before:
days: 0
bpreseed_3857:
caches: [bplan_raster_cache_3857,bplan_vektor_cache_3857]
coverages: [bpchanges]
refresh_before:
days: 0
fpreseed_3857:
caches: [fplan_raster_cache_3857,fplan_vektor_cache_3857]
coverages: [fpchanges]
refresh_before:
days: 0
lpreseed_3857:
caches: [lplan_raster_cache_3857,lplan_vektor_cache_3857]
coverages: [lpchanges]
refresh_before:
days: 0
rpreseed_3857:
caches: [rplan_raster_cache_3857,rplan_vektor_cache_3857]
coverages: [rpchanges]
refresh_before:
days: 0
soreseed_3857:
caches: [soplan_raster_cache_3857,soplan_vektor_cache_3857]
coverages: [sochanges] coverages: [sochanges]
refresh_before: refresh_before:
days: 0 days: 0
# wird bei einem frischen Deployment vermutlich gar nicht benötigt? # wird bei einem frischen Deployment vermutlich gar nicht benötigt?
fullseed: fullseed_25832:
caches: [bplan_raster_cache,bplan_vektor_cache,fplan_raster_cache,fplan_vektor_cache,lplan_raster_cache,lplan_vektor_cache,rplan_raster_cache,rplan_vektor_cache,soplan_raster_cache,soplan_vektor_cache] caches: [bplan_raster_cache_25832,bplan_vektor_cache_25832,fplan_raster_cache_25832,fplan_vektor_cache_25832,lplan_raster_cache_25832,lplan_vektor_cache_25832,rplan_raster_cache_25832,rplan_vektor_cache_25832,soplan_raster_cache_25832,soplan_vektor_cache_25832]
grids: [gdi_de_25832] coverages: [full]
refresh_before:
days: 0
fullseed_3857:
caches: [bplan_raster_cache_3857,bplan_vektor_cache_3857,fplan_raster_cache_3857,fplan_vektor_cache_3857,lplan_raster_cache_3857,lplan_vektor_cache_3857,rplan_raster_cache_3857,rplan_vektor_cache_3857,soplan_raster_cache_3857,soplan_vektor_cache_3857]
coverages: [full] coverages: [full]
refresh_before: refresh_before:
days: 0 days: 0
......
xplan-docker/xplan-docker-mapproxy/docker-entrypoint.sh
+ 1
− 1
View file @ 2632ece2
...@@ -12,7 +12,7 @@ envsubst "$defined_envs" < /xplan-docker-mapproxy/xplan-mapproxy-config/seed.yam ...@@ -12,7 +12,7 @@ envsubst "$defined_envs" < /xplan-docker-mapproxy/xplan-mapproxy-config/seed.yam
if [ "$executionMode" == "seed" ] if [ "$executionMode" == "seed" ]
then then
echo "[$(date -Iseconds)] MapProxy seed..." echo "[$(date -Iseconds)] MapProxy seed..."
exec mapproxy-seed -f /srv/mapproxy/mapproxy.yaml -s /srv/mapproxy/seed.yaml -c $XPLAN_MAPPROXY_RESEED_CONCURRENCY --seed bpreseed,fpreseed,lpreseed,rpreseed,soreseed exec mapproxy-seed -f /srv/mapproxy/mapproxy.yaml -s /srv/mapproxy/seed.yaml -c $XPLAN_MAPPROXY_RESEED_CONCURRENCY --seed bpreseed_25832,fpreseed_25832,lpreseed_25832,rpreseed_25832,soreseed_25832,bpreseed_3857,fpreseed_3857,lpreseed_3857,rpreseed_3857,soreseed_3857
else else
echo "[$(date -Iseconds)] MapProxy startup..." echo "[$(date -Iseconds)] MapProxy startup..."
exec uwsgi --ini /srv/mapproxy/uwsgi.ini exec uwsgi --ini /srv/mapproxy/uwsgi.ini
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Consent

On this website, we use the web analytics service Matomo to analyze and review the use of our website. Through the collected statistics, we can improve our offerings and make them more appealing for you. Here, you can decide whether to allow us to process your data and set corresponding cookies for these purposes, in addition to technically necessary cookies. Further information on data protection—especially regarding "cookies" and "Matomo"—can be found in our privacy policy. You can withdraw your consent at any time.