external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

vector-map -> vector-maps

Browse source
This commit is contained in:
George Hunt 2019-05-05 18:51:34 -07:00
parent 3be9c87f3a
commit 66b9e844bd
11 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/vector-map/files/test-index.redirect
View file

@ -1,4 +0,0 @@
<head>
<meta http-equiv="refresh" content="0; URL=/vector-map/maplist/" />
</head>

2
roles/vector-map/defaults/main.yml → roles/vector-maps/defaults/main.yml
View file

@ -1,6 +1,6 @@
vector_map_install: True vector_map_install: True
vector_map_enabled: True vector_map_enabled: True
vector_map_path: '{{ content_base }}/www/vector-map' vector_map_path: '{{ content_base }}/www/vector-maps'
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # 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! # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!

0
roles/vector-map/files/countries.json → roles/vector-maps/files/countries.json
View file

0
roles/vector-map/files/en-map_test.json → roles/vector-maps/files/en-map_test.json
View file

4
roles/vector-map/files/osm_functions.js → roles/vector-maps/files/osm_functions.js
View file

@ -7,7 +7,7 @@ var regionGeojson = {};
var regionList = []; var regionList = [];
var regionInstalled = []; var regionInstalled = [];
var commonAssetsDir = '/common/assets/'; var commonAssetsDir = '/common/assets/';
var mapAssetsDir = '/vector-map/maplist/assets/'; var mapAssetsDir = '/vector-maps/maplist/assets/';
var iiab_config_dir = '/etc/iiab/'; var iiab_config_dir = '/etc/iiab/';
var onChangeFunc = "setSize"; var onChangeFunc = "setSize";
var osmCatalog = {}; var osmCatalog = {};
@ -27,7 +27,7 @@ function readOsmIdx(){
//consoleLog ("in readOsmIdx"); //consoleLog ("in readOsmIdx");
var resp = $.ajax({ var resp = $.ajax({
type: 'GET', type: 'GET',
url: consoleJsonDir + 'vector-map-idx.json', url: consoleJsonDir + 'vector-maps-idx.json',
dataType: 'json' dataType: 'json'
}) })
.done(function( data ) { .done(function( data ) {

4
roles/vector-maps/files/test-index.redirect Normal file
View file

@ -0,0 +1,4 @@
<head>
<meta http-equiv="refresh" content="0; URL=/vector-maps/maplist/" />
</head>

18
roles/vector-map/tasks/main.yml → roles/vector-maps/tasks/main.yml
View file

@ -1,4 +1,4 @@
- name: Make sure the vector-map directory exists - name: Make sure the vector-maps directory exists
file: file:
path: '{{ vector_map_path }}/maplist/assets' path: '{{ vector_map_path }}/maplist/assets'
state: directory state: directory
@ -45,7 +45,7 @@
dest: /usr/bin/iiab-update-osm dest: /usr/bin/iiab-update-osm
mode: "0755" mode: "0755"
- name: Run the script that does vector-map housekeeping - name: Run the script that does vector-maps housekeeping
shell: /usr/bin/iiab-update-osm shell: /usr/bin/iiab-update-osm
- name: Copy the Countries geojson to assets - name: Copy the Countries geojson to assets
@ -61,19 +61,19 @@
- name: Install /etc/{{ apache_config_dir }}/osm-vect.conf from template - name: Install /etc/{{ apache_config_dir }}/osm-vect.conf from template
template: template:
src: vector-map.conf src: vector-maps.conf
dest: "/etc/{{ apache_config_dir }}/vector-map.conf" dest: "/etc/{{ apache_config_dir }}/vector-maps.conf"
- name: Create symlink vector-map.conf from sites-enabled to sites-available (debuntu, not nec for redhat) - name: Create symlink vector-maps.conf from sites-enabled to sites-available (debuntu, not nec for redhat)
file: file:
src: /etc/apache2/sites-available/vector-map.conf src: /etc/apache2/sites-available/vector-maps.conf
path: /etc/apache2/sites-enabled/vector-map.conf path: /etc/apache2/sites-enabled/vector-maps.conf
state: link state: link
when: vector_map_enabled and is_debuntu when: vector_map_enabled and is_debuntu
- name: Remove symlink /etc/apache2/sites-enabled/vector-map.conf (debuntu) - name: Remove symlink /etc/apache2/sites-enabled/vector-maps.conf (debuntu)
file: file:
path: /etc/apache2/sites-enabled/vector-map.conf path: /etc/apache2/sites-enabled/vector-maps.conf
state: absent state: absent
when: not vector_map_enabled and is_debuntu when: not vector_map_enabled and is_debuntu

4
roles/vector-map/templates/iiab-update-osm → roles/vector-maps/templates/iiab-update-osm
View file

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# Scan the vector-map directory, update the vector-map-idx.json, add menu-defs # Scan the vector-maps directory, update the vector-maps-idx.json, add menu-defs
from geojson import Feature, Point, FeatureCollection, Polygon from geojson import Feature, Point, FeatureCollection, Polygon
import geojson import geojson
@ -27,7 +27,7 @@ doc_root = get_iiab_env('WWWROOT')
menuDefs = doc_root + "/js-menu/menu-files/menu-defs/" menuDefs = doc_root + "/js-menu/menu-files/menu-defs/"
vector_map_idx_dir = doc_root + "/common/assets" vector_map_idx_dir = doc_root + "/common/assets"
#map_doc_root = '{{ vector_map_path }}' #map_doc_root = '{{ vector_map_path }}'
map_doc_root = '/library/www/vector-map' map_doc_root = '/library/www/vector-maps'
# map_catalog will be global, assumed always available # map_catalog will be global, assumed always available
map_catalog = {} map_catalog = {}
map_menu_def_list = [] map_menu_def_list = []

4
roles/vector-map/templates/index.html → roles/vector-maps/templates/index.html
View file

@ -46,12 +46,12 @@
return (bytes / Math.pow(1024, e)).toFixed(2) + " " + s[e]; return (bytes / Math.pow(1024, e)).toFixed(2) + " " + s[e];
} }
</script> </script>
<script src="/vector-map/maplist/assets/osm_functions.js"></script> <script src="/vector-maps/maplist/assets/osm_functions.js"></script>
<script> <script>
window.$ = window.$ = jQuery; window.$ = window.$ = jQuery;
$.when(readOsmCatalog()).done(function() { $.when(readOsmCatalog()).done(function() {
renderRegionList(false); renderRegionList(false);
}); });
</script> </script>
<script type="text/javascript" src="/vector-map/maplist/main.js"></script></body> <script type="text/javascript" src="/vector-maps/maplist/main.js"></script></body>
</html> </html>

0
roles/vector-map/templates/main.js → roles/vector-maps/templates/main.js
View file

2
roles/vector-map/templates/vector-map.conf → roles/vector-maps/templates/vector-map.conf
View file

@ -1,6 +1,6 @@
# For downloadable regional vector tilesets # For downloadable regional vector tilesets
Alias /maps {{ vector_map_path }} Alias /maps {{ vector_map_path }}
Alias /vector-map {{ vector_map_path }} Alias /vector-maps {{ vector_map_path }}
<Directory {{ vector_map_path }}> <Directory {{ vector_map_path }}>
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
AllowOverride All AllowOverride All