diff --git a/www/events.js b/www/events.js index 9152c3f..09ca4fe 100644 --- a/www/events.js +++ b/www/events.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 r20211017.1 (2021-10-17) + Version r20211017.2 (2021-10-17) */ /* adding row(s) to a table and format date strings afterwards */ diff --git a/www/events.js.en b/www/events.js.en index 3b1139f..839ebef 100644 --- a/www/events.js.en +++ b/www/events.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 http://www.gnu.org/licenses/. - Version r20211017.1 (2021-10-17) + Version r20211017.2 (2021-10-17) */ /* adding row(s) to a table and format date strings afterwards */ diff --git a/www/index.html.de b/www/index.html.de index 361dc3a..b091d4a 100755 --- a/www/index.html.de +++ b/www/index.html.de @@ -1,5 +1,5 @@ - + diff --git a/www/index.html.en b/www/index.html.en index b74d5b4..dd06d3d 100755 --- a/www/index.html.en +++ b/www/index.html.en @@ -1,5 +1,5 @@ - + diff --git a/www/map.js b/www/map.js index 8bc4663..05b6cfb 100644 --- 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 r20211017.1 (2021-10-17) + Version VVVVV */ /* add station marker */ @@ -153,14 +153,15 @@ $(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: '© Bundesamt für Kartographie und Geodäsie ('+jahr+'), Datenquellen: Geodatenzentrum'}).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 diff --git a/www/map.js.en b/www/map.js.en index 3aa306e..1d97a00 100644 --- 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 r20211017.1 (2021-10-17) + Version VVVVV */ /* add station marker */ @@ -154,14 +154,15 @@ $(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 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: '© Federal Agency for Cartography and Geodesy ('+jahr+'), Datasource: Geodatenzentrum'}).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 new L.Control.Zoom({ position: 'topright' }).addTo(map); diff --git a/www/misc.js b/www/misc.js index d2199c4..20261c5 100644 --- 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 r20211017.1 (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 = {}; @@ -101,7 +102,7 @@ var config = { 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'], diff --git a/www/stations.js b/www/stations.js index f5026f7..3647d9e 100644 --- a/www/stations.js +++ b/www/stations.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 r20211017.1 (2021-10-17) + Version r20211017.2 (2021-10-17) */ /* Load the stations using ajax */ diff --git a/www/stations.js.en b/www/stations.js.en index 7cb1460..a3aad6b 100644 --- a/www/stations.js.en +++ b/www/stations.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 http://www.gnu.org/licenses/. - Version r20211017.1 (2021-10-17) + Version r20211017.2 (2021-10-17) */ /* Load the stations using ajax */