Merge branch 'hotfix/r20211017.2' into main

2021-10-17 15:47:16 +02:00
6 changed files with 18 additions and 49 deletions
--- a/2
+++ b/2
@@ -1,2 +0,0 @@
-FROM nginx
-COPY www /usr/share/nginx/html
--- 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'>
-<!-- Version VVVVV -->
+<!-- r20211017.2 (2021-10-17) -->
 <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" />
@@ -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-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>
--- 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'>
-<!-- Version VVVVV -->
+<!-- r20211017.2 (2021-10-17) -->
 <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" />
@@ -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-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>
@@ -156,9 +154,7 @@
 			<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_de" id="moretab">
-			<p>Loading text ...</p>
-		</div>
+		<div class="tab" id="moretab"><!--include virtual="more.html.de" --></div>
 		<!-- Info -->
 		<div class="tab" id="infotab">
 			<div id="infoaccordion">
--- a/www/map.js
+++ b/www/map.js
@@ -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 VVVVV
+	Version r20211017.2 (2021-10-17)
 */

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

-	map = L.map('map', {
-		center: config['map']['centerDefault'],
-		zoom: config['map']['zoomDefault'],
-		zoomControl: false,
-		worldCopyJump: true
-	});
-
-	// change baselayer if mapquest is not requested
+	// 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']);
+	
+	// create baselayer
 	switch ( config['map']['baselayer'] ) {
 	case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names)
 		L.tileLayer.provider('Esri.WorldGrayCanvas').addTo(map);
@@ -157,16 +153,9 @@ $(document).ready(function() {
 	case 'opentopo': // add OpenTopoMap tile layer
 		L.tileLayer.provider('OpenTopoMap').addTo(map);
 		break;
-	case 'mapnik': // add OpenStreetMap.Mapnik tile layer
+	case 'mapnik': // add OpenStreetMap.Mapni 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('OpenStreetMap.DE').addTo(map);
 	};
--- a/www/map.js.en
+++ b/www/map.js.en
@@ -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 VVVVV
+	Version r20211017.2 (2021-10-17)
 */

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

-	map = L.map('map', {
-		center: config['map']['centerDefault'],
-		zoom: config['map']['zoomDefault'],
-		zoomControl: false,
-		worldCopyJump: true
-	});
+	// 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']);
+	

-	// change baselayer if mapquest is not requested
+	// create baselayer
 	switch ( config['map']['baselayer'] ) {
 	case 'esrigray': // add ESRI Grayscale World Map (neither city nor road names)
 		L.tileLayer.provider('Esri.WorldGrayCanvas').addTo(map);
@@ -157,20 +154,12 @@ $(document).ready(function() {
 	case 'opentopo': // add OpenTopoMap tile layer
 		L.tileLayer.provider('OpenTopoMap').addTo(map);
 		break;
-	case 'mapnik': // add OpenStreetMap.Mapnik tile layer
+	case 'mapnik': // add OpenStreetMap.Mapni 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('OpenStreetMap.DE').addTo(map);
 	};
-
 	// add controls
 	new L.Control.Zoom({ position: 'topright' }).addTo(map);
 	new L.control.scale({position: 'bottomright', imperial: false}).addTo(map);
--- a/www/misc.js
+++ b/www/misc.js
@@ -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 VVVVV
+	Version r20211017.2 (2021-10-17)
 */

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

 /* create global vars */
-var jahr = new Date().getFullYear();
 var map;
 var openMarkerID;
 var eventTable = {};