Merge pull request #240 from iiab/master

sync from iiab/iiab

roles/2-common/tasks/fl.yml

@@ -14,8 +14,10 @@
     - "{{ downloads_dir }}"
     - /library/downloads/zims
     - /library/downloads/rachel
+    - /library/downloads/maps
     - /library/working/zims
     - /library/working/rachel
+    - /library/working/maps
     - "{{ iiab_zim_path }}/content"
     - "{{ iiab_zim_path }}/index"
     - "{{ doc_root }}/local_content"

roles/osm-vector-maps/defaults/main.yml

@@ -1,8 +1,8 @@
-osm_vector_maps_install: True
-osm_vector_maps_enabled: True
-vector_map_path: '{{ content_base }}/www/osm-vector-maps'
+# osm_vector_maps_install: True
+# osm_vector_maps_enabled: True
+
+# iiab_map_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden
+# vector_map_path: "{{ content_base }}/www/osm-vector-maps"
 
 # 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!
-
-iiab_map_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden

roles/osm-vector-maps/files/map_functions.js

@@ -1,6 +1,6 @@
 // map_functions.js  -- (non authoritative see below) src = iiab/roles/files/
 // copyright 2019 George Hunt
-// CAUTION -- this file is duplicate to admin-console/console/files/js/map_fuctions.js -- please think of admin-console as authoritative
+// CAUTION -- this file is duplicate to admin-console/console/files/js/map_functions.js -- please think of admin-console as authoritative
 //     Placed here in duplicate to ease debugging, and simplify dependences
 
 var regionGeojson = {};

vars/default_vars.yml

@@ -15,7 +15,6 @@ pip_packages_dir: "{{ iiab_base }}/pip-packages"
 yum_packages_dir: "{{ iiab_base }}/yum-packages"
 downloads_dir: "{{ iiab_base }}/downloads"
 iiab_download_url: http://download.iiab.io/packages
-iiab_map_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden
 
 content_base: "/library"
 doc_base: "{{ content_base }}/www"
@@ -354,7 +353,8 @@ mongodb_port: 27018
 # Regional OSM vector maps use much less disk space than bitmap/raster versions
 osm_vector_maps_install: True
 osm_vector_maps_enabled: True
-vector_map_path: '{{ content_base }}/www/osm-vector-maps'
+iiab_map_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden
+vector_map_path: "{{ content_base }}/www/osm-vector-maps"
 
 # roles/sugarizer/meta/main.yml auto-invokes 2 above prereqs: mongodb & nodejs
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879