From 17118ea80368c7c90c5031292d48ec817e94e97d Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Tue, 11 Aug 2020 15:37:23 -0700
Subject: [PATCH 01/15] move scripts and assets

---
 roles/osm-vector-maps/defaults/main.yml | 6 ++++--
 roles/osm-vector-maps/tasks/install.yml | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml
index 2830e7c01..7afd3cd8a 100644
--- a/roles/osm-vector-maps/defaults/main.yml
+++ b/roles/osm-vector-maps/defaults/main.yml
@@ -8,8 +8,10 @@
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 #osm_map_url: https://github.com/iiab/maps/raw/master
 # for testing, use the new unpublished version of regions.json
-osm_repo_url: https://raw.githubusercontent.com/iiab/maps
+#osm_repo_url: https://raw.githubusercontent.com/iiab/maps
+osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps
 archive_org_url: https://archive.org/download
 satellite_version: satellite_z0-z9_v3.mbtiles
-maps_branch: 'master'
+#maps_branch: 'master'
+maps_branch: '7.2-maps'
 map_catalog_url: http://download.iiab.io/content/OSM/vector-tiles
diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index 3c46756e6..f91c5304c 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -74,7 +74,6 @@
      dest: '{{ vector_map_path }}/viewer/'
   with_items:
       - mbtileinfo.php
-      - ol-contextmenu.css
       - popup.css
       - searchapi.php
       - tileserver.php
@@ -119,6 +118,7 @@
       - countries.json
       - fonts.css
       - ol5-layerswitcher.css
+      - ol-contextmenu.css
       - pin_drop.png
       - sprite@2x.json
       - sprite@2x.png
@@ -170,7 +170,7 @@
 
 - name: Copy a scripts to download tiles
   get_url:
-      url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/{{ item }}"
+      url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/scripts/{{ item }}"
       dest: /usr/bin/
       mode: 0755
   with_items:

From 4d730e3ea80c1574fa43d2d95c955ef79afa1e4e Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Wed, 12 Aug 2020 19:27:49 -0700
Subject: [PATCH 02/15] webpack does not bundle externap -- not node -- modules

---
 roles/osm-vector-maps/tasks/install.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index f91c5304c..470f0cc81 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -118,7 +118,9 @@
       - countries.json
       - fonts.css
       - ol5-layerswitcher.css
+      - ol5-layerswitcher.js
       - ol-contextmenu.css
+      - ol-contextmenu.js
       - pin_drop.png
       - sprite@2x.json
       - sprite@2x.png

From bdaa788e16acf86e156117513e3db16500d732ce Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Fri, 21 Aug 2020 13:22:12 -0700
Subject: [PATCH 03/15] change main.js to *-bundle for viewer, test-page, and
 installer

---
 roles/osm-vector-maps/tasks/install.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index 470f0cc81..4d2ac2827 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -49,13 +49,13 @@
     dest: "{{ vector_map_path }}/maplist/assets/regions.json"
     state: link
 
-- name: Download the JavaScript bundle with OpenLayers (main.js) for test page http://box/maps/maplist
+- name: Download the JavaScript bundle with OpenLayers (test-page-bundle.js) for test page http://box/maps/maplist
 # At this point, fetches from github.com/georgejhunt/maps from test branch
   get_url:
     url: "{{ item }}"
     dest: '{{ vector_map_path }}/test-page/'
   with_items:
-    - "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/main.js"
+    - "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/test-page-bundle.js"
     - "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/index.html"
 
 - name: Fetch the javascript bundle with openlayers for Viewer page
@@ -65,8 +65,8 @@
      dest: '{{ vector_map_path }}/viewer/'
   with_items:
       - index.html
-      - main.js
-      - main.js.map
+      - viewer-bundle.js
+      - viewer-bundle.js.map
 
 - name: Get the helper files for viewer
   get_url:
@@ -95,7 +95,7 @@
     dest: '{{ vector_map_path }}/installer/'
   with_items:
       - index.html
-      - main.js
+      - installer-bundle.js
 
 - name: Fetch the action routines for installer
   get_url:

