diff --git a/roles/osm-vector/files/osm_functions.js b/roles/osm-vector/files/osm_functions.js index 9c95facb0..f1e620b47 100644 --- a/roles/osm-vector/files/osm_functions.js +++ b/roles/osm-vector/files/osm_functions.js @@ -1,4 +1,4 @@ -// osm_functions.js +// osm_functions.js -- (non authoritative see below) src = iiab/roles/files/ // copyright 2019 George Hunt // CAUTION -- this file is duplicate to admin-console/console/files/js/osm_fuctions.js -- please think of admin-console as authoritative // Placed here in duplicate to ease debugging, and simplify dependences @@ -7,6 +7,7 @@ var regionGeojson = {}; var regionList = []; var regionInstalled = []; var commonAssetsDir = '/common/assets/'; +var mapAssetsDir = '/osm-vector/assets/'; var iiab_config_dir = '/etc/iiab/'; var onChangeFunc = "setSize"; var osmCatalog = {}; @@ -50,7 +51,7 @@ function readOsmCatalog(checkbox){ regionList = []; var resp = $.ajax({ type: 'GET', - url: commonAssetsDir + 'regions.json', + url: mapAssetsDir + 'regions.json', dataType: 'json' }) .done(function( data ) { diff --git a/roles/osm-vector/files/test-index.redirect b/roles/osm-vector/files/test-index.redirect index 215fb1d30..0f3eb702e 100644 --- a/roles/osm-vector/files/test-index.redirect +++ b/roles/osm-vector/files/test-index.redirect @@ -1,5 +1,5 @@ diff --git a/roles/osm-vector/tasks/main.yml b/roles/osm-vector/tasks/main.yml index 1f473e1c6..b74ebc7b6 100644 --- a/roles/osm-vector/tasks/main.yml +++ b/roles/osm-vector/tasks/main.yml @@ -18,7 +18,7 @@ - name: Fetch the index.html for test page template: - src: "test-index.html" + src: "index.html" dest: '{{ osm_vector_path }}/assets/index.html' # Wanted to generate on the fly. But geofabrik has non-rectangular bboxes diff --git a/roles/osm-vector/templates/test-index.html b/roles/osm-vector/templates/index.html similarity index 92% rename from roles/osm-vector/templates/test-index.html rename to roles/osm-vector/templates/index.html index afdcba0fd..3bd846a45 100644 --- a/roles/osm-vector/templates/test-index.html +++ b/roles/osm-vector/templates/index.html @@ -44,13 +44,12 @@ return (bytes / Math.pow(1024, e)).toFixed(2) + " " + s[e]; } - + - - +