made /cache_data dir + permissions + proper demo example (#4)

* made /cache_data dir + permissions + proper demo example

* update mapproxy configmap with osm example

Author: WouterVisscher

Dockerfile

@@ -18,7 +18,7 @@ RUN apt-get -y update \
                git \
     && rm -rf /var/lib/apt/lists/* 
 
-RUN pip install PyYAML boto3 Pillow requests Shapely eventlet gunicorn uwsgi prometheus_client
+RUN pip install Numpy PyYAML boto3 Pillow requests Shapely eventlet gunicorn uwsgi prometheus_client
 # master for the 1.12-alpha
 RUN pip install git+https://github.com/mapproxy/mapproxy.git@master
 
@@ -29,6 +29,10 @@ RUN groupadd -g 1337 mapproxy \
 
 RUN apt-get clean
 
+# default dir needed for the cache_data
+RUN mkdir -p /srv/mapproxy/cache_data
+RUN chmod a+rwx /srv/mapproxy/cache_data
+
 WORKDIR /srv/mapproxy
 
 EXPOSE 80

examples/config/mapproxy.yaml

@@ -1,11 +1,46 @@
 # -------------------------------
 # MapProxy configuration.
+#
+# OSM example based on https://wiki.openstreetmap.org/wiki/MapProxy
 # -------------------------------
 services:
   demo:
+  wmts:
+    kvp: true
+    restful: true
+
+layers:
+  - name: osm
+    title: Open Streetmap Tiles
+    sources: [osm_cache]
+
+caches:
+  osm_cache:
+    sources: [osm_tiles]
+    grids: [GLOBAL_MERCATOR]
+    format: image/png
+    cache:
+      type: geopackage
+      filename: /srv/mapproxy/cache_data/osm.gpkg
+      table_name: osm_tiles
+
+sources:
+   osm_tiles:
+     type: tile
+     url: http://c.tile.openstreetmap.org/%(tms_path)s.%(format)s
+     grid: osm_grid 
+
+grids:
+  osm_grid:
+    srs: EPSG:900913
+    origin: nw
 
 globals:
   cache:
     base_dir: '/srv/mapproxy/cache_data'
     lock_dir: '/srv/mapproxy/cache_data/locks'
-    tile_lock_dir: '/srv/mapproxy/cache_data/tile_locks'
+    tile_lock_dir: '/srv/mapproxy/cache_data/tile_locks'
+
+  image:
+      resampling_method: bilinear
+      jpeg_quality: 90

examples/k8s/mapproxy-deployment-example.yml

@@ -146,15 +146,50 @@ data:
   mapproxy.yaml: |-
     # -------------------------------
     # MapProxy configuration.
+    #
+    # OSM example based on https://wiki.openstreetmap.org/wiki/MapProxy
     # -------------------------------
     services:
       demo:
+      wmts:
+        kvp: true
+        restful: true
+
+    layers:
+      - name: osm
+        title: Open Streetmap Tiles
+        sources: [osm_cache]
+
+    caches:
+      osm_cache:
+        sources: [osm_tiles]
+        grids: [GLOBAL_MERCATOR]
+        format: image/png
+        cache:
+          type: geopackage
+          filename: /srv/mapproxy/cache_data/osm.gpkg
+          table_name: osm_tiles
+
+    sources:
+      osm_tiles:
+        type: tile
+        url: http://c.tile.openstreetmap.org/%(tms_path)s.%(format)s
+        grid: osm_grid 
+
+    grids:
+      osm_grid:
+        srs: EPSG:900913
+        origin: nw
 
     globals:
       cache:
         base_dir: '/srv/mapproxy/cache_data'
         lock_dir: '/srv/mapproxy/cache_data/locks'
         tile_lock_dir: '/srv/mapproxy/cache_data/tile_locks'
+
+      image:
+          resampling_method: bilinear
+          jpeg_quality: 90
   uwsgi.ini: |-
     [uwsgi]
     chdir = $(UWSGI_CHDIR)