From 6a3072671a814c055322292b46dd0b202a114951 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Fri, 21 Aug 2020 13:29:00 -0700
Subject: [PATCH 04/15] disable the long download of osm for all versions of
 local_vars

---
 vars/local_vars_big.yml    | 2 +-
 vars/local_vars_medium.yml | 2 +-
 vars/local_vars_min.yml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index 7bf36019b..6d59e3b45 100644
--- a/vars/local_vars_big.yml
+++ b/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: True
+osm_vector_maps_enabled: False
 
 # 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
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index 0d3e1082e..e6d2397b9 100644
--- a/vars/local_vars_medium.yml
+++ b/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: True
+osm_vector_maps_enabled: False
 
 # 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
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index def8807c9..c903090b6 100644
--- a/vars/local_vars_min.yml
+++ b/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: True
+osm_vector_maps_enabled: False
 
 # 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

From e4055a9fc59e6f0fd414fc4e4676259439c42a7d Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Fri, 21 Aug 2020 22:32:40 +0000
Subject: [PATCH 05/15] start nginx for OSM always

---
 roles/osm-vector-maps/tasks/nginx.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/osm-vector-maps/tasks/nginx.yml b/roles/osm-vector-maps/tasks/nginx.yml
index b764220d6..c02aa8281 100644
--- a/roles/osm-vector-maps/tasks/nginx.yml
+++ b/roles/osm-vector-maps/tasks/nginx.yml
@@ -2,13 +2,14 @@
   template:
     src: osm-vector-maps-nginx.conf.j2
     dest: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf"    # /etc/nginx/conf.d
-  when: osm_vector_maps_enabled | bool
+  when: osm_vector_maps_install | bool
+# Note that the above change from enabled->install is required by the OSM command line installer
 
 - name: Disable http://box/maps & http://box/osm-vector-maps via NGINX, by removing {{ nginx_conf_dir }}/osm-vector-maps-nginx.conf
   file:
     path: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf"    # /etc/nginx/conf.d
     state: absent
-  when: not osm_vector_maps_enabled
+  when: not osm_vector_maps_install
 
 - name: Reload 'nginx' systemd service
   systemd:

From 77a051fa791ed97995c26bf8ee9bd172a817c3d3 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Fri, 21 Aug 2020 16:27:23 -0700
Subject: [PATCH 06/15] let nodejs provide js packages

---
 roles/osm-vector-maps/tasks/install.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index 4d2ac2827..b6ab41aad 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -117,10 +117,8 @@
       - center.png
       - countries.json
       - fonts.css
-      - ol5-layerswitcher.css
-      - ol5-layerswitcher.js
+      - ol-layerswitcher.css
       - ol-contextmenu.css
-      - ol-contextmenu.js
       - pin_drop.png
       - sprite@2x.json
       - sprite@2x.png

From b65255e3a3760a8900bfce4de397ccbb282f3aee Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Tue, 11 Aug 2020 15:37:23 -0700
Subject: [PATCH 07/15] move scripts and assets

---
 roles/osm-vector-maps/defaults/main.yml | 6 ++++--
 roles/osm-vector-maps/tasks/install.yml | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml
index 2830e7c01..7afd3cd8a 100644
--- a/roles/osm-vector-maps/defaults/main.yml
+++ b/roles/osm-vector-maps/defaults/main.yml
@@ -8,8 +8,10 @@
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 #osm_map_url: https://github.com/iiab/maps/raw/master
 # for testing, use the new unpublished version of regions.json
-osm_repo_url: https://raw.githubusercontent.com/iiab/maps
+#osm_repo_url: https://raw.githubusercontent.com/iiab/maps
+osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps
 archive_org_url: https://archive.org/download
 satellite_version: satellite_z0-z9_v3.mbtiles
-maps_branch: 'master'
+#maps_branch: 'master'
+maps_branch: '7.2-maps'
 map_catalog_url: http://download.iiab.io/content/OSM/vector-tiles
diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index 3c46756e6..f91c5304c 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -74,7 +74,6 @@
      dest: '{{ vector_map_path }}/viewer/'
   with_items:
       - mbtileinfo.php
