Merge pull request #433 from iiab/master

Sync from iiab:master

roles/gitea/defaults/main.yml

@@ -9,7 +9,7 @@
 
 # Info needed to install Gitea:
 
-gitea_version: 1.12.4
+gitea_version: 1.12.5
 iset_suffixes:
   i386: 386
   x86_64: amd64

roles/osm-vector-maps/README.md

@@ -1,11 +1,27 @@
-## What's Changed in Maps for the IIAB 7.2 Release?
+## What's New with IIAB Maps in IIAB 7.2?
-1. Two variables in /etc/local_vars have new meanings:
+
-    1. Osm_vector_maps_install means install the map program (about 40MB).
+1. If you install [IIAB 7.2](https://github.com/iiab/iiab/wiki/IIAB-7.2-Release-Notes) with [IIAB Maps](https://github.com/iiab/iiab/wiki/IIAB-Maps), a new **Install IIAB Maps** page is available (http://box/osm-vector-maps/installer/) with [instructions](https://github.com/iiab/iiab/wiki/IIAB-Maps#how-do-i-install-map-packs-and-satellite-photo-regions-on-iiab-72-), separate from IIAB's Admin Console:
-    2. Osm_vector_maps_installed means install a functioning world map to zoom 10 (about 2.8GB). 
+   1. This [very visual page](https://user-images.githubusercontent.com/2458907/94740848-46c4eb00-0341-11eb-93ea-e3e4758dce48.png) facilitates selecting/downloading/installing of Map Pack(s) for your favorite "continent(s)".  (SEE 2. BELOW)
-2. There is a new installer page, separate from the Admin Console, with installs regions and downloads higher resolution satellite imagery from zoom 11 to zoom 13 (16 times the resolution provided by zoom 10j).
+   2. If you've installed at least one Map Pack, you can then use this same page to select/download/install Hi-Res Satellite Photo Region(s) for your local communities.  (SEE 3. BELOW)
-3. Multiple vector OpenStreetMap regions may be installed, and viewed on the same map.
+
-4. Multiple regions of satellite improvements can be added to the same map.
+2. **Map Packs** no longer bundle both data and program in a .zip file.  All Map Packs are really now just a collection of 3 .mbtiles files:
-1. The region size for satellite downloads can be adjusted to 50, 150, or 500KM around a selected map point.
+   1. The main focus of a Map Pack remains Hi-Res Vector Map data from OpenStreetMap, for your selected "continent" — but Lo-Res vector map tiles (1.74GB .mbtiles) and Lo-Res satellite photos (932MB .mbtiles) are also included for the entire planet.  Read more at: https://github.com/iiab/iiab/wiki/IIAB-Maps
-1. More recent OSM data is used in the vector tiles (2017 => 2019).
+   2. Every Map Pack's OSM vector tile data (originally from 2017) was updated to [September 2019](https://archive.org/details/osm-vector-mbtiles).
-4. Increase the base install  (world view) from zoom 9 to 10, so that city search is successful more of the time.
+   3. The world view (planetwide OSM vector maps included with all Map Packs) increased zoom levels from 0-9 to 0-10 (1.74GB osm-planet_z0-z10_2019.mbtiles) so that city search is successful more of the time.
-5. There is a new drag and drop feature which permits the student to add descriptions and pictres about local points of interest, and then save and restore them using their local browser.
+   4. Multiple Map Packs can be downloaded/installed (one "continent" at a time).  However this can waste disk space with duplicate data, and potentially cause rendering slowness in areas where Map Packs overlap ("continent" bounding boxes have been designed to overlap on purpose, so multiple Map Packs are rarely necessary!)
+
+3. **Hi-Res Satellite Photos** can be downloaded/installed for any 100 x 100 km, 300 x 300 km, or 1000 x 1000 km square region (around any map point that you click!)
+   1. These new Hi-Res Satellite Photo Regions are "squares" with 4 additional levels of satellite photo zoom (i.e. zoom levels 10-13) giving you 16X the resolution (i.e. 19 x 19 m pixels) and 256X more photographic information density.
+   2. As compared to Lo-Res Satellite Photos i.e. zoom levels 0-9 (305 x 305 m pixels) everywhere else on the planet (932MB satellite_z0-z9_v3.mbtiles is included with all Map Packs).  (SEE 2. ABOVE)
+   3. Multiple Hi-Res Satellite Photo Regions can be downloaded/installed (one "square" region at a time, thankfully duplicate disk space is avoided when such "squares" overlap!)
+
+4. Some variables have newer meanings:
+   1. `osm_vector_maps_install` in [/etc/iiab/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) means install the map program and 7 levels of zoom (about 40MB ?)
+   2. `osm_vector_maps_enabled` in [/etc/iiab/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) is once again standardized, solving #2484 install delays.
+   3. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means a functioning world map with 7 levels of zoom (z0-z6) has been installed — i.e. a preview of IIAB's mapping system that helps you select Maps Pack(s) and Hi-Res Satellite Photo Region(s) to download and install on your IIAB.  (SEE 1. ABOVE)
+
+5. **Drag-and-Drop Map Overlays** — try this by dragging and dropping any relevant GeoJSON file onto the IIAB Maps (http://box/maps) in your browser!  For example try this GeoJSON file, to explore the shape of gerrymandered US Congressional districts: https://eric.clst.org/assets/wiki/uploads/Stuff/gz_2010_us_500_11_20m.json
+
+6. Similarly but separately: Students can _Right-Click_ on IIAB Maps (http://box/maps) to **add descriptions and photos** of local points of interest<!-- — and then save and restore them using their local browser-->.  Choose "Add Data Point" after right-clicking, and then later "Export Points" to share with others.  [CAN ANYBODY SUGGEST STUDENT/TEACHER OUTDOOR EXPLORATION / GEOSPATIAL ADVENTURE TIPS THAT WORK WELL WITH STUDENT PHONES?]
+
+#### Please also see the IIAB Maps doc: https://github.com/iiab/iiab/wiki/IIAB-Maps

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

@@ -192,13 +192,6 @@
     - iiab-make-init.py
     - iiab-update-map
 
-- name: Install /etc/nginx/osm-vector-maps-nginx.conf from template
-  template:
-    src: osm-vector-maps-nginx.conf.j2
-    dest: /etc/nginx/conf.d/osm-vector-maps-nginx.conf
-  when:
-    osm_vector_maps_install | bool
-
 
 # RECORD OSM Vector Maps AS INSTALLED
 

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

@@ -18,7 +18,7 @@
 
 - name: Enable/Disable/Reload NGINX for OSM, if nginx_enabled
   include_tasks: nginx.yml
-  when: nginx_enabled | bool
+  #when: nginx_enabled | bool    # NGINX is mandatory starting with IIAB 7.2
 
 
 - name: Add 'osm-vector-maps' variable values to {{ iiab_ini_file }}

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

@@ -2,14 +2,13 @@
   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_install | bool
+  when: osm_vector_maps_enabled | 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_install
+  when: not osm_vector_maps_enabled
 
 - name: Reload 'nginx' systemd service
   systemd: