kasper/seisobs-webapp
1
0
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Compare commits

base: kasper:7e7f7d59a0eb49224e50e7801ce381e80c50dccc
Branches Tags
kasper:main kasper:develop kasper:feature/vagrant kasper:feature/mapquest kasper:feature/docker-nginx kasper:feature/topplus kasper:support/iframe
kasper:v1.1 kasper:release/v1.2 kasper:release/v1.1 kasper:release/v1.0 kasper:release/r20211017.2 kasper:release/r20211017.1 kasper:release/r20211017 kasper:release/r20200714 kasper:release/r20131023 kasper:release/r20140505 kasper:release/r20130222
..
compare: kasper:release/r20211017.2
Branches Tags
kasper:develop kasper:main kasper:feature/vagrant kasper:feature/mapquest kasper:feature/docker-nginx kasper:feature/topplus kasper:support/iframe
kasper:v1.1 kasper:release/v1.2 kasper:release/v1.1 kasper:release/v1.0 kasper:release/r20211017.2 kasper:release/r20211017.1 kasper:release/r20211017 kasper:release/r20200714 kasper:release/r20131023 kasper:release/r20140505 kasper:release/r20130222

1 Commits
7e7f7d59a0 ... release/r2

Author SHA1 Message Date
Kasper D. Fischer
a91616d003 Merge branch 'hotfix/r20211017.2' into main 2021-10-17 15:47:16 +02:00
6 changed files with 18 additions and 49 deletions
Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,2 +0,0 @@
FROM nginx
COPY www /usr/share/nginx/html

6
www/index.html.de
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'> <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<!-- Version VVVVV --> <!-- r20211017.2 (2021-10-17) -->
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'> <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
@@ -35,9 +35,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.3.1/leaflet-dvf.markers.min.js" integrity="sha512-R/iucaxFnDFUTdZRxUvxzc+sypDQhqnxInBmNjgGE0RaiMl/ektVB1wFS/L0xDZmLFPpEGR0Kw3GEBgtQNFHyg==" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.3.1/leaflet-dvf.markers.min.js" integrity="sha512-R/iucaxFnDFUTdZRxUvxzc+sypDQhqnxInBmNjgGE0RaiMl/ektVB1wFS/L0xDZmLFPpEGR0Kw3GEBgtQNFHyg==" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-providers/1.10.1/leaflet-providers.min.js" integrity="sha512-Ifxj89Ujg72gC/psKB9ystryRYiopmDud2EmNTKC9kz192aQwDKVK1FzWsyPc37tgU0UmRQlNnBM++ZnwIXJ9Q==" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-providers/1.10.1/leaflet-providers.min.js" integrity="sha512-Ifxj89Ujg72gC/psKB9ystryRYiopmDud2EmNTKC9kz192aQwDKVK1FzWsyPc37tgU0UmRQlNnBM++ZnwIXJ9Q==" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/leaflet.browser.print@1.0.5/dist/leaflet.browser.print.min.js" integrity="sha256-1MQvHEnVXSKwR+XIVswRSBla/B5ohkp5+HJtritIkgE=" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/leaflet.browser.print@1.0.5/dist/leaflet.browser.print.min.js" integrity="sha256-1MQvHEnVXSKwR+XIVswRSBla/B5ohkp5+HJtritIkgE=" crossorigin="anonymous"></script>
<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=RPOPuz3lA2GGBtVpEU0ugxtVoGba53Dt"></script>
<!-- Map, Events & Stations --> <!-- Map, Events & Stations -->
<script type="text/javascript" src="misc.js"></script> <script type="text/javascript" src="misc.js"></script>
<script type="text/javascript" src="geolocation.js"></script> <script type="text/javascript" src="geolocation.js"></script>

10
www/index.html.en
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'> <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<!-- Version VVVVV --> <!-- r20211017.2 (2021-10-17) -->
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'> <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
@@ -35,9 +35,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.3.1/leaflet-dvf.markers.min.js" integrity="sha512-R/iucaxFnDFUTdZRxUvxzc+sypDQhqnxInBmNjgGE0RaiMl/ektVB1wFS/L0xDZmLFPpEGR0Kw3GEBgtQNFHyg==" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.3.1/leaflet-dvf.markers.min.js" integrity="sha512-R/iucaxFnDFUTdZRxUvxzc+sypDQhqnxInBmNjgGE0RaiMl/ektVB1wFS/L0xDZmLFPpEGR0Kw3GEBgtQNFHyg==" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-providers/1.10.1/leaflet-providers.min.js" integrity="sha512-Ifxj89Ujg72gC/psKB9ystryRYiopmDud2EmNTKC9kz192aQwDKVK1FzWsyPc37tgU0UmRQlNnBM++ZnwIXJ9Q==" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-providers/1.10.1/leaflet-providers.min.js" integrity="sha512-Ifxj89Ujg72gC/psKB9ystryRYiopmDud2EmNTKC9kz192aQwDKVK1FzWsyPc37tgU0UmRQlNnBM++ZnwIXJ9Q==" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/leaflet.browser.print@1.0.5/dist/leaflet.browser.print.min.js" integrity="sha256-1MQvHEnVXSKwR+XIVswRSBla/B5ohkp5+HJtritIkgE=" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/leaflet.browser.print@1.0.5/dist/leaflet.browser.print.min.js" integrity="sha256-1MQvHEnVXSKwR+XIVswRSBla/B5ohkp5+HJtritIkgE=" crossorigin="anonymous"></script>
<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=RPOPuz3lA2GGBtVpEU0ugxtVoGba53Dt"></script>
<!-- Map, Events & Stations --> <!-- Map, Events & Stations -->
<script type="text/javascript" src="misc.js"></script> <script type="text/javascript" src="misc.js"></script>
<script type="text/javascript" src="geolocation.js"></script> <script type="text/javascript" src="geolocation.js"></script>
@@ -156,9 +154,7 @@
<p class="table-caption">Download as <a id="stations-csv-link" href="link" download="stations.csv">CSV file</a>.</p> <p class="table-caption">Download as <a id="stations-csv-link" href="link" download="stations.csv">CSV file</a>.</p>
</div> </div>
<!-- More --> <!-- More -->
<div class="tab more_de" id="moretab"> <div class="tab" id="moretab"><!--include virtual="more.html.de" --></div>
<p>Loading text ...</p>
</div>
<!-- Info --> <!-- Info -->
<div class="tab" id="infotab"> <div class="tab" id="infotab">
<div id="infoaccordion"> <div id="infoaccordion">

23
www/map.js
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see https://www.gnu.org/licenses/. with this program. If not, see https://www.gnu.org/licenses/.
Version VVVVV Version r20211017.2 (2021-10-17)
*/ */
/* add station marker */ /* add station marker */
@@ -139,14 +139,10 @@ function initMapLink() {
**********************************************************************/ **********************************************************************/
$(document).ready(function() { $(document).ready(function() {
map = L.map('map', { // create a map in the "map" div, set the view to a given place and zoom
center: config['map']['centerDefault'], map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
zoom: config['map']['zoomDefault'],
zoomControl: false, // create baselayer
worldCopyJump: true
});
// change baselayer if mapquest is not requested
switch ( config['map']['baselayer'] ) { switch ( config['map']['baselayer'] ) {
case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names) case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names)
L.tileLayer.provider('Esri.WorldGrayCanvas').addTo(map); L.tileLayer.provider('Esri.WorldGrayCanvas').addTo(map);
@@ -157,16 +153,9 @@ $(document).ready(function() {
case 'opentopo': // add OpenTopoMap tile layer case 'opentopo': // add OpenTopoMap tile layer
L.tileLayer.provider('OpenTopoMap').addTo(map); L.tileLayer.provider('OpenTopoMap').addTo(map);
break; break;
case 'mapnik': // add OpenStreetMap.Mapnik tile layer case 'mapnik': // add OpenStreetMap.Mapni tile layer
L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map); L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map);
break; break;
case 'topplus': // add TopPlus tile layer (https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wmts-topplusopen-wmts-topplus-open.html)
L.tileLayer('https://sgx.geodatenzentrum.de/wmts_topplus_open/tile/1.0.0/web/default/WEBMERCATOR/{z}/{y}/{x}.png',
{attribution: '&copy; Bundesamt für Kartographie und Geodäsie ('+jahr+'), Datenquellen: <a href="http://sg.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf">Geodatenzentrum</a>'}).addTo(map);
break;
case 'mapquest':
MQ.mapLayer().addTo(map);
break;
default: // use OpenStreetMap.DE as default default: // use OpenStreetMap.DE as default
L.tileLayer.provider('OpenStreetMap.DE').addTo(map); L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
}; };

23
www/map.js.en
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see https://www.gnu.org/licenses/. with this program. If not, see https://www.gnu.org/licenses/.
Version VVVVV Version r20211017.2 (2021-10-17)
*/ */
/* add station marker */ /* add station marker */
@@ -139,14 +139,11 @@ function initMapLink() {
**********************************************************************/ **********************************************************************/
$(document).ready(function() { $(document).ready(function() {
map = L.map('map', { // create a map in the "map" div, set the view to a given place and zoom
center: config['map']['centerDefault'], map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
zoom: config['map']['zoomDefault'],
zoomControl: false,
worldCopyJump: true
});
// change baselayer if mapquest is not requested // create baselayer
switch ( config['map']['baselayer'] ) { switch ( config['map']['baselayer'] ) {
case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names) case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names)
L.tileLayer.provider('Esri.WorldGrayCanvas').addTo(map); L.tileLayer.provider('Esri.WorldGrayCanvas').addTo(map);
@@ -157,20 +154,12 @@ $(document).ready(function() {
case 'opentopo': // add OpenTopoMap tile layer case 'opentopo': // add OpenTopoMap tile layer
L.tileLayer.provider('OpenTopoMap').addTo(map); L.tileLayer.provider('OpenTopoMap').addTo(map);
break; break;
case 'mapnik': // add OpenStreetMap.Mapnik tile layer case 'mapnik': // add OpenStreetMap.Mapni tile layer
L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map); L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map);
break; break;
case 'topplus': // add TopPlus tile layer (https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wmts-topplusopen-wmts-topplus-open.html)
L.tileLayer('https://sgx.geodatenzentrum.de/wmts_topplus_open/tile/1.0.0/web/default/WEBMERCATOR/{z}/{y}/{x}.png',
{attribution: '&copy; Federal Agency for Cartography and Geodesy ('+jahr+'), Datasource: <a href="http://sg.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf">Geodatenzentrum</a>'}).addTo(map);
break;
case 'mapquest':
MQ.mapLayer().addTo(map);
break;
default: // use OpenStreetMap.DE as default default: // use OpenStreetMap.DE as default
L.tileLayer.provider('OpenStreetMap.DE').addTo(map); L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
}; };
// add controls // add controls
new L.Control.Zoom({ position: 'topright' }).addTo(map); new L.Control.Zoom({ position: 'topright' }).addTo(map);
new L.control.scale({position: 'bottomright', imperial: false}).addTo(map); new L.control.scale({position: 'bottomright', imperial: false}).addTo(map);

3
www/misc.js
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version VVVVV Version r20211017.2 (2021-10-17)
*/ */
/* calculate marker radius from magnitude /* calculate marker radius from magnitude
@@ -81,7 +81,6 @@ function parseQueryString() {
} }
/* create global vars */ /* create global vars */
var jahr = new Date().getFullYear();
var map; var map;
var openMarkerID; var openMarkerID;
var eventTable = {}; var eventTable = {};