From 9f0054d8d539dfd5053fafce9f5797a016cbb20b Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 28 Sep 2020 07:16:08 -0400 Subject: [PATCH 01/24] DRAFT revision of roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 2c4094a1b..1d1f03a55 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -1,11 +1,12 @@ ## What's Changed in Maps for the IIAB 7.2 Release? -1. Two variables in /etc/local_vars have new meanings: - 1. Osm_vector_maps_install means install the map program (about 40MB). - 2. Osm_vector_maps_installed means install a functioning world map to zoom 10 (about 2.8GB). -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). + +1. Two variables have new meanings: + 1. `osm_vector_maps_install` in `/etc/iiab/local_vars.yml` means install the map program (about 40MB). + 2. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means it's been installed. +2. There is a new installer page, separate from the Admin Console, with installs regions and downloads higher resolution satellite imagery from zoom 11 [10?] to zoom 13 (16 times the resolution provided by zoom 10 [9?]). 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. -1. The region size for satellite downloads can be adjusted to 50, 150, or 500KM around a selected map point. -1. More recent OSM data is used in the vector tiles (2017 => 2019). -4. Increase the base install (world view) from zoom 9 to 10, 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. +5. The region size for satellite downloads can be adjusted to 100x100 km, 300x300 km, or 1000x1000 km around a selected map point. +6. More recent OSM data is used in the vector tiles (2017 => 2019) [is this included in all 12 Map Packs?]. +7. Increase the base install (world view) from zoom 9 to 10, so that city search is successful more of the time [is this included in all 12 Map Packs?]. +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 [how does one do this?]. From 3df50f19b9484251d555963c6866b6bfd20ff52f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 28 Sep 2020 07:24:17 -0400 Subject: [PATCH 02/24] WIP: roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 1d1f03a55..6b5394ba7 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -2,11 +2,11 @@ 1. Two variables have new meanings: 1. `osm_vector_maps_install` in `/etc/iiab/local_vars.yml` means install the map program (about 40MB). - 2. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means it's been installed. -2. There is a new installer page, separate from the Admin Console, with installs regions and downloads higher resolution satellite imagery from zoom 11 [10?] to zoom 13 (16 times the resolution provided by zoom 10 [9?]). + 2. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means it's been installed [no longer means "install a functioning world map to zoom 10 (about 2.8GB)" right?]. +2. There is a new installer page (http://box/osm-vector-maps/installer/) separate from the Admin Console, with installs regions and downloads higher resolution satellite imagery from zoom 11 [10?] to zoom 13 (16 times [5x5 km to 5x5 m pixels implies 1000X ?] the resolution provided by zoom 10 [9?]). 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. 5. The region size for satellite downloads can be adjusted to 100x100 km, 300x300 km, or 1000x1000 km around a selected map point. 6. More recent OSM data is used in the vector tiles (2017 => 2019) [is this included in all 12 Map Packs?]. 7. Increase the base install (world view) from zoom 9 to 10, so that city search is successful more of the time [is this included in all 12 Map Packs?]. -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 [how does one do this?]. +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 [how does one do this?]. From 35bd5a6201edf2f9e69fa7cb5252bba24fe3271a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 28 Sep 2020 07:27:55 -0400 Subject: [PATCH 03/24] Question re: osm_vector_maps_enabled --- roles/osm-vector-maps/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 6b5394ba7..e14e0c9e8 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -1,8 +1,9 @@ ## What's Changed in Maps for the IIAB 7.2 Release? -1. Two variables have new meanings: +1. Variables have new meanings: 1. `osm_vector_maps_install` in `/etc/iiab/local_vars.yml` means install the map program (about 40MB). - 2. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means it's been installed [no longer means "install a functioning world map to zoom 10 (about 2.8GB)" right?]. + 2. `osm_vector_maps_enabled` in `/etc/iiab/local_vars.yml` is not currently in use [why if so?]. + 3. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means it's been installed [no longer means "install a functioning world map to zoom 10 (about 2.8GB)" right?]. 2. There is a new installer page (http://box/osm-vector-maps/installer/) separate from the Admin Console, with installs regions and downloads higher resolution satellite imagery from zoom 11 [10?] to zoom 13 (16 times [5x5 km to 5x5 m pixels implies 1000X ?] the resolution provided by zoom 10 [9?]). 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. From 8da71eb35d4db4785f6e0658fe9326da639dc87a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 28 Sep 2020 07:39:48 -0400 Subject: [PATCH 04/24] Revise osm-vector-maps/tasks/install.yml ? --- roles/osm-vector-maps/tasks/install.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 70bb3e73a..f60edc1a9 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -192,12 +192,13 @@ - 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 +# nginx.yml handles this, right? +#- 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 From ceaa42937a2db8eff984410106a6e36fc1fd92f0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 28 Sep 2020 07:42:13 -0400 Subject: [PATCH 05/24] osm-vector-maps/tasks/main.yml: NGINX is now mandatory --- roles/osm-vector-maps/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/tasks/main.yml b/roles/osm-vector-maps/tasks/main.yml index 826f22e39..452005440 100644 --- a/roles/osm-vector-maps/tasks/main.yml +++ b/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 - name: Add 'osm-vector-maps' variable values to {{ iiab_ini_file }} From 5b196543e70d7efb0fed886338ed49908e91170b Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 28 Sep 2020 16:25:27 -0400 Subject: [PATCH 06/24] Important link for roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index e14e0c9e8..06247b34f 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -11,3 +11,5 @@ 6. More recent OSM data is used in the vector tiles (2017 => 2019) [is this included in all 12 Map Packs?]. 7. Increase the base install (world view) from zoom 9 to 10, so that city search is successful more of the time [is this included in all 12 Map Packs?]. 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 [how does one do this?]. + +#### Please also see our IIAB Maps doc: https://github.com/iiab/iiab/wiki/IIAB-Maps From bcb8887346474c24c9dd230cefab15d6285ae8e6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 29 Sep 2020 03:36:53 -0400 Subject: [PATCH 07/24] Another draft of roles/osm-vector-maps/README.md (iiab-extend-sat.py confirms 4 zoom levels added, etc) --- roles/osm-vector-maps/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 06247b34f..2b08d7fa0 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -1,15 +1,15 @@ ## What's Changed in Maps for the IIAB 7.2 Release? -1. Variables have new meanings: +1. Some variables have newer meanings: 1. `osm_vector_maps_install` in `/etc/iiab/local_vars.yml` means install the map program (about 40MB). 2. `osm_vector_maps_enabled` in `/etc/iiab/local_vars.yml` is not currently in use [why if so?]. 3. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means it's been installed [no longer means "install a functioning world map to zoom 10 (about 2.8GB)" right?]. -2. There is a new installer page (http://box/osm-vector-maps/installer/) separate from the Admin Console, with installs regions and downloads higher resolution satellite imagery from zoom 11 [10?] to zoom 13 (16 times [5x5 km to 5x5 m pixels implies 1000X ?] the resolution provided by zoom 10 [9?]). -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. -5. The region size for satellite downloads can be adjusted to 100x100 km, 300x300 km, or 1000x1000 km around a selected map point. +2. There's an "Install IIAB Maps" page (http://box/osm-vector-maps/installer/) separate from the Admin Console, to help you download both Map Pack(s) for your favorite continents, and Hi-Res Satellite Imagery for (square) local regions. That means 4 more levels of satellite zoom (i.e. zoom level 10 to 13) which means 16 times the resolution [5x5 km to 5x5 m pixels implies 1000X the resolution ?] as compared to zoom level 9). +3. OpenStreetMap Vector Maps: multiple Map Packs can be installed, one "continent" at a time. +4. Hi-Res Satellite Photos: multiple (square) local regions can be installed, one at a time. +5. Hi-Res Satellite Photos can be downloaded for any 100x100 km, 300x300 km, or 1000x1000 km region, around a selected map point. 6. More recent OSM data is used in the vector tiles (2017 => 2019) [is this included in all 12 Map Packs?]. -7. Increase the base install (world view) from zoom 9 to 10, so that city search is successful more of the time [is this included in all 12 Map Packs?]. +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 [is this included in all 12 Map Packs?]. 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 [how does one do this?]. #### Please also see our IIAB Maps doc: https://github.com/iiab/iiab/wiki/IIAB-Maps From 65611c60c954b976f54717e40376f16fa0d80ebc Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 29 Sep 2020 20:00:46 -0400 Subject: [PATCH 08/24] WIP: roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 2b08d7fa0..3841b4634 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -2,14 +2,14 @@ 1. Some variables have newer meanings: 1. `osm_vector_maps_install` in `/etc/iiab/local_vars.yml` means install the map program (about 40MB). - 2. `osm_vector_maps_enabled` in `/etc/iiab/local_vars.yml` is not currently in use [why if so?]. - 3. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means it's been installed [no longer means "install a functioning world map to zoom 10 (about 2.8GB)" right?]. -2. There's an "Install IIAB Maps" page (http://box/osm-vector-maps/installer/) separate from the Admin Console, to help you download both Map Pack(s) for your favorite continents, and Hi-Res Satellite Imagery for (square) local regions. That means 4 more levels of satellite zoom (i.e. zoom level 10 to 13) which means 16 times the resolution [5x5 km to 5x5 m pixels implies 1000X the resolution ?] as compared to zoom level 9). -3. OpenStreetMap Vector Maps: multiple Map Packs can be installed, one "continent" at a time. -4. Hi-Res Satellite Photos: multiple (square) local regions can be installed, one at a time. -5. Hi-Res Satellite Photos can be downloaded for any 100x100 km, 300x300 km, or 1000x1000 km region, around a selected map point. -6. More recent OSM data is used in the vector tiles (2017 => 2019) [is this included in all 12 Map Packs?]. -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 [is this included in all 12 Map Packs?]. -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 [how does one do this?]. + 2. `osm_vector_maps_enabled` in `/etc/iiab/local_vars.yml` is not currently in use. [why if so?] + 3. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means it's been installed. [no longer means "install a functioning world map to zoom 10 (about 2.8GB)" right?] +2. There's an "Install IIAB Maps" page (http://box/osm-vector-maps/installer/) separate from the Admin Console, to help you download Map Pack(s) for your favorite continents, and Hi-Res Satellite Photo Imagery for (square) local regions. This lets you to add satellite photos with 4 more levels of zoom (i.e. zoom level 10-13) to get 16X the resolution (i.e. 19 x 19 m pixels) — as compared to zoom level 9 (i.e. 306 x 306 m pixels) everywhere else. +3. OpenStreetMap Vector Maps: multiple Map Packs can be installed (one "continent" at a time). +4. Hi-Res Satellite Photos: multiple local regions can be 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. More recent OSM data is used in the vector tiles (2017 => 2019). [is this included in all 12 Map Packs? who did the 2019 updates?] +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. [is this included in all 12 Map Packs?] +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?] #### Please also see our IIAB Maps doc: https://github.com/iiab/iiab/wiki/IIAB-Maps From 2fae6b0dd8f5689a9c64dc0a83fbb8a693cd7247 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 29 Sep 2020 22:52:20 -0400 Subject: [PATCH 09/24] osm-vector-maps/README.md & osm_vector_maps_enabled experiment for IIAB 7.2 RC2 --- roles/osm-vector-maps/README.md | 14 ++++++++------ roles/osm-vector-maps/tasks/install.yml | 3 ++- roles/osm-vector-maps/tasks/main.yml | 2 +- roles/osm-vector-maps/tasks/nginx.yml | 16 ++++++++++++++-- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 3841b4634..54451654a 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -2,14 +2,16 @@ 1. Some variables have newer meanings: 1. `osm_vector_maps_install` in `/etc/iiab/local_vars.yml` means install the map program (about 40MB). - 2. `osm_vector_maps_enabled` in `/etc/iiab/local_vars.yml` is not currently in use. [why if so?] - 3. `osm_vector_maps_installed` in `/etc/iiab/iiab_state.yml` means it's been installed. [no longer means "install a functioning world map to zoom 10 (about 2.8GB)" right?] -2. There's an "Install IIAB Maps" page (http://box/osm-vector-maps/installer/) separate from the Admin Console, to help you download Map Pack(s) for your favorite continents, and Hi-Res Satellite Photo Imagery for (square) local regions. This lets you to add satellite photos with 4 more levels of zoom (i.e. zoom level 10-13) to get 16X the resolution (i.e. 19 x 19 m pixels) — as compared to zoom level 9 (i.e. 306 x 306 m pixels) everywhere else. + 2. `osm_vector_maps_enabled` in `/etc/iiab/local_vars.yml` 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. [NO LONGER 2.8GB & HOURLONG WAIT TO DOWNLOAD 10 ZOOM LEVELS PER #2484, PR #2486, PR #2487 ETC] +2. There's an "Install IIAB Maps" page (http://box/osm-vector-maps/installer/) separate from the Admin Console, to help you download Map Pack(s) for your favorite continents, and Hi-Res Satellite Photo Regions serving 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. As compared to Lo-Res Satellite Photos i.e. zooms level 0-9 (306 x 306 m pixels) everywhere else on the planet. 3. OpenStreetMap Vector Maps: multiple Map Packs can be installed (one "continent" at a time). 4. Hi-Res Satellite Photos: multiple local regions can be 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. More recent OSM data is used in the vector tiles (2017 => 2019). [is this included in all 12 Map Packs? who did the 2019 updates?] -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. [is this included in all 12 Map Packs?] -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?] +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?] #### Please also see our IIAB Maps doc: https://github.com/iiab/iiab/wiki/IIAB-Maps diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index f60edc1a9..bdafd9b51 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -192,7 +192,8 @@ - iiab-make-init.py - iiab-update-map -# nginx.yml handles this, right? +# 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 diff --git a/roles/osm-vector-maps/tasks/main.yml b/roles/osm-vector-maps/tasks/main.yml index 452005440..e10a47df3 100644 --- a/roles/osm-vector-maps/tasks/main.yml +++ b/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 }} diff --git a/roles/osm-vector-maps/tasks/nginx.yml b/roles/osm-vector-maps/tasks/nginx.yml index c02aa8281..b0d852b3b 100644 --- a/roles/osm-vector-maps/tasks/nginx.yml +++ b/roles/osm-vector-maps/tasks/nginx.yml @@ -2,14 +2,26 @@ 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 + #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_install + when: not osm_vector_maps_enabled + #when: not osm_vector_maps_install - name: Reload 'nginx' systemd service systemd: From 3a628ed274df212ae0195f3b22f01d43e67080d2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 29 Sep 2020 23:03:49 -0400 Subject: [PATCH 10/24] Math typo in roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 54451654a..af925e86b 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -6,7 +6,7 @@ 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. [NO LONGER 2.8GB & HOURLONG WAIT TO DOWNLOAD 10 ZOOM LEVELS PER #2484, PR #2486, PR #2487 ETC] 2. There's an "Install IIAB Maps" page (http://box/osm-vector-maps/installer/) separate from the Admin Console, to help you download Map Pack(s) for your favorite continents, and Hi-Res Satellite Photo Regions serving 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. As compared to Lo-Res Satellite Photos i.e. zooms level 0-9 (306 x 306 m pixels) everywhere else on the planet. + 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 installed (one "continent" at a time). 4. Hi-Res Satellite Photos: multiple local regions can be 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). From 5c7cb449e734ed593922a23bbacd749866b64ae3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 30 Sep 2020 08:25:18 -0400 Subject: [PATCH 11/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index af925e86b..25bcf4980 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -3,7 +3,7 @@ 1. Some variables have newer meanings: 1. `osm_vector_maps_install` in `/etc/iiab/local_vars.yml` means install the map program (about 40MB). 2. `osm_vector_maps_enabled` in `/etc/iiab/local_vars.yml` 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. [NO LONGER 2.8GB & HOURLONG WAIT TO DOWNLOAD 10 ZOOM LEVELS PER #2484, PR #2486, PR #2487 ETC] + 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/) separate from the Admin Console, to help you download Map Pack(s) for your favorite continents, and Hi-Res Satellite Photo Regions serving 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. As compared to Lo-Res Satellite Photos i.e. zooms level 0-9 (305 x 305 m pixels) everywhere else on the planet. From 185f03487db97fc3b3dd67876928fb35383a7261 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 30 Sep 2020 08:36:36 -0400 Subject: [PATCH 12/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 25bcf4980..02a73f6fd 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -1,9 +1,9 @@ ## What's Changed in Maps for the IIAB 7.2 Release? 1. Some variables have newer meanings: - 1. `osm_vector_maps_install` in `/etc/iiab/local_vars.yml` means install the map program (about 40MB). - 2. `osm_vector_maps_enabled` in `/etc/iiab/local_vars.yml` 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] + 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/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) 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/) separate from the Admin Console, to help you download Map Pack(s) for your favorite continents, and Hi-Res Satellite Photo Regions serving 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. As compared to Lo-Res Satellite Photos i.e. zooms level 0-9 (305 x 305 m pixels) everywhere else on the planet. From fb5c1eec1cc21c31a7130e5f73750f2284c2b9c1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 30 Sep 2020 09:35:54 -0400 Subject: [PATCH 13/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 02a73f6fd..4fdd2a22c 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -4,11 +4,11 @@ 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/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) 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/) separate from the Admin Console, to help you download Map Pack(s) for your favorite continents, and Hi-Res Satellite Photo Regions serving local communities. +2. There's an "Install IIAB Maps" page (http://box/osm-vector-maps/installer/) 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. 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 installed (one "continent" at a time). -4. Hi-Res Satellite Photos: multiple local regions can be installed (one "square" at a time). +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. From bb48ed40a5b9ae340b0dd52496c7ec29d61ce036 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 30 Sep 2020 09:38:15 -0400 Subject: [PATCH 14/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 4fdd2a22c..6c0a02445 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -3,7 +3,7 @@ 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/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) 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] + 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/) 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. As compared to Lo-Res Satellite Photos i.e. zooms level 0-9 (305 x 305 m pixels) everywhere else on the planet. From d14e9ad5ac6c4d5011a36cb5bde00534411dfacf Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 30 Sep 2020 09:50:18 -0400 Subject: [PATCH 15/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 6c0a02445..b34df8a7f 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -4,7 +4,7 @@ 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/) 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. +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. 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). From 1b6162420a38f82f4e794416fb90b49cb6d5c3b2 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 30 Sep 2020 15:39:08 -0400 Subject: [PATCH 16/24] OSM for IIAB 7.2 clarifs/cleanups thx to call w/ @georgejhunt --- roles/osm-vector-maps/README.md | 24 ++++++++++++++---------- roles/osm-vector-maps/tasks/install.yml | 9 --------- roles/osm-vector-maps/tasks/nginx.yml | 13 ------------- 3 files changed, 14 insertions(+), 32 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index b34df8a7f..34208f620 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -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 diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index bdafd9b51..dbcd49351 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -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 diff --git a/roles/osm-vector-maps/tasks/nginx.yml b/roles/osm-vector-maps/tasks/nginx.yml index b0d852b3b..b764220d6 100644 --- a/roles/osm-vector-maps/tasks/nginx.yml +++ b/roles/osm-vector-maps/tasks/nginx.yml @@ -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: From 2e7fcbc2b133a891ddc98ee1d9f21f697b04109a Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 30 Sep 2020 17:27:01 -0400 Subject: [PATCH 17/24] 6 bullets: reorganize roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 42 ++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 34208f620..8773a80de 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -1,21 +1,29 @@ -## What's Changed in Maps for the IIAB 7.2 Release? +## What's New with IIAB Maps for the IIAB 7.2 Release? -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) 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. +#### See also the [IIAB 7.2 Release Notes](https://github.com/iiab/iiab/wiki/IIAB-7.2-Release-Notes). -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. +1. There's a new **Install IIAB Maps** page (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. + 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. And then likewise for Hi-Res Satellite Photo Regions serving your local communities. (SEE 3. BELOW) -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?] +2. **Map Packs** are no longer bundle both data and program in a .zip file. All Map Packs are now a collection of 3 .mbtiles files. + 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.8GB .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 + 2. Map Packs' OSM vector tile data (from 2017) was updated to data from [September 2019](https://archive.org/details/osm-vector-mbtiles). + 3. The world view (planetwide OSM vector maps included with all Map Packs) increased 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. + 4. Multiple Map Packs can be downloaded/installed (one "continent" at a time). However this can waste disk space with duplicate data (and "continent" bounding boxes have been designed so that this is rarely necessary!) -#### Please also see our IIAB Maps doc: https://github.com/iiab/iiab/wiki/IIAB-Maps +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. zooms level 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, even if they 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 (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 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. 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. [CAN ANYBODY SUGGEST STUDENT/TEACHER GEOGRAPHIC ADVENTURE & LOCAL EXPLORATION TIPS THAT WORK ON PHONES?] + +#### Please also see the IIAB Maps doc: https://github.com/iiab/iiab/wiki/IIAB-Maps From 7e00ef85418a3db907f5f4085b8654d9cc99d40a Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 30 Sep 2020 17:38:47 -0400 Subject: [PATCH 18/24] Polish roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 8773a80de..df23e541f 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -2,14 +2,14 @@ #### See also the [IIAB 7.2 Release Notes](https://github.com/iiab/iiab/wiki/IIAB-7.2-Release-Notes). -1. There's a new **Install IIAB Maps** page (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. +1. There's a new **Install IIAB Maps** page (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: 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. And then likewise for Hi-Res Satellite Photo Regions serving your local communities. (SEE 3. BELOW) -2. **Map Packs** are no longer bundle both data and program in a .zip file. All Map Packs are now a collection of 3 .mbtiles files. - 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.8GB .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 +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 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 2. Map Packs' OSM vector tile data (from 2017) was updated to data from [September 2019](https://archive.org/details/osm-vector-mbtiles). - 3. The world view (planetwide OSM vector maps included with all Map Packs) increased 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. + 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. 4. Multiple Map Packs can be downloaded/installed (one "continent" at a time). However this can waste disk space with duplicate data (and "continent" bounding boxes have been designed so that this is 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!) From 8581616ac380f131f584d4a654dacff4e073132e Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 1 Oct 2020 07:47:16 -0400 Subject: [PATCH 19/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index df23e541f..31db3d418 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -1,26 +1,24 @@ ## What's New with IIAB Maps for the IIAB 7.2 Release? -#### See also the [IIAB 7.2 Release Notes](https://github.com/iiab/iiab/wiki/IIAB-7.2-Release-Notes). - -1. There's a new **Install IIAB Maps** page (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: +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: 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. And then likewise for Hi-Res Satellite Photo Regions serving your local communities. (SEE 3. BELOW) + 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) 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 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 - 2. Map Packs' OSM vector tile data (from 2017) was updated to data from [September 2019](https://archive.org/details/osm-vector-mbtiles). + 2. Map Packs' OSM vector tile data (originally from 2017) was updated to [September 2019](https://archive.org/details/osm-vector-mbtiles). 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. - 4. Multiple Map Packs can be downloaded/installed (one "continent" at a time). However this can waste disk space with duplicate data (and "continent" bounding boxes have been designed so that this is rarely necessary!) + 4. Multiple Map Packs can be downloaded/installed (one "continent" at a time). However this can waste disk space with duplicate data ("continent" bounding boxes have been designed to overlap on purpose, so that 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. + 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. zooms level 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, even if they overlap!) + 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 (about 40MB). + 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 Satellite Photo Region(s) to download and install on your IIAB. (SEE 1. ABOVE) + 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 From fecd0a57234c342aaa82e8e017b8d589f999877f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 1 Oct 2020 07:58:56 -0400 Subject: [PATCH 20/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 31db3d418..499e7cfc1 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -6,13 +6,13 @@ 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 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 - 2. Map Packs' OSM vector tile data (originally from 2017) was updated to [September 2019](https://archive.org/details/osm-vector-mbtiles). + 2. Every Map Pack's OSM vector tile data (originally from 2017) was updated to [September 2019](https://archive.org/details/osm-vector-mbtiles). 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. 4. Multiple Map Packs can be downloaded/installed (one "continent" at a time). However this can waste disk space with duplicate data ("continent" bounding boxes have been designed to overlap on purpose, so that 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. zooms level 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) + 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: From f8d67aee486b7f336f1626db24fc0520ef4972a9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 1 Oct 2020 08:48:53 -0400 Subject: [PATCH 21/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index 499e7cfc1..a8d7c5498 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -1,4 +1,4 @@ -## What's New with IIAB Maps for the IIAB 7.2 Release? +## What's New with IIAB Maps in IIAB 7.2? 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: 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) From 0217d16f0603f628c9f14f4a96d992b272731afa Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 1 Oct 2020 14:08:58 -0400 Subject: [PATCH 22/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index a8d7c5498..d95b02159 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -22,6 +22,6 @@ 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. 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. [CAN ANYBODY SUGGEST STUDENT/TEACHER GEOGRAPHIC ADVENTURE & LOCAL EXPLORATION TIPS THAT WORK ON PHONES?] +6. Similarly but separately: Students can _Right-Click_ on IIAB Maps (http://box/maps) to **add descriptions and photos** of local points of interest. 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 From 14da7d6536a2c40559fed0fd962cef0192b77e87 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 1 Oct 2020 17:08:06 -0400 Subject: [PATCH 23/24] Gitea 1.12.4 -> 1.12.5 --- roles/gitea/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index b21a68bdc..282527e53 100644 --- a/roles/gitea/defaults/main.yml +++ b/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 From 7e668cb6bc8b3ef7a7fa35ea9195c522f41541c9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 2 Oct 2020 09:54:59 -0400 Subject: [PATCH 24/24] Update roles/osm-vector-maps/README.md --- roles/osm-vector-maps/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index d95b02159..f1e7c39f1 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -8,7 +8,7 @@ 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 2. Every Map Pack's OSM vector tile data (originally from 2017) was updated to [September 2019](https://archive.org/details/osm-vector-mbtiles). 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. - 4. Multiple Map Packs can be downloaded/installed (one "continent" at a time). However this can waste disk space with duplicate data ("continent" bounding boxes have been designed to overlap on purpose, so that multiple Map Packs are rarely necessary!) + 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.