Merge pull request #1602 from holta/osm-vector-vars

Explain osm_vector vars in {MIN, MEDIUM, BIG} local_vars.yml

roles/osm-vector/defaults/main.yml

@@ -1,3 +1,9 @@
-menu_def_dir: '{{ doc_root }}/js-menu/menu-files/menu-defs'
+osm_vector_install: True
+osm_vector_enabled: True
 osm_vector_path: '{{ content_base }}/www/osm-vector'
+
+# 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!
+
+menu_def_dir: '{{ doc_root }}/js-menu/menu-files/menu-defs'
 iiab_osm_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden

roles/osm-vector/tasks/main.yml

@@ -8,36 +8,35 @@
 
 - name: Fetch the catalog for osm maps
   get_url:
-     url: "{{ iiab_osm_url }}/assets/regions.json"
+    url: "{{ iiab_osm_url }}/assets/regions.json"
-     dest: '{{ osm_vector_path }}/maplist/assets/'
+    dest: '{{ osm_vector_path }}/maplist/assets/'
 
 - name: Create a link to osm catalog in /common/assets
   file:
-      src: "{{ osm_vector_path }}/maplist/assets/regions.json"
+    src: "{{ osm_vector_path }}/maplist/assets/regions.json"
-      dest: "{{ doc_root }}/common/assets/regions.json"
+    dest: "{{ doc_root }}/common/assets/regions.json"
-      state: link
+    state: link
 
 - name: Fetch the javascript bundle with openlayers for test page
   get_url:
-     url: "{{ iiab_osm_url }}/../main.js"
+    url: "{{ iiab_osm_url }}/../main.js"
-     dest: '{{ osm_vector_path }}/maplist/'
+    dest: '{{ osm_vector_path }}/maplist/'
 
 - name: Fetch the index.html for test page
   template:
-     src: "index.html"
+    src: "index.html"
-     dest: '{{ osm_vector_path }}/maplist/index.html'
+    dest: '{{ osm_vector_path }}/maplist/index.html'
 
-# Bboxes are currently square.  But geofabrik has non-rectangular bboxes 
+# Bboxes (bounding boxes) are currently square.  But geofabrik has non-rectangular bboxes.
-#  So bring the bounding box definition from cloud (bboxes.geojson is big)
+# So bring the bounding box definition from cloud (bboxes.geojson is big)
 - name: Fetch the bounding box description for osm maps
   get_url:
-     url: "{{ iiab_osm_url }}/assets/bboxes.geojson"
+    url: "{{ iiab_osm_url }}/assets/bboxes.geojson"
-     dest: '{{ osm_vector_path }}/maplist/assets/'
+    dest: '{{ osm_vector_path }}/maplist/assets/'
 
-- name: Install a package that helps with geojson
+- name: Install python-geojson package, that helps with geojson
   package:
-    name:
+    name: python-geojson
-      - python-geojson
     state: present
 
 - name: Install the script to update osm catalog
@@ -96,6 +95,6 @@
 
 - name: Do not overwrite if it already exists
   copy:
-     src: en-map_test.json
+    src: en-map_test.json
-     dest: '{{ menu_def_dir }}/en-map_test.json'
+    dest: '{{ menu_def_dir }}/en-map_test.json'
   when: menu_def.stat.exists is defined and not menu_def.stat.exists

vars/default_vars.yml

@@ -351,7 +351,7 @@ mongodb_install: False
 mongodb_enabled: False
 mongodb_port: 27018
 
-# Regional OSM vector maps take much less disk space than image versions
+# Regional OSM vector maps use much less disk space than bitmap/raster versions
 osm_vector_install: True
 osm_vector_enabled: True
 osm_vector_path: '{{ content_base }}/www/osm-vector'

vars/local_vars_big.yml

@@ -229,6 +229,10 @@ moodle_install: True
 moodle_enabled: True
 # If using Moodle intensively, set apache_high_php_limits in 3-BASE-SERVER
 
+# Regional OSM vector maps use much less disk space than bitmap/raster versions
+osm_vector_install: True
+osm_vector_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
 sugarizer_install: True

vars/local_vars_medium.yml

@@ -229,6 +229,10 @@ moodle_install: False
 moodle_enabled: False
 # If using Moodle intensively, set apache_high_php_limits in 3-BASE-SERVER
 
+# Regional OSM vector maps use much less disk space than bitmap/raster versions
+osm_vector_install: True
+osm_vector_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
 sugarizer_install: True

vars/local_vars_min.yml

@@ -229,6 +229,10 @@ moodle_install: False
 moodle_enabled: False
 # If using Moodle intensively, set apache_high_php_limits in 3-BASE-SERVER
 
+# Regional OSM vector maps use much less disk space than bitmap/raster versions
+osm_vector_install: True
+osm_vector_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
 sugarizer_install: False