From 3646fd1a5d0cf5551cf2615b8022aeea9d3200ad Mon Sep 17 00:00:00 2001 From: George Hunt Date: Wed, 3 Apr 2019 12:11:32 -0700 Subject: [PATCH] move this over to test machine --- roles/osm-vector/defaults/main.yml | 2 ++ roles/osm-vector/tasks/main.yml | 7 ++++--- .../{splash-index.html => test-index.html} | 14 ++++++++------ 3 files changed, 14 insertions(+), 9 deletions(-) rename roles/osm-vector/templates/{splash-index.html => test-index.html} (84%) diff --git a/roles/osm-vector/defaults/main.yml b/roles/osm-vector/defaults/main.yml index dc088f745..601b1ea2e 100644 --- a/roles/osm-vector/defaults/main.yml +++ b/roles/osm-vector/defaults/main.yml @@ -1 +1,3 @@ menu_def_dir: '{{ doc_root }}/js-menu/menu-files/menu-defs' +osm_vector_path: '{{ content_base }}/osm-vector' +iiab_osm_url : http://download.iiab.io/content/OSM/vector-tiles diff --git a/roles/osm-vector/tasks/main.yml b/roles/osm-vector/tasks/main.yml index 78c4b1adf..ee77fb1a5 100644 --- a/roles/osm-vector/tasks/main.yml +++ b/roles/osm-vector/tasks/main.yml @@ -17,10 +17,11 @@ dest: '{{ osm_vector_path }}/assets' - name: Fetch the index.html for test page - get_url: - url: "{{ iiab_osm_url }}/assets/index.html.template" + template: + src: "test-index.html" dest: '{{ osm_vector_path }}/assets/index.html' +# Wanted to generate on the fly. But geofabrik has non-rectangular bboxes - name: Fetch the bounding box description for osm maps get_url: url: "{{ iiab_osm_url }}/assets/bboxes.geojson" @@ -72,7 +73,7 @@ - name: Copy the php redirect to the splash page copy: - src: splash-index.redirect + src: test-index.redirect dest: "{{ osm_vector_path }}/index.html" - name: Determine status of splash menu def diff --git a/roles/osm-vector/templates/splash-index.html b/roles/osm-vector/templates/test-index.html similarity index 84% rename from roles/osm-vector/templates/splash-index.html rename to roles/osm-vector/templates/test-index.html index 6f8e135d1..61825b8e5 100644 --- a/roles/osm-vector/templates/splash-index.html +++ b/roles/osm-vector/templates/test-index.html @@ -4,9 +4,7 @@ Osm-Vector Splash Page - - - + @@ -46,8 +44,12 @@ return (bytes / Math.pow(1024, e)).toFixed(2) + " " + s[e]; } - - - + +