From 5a044039113547ced70a92176ad9cf8d3a5a6e01 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Wed, 8 Sep 2021 19:21:27 -0400
Subject: [PATCH] Tighten up osm-vector-maps/tasks/install.yml & explanations

---
 roles/osm-vector-maps/tasks/install.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml
index c163938f1..cac05a1ff 100644
--- a/roles/osm-vector-maps/tasks/install.yml
+++ b/roles/osm-vector-maps/tasks/install.yml
@@ -1,4 +1,4 @@
-- name: Make ~5 directories (0755 by default)
+- name: Make 5 directories (0755 by default)
   file:
     path: "{{ item }}"
     state: directory
@@ -20,16 +20,17 @@
     url: "{{ iiab_map_url }}/assets/regions.json"    # http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden
     dest: "{{ iiab_etc_path }}"
 
-- name: Does ~26M cities database {{ vector_map_path }}/viewer/cities1000.sqlite exist?
-  stat:
-    path: "{{ vector_map_path }}/viewer/cities1000.sqlite"
-  register: cities_installed
+# - name: Does 26M cities database {{ vector_map_path }}/viewer/cities1000.sqlite exist?
+#   stat:
+#     path: "{{ vector_map_path }}/viewer/cities1000.sqlite"
+#   register: cities_installed
 
-- name: If not, download {{ iiab_map_url }}/regional-resources/cities1000.sqlite to {{ vector_map_path }}/viewer/
+# - name: If not, download {{ iiab_map_url }}/regional-resources/cities1000.sqlite to {{ vector_map_path }}/viewer/
+- name: Download 26M {{ iiab_map_url }}/regional-resources/cities1000.sqlite to {{ vector_map_path }}/viewer/
   get_url:
     url: "{{ iiab_map_url }}/regional-resources/cities1000.sqlite"
     dest: "{{ vector_map_path }}/viewer/"
-  when: not cities_installed.stat.exists
+# when: not cities_installed.stat.exists
 
 - name: Symlink {{ doc_root }}/common/assets/map-catalog.json -> /etc/iiab/map-catalog.json
   file:
@@ -68,7 +69,7 @@
     - viewer-bundle.js
     - viewer-bundle.js.map
 
-- name: Download ~4 .css and .php helper files from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/* to {{ vector_map_path }}/viewer/ -- for viewer
+- name: Download 4 .css and .php helper files from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/* to {{ vector_map_path }}/viewer/ -- for viewer
   get_url:
     url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/{{ item }}"
     dest: "{{ vector_map_path }}/viewer/"
@@ -78,7 +79,7 @@
     - 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 }}/planet_z0-z6_2019.mbtiles to {{ vector_map_path }}/installer/ -- for map installer
   get_url:
     url: "{{ map_catalog_url }}/planet_z0-z6_2019.mbtiles"
     dest: "{{ vector_map_path }}/installer/"
@@ -108,7 +109,7 @@
     - index.html
     - installer-bundle.js
 
-- name: Download ~4 action routines from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/installer/* to {{ vector_map_path }}/installer/ -- for installer
+- name: Download 4 action routines from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/installer/* to {{ vector_map_path }}/installer/ -- for installer
   get_url:
     url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/installer/{{ item }}"
     dest: "{{ vector_map_path }}/installer/"
@@ -119,7 +120,7 @@
     - tileserver.php
 
 # the following was changed to grab from the iiab/maps repo
-- name: Download common assets from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/assets/* to {{ vector_map_path }}/viewer/assets/ -- for the general purpose map viewer
+- name: Download 15 common assets from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/assets/* to {{ vector_map_path }}/viewer/assets/ -- for the general purpose map viewer
   get_url:
     url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/assets/{{ item }}"
     dest: "{{ vector_map_path }}/viewer/assets/"
@@ -154,7 +155,7 @@
     state: link
     force: yes
 
-- name: Copy fonts to {{ doc_root }}/common/fonts/ for the general purpose map viewer (root:root, 0644 by default)
+- name: Copy fonts (16 files) to {{ doc_root }}/common/fonts/ for the general purpose map viewer (root:root, 0644 by default)
   copy:
     src: "{{ item }}"
     dest: "{{ doc_root }}/common/fonts/"