Merge pull request #2487 from georgejhunt/7.2-maps

7.2 maps [OSM "Preview World" tileset to zoom level 7]

roles/osm-vector-maps/tasks/install.yml

@@ -89,6 +89,19 @@
       dest: '{{ vector_map_path }}/installer/detail.mbtiles'
       state: link
 
+- name: Link to the World Map to zoom 6
+  file:
+      src: '{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles'
+      dest: '{{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles'
+      state: link
+  when: osm_vector_maps_enabled | bool
+
+- name: Copy the map abbreviated satellite images
+  get_url:
+    url: "{{ map_catalog_url }}/satellite_z0-z6_v3.mbtiles"
+    dest: '{{ vector_map_path }}/viewer/tiles/satellite_z0-z6_v3.mbtiles'
+  when: osm_vector_maps_enabled | bool
+
 - name: Fetch the javascript bundle for map installer
   get_url:
     url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/installer/build/{{ item }}"
@@ -181,10 +194,6 @@
       - iiab-make-init.py
       - iiab-update-map
 
-- name: Install the World Map to zoom 10
-  shell: iiab-install-map-region
-  when: osm_vector_maps_enabled | bool
-
 - name: Install /etc/nginx/osm-vector-maps-nginx.conf from template
   template:
     src: osm-vector-maps-nginx.conf.j2

vars/local_vars_big.yml

@@ -297,7 +297,7 @@ moodle_enabled: True
 # Regional OSM vector maps use far less disk space than bitmap/raster versions.
 # Instructions: https://github.com/iiab/iiab/wiki/IIAB-Maps
 osm_vector_maps_install: True
-osm_vector_maps_enabled: False
+osm_vector_maps_enabled: True
 
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957

vars/local_vars_medium.yml

@@ -297,7 +297,7 @@ moodle_enabled: False
 # Regional OSM vector maps use far less disk space than bitmap/raster versions.
 # Instructions: https://github.com/iiab/iiab/wiki/IIAB-Maps
 osm_vector_maps_install: True
-osm_vector_maps_enabled: False
+osm_vector_maps_enabled: True
 
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957

vars/local_vars_min.yml

@@ -297,7 +297,7 @@ moodle_enabled: False
 # Regional OSM vector maps use far less disk space than bitmap/raster versions.
 # Instructions: https://github.com/iiab/iiab/wiki/IIAB-Maps
 osm_vector_maps_install: True
-osm_vector_maps_enabled: False
+osm_vector_maps_enabled: True
 
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957