From ad9b21f039b4eb1a81b8580ecefd07fce7768949 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 4 Feb 2022 05:37:38 +0000 Subject: [PATCH 1/4] point to timmoody for catalog and use ghunt test branch --- roles/osm-vector-maps/defaults/main.yml | 13 ++++++++----- roles/osm-vector-maps/tasks/install.yml | 18 +++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml index 5c8f219ba..ae4f6121c 100644 --- a/roles/osm-vector-maps/defaults/main.yml +++ b/roles/osm-vector-maps/defaults/main.yml @@ -8,12 +8,15 @@ # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! # The following soft coded variables allow testing, before pulling PR's into master -osm_repo_url: https://raw.githubusercontent.com/iiab/maps -#osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps -maps_branch: 'master' # Quotes not required -#maps_branch: '7.2-maps' +# osm_repo_url: https://raw.githubusercontent.com/iiab/maps +osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps +#maps_branch: 'master' # Quotes not required +maps_branch: 'jupyter' # soft code sources archive_org_url: https://archive.org/download -map_catalog_url: http://download.iiab.io/content/OSM/vector-tiles +#map_catalog_url: http://download.iiab.io/content/OSM/vector-tiles +map_catalog_url: http://timmoody.com/iiab-files/maps satellite_version: satellite_z0-z9_v3.mbtiles # 2021-12-20: Var unused, but hard-coded in 11 places within https://github.com/iiab/iiab-admin-console -- #3077 discusses map-catalog.json & adm-map-catalog.json +installer_planet: planet_z0-z6_2020.mbtiles +installer_satellite: satellite_z0-z6_v3.mbtiles diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index c57a07700..3bb9e5176 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -85,27 +85,27 @@ - searchapi.php - tileserver.php -- name: Download 34MB {{ map_catalog_url }}/planet_z0-z6_2019.mbtiles to {{ vector_map_path }}/installer/ -- for map installer +- name: Download 34MB {{ map_catalog_url }}/{{ installer_planet }} to {{ vector_map_path }}/installer/ -- for map installer get_url: - url: "{{ map_catalog_url }}/planet_z0-z6_2019.mbtiles" + url: "{{ map_catalog_url }}/{{ installer_planet }}" dest: "{{ vector_map_path }}/installer/" timeout: "{{ download_timeout }}" -- name: Symlink {{ vector_map_path }}/installer/detail.mbtiles -> {{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles +- name: Symlink {{ vector_map_path }}/installer/detail.mbtiles -> {{ vector_map_path }}/installer/{{ installer_planet }} file: - src: "{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles" + src: "{{ vector_map_path }}/installer/{{ installer_planet }}" path: "{{ vector_map_path }}/installer/detail.mbtiles" state: link -- name: Symlink {{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles -> {{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles +- name: Symlink {{ vector_map_path }}/viewer/tiles/{{ installer_planet }} -> {{ vector_map_path }}/installer/{{ installer_planet }} file: - src: "{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles" - path: "{{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles" + src: "{{ vector_map_path }}/installer/{{ installer_planet }}" + path: "{{ vector_map_path }}/viewer/tiles/{{ installer_planet }}" state: link -- name: Download abbreviated satellite images from {{ map_catalog_url }}/satellite_z0-z6_v3.mbtiles to {{ vector_map_path }}/viewer/tiles/ +- name: Download abbreviated satellite images from {{ map_catalog_url }}/{{ installer_satellite }} to {{ vector_map_path }}/viewer/tiles/ get_url: - url: "{{ map_catalog_url }}/satellite_z0-z6_v3.mbtiles" + url: "{{ map_catalog_url }}/{{ installer_satellite }}" dest: "{{ vector_map_path }}/viewer/tiles/" timeout: "{{ download_timeout }}" From 32ad3c31c153bdcb514d85a7ff3b1b8ede1ebc12 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sun, 13 Feb 2022 00:08:17 +0000 Subject: [PATCH 2/4] change satellite installer filename --- roles/osm-vector-maps/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml index ae4f6121c..40b8dc9f3 100644 --- a/roles/osm-vector-maps/defaults/main.yml +++ b/roles/osm-vector-maps/defaults/main.yml @@ -19,4 +19,4 @@ archive_org_url: https://archive.org/download map_catalog_url: http://timmoody.com/iiab-files/maps satellite_version: satellite_z0-z9_v3.mbtiles # 2021-12-20: Var unused, but hard-coded in 11 places within https://github.com/iiab/iiab-admin-console -- #3077 discusses map-catalog.json & adm-map-catalog.json installer_planet: planet_z0-z6_2020.mbtiles -installer_satellite: satellite_z0-z6_v3.mbtiles +installer_satellite: satellite_z0-z6_2020.mbtiles From 2a149d4945490d7bcdc4c2fc48d0488cae82b044 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 4 Mar 2022 04:01:40 +0000 Subject: [PATCH 3/4] change maps branch to maps7.3 --- roles/osm-vector-maps/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml index 40b8dc9f3..e32bc6a1c 100644 --- a/roles/osm-vector-maps/defaults/main.yml +++ b/roles/osm-vector-maps/defaults/main.yml @@ -11,7 +11,7 @@ # osm_repo_url: https://raw.githubusercontent.com/iiab/maps osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps #maps_branch: 'master' # Quotes not required -maps_branch: 'jupyter' +maps_branch: 'maps7.3' # soft code sources archive_org_url: https://archive.org/download From 63f01d0476dc05f55b1a0a139d3e4521875b3db2 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Wed, 23 Mar 2022 05:03:52 +0000 Subject: [PATCH 4/4] how to upgrade maps --- roles/osm-vector-maps/README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/README.md b/roles/osm-vector-maps/README.md index e5acf736e..1aff222c9 100644 --- a/roles/osm-vector-maps/README.md +++ b/roles/osm-vector-maps/README.md @@ -23,6 +23,18 @@ 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. 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 + +#### Notes on upgrading from maps 7.2 to maps 7.3 + +The format of the map-catalog.json has changed. And the programs need to be updated also. This can be accomplished by the following: +``` + cd /library/www/ + rm -rf osm-vector-maps/ + vim /etc/iiab/iiab_state.yml (and delete the line osm-vector-maps) + git remote add ghunt git@github.com:/georgejhunt/iiab + git fetch --all + git checkout -b maps7.3 ghunt/maps7.3 + ./runroles osm-vector-maps +```