map_url

roles/vector-maps/defaults/main.yml

@@ -5,4 +5,4 @@ vector_map_path: '{{ content_base }}/www/vector-maps'
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
-iiab_osm_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden
+iiab_map_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden

roles/vector-maps/tasks/main.yml

@@ -8,7 +8,7 @@
 
 - name: Fetch the catalog for osm maps
   get_url:
-    url: "{{ iiab_osm_url }}/assets/regions.json"
+    url: "{{ iiab_map_url }}/assets/regions.json"
     dest: '{{ vector_map_path }}/maplist/assets/'
 
 - name: Create a link to osm catalog in /common/assets
@@ -19,7 +19,7 @@
 
 - name: Fetch the javascript bundle with openlayers for test page
   get_url:
-    url: "{{ iiab_osm_url }}/../main.js"
+    url: "{{ iiab_map_url }}/../main.js"
     dest: '{{ vector_map_path }}/maplist/'
 
 - name: Fetch the index.html for test page
@@ -31,7 +31,7 @@
 # So bring the bounding box definition from cloud (bboxes.geojson is big)
 - name: Fetch the bounding box description for osm maps
   get_url:
-    url: "{{ iiab_osm_url }}/assets/bboxes.geojson"
+    url: "{{ iiab_map_url }}/assets/bboxes.geojson"
     dest: '{{ vector_map_path }}/maplist/assets/'
 
 - name: Install python-geojson package, that helps with geojson
@@ -41,12 +41,12 @@
 
 - name: Install the script to update osm catalog
   template:
-    src: iiab-update-osm
-    dest: /usr/bin/iiab-update-osm
+    src: iiab-update-map
+    dest: /usr/bin/iiab-update-map
     mode: "0755"
 
 - name: Run the script that does vector-maps housekeeping
-  shell: /usr/bin/iiab-update-osm
+  shell: /usr/bin/iiab-update-map
  
 - name: Copy the Countries geojson to assets
   copy: 
@@ -56,10 +56,10 @@
 #  It is too complicated to use a single file for both iiab and admin-console
 - name: Copy the duplicated javascript to assets
   copy: 
-    src: osm_functions.js
+    src: map_functions.js
     dest: '{{ vector_map_path }}/maplist/assets'
 
-- name: Install /etc/{{ apache_config_dir }}/osm-vect.conf from template
+- name: Install /etc/{{ apache_config_dir }}/vector-maps.conf from template
   template:
     src: vector-maps.conf
     dest: "/etc/{{ apache_config_dir }}/vector-maps.conf"

vars/default_vars.yml

@@ -15,7 +15,7 @@ pip_packages_dir: "{{ iiab_base }}/pip-packages"
 yum_packages_dir: "{{ iiab_base }}/yum-packages"
 downloads_dir: "{{ iiab_base }}/downloads"
 iiab_download_url: http://download.iiab.io/packages
-iiab_osm_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden
+iiab_map_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden
 
 content_base: "/library"
 doc_base: "{{ content_base }}/www"