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

Merge pull request #3165 from georgejhunt/maps7.3

Browse source 
Branch Maps7.3 -- includes 2020 OSM data and 2020 satellite images
This commit is contained in:
A Holt 2022-04-21 10:47:07 -04:00 • committed by GitHub
commit 77436eb04d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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<!-- — 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
#### 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
```

13
roles/osm-vector-maps/defaults/main.yml
View file

@ -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: 'maps7.3'
# 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_2020.mbtiles

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

@ -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 }}"