mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
Merge pull request #2548 from holta/lint-for-release
Lint for release: osm-vector-maps indentation/spacing
This commit is contained in:
A Holt
GitHub
commit
1d844134f0
2 changed files with 99 additions and 96 deletions
|
|
@ -1,19 +1,19 @@
|
||||||
- name: Make the required directories for Maps
|
- name: Make the required directories for Maps
|
||||||
file:
|
file:
|
||||||
path: '{{ item }}'
|
path: "{{ item }}"
|
||||||
state: directory
|
state: directory
|
||||||
mode: '0755'
|
mode: '0755'
|
||||||
with_items:
|
with_items:
|
||||||
- '{{ vector_map_path }}/test-page/assets'
|
- "{{ vector_map_path }}/test-page/assets" # /library/www/osm-vector-maps
|
||||||
- '{{ vector_map_path }}/maplist/assets'
|
- "{{ vector_map_path }}/maplist/assets"
|
||||||
- '{{ vector_map_path }}/viewer/assets'
|
- "{{ vector_map_path }}/viewer/assets"
|
||||||
- '{{ vector_map_path }}/viewer/tiles'
|
- "{{ vector_map_path }}/viewer/tiles"
|
||||||
- '{{ vector_map_path }}/installer'
|
- "{{ vector_map_path }}/installer"
|
||||||
|
|
||||||
- name: Copy the map catalog to /etc/iiab/map-catalog.json
|
- name: Copy the map catalog to /etc/iiab/map-catalog.json
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ map_catalog_url }}/map-catalog.json"
|
url: "{{ map_catalog_url }}/map-catalog.json" # http://download.iiab.io/content/OSM/vector-tiles
|
||||||
dest: /etc/iiab/
|
dest: "{{ iiab_etc_path }}" # /etc/iiab
|
||||||
|
|
||||||
- name: Download map catalog {{ iiab_map_url }}/assets/regions.json to {{ iiab_etc_path }}
|
- name: Download map catalog {{ iiab_map_url }}/assets/regions.json to {{ iiab_etc_path }}
|
||||||
get_url:
|
get_url:
|
||||||
|
|
@ -28,24 +28,24 @@
|
||||||
- name: Fetch the city database
|
- name: Fetch the city database
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ iiab_map_url }}/regional-resources/cities1000.sqlite"
|
url: "{{ iiab_map_url }}/regional-resources/cities1000.sqlite"
|
||||||
dest: '{{ vector_map_path }}/viewer/cities1000.sqlite'
|
dest: "{{ vector_map_path }}/viewer/cities1000.sqlite"
|
||||||
when: not cities_installed.stat.exists
|
when: not cities_installed.stat.exists
|
||||||
|
|
||||||
- name: Create a link to osm catalog in /common/assets
|
- name: Create a link to osm catalog in /common/assets
|
||||||
file:
|
file:
|
||||||
src: "/etc/iiab/map-catalog.json"
|
src: /etc/iiab/map-catalog.json
|
||||||
dest: "{{ doc_root }}/common/assets/map-catalog.json"
|
dest: "{{ doc_root }}/common/assets/map-catalog.json" # /library/www/html
|
||||||
state: link
|
state: link
|
||||||
|
|
||||||
- name: Create a link to osm catalog in {{ vector_map_path }}/maplist/assets
|
- name: Create a link to osm catalog in {{ vector_map_path }}/maplist/assets
|
||||||
file:
|
file:
|
||||||
src: "/etc/iiab/map-catalog.json"
|
src: /etc/iiab/map-catalog.json
|
||||||
dest: "{{ vector_map_path }}/test-page/assets/map-catalog.json"
|
dest: "{{ vector_map_path }}/test-page/assets/map-catalog.json"
|
||||||
state: link
|
state: link
|
||||||
|
|
||||||
- name: Create a link to regions.json in {{ vector_map_path }}/maplist/assets
|
- name: Create a link to regions.json in {{ vector_map_path }}/maplist/assets
|
||||||
file:
|
file:
|
||||||
src: "/etc/iiab/regions.json"
|
src: /etc/iiab/regions.json
|
||||||
dest: "{{ vector_map_path }}/maplist/assets/regions.json"
|
dest: "{{ vector_map_path }}/maplist/assets/regions.json"
|
||||||
state: link
|
state: link
|
||||||
|
|
||||||
|
|
@ -53,152 +53,153 @@
|
||||||
# At this point, fetches from github.com/georgejhunt/maps from test branch
|
# At this point, fetches from github.com/georgejhunt/maps from test branch
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ item }}"
|
url: "{{ item }}"
|
||||||
dest: '{{ vector_map_path }}/test-page/'
|
dest: "{{ vector_map_path }}/test-page/"
|
||||||
with_items:
|
with_items:
|
||||||
- "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/test-page-bundle.js"
|
- "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/test-page-bundle.js" # https://raw.githubusercontent.com/iiab/maps / master
|
||||||
- "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/index.html"
|
- "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/index.html"
|
||||||
|
|
||||||
- name: Fetch the javascript bundle with openlayers for Viewer page
|
- name: Fetch the javascript bundle with openlayers for Viewer page
|
||||||
# At this point, fetches from github.com/iiab/maps from {{ maps_branch }} branch
|
# At this point, fetches from github.com/iiab/maps from {{ maps_branch }} branch
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/build/{{ item }}"
|
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/build/{{ item }}"
|
||||||
dest: '{{ vector_map_path }}/viewer/'
|
dest: "{{ vector_map_path }}/viewer/"
|
||||||
with_items:
|
with_items:
|
||||||
- index.html
|
- index.html
|
||||||
- viewer-bundle.js
|
- viewer-bundle.js
|
||||||
- viewer-bundle.js.map
|
- viewer-bundle.js.map
|
||||||
|
|
||||||
- name: Get the helper files for viewer
|
- name: Get the helper files for viewer
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/{{ item }}"
|
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/{{ item }}"
|
||||||
dest: '{{ vector_map_path }}/viewer/'
|
dest: "{{ vector_map_path }}/viewer/"
|
||||||
with_items:
|
with_items:
|
||||||
- mbtileinfo.php
|
- mbtileinfo.php
|
||||||
- popup.css
|
- popup.css
|
||||||
- searchapi.php
|
- searchapi.php
|
||||||
- tileserver.php
|
- tileserver.php
|
||||||
|
|
||||||
- name: Copy the map installer mbtiles
|
- name: Copy the map installer mbtiles
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ map_catalog_url }}/planet_z0-z6_2019.mbtiles"
|
url: "{{ map_catalog_url }}/planet_z0-z6_2019.mbtiles"
|
||||||
dest: '{{ vector_map_path }}/installer/'
|
dest: "{{ vector_map_path }}/installer/"
|
||||||
|
|
||||||
- name: Create a synlink from tiles to detail.mbtiles
|
- name: Create a synlink from tiles to detail.mbtiles
|
||||||
file:
|
file:
|
||||||
src: '{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles'
|
src: "{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles"
|
||||||
dest: '{{ vector_map_path }}/installer/detail.mbtiles'
|
dest: "{{ vector_map_path }}/installer/detail.mbtiles"
|
||||||
state: link
|
state: link
|
||||||
|
|
||||||
- name: Link to the World Map to zoom 6
|
- name: Link to the World Map to zoom 6
|
||||||
file:
|
file:
|
||||||
src: '{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles'
|
src: "{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles"
|
||||||
dest: '{{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles'
|
dest: "{{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles"
|
||||||
state: link
|
state: link
|
||||||
|
|
||||||
- name: Copy the map abbreviated satellite images
|
- name: Copy the map abbreviated satellite images
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ map_catalog_url }}/satellite_z0-z6_v3.mbtiles"
|
url: "{{ map_catalog_url }}/satellite_z0-z6_v3.mbtiles"
|
||||||
dest: '{{ vector_map_path }}/viewer/tiles/satellite_z0-z6_v3.mbtiles'
|
dest: "{{ vector_map_path }}/viewer/tiles/satellite_z0-z6_v3.mbtiles"
|
||||||
|
|
||||||
- name: Fetch the javascript bundle for map installer
|
- name: Fetch the javascript bundle for map installer
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/installer/build/{{ item }}"
|
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/installer/build/{{ item }}"
|
||||||
dest: '{{ vector_map_path }}/installer/'
|
dest: "{{ vector_map_path }}/installer/"
|
||||||
with_items:
|
with_items:
|
||||||
- index.html
|
- index.html
|
||||||
- installer-bundle.js
|
- installer-bundle.js
|
||||||
|
|
||||||
- name: Fetch the action routines for installer
|
- name: Fetch the action routines for installer
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/installer/{{ item }}"
|
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/installer/{{ item }}"
|
||||||
dest: '{{ vector_map_path }}/installer/'
|
dest: "{{ vector_map_path }}/installer/"
|
||||||
with_items:
|
with_items:
|
||||||
- map.css
|
- map.css
|
||||||
- style-osm.json
|
- style-osm.json
|
||||||
- installer-functions.js
|
- installer-functions.js
|
||||||
- tileserver.php
|
- tileserver.php
|
||||||
|
|
||||||
# the following was changed to grab from the iiab/maps repo
|
# the following was changed to grab from the iiab/maps repo
|
||||||
- name: Copy the common assets for the general purpose map viewer
|
- name: Copy the common assets for the general purpose map viewer
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/assets/{{ item }}"
|
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/assets/{{ item }}"
|
||||||
dest: "{{ vector_map_path }}/viewer/assets"
|
dest: "{{ vector_map_path }}/viewer/assets"
|
||||||
with_items:
|
with_items:
|
||||||
- bboxes.geojson
|
- bboxes.geojson
|
||||||
- center.png
|
- center.png
|
||||||
- countries.json
|
- countries.json
|
||||||
- fonts.css
|
- fonts.css
|
||||||
- ol-layerswitcher.css
|
- ol-layerswitcher.css
|
||||||
- ol-contextmenu.css
|
- ol-contextmenu.css
|
||||||
- pin_drop.png
|
- pin_drop.png
|
||||||
- sprite@2x.json
|
- sprite@2x.json
|
||||||
- sprite@2x.png
|
- sprite@2x.png
|
||||||
- sprite.json
|
- sprite.json
|
||||||
- sprite.png
|
- sprite.png
|
||||||
- style-cdn.json
|
- style-cdn.json
|
||||||
- style-osm.json
|
- style-osm.json
|
||||||
- style-sat.json
|
- style-sat.json
|
||||||
- view_list.png
|
- view_list.png
|
||||||
|
|
||||||
- name: Place a link to bboxes.geojson for Admin Console
|
- name: Place a link to bboxes.geojson for Admin Console
|
||||||
file:
|
file:
|
||||||
src: "{{ vector_map_path }}/viewer/assets/bboxes.geojson"
|
src: "{{ vector_map_path }}/viewer/assets/bboxes.geojson"
|
||||||
dest: "{{ vector_map_path }}/maplist/assets/bboxes.geojson"
|
dest: "{{ vector_map_path }}/maplist/assets/bboxes.geojson"
|
||||||
state: link
|
state: link
|
||||||
force: True
|
force: True
|
||||||
|
|
||||||
- name: Place a link to countries.json for Admin Console
|
- name: Place a link to countries.json for Admin Console
|
||||||
file:
|
file:
|
||||||
src: "{{ vector_map_path }}/viewer/assets/countries.json"
|
src: "{{ vector_map_path }}/viewer/assets/countries.json"
|
||||||
dest: "{{ vector_map_path }}/maplist/assets/countries.json"
|
dest: "{{ vector_map_path }}/maplist/assets/countries.json"
|
||||||
state: link
|
state: link
|
||||||
force: True
|
force: True
|
||||||
|
|
||||||
- name: Copy the fonts for the general purpose map viewer
|
- name: Copy the fonts for the general purpose map viewer
|
||||||
copy:
|
copy:
|
||||||
src: "{{ item }}"
|
src: "{{ item }}"
|
||||||
dest: "{{ doc_root }}/common/fonts/"
|
dest: "{{ doc_root }}/common/fonts/"
|
||||||
mode: 0644
|
mode: 0644
|
||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
with_fileglob:
|
with_fileglob:
|
||||||
- fonts/*
|
- fonts/*
|
||||||
|
|
||||||
- name: Copy the redirect to the test page
|
- name: Copy the redirect to the test page
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/installer-index.redirect"
|
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/installer-index.redirect"
|
||||||
dest: "{{ vector_map_path }}/maplist/index.html"
|
dest: "{{ vector_map_path }}/maplist/index.html"
|
||||||
force: yes
|
force: yes
|
||||||
|
|
||||||
- name: Get packages necessary for map installation
|
- name: Get packages necessary for map installation
|
||||||
package:
|
package:
|
||||||
state: present
|
state: present
|
||||||
name:
|
name:
|
||||||
- python3-wget
|
- python3-wget
|
||||||
- "php{{ php_version }}-sqlite3"
|
- "php{{ php_version }}-sqlite3"
|
||||||
- python3-geojson
|
- python3-geojson
|
||||||
- python3-pil
|
- python3-pil
|
||||||
|
|
||||||
- name: Copy a scripts to download tiles
|
- name: Copy a scripts to download tiles
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/scripts/{{ item }}"
|
url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/scripts/{{ item }}"
|
||||||
dest: /usr/bin/
|
dest: /usr/bin/
|
||||||
mode: 0755
|
mode: 0755
|
||||||
with_items:
|
with_items:
|
||||||
- iiab-install-map-region
|
- iiab-install-map-region
|
||||||
- iiab-extend-sat.py
|
- iiab-extend-sat.py
|
||||||
- iiab-summarize.sh
|
- iiab-summarize.sh
|
||||||
- iiab-maps-finish.py
|
- iiab-maps-finish.py
|
||||||
- iiab-make-init.py
|
- iiab-make-init.py
|
||||||
- iiab-update-map
|
- iiab-update-map
|
||||||
|
|
||||||
- name: Install /etc/nginx/osm-vector-maps-nginx.conf from template
|
- name: Install /etc/nginx/osm-vector-maps-nginx.conf from template
|
||||||
template:
|
template:
|
||||||
src: osm-vector-maps-nginx.conf.j2
|
src: osm-vector-maps-nginx.conf.j2
|
||||||
dest: "/etc/nginx/conf.d/osm-vector-maps-nginx.conf"
|
dest: /etc/nginx/conf.d/osm-vector-maps-nginx.conf
|
||||||
when:
|
when:
|
||||||
osm_vector_maps_install | bool
|
osm_vector_maps_install | bool
|
||||||
|
|
||||||
|
|
||||||
# RECORD OSM Vector Maps AS INSTALLED
|
# RECORD OSM Vector Maps AS INSTALLED
|
||||||
|
|
||||||
- name: "Set 'osm_vector_maps_installed: True'"
|
- name: "Set 'osm_vector_maps_installed: True'"
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,12 @@
|
||||||
include_tasks: install.yml
|
include_tasks: install.yml
|
||||||
when: osm_vector_maps_installed is undefined
|
when: osm_vector_maps_installed is undefined
|
||||||
|
|
||||||
|
|
||||||
- name: Enable/Disable/Reload NGINX for OSM, if nginx_enabled
|
- name: Enable/Disable/Reload NGINX for OSM, if nginx_enabled
|
||||||
include_tasks: nginx.yml
|
include_tasks: nginx.yml
|
||||||
when: nginx_enabled | bool
|
when: nginx_enabled | bool
|
||||||
|
|
||||||
|
|
||||||
- name: Add 'osm-vector-maps' variable values to {{ iiab_ini_file }}
|
- name: Add 'osm-vector-maps' variable values to {{ iiab_ini_file }}
|
||||||
ini_file:
|
ini_file:
|
||||||
path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini
|
path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue