1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-15 04:32:11 +00:00

try to get it all in osm root

This commit is contained in:
George Hunt 2019-04-03 17:23:03 -07:00
parent afc77ed12f
commit 3c6fa71e25
4 changed files with 7 additions and 7 deletions

View file

@ -1,4 +1,4 @@
// osm_functions.js // osm_functions.js -- (non authoritative see below) src = iiab/roles/files/
// copyright 2019 George Hunt // 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 // 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 // Placed here in duplicate to ease debugging, and simplify dependences
@ -7,6 +7,7 @@ var regionGeojson = {};
var regionList = []; var regionList = [];
var regionInstalled = []; var regionInstalled = [];
var commonAssetsDir = '/common/assets/'; var commonAssetsDir = '/common/assets/';
var mapAssetsDir = '/osm-vector/assets/';
var iiab_config_dir = '/etc/iiab/'; var iiab_config_dir = '/etc/iiab/';
var onChangeFunc = "setSize"; var onChangeFunc = "setSize";
var osmCatalog = {}; var osmCatalog = {};
@ -50,7 +51,7 @@ function readOsmCatalog(checkbox){
regionList = []; regionList = [];
var resp = $.ajax({ var resp = $.ajax({
type: 'GET', type: 'GET',
url: commonAssetsDir + 'regions.json', url: mapAssetsDir + 'regions.json',
dataType: 'json' dataType: 'json'
}) })
.done(function( data ) { .done(function( data ) {

View file

@ -1,5 +1,5 @@
<?php <?php
header('Location: /osm-vector/splash,true,302'); header('Location: /osm-vector/assets,true,302');
die(); die();
?> ?>

View file

@ -18,7 +18,7 @@
- name: Fetch the index.html for test page - name: Fetch the index.html for test page
template: template:
src: "test-index.html" src: "index.html"
dest: '{{ osm_vector_path }}/assets/index.html' dest: '{{ osm_vector_path }}/assets/index.html'
# Wanted to generate on the fly. But geofabrik has non-rectangular bboxes # Wanted to generate on the fly. But geofabrik has non-rectangular bboxes

View file

@ -44,13 +44,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="osm_functions.js"></script> <script src="/osm-vector/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 src="main.js"></script> <script type="text/javascript" src="/osm-vector/assets/main.js"></script></body>
</body>
</html> </html>