-      - ol-contextmenu.css
       - popup.css
       - searchapi.php
       - tileserver.php
@@ -119,6 +118,7 @@
       - countries.json
       - fonts.css
       - ol5-layerswitcher.css
+      - ol-contextmenu.css
       - pin_drop.png
       - sprite@2x.json
       - sprite@2x.png
@@ -170,7 +170,7 @@
 
 - name: Copy a scripts to download tiles
   get_url:
-      url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/{{ item }}"
+      url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/scripts/{{ item }}"
       dest: /usr/bin/
       mode: 0755
   with_items:

From 265ce88ef27a95ddcded9524c1bc493181f7800e Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Wed, 12 Aug 2020 19:27:49 -0700
Subject: [PATCH 08/15] webpack does not bundle externap -- not node -- modules

---
 roles/osm-vector-maps/tasks/install.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index f91c5304c..470f0cc81 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -118,7 +118,9 @@
       - countries.json
       - fonts.css
       - ol5-layerswitcher.css
+      - ol5-layerswitcher.js
       - ol-contextmenu.css
+      - ol-contextmenu.js
       - pin_drop.png
       - sprite@2x.json
       - sprite@2x.png

From db47db18510a6f76c97c070c68a504d03d9fdddf Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Fri, 21 Aug 2020 13:22:12 -0700
Subject: [PATCH 09/15] change main.js to *-bundle for viewer, test-page, and
 installer

---
 roles/osm-vector-maps/tasks/install.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index 470f0cc81..4d2ac2827 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -49,13 +49,13 @@
     dest: "{{ vector_map_path }}/maplist/assets/regions.json"
     state: link
 
-- name: Download the JavaScript bundle with OpenLayers (main.js) for test page http://box/maps/maplist
+- name: Download the JavaScript bundle with OpenLayers (test-page-bundle.js) for test page http://box/maps/maplist
 # At this point, fetches from github.com/georgejhunt/maps from test branch
   get_url:
     url: "{{ item }}"
     dest: '{{ vector_map_path }}/test-page/'
   with_items:
-    - "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/main.js"
+    - "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/test-page-bundle.js"
     - "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/index.html"
 
 - name: Fetch the javascript bundle with openlayers for Viewer page
@@ -65,8 +65,8 @@
      dest: '{{ vector_map_path }}/viewer/'
   with_items:
       - index.html
-      - main.js
-      - main.js.map
+      - viewer-bundle.js
+      - viewer-bundle.js.map
 
 - name: Get the helper files for viewer
   get_url:
@@ -95,7 +95,7 @@
     dest: '{{ vector_map_path }}/installer/'
   with_items:
       - index.html
-      - main.js
+      - installer-bundle.js
 
 - name: Fetch the action routines for installer
   get_url:

From e19d5bc98802b581188f43a6b724e35301c8bcef Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Fri, 21 Aug 2020 13:29:00 -0700
Subject: [PATCH 10/15] disable the long download of osm for all versions of
 local_vars

---
 vars/local_vars_big.yml    | 2 +-
 vars/local_vars_medium.yml | 2 +-
 vars/local_vars_min.yml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index 7bf36019b..6d59e3b45 100644
--- a/vars/local_vars_big.yml
+++ b/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: True
+osm_vector_maps_enabled: False
 
 # 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
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index 0d3e1082e..e6d2397b9 100644
--- a/vars/local_vars_medium.yml
+++ b/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: True
+osm_vector_maps_enabled: False
 
 # 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
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index def8807c9..c903090b6 100644
--- a/vars/local_vars_min.yml
+++ b/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: True
+osm_vector_maps_enabled: False
 
 # 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

From af1432f328924ad316cf055e89a0875011d429e2 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Fri, 21 Aug 2020 22:32:40 +0000
Subject: [PATCH 11/15] start nginx for OSM always

---
 roles/osm-vector-maps/tasks/nginx.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/osm-vector-maps/tasks/nginx.yml b/roles/osm-vector-maps/tasks/nginx.yml
