diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 461bb68a8..bea7c342f 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 in {{ vector_map_path }} (0755 by default) +- name: Make ~5 directories (0755 by default) file: path: "{{ item }}" state: directory @@ -20,9 +20,9 @@ url: "{{ iiab_map_url }}/assets/regions.json" # http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden dest: "{{ iiab_etc_path }}" -- name: Does cities database {{ vector_map_path }}/cities1000.sqlite exist? +- name: Does ~26M cities database {{ vector_map_path }}/viewer/cities1000.sqlite exist? stat: - path: "{{ vector_map_path }}/cities1000.sqlite" + 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/ @@ -52,11 +52,11 @@ # At this point, fetches from github.com/georgejhunt/maps from test branch - name: Download OpenLayers test page stuff (JavaScript bundle etc) from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/* to {{ vector_map_path }}/test-page/ -- for test page http://box/maps/maplist get_url: - url: "{{ item }}" + url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/{{ item }}" # https://raw.githubusercontent.com/iiab/maps / master dest: "{{ vector_map_path }}/test-page/" with_items: - - "{{ 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" + - test-page-bundle.js + - index.html - name: Download OpenLayers viewer page stuff (JavaScript bundle etc) from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/build/* to {{ vector_map_path }}/viewer/ # At this point, fetches from github.com/iiab/maps from {{ maps_branch }} branch