using mapquest leaflet sdk

Merge branch 'develop' into feature/mapquest
add Dockerfile for simple local testing
2021-10-18 12:44:04 +02:00 · 2021-10-18 11:27:24 +02:00 · 2021-10-18 11:27:01 +02:00 · 2021-10-18 10:58:32 +02:00 · 2021-10-18 10:20:37 +02:00 · 2021-10-18 10:18:21 +02:00
11 changed files with 80 additions and 58 deletions
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+FROM nginx
+COPY www /usr/share/nginx/html
--- a/www/events.js
+++ b/www/events.js
@@ -4,7 +4,7 @@
 **********************************************************************/

 /*	License
-	Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
+	Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>

 	This program is free software: you can redistribute it and/or modify it
 	under the terms of the GNU General Public License as published by the Free
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version r20211017 (2021-10-17)
+	Version r20211017.2 (2021-10-17)
 */

 /* adding row(s) to a table and format date strings afterwards */
@@ -421,9 +421,6 @@ $(document).ready(function() {
 			case 'earthquake':
 				typetext += 'tektonisches Erdbeben&nbsp;(Stern)';
 				break;
-			case 'explosion':
-				typetext += 'Explosion&nbsp;(Sechseck)';
-				break;
 			case 'induced or triggered event':
 				typetext += '(bergbau-)induziertes Ereignis&nbsp;(Kreis)';
 				break;
--- a/www/events.js.en
+++ b/www/events.js.en
@@ -1,10 +1,10 @@
 /**********************************************************************
- * events.js                                                          *
+ * events.js.en                                                       *
 * script for event specific functions and setup                      *
 **********************************************************************/

 /*	License
-	Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
+	Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>

 	This program is free software: you can redistribute it and/or modify it
 	under the terms of the GNU General Public License as published by the Free
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version r20211017 (2021-10-17)
+	Version r20211017.2 (2021-10-17)
 */

 /* adding row(s) to a table and format date strings afterwards */
@@ -421,9 +421,6 @@ $(document).ready(function() {
 			case 'earthquake':
 				typetext += 'tectonic earthquake&nbsp;(star)';
 				break;
-			case 'explosion':
-				typetext += 'explosion&nbsp;(hexagon)';
-				break;
 			case 'induced or triggered event':
 				typetext += '(mining-)induced event&nbsp;(circle)';
 				break;
--- a/www/index.html.de
+++ b/www/index.html.de
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
-<!-- $Id$ -->
+<!-- Version VVVVV -->
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
 <head>
 	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
@@ -36,6 +36,8 @@
 	<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://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=RPOPuz3lA2GGBtVpEU0ugxtVoGba53Dt"></script>
+
 	<!-- Map, Events & Stations -->
 	<script type="text/javascript" src="misc.js"></script>
 	<script type="text/javascript" src="geolocation.js"></script>
@@ -167,10 +169,11 @@
 				<h3 class="aheader">Impressum</h3>
 				<div class="imprint_de"><p>Text wird geladen ...</p></div>
 			</div>
+
 		</div>
 	</div>
 	<!-- Logo -->
-	<div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-Universität Bochum" title="Ruhr-Universität Bochum" border="0"/></a></div>
+	<div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-Universität Bochum" title="Ruhr-Universität Bochum" border="0"/></a></div>
 	<!-- Map -->
 	<div id="map" class="map"></div>
 	<div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/><br />Loading ...</div>
--- a/www/index.html.en
+++ b/www/index.html.en
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
-<!-- $Id$ -->
+<!-- Version VVVVV -->
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
 <head>
 	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
@@ -36,6 +36,8 @@
 	<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://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=RPOPuz3lA2GGBtVpEU0ugxtVoGba53Dt"></script>
+
 	<!-- Map, Events & Stations -->
 	<script type="text/javascript" src="misc.js"></script>
 	<script type="text/javascript" src="geolocation.js"></script>
@@ -154,23 +156,24 @@
 			<p class="table-caption">Download as <a id="stations-csv-link" href="link" download="stations.csv">CSV file</a>.</p>
 		</div>
 		<!-- More -->
-		<div class="tab more_en" id="moretab">
-			<p>Text loading ...</p>
+		<div class="tab more_de" id="moretab">
+			<p>Loading text ...</p>
 		</div>
 		<!-- Info -->
 		<div class="tab" id="infotab">
 			<div id="infoaccordion">
 				<h3 class="aheader">Navigation / Links</h3>
-				<div class="info_en"><p>Text loading ...</p></div>
-				<h3 class="aheader">Copyright / Lizenz</h3>
-				<div class="copyright_en"><p>Text loading ...</p></div>
+				<div class="info_de"><p>Loading text ...</p></div>
+				<h3 class="aheader">Copyright / Licence</h3>
+				<div class="copyright_de"><p>Loading text ...</p></div>
 				<h3 class="aheader">Imprint</h3>
-				<div class="imprint_en"><p>Text loading ...</p></div>
+				<div class="imprint_de"><p>Loading text ...</p></div>
 			</div>
+
 		</div>
 	</div>
 	<!-- Logo -->
-	<div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-University Bochum" title="Ruhr-University Bochum" border="0"/></a></div>
+	<div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/en/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-University Bochum" title="Ruhr-University Bochum" border="0"/></a></div>
 	<!-- Map -->
 	<div id="map" class="map"></div>
 	<div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/><br />Loading ...</div>
--- a/www/map.js
+++ b/www/map.js
@@ -4,7 +4,7 @@
 **********************************************************************/

 /*	License
-	Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
+	Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>

 	This program is free software: you can redistribute it and/or modify it
 	under the terms of the GNU General Public License as published by the Free
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see https://www.gnu.org/licenses/.

-	Version r20211017 (2021-10-17)
+	Version VVVVV
 */

 /* add station marker */
@@ -139,10 +139,14 @@ function initMapLink() {
 **********************************************************************/
 $(document).ready(function() {

-	// create a map in the "map" div, set the view to a given place and zoom
-	map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
+	map = L.map('map', {
+		center: config['map']['centerDefault'],
+		zoom: config['map']['zoomDefault'],
+		zoomControl: false,
+		worldCopyJump: true
+	});

-	// create baselayer
+	// change baselayer if mapquest is not requested
 	switch ( config['map']['baselayer'] ) {
 	case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names)
 		L.tileLayer.provider('Esri.WorldGrayCanvas').addTo(map);
@@ -153,14 +157,18 @@ $(document).ready(function() {
 	case 'opentopo': // add OpenTopoMap tile layer
 		L.tileLayer.provider('OpenTopoMap').addTo(map);
 		break;
-	case 'osmde': // add OpenStreetMap.DE tile layer, default
-		L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
-		break;
-	case 'mapnik': // add OpenStreetMap.Mapni tile layer
+	case 'mapnik': // add OpenStreetMap.Mapnik tile layer
 		L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map);
 		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
-		L.tileLayer.provider(config['map']['baselayer']).addTo(map);
+		L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
 	};

 	// add controls
--- a/www/map.js.en
+++ b/www/map.js.en
@@ -1,10 +1,10 @@
 /**********************************************************************
- * map.js                                                             *
+ * map.js.en                                                          *
 * script for map specific functions and setup                        *
 **********************************************************************/

 /*	License
-	Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
+	Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>

 	This program is free software: you can redistribute it and/or modify it
 	under the terms of the GNU General Public License as published by the Free
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see https://www.gnu.org/licenses/.

-	Version r20211017 (2021-10-17)
+	Version VVVVV
 */

 /* add station marker */
@@ -139,10 +139,14 @@ function initMapLink() {
 **********************************************************************/
 $(document).ready(function() {

-	// create a map in the "map" div, set the view to a given place and zoom
-	map = L.map('map', { zoomControl: false, worldCopyJump: true }).setView(config['map']['centerDefault'], config['map']['zoomDefault']);
+	map = L.map('map', {
+		center: config['map']['centerDefault'],
+		zoom: config['map']['zoomDefault'],
+		zoomControl: false,
+		worldCopyJump: true
+	});

-	// create baselayer
+	// change baselayer if mapquest is not requested
 	switch ( config['map']['baselayer'] ) {
 	case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names)
 		L.tileLayer.provider('Esri.WorldGrayCanvas').addTo(map);
@@ -153,14 +157,18 @@ $(document).ready(function() {
 	case 'opentopo': // add OpenTopoMap tile layer
 		L.tileLayer.provider('OpenTopoMap').addTo(map);
 		break;
-	case 'osmde': // add OpenStreetMap.DE tile layer, default
-		L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
-		break;
-	case 'mapnik': // add OpenStreetMap.Mapni tile layer
+	case 'mapnik': // add OpenStreetMap.Mapnik tile layer
 		L.tileLayer.provider('OpenStreetMap.Mapnik').addTo(map);
 		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
-		L.tileLayer.provider(config['map']['baselayer']).addTo(map);
+		L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
 	};

 	// add controls
--- a/www/misc.js
+++ b/www/misc.js
@@ -4,7 +4,7 @@
 **********************************************************************/

 /*	License
-	Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
+	Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>

 	This program is free software: you can redistribute it and/or modify it
 	under the terms of the GNU General Public License as published by the Free
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version r20211017 (2021-10-17)
+	Version VVVVV
 */

 /* calculate marker radius from magnitude
@@ -81,6 +81,7 @@ function parseQueryString() {
 }

 /* create global vars */
+var jahr = new Date().getFullYear();
 var map;
 var openMarkerID;
 var eventTable = {};
@@ -94,14 +95,14 @@ var config = {
 		mseedURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/dataselect/1/query',
 		stationURL: 'https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/station/1/query',
 		nominatimURL: 'https://photon.komoot.de/reverse',
-		timespan: 180,
+		timespan: 400,
 	},
 	event: {
 		evaluationBlacklist: ['automatic', 'preliminary', 'rejected'],
 		markerOpacity: 0.4,
 		markerColor: 'blue',
 		markerColorH: 'red',
-		minMag: 1.2,
+		minMag: 0.7,
 		minMagDelta: 0.1,
 		typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion'],
 		// typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion', 'nuclear explosion'],
@@ -137,7 +138,7 @@ var config = {
 	},
 	tab: {
 		active: 0,
-		// disabled: [2],
+		disabled: [2],
 		max: 4,
 	},
 };
--- a/www/specialevents.js
+++ b/www/specialevents.js
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* last change 2021-10-17 */
 var specialEvents = [
 	//'bug2014ytlk', // Vechta 3.0
 	//'bug2014wjwx', // Haltern 3.6
@@ -33,5 +33,8 @@ var specialEvents = [
 	// 'bug2019czbt', // Ochtendung 2.9
 	// 'bug2019fura', // Sprengung Duisburg-Hochheide (Weißer Riese) 2.0
 	// 'bug2019yeij', // Tektonisch, Hambach 2.2
-	'bug2020fqxf' // Meckenheim, 2.5
+	'bug2020fqxf', // Meckenheim, 2.5
+	'bug2020skmt', // Heinsberg 1.7
+	'bug2020skon', // Heinsberg 2.5
+	'bug2020stdp' // Niederkassel 2.4
 ];
--- a/www/stations.js
+++ b/www/stations.js
@@ -4,7 +4,7 @@
 **********************************************************************/

 /*	License
-	Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
+	Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>

 	This program is free software: you can redistribute it and/or modify it
 	under the terms of the GNU General Public License as published by the Free
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version r20211017 (2021-10-17)
+	Version r20211017.2 (2021-10-17)
 */

 /* Load the stations using ajax */
--- a/www/stations.js.en
+++ b/www/stations.js.en
@@ -1,10 +1,10 @@
 /**********************************************************************
- * stations.js                                                        *
+ * stations.js.en                                                     *
 * script for station specific functions and setup                    *
 **********************************************************************/

 /*	License
-	Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
+	Copyright 2014-2021 Kasper D. Fischer <kasper.fischer@rub.de>

 	This program is free software: you can redistribute it and/or modify it
 	under the terms of the GNU General Public License as published by the Free
@@ -19,7 +19,7 @@
 	You should have received a copy of the GNU General Public License along
 	with this program. If not, see http://www.gnu.org/licenses/.

-	Version r20211017 (2021-10-17)
+	Version r20211017.2 (2021-10-17)
 */

 /* Load the stations using ajax */
Author	SHA1	Message	Date
Kasper D. Fischer	7e7f7d59a0	using mapquest leaflet sdk	2021-10-18 12:44:04 +02:00
Kasper D. Fischer	60c7e0ef09	Merge branch 'develop' into feature/mapquest	2021-10-18 11:27:24 +02:00
Kasper D. Fischer	93c15d8640	add Dockerfile for simple local testing usage: docker build -t seisobs-webapp:dev . docker run --name seisobs-map -d -p 8080:80 seisobs-webapp:dev	2021-10-18 11:27:01 +02:00
Kasper D. Fischer	2e5e998d8a	added mapquest baselayer option uses API key registered to https://araidne.geophysik.ruhr-uni-bochum.de/map/	2021-10-18 10:58:32 +02:00
Kasper D. Fischer	ecdeaecfde	Merge branch 'develop' into feature/mapquest	2021-10-18 10:20:37 +02:00
Kasper D. Fischer	137b4a2761	fixing broken TopPlus baselayer	2021-10-18 10:18:21 +02:00
Kasper D. Fischer	5989af8ce1	Merge branch 'hotfix/r20211017.2' into develop	2021-10-17 15:47:16 +02:00
Kasper D. Fischer	a659f47a87	hotfix-20211017.2: broken default basemap fixed borken default basemap decrease default minMag to 0.7	2021-10-17 15:46:39 +02:00
Kasper D. Fischer	6576b0a2b5	load mapquest leaflet scripts w/ api key	2021-10-17 15:13:17 +02:00
Kasper D. Fischer	b585e447f0	Merge branch 'hotfix/r20211017.1' into develop	2021-10-17 15:09:02 +02:00
Kasper D. Fischer	db1f4758f5	Merge branch 'hotfix/r20211017.1' into main	2021-10-17 15:09:02 +02:00
Kasper D. Fischer	e5b86d34f6	hotfix: r20211017.1 add manual changes from production server, bump version	2021-10-17 15:08:42 +02:00
Kasper D. Fischer	723ec43eee	Merge remote-tracking branch 'origin/develop' into develop	2021-10-17 13:32:41 +02:00
Kasper D. Fischer	9c3564f9ab	Merge branch 'release/r20211017' into develop	2021-10-17 13:28:50 +02:00