diff --git a/.gitignore b/.gitignore index f9a8a2b..c3f03e0 100644 --- a/.gitignore +++ b/.gitignore @@ -41,11 +41,9 @@ Temporary Items ## Project Files wsgi/.idea www/dlsv -www/event.xml -www/events.xml -www/geolocation.js -www/geolocationTable.js www/stations.xml www/index.html +www/data/events.xml +www/data/geolocation.js scripts/*.json scripts/*.xml diff --git a/www/data/.gitkeep b/www/data/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/www/specialevents.js b/www/data/specialevents.js similarity index 93% rename from www/specialevents.js rename to www/data/specialevents.js index f3b18de..79742a9 100644 --- a/www/specialevents.js +++ b/www/data/specialevents.js @@ -1,4 +1,4 @@ -/* last change 2021-10-17 */ +/* last change 2021-10-30 */ var specialEvents = [ //'bug2014ytlk', // Vechta 3.0 //'bug2014wjwx', // Haltern 3.6 @@ -36,5 +36,6 @@ var specialEvents = [ 'bug2020fqxf', // Meckenheim, 2.5 'bug2020skmt', // Heinsberg 1.7 'bug2020skon', // Heinsberg 2.5 - 'bug2020stdp' // Niederkassel 2.4 + 'bug2020stdp', // Niederkassel 2.4 + 'bug2021ryaa' // Thedinghausen 3.2 ]; diff --git a/www/index.html.de b/www/index.html.de index 97ed9b4..1a3f7f6 100755 --- a/www/index.html.de +++ b/www/index.html.de @@ -40,11 +40,11 @@ <!-- Map, Events & Stations --> <script type="text/javascript" src="misc.js"></script> - <script type="text/javascript" src="geolocation.js"></script> - <script type="text/javascript" src="specialevents.js"></script> <script type="text/javascript" src="map.js"></script> <script type="text/javascript" src="events.js"></script> <script type="text/javascript" src="stations.js"></script> + <script type="text/javascript" src="data/geolocation.js"></script> + <script type="text/javascript" src="data/specialevents.js"></script> </head> <body> diff --git a/www/index.html.en b/www/index.html.en index b6f4f3e..d773cf4 100755 --- a/www/index.html.en +++ b/www/index.html.en @@ -40,11 +40,11 @@ <!-- Map, Events & Stations --> <script type="text/javascript" src="misc.js"></script> - <script type="text/javascript" src="geolocation.js"></script> - <script type="text/javascript" src="specialevents.js"></script> <script type="text/javascript" src="map.js.en"></script> <script type="text/javascript" src="events.js.en"></script> <script type="text/javascript" src="stations.js.en"></script> + <script type="text/javascript" src="data/geolocation.js"></script> + <script type="text/javascript" src="data/specialevents.js"></script> </head> <body> diff --git a/www/map.js b/www/map.js index 9e8fa58..a9f54bf 100644 --- a/www/map.js +++ b/www/map.js @@ -181,7 +181,7 @@ $(document).ready(function() { eventLayer = new L.MarkerGroup().addTo(map); // load events - ajaxLoadEvents('', '', '', 'events.xml'); + ajaxLoadEvents('', '', '', 'data/events.xml'); ajaxLoadEvents(); specialEvents.map(function(id) { ajaxLoadEvents('', '', id) diff --git a/www/map.js.en b/www/map.js.en index 380b742..a8a8109 100644 --- a/www/map.js.en +++ b/www/map.js.en @@ -181,7 +181,7 @@ $(document).ready(function() { eventLayer = new L.MarkerGroup().addTo(map); // load events - ajaxLoadEvents('', '', '', 'events.xml'); + ajaxLoadEvents('', '', '', 'data/events.xml'); ajaxLoadEvents(); specialEvents.map(function(id) { ajaxLoadEvents('', '', id)