index b764220d6..c02aa8281 100644
--- a/roles/osm-vector-maps/tasks/nginx.yml
+++ b/roles/osm-vector-maps/tasks/nginx.yml
@@ -2,13 +2,14 @@
   template:
     src: osm-vector-maps-nginx.conf.j2
     dest: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf"    # /etc/nginx/conf.d
-  when: osm_vector_maps_enabled | bool
+  when: osm_vector_maps_install | bool
+# Note that the above change from enabled->install is required by the OSM command line installer
 
 - name: Disable http://box/maps & http://box/osm-vector-maps via NGINX, by removing {{ nginx_conf_dir }}/osm-vector-maps-nginx.conf
   file:
     path: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf"    # /etc/nginx/conf.d
     state: absent
-  when: not osm_vector_maps_enabled
+  when: not osm_vector_maps_install
 
 - name: Reload 'nginx' systemd service
   systemd:

From 44ab8be8c9181987a69f9670e60e7f625ca16343 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Fri, 21 Aug 2020 16:27:23 -0700
Subject: [PATCH 12/15] let nodejs provide js packages

---
 roles/osm-vector-maps/tasks/install.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index 4d2ac2827..b6ab41aad 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -117,10 +117,8 @@
       - center.png
       - countries.json
       - fonts.css
-      - ol5-layerswitcher.css
-      - ol5-layerswitcher.js
+      - ol-layerswitcher.css
       - ol-contextmenu.css
-      - ol-contextmenu.js
       - pin_drop.png
       - sprite@2x.json
       - sprite@2x.png

From ed2405b4e096fe2671eeba83ea21d0834727cff8 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Sat, 22 Aug 2020 07:06:56 -0700
Subject: [PATCH 13/15] change soft coded pointers from test branch to master

---
 roles/osm-vector-maps/defaults/main.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml
index 7afd3cd8a..822803728 100644
--- a/roles/osm-vector-maps/defaults/main.yml
+++ b/roles/osm-vector-maps/defaults/main.yml
@@ -6,12 +6,14 @@
 
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
-#osm_map_url: https://github.com/iiab/maps/raw/master
-# for testing, use the new unpublished version of regions.json
-#osm_repo_url: https://raw.githubusercontent.com/iiab/maps
-osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps
+
+# The following soft coded variables allow testing, before pulling PR's into master
+osm_repo_url: https://raw.githubusercontent.com/iiab/maps
+#osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps
+maps_branch: 'master'
+#maps_branch: '7.2-maps'
+
+# soft code sources
 archive_org_url: https://archive.org/download
-satellite_version: satellite_z0-z9_v3.mbtiles
-#maps_branch: 'master'
-maps_branch: '7.2-maps'
 map_catalog_url: http://download.iiab.io/content/OSM/vector-tiles
+satellite_version: satellite_z0-z9_v3.mbtiles

From cccf273845591b8599e4875c7f68aeb6fa12a235 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Sat, 22 Aug 2020 15:11:55 -0700
Subject: [PATCH 14/15] if maps enabled, download 20MB satellite and link to
 installer osm

---
 roles/osm-vector-maps/tasks/install.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index b6ab41aad..e02d99f11 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -181,8 +181,17 @@
       - iiab-make-init.py
       - iiab-update-map
 
-- name: Install the World Map to zoom 10
-  shell: iiab-install-map-region
+- 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: Install /etc/nginx/osm-vector-maps-nginx.conf from template

From c2ff54c8abfa29b7c08ca5712bac9003a447f658 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Sat, 22 Aug 2020 17:25:43 -0700
Subject: [PATCH 15/15] set enabled back to true to enable preview tiles

---
 vars/local_vars_big.yml    | 2 +-
 vars/local_vars_medium.yml | 2 +-
 vars/local_vars_min.yml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index 6d59e3b45..7bf36019b 100644
--- a/vars/local_vars_big.yml
+++ b/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
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index e6d2397b9..0d3e1082e 100644
--- a/vars/local_vars_medium.yml
+++ b/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
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index c903090b6..def8807c9 100644
--- a/vars/local_vars_min.yml
+++ b/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