external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

OSM for IIAB 7.2 clarifs/cleanups thx to call w/ @georgejhunt

Browse source
This commit is contained in:
root 2020-09-30 15:39:08 -04:00
parent d14e9ad5ac
commit 1b6162420a
3 changed files with 14 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

24
roles/osm-vector-maps/README.md
View file

@ -2,16 +2,20 @@
1. 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 (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) was not in use. [CAN WE SPELL OUT WHY? SEE tasks/nginx.yml AND TKTS BELOW]
3. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means a functioning world map to with 7 levels of zoom (z0-z6) has been installed. [LIKELY EXPLANATION: THE HOURLONG WAIT FOR 2.8 GB TO DOWNLOAD 10 ZOOM LEVELS WAS REDUCED, TO A PREVIEW OF 7 ZOOM LEVELS, PER #2484, PR #2486, PR #2487 ETC]
2. There's an "Install IIAB Maps" page (http://box/osm-vector-maps/installer/, PR [iiab/maps#29](https://github.com/iiab/maps/pull/29)) separate from the Admin Console, to help you download/install Map Pack(s) for your favorite continents, and Hi-Res Satellite Photo Regions serving your local communities.
1. Hi-Res Satellite Photo Regions are 'squares' with 4 more 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. `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 Satellite Photo Region(s) to download and install on your IIAB.
2. There's a new "Install IIAB Maps" page (http://box/osm-vector-maps/installer/, PR [iiab/maps#29](https://github.com/iiab/maps/pull/29)) separate from IIAB's Admin Console, to facilitate this selecting/downloading/installing of Map Pack(s) for your favorite continents — and then likewise for Hi-Res Satellite Photo Regions serving your local communities.
1. The new Hi-Res Satellite Photo Regions are 'squares' with 4 more 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. zooms level 0-9 (305 x 305 m pixels) everywhere else on the planet.
3. OpenStreetMap Vector Maps: multiple Map Packs can be downloaded/installed (one "continent" at a time).
4. Hi-Res Satellite Photos: multiple local regions can be downloaded/installed (one "square" at a time).
5. Hi-Res Satellite Photos can be downloaded for any 100 x 100 km, 300 x 300 km, or 1000 x 1000 km square region (around a selected map point).
6. Map Packs' OSM vector tile data (from 2017) was updated to 2019 data. [WHO GENERATED THE 2019 VECTOR TILES? WHEN IN 2019?]
7. The base install (world view) increases zoom levels from 0-9 to 0-10, so that city search is successful more of the time.
8. There is a new drag-and-drop feature which permits the student to add descriptions and pictures about local points of interest, and then save and restore them using their local browser. [BY RIGHT CLICKING? ANY TEACHER TIPS AND/OR HINTS AS TO HOW THIS WORKS?]
3. Map Packs no longer bundle both data and program in a .zip file. All Map Packs are now a collection of 3 .mbtiles files. The main focus of a Map Pack remains Hi-Res Vector Map data from OpenStreetMap, for your selected "continent," but read more at: https://github.com/iiab/iiab/wiki/IIAB-Maps
4. Multiple Map Packs can be downloaded/installed (one "continent" at a time!)
5. 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 the map point that you click).
6. Hi-Res Satellite Photos: multiple regions can be downloaded/installed (one "square" region at a time, even if they overlap!)
7. Map Packs' OSM vector tile data (from 2017) was updated to data from [September 2019](https://archive.org/details/osm-vector-mbtiles).
8. The world view (planetwide OSM vector maps included with all Map Packs) increases zoom levels from 0-9 to 0-10 (1.8GB osm-planet_z0-z10_2019.mbtiles) so that city search is successful more of the time.
9. There is a new **drag-and-drop** feature that instantly displays map overlays — try to drag any relevant GeoJSON file onto the IIAB Maps (http://box/maps) shown in your browser! For example try this GeoJSON file, to explore gerrymandered US Congressional districts: https://eric.clst.org/assets/wiki/uploads/Stuff/gz_2010_us_500_11_20m.json
10. Separately: Students can **right-click** on the map to add points, descriptions and photos of local points of interest — and then save and restore them using their local browser! [CAN ANYBODY SUGGEST TEACHER TIPS AND/OR STUDENT HINTS AS TO HOW THIS WORKS?]
#### Please also see our IIAB Maps doc: https://github.com/iiab/iiab/wiki/IIAB-Maps

9
roles/osm-vector-maps/tasks/install.yml
View file

@ -192,15 +192,6 @@
- iiab-make-init.py
- iiab-update-map
# nginx.yml handles this. Please see discussion/question in tasks/nginx.yml
#
#- 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

13
roles/osm-vector-maps/tasks/nginx.yml
View file

@ -3,25 +3,12 @@
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
# 2020-09-29: @georgejhunt can u explain more the PR #2486 comment just above ?
#
# osm_vector_maps_install is _always_ true here, so doesn't serve a purpose in
# when: conditions. What underlying issue are we trying to solve? If this is
# to enable a functioning world map to zoom level 7-or-10, can we be honest in
# saying "enablement" IS essentially required...in most/all situations? @holta
#
# SEE: #2484, PR #2486, #2487 mentioned @ roles/osm-vector-maps/README.md
- 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: