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

Merge branch 'develop' into feature/mapquest

Browse Source
This commit is contained in:
Kasper D. Fischer 2021-10-18 10:20:37 +02:00
commit ecdeaecfde
9 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/events.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 r20211017.1 (2021-10-17) Version r20211017.2 (2021-10-17)
*/ */
/* adding row(s) to a table and format date strings afterwards */ /* adding row(s) to a table and format date strings afterwards */

2
www/events.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 http://www.gnu.org/licenses/. 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 */ /* adding row(s) to a table and format date strings afterwards */

2
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'>
<!-- r20211017.1 (2021-10-17) --> <!-- 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" />

2
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'>
<!-- r20211017.1 (2021-10-17) --> <!-- 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" />

13
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 r20211017.1 (2021-10-17) Version VVVVV
*/ */
/* add station marker */ /* add station marker */
@ -153,14 +153,15 @@ $(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 'osmde': // add OpenStreetMap.DE tile layer, default case 'mapnik': // add OpenStreetMap.Mapnik tile layer
L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
break;
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;
default: // use OpenStreetMap.DE as default default: // use OpenStreetMap.DE as default
L.tileLayer.provider(config['map']['baselayer']).addTo(map); L.tileLayer.provider('OpenStreetMap.DE').addTo(map);
}; };
// add controls // add controls

11
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 r20211017.1 (2021-10-17) Version VVVVV
*/ */
/* add station marker */ /* add station marker */
@ -154,14 +154,15 @@ $(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 '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.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;
default: // use OpenStreetMap.DE as default default: // use OpenStreetMap.DE as default
L.tileLayer.provider(config['map']['baselayer']).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);

5
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 r20211017.1 (2021-10-17) Version VVVVV
*/ */
/* calculate marker radius from magnitude /* calculate marker radius from magnitude
@ -81,6 +81,7 @@ 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 = {};
@ -101,7 +102,7 @@ var config = {
markerOpacity: 0.4, markerOpacity: 0.4,
markerColor: 'blue', markerColor: 'blue',
markerColorH: 'red', markerColorH: 'red',
minMag: 1.2, minMag: 0.7,
minMagDelta: 0.1, minMagDelta: 0.1,
typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion'], typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion'],
// typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion', 'nuclear explosion'], // typeWhitelist: ['earthquake', 'induced or triggered event', 'controlled explosion', 'nuclear explosion'],

2
www/stations.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 r20211017.1 (2021-10-17) Version r20211017.2 (2021-10-17)
*/ */
/* Load the stations using ajax */ /* Load the stations using ajax */

2
www/stations.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 http://www.gnu.org/licenses/. 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 */ /* Load the stations using ajax */