Permalink
Browse files

changed back to own tiles proxy

no access to files outside domain luftdaten.info
added new places
  • Loading branch information...
ricki-z committed Feb 22, 2018
1 parent 2690e53 commit af24cf33ea8e4ff816e2745d9e94c76f7f4541cb
Showing with 34 additions and 7 deletions.
  1. +5 −4 index.html
  2. +2 −2 src/cell-info.vue
  3. +3 −0 src/countries.txt
  4. +2 −1 src/map.vue
  5. +12 −0 src/places.js
  6. +10 −0 src/zooms.js
View
@@ -4,10 +4,11 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="/static/img/favicon.ico">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400,100,300,500,700,900,400italic,100italic,300italic,700italic,500italic,900italic" />
<link href='https://fonts.googleapis.com/css?family=Roboto+Mono:700,400,100,300' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/css?family=Roboto+Slab:400,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!-- proxy: https://fonts.googleapis.com/ to https://maps.luftdaten.info/fonts/ -->
<link rel="stylesheet" href="https://maps.luftdaten.info/fonts/css?family=Roboto:400,100,300,500,700,900,400italic,100italic,300italic,700italic,500italic,900italic" />
<link href='https://maps.luftdaten.info/fonts/css?family=Roboto+Mono:700,400,100,300' rel='stylesheet' type='text/css'>
<link href="https://maps.luftdaten.info/fonts/css?family=Roboto+Slab:400,700" rel="stylesheet">
<link href="https://maps.luftdaten.info/fonts/icon?family=Material+Icons" rel="stylesheet">
<title>openData Feinstaub Map</title>
</head>
<body>
View
@@ -23,8 +23,8 @@
template(v-for="sensor in cell")
tr
td(style="text-align:left;")
a(:id="'graph_'+sensor.o.id+'_on'" class="graph_on" onclick="var sensor=this.id.substring(0,this.id.length-3);document.getElementById(sensor).style.display='';document.getElementById(sensor+'_on').style.display='none';document.getElementById(sensor+'_off').style.display=''; document.getElementById('images_'+sensor.substr(6)).innerHTML='<img src=\"https://api.luftdaten.info/grafana/render/dashboard-solo/db/single-sensor-view?orgId=1&panelId=1&width=300&height=200&tz=UTC%2B02%3A00&var-node=' + sensor.substring(6) + '\" /><br /><img src=\"https://api.luftdaten.info/grafana/render/dashboard-solo/db/single-sensor-view?orgId=1&panelId=2&width=300&height=200&tz=UTC%2B02%3A00&var-node=' + sensor.substring(6) + '\" /><br /><br />'; return false;" href='#' style='color:white; text-decoration: none;') (+) {{sensor.o.id}}
a(:id="'graph_'+sensor.o.id+'_off'" class="graph_off" onclick="var sensor=this.id.substring(0,this.id.length-4);document.getElementById(sensor).style.display='none';document.getElementById(sensor+'_on').style.display='';document.getElementById(sensor+'_off').style.display='none'; document.getElementById('images_'+sensor.substr(6)).innerHTML=''; return false;" href='#' style='color:white; text-decoration: none; display: none;') (-) {{sensor.o.id}}
a(:id="'graph_'+sensor.o.id+'_on'" class="graph_on" onclick="var sensor=this.id.substring(0,this.id.length-3);document.getElementById(sensor).style.display='';document.getElementById(sensor+'_on').style.display='none';document.getElementById(sensor+'_off').style.display=''; document.getElementById('images_'+sensor.substr(6)).innerHTML='<img src=\"https://api.luftdaten.info/grafana/render/dashboard-solo/db/single-sensor-view?orgId=1&panelId=1&width=300&height=200&tz=UTC%2B02%3A00&var-node=' + sensor.substring(6) + '\" /><br /><img src=\"https://api.luftdaten.info/grafana/render/dashboard-solo/db/single-sensor-view?orgId=1&panelId=2&width=300&height=200&tz=UTC%2B02%3A00&var-node=' + sensor.substring(6) + '\" /><br /><br />'; return false;" href='#' style='color:white; text-decoration: none;') (+)&nbsp;{{sensor.o.id}}
a(:id="'graph_'+sensor.o.id+'_off'" class="graph_off" onclick="var sensor=this.id.substring(0,this.id.length-4);document.getElementById(sensor).style.display='none';document.getElementById(sensor+'_on').style.display='';document.getElementById(sensor+'_off').style.display='none'; document.getElementById('images_'+sensor.substr(6)).innerHTML=''; return false;" href='#' style='color:white; text-decoration: none; display: none;') (-)&nbsp;{{sensor.o.id}}
td {{sensor.o.data.P1.toFixed(0)}}
td {{sensor.o.data.P2.toFixed(0)}}
tr(:id = "'graph_'+sensor.o.id" style="display:none" class="cell_info_images")
View
@@ -10,6 +10,7 @@
// Asia BN Brunei
// America BO Bolivia
// America BR Brazil
// Europe BY Belarus
// America CA Canada
// Europe CH Suisse
// America CL Chile
@@ -28,6 +29,7 @@
// Europe HU Hungary
// * Europe IE Ireland
// Europe IT Italy
// Asia JP Japan
// Africa KE Kenya
// Asia KG Kyrgyzstan
// Asia KR Republic of Korea
@@ -47,6 +49,7 @@
// Europe RS Serbia
// Europe SE Sweden
// Europe SI Slovenia
// Europe SK Slovakia
// * Asia TH Thailand
// Asia TR Turkey
// * Asia TW Taiwan (nur externe Sensoren via MQTT)
View
@@ -16,7 +16,8 @@ export default {
center: config.center,
zoom: config.zoom
})
leaflet.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
// leaflet.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
leaflet.tileLayer('https://maps.luftdaten.info/tiles/{z}/{x}/{y}.png', {
attribution: 'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors',
maxZoom: 13,
// continuousWorld: false,
View
@@ -235,6 +235,10 @@ module.exports = {
"salzburg": [47.8,13.0333],
"innsbruck": [47.2672,11.3928],
// Belarus
"belarus": [54,28],
"minsk": [53.917, 27.55],
// Belgium
"belgium": [50.8,4],
"brussels": [50.833333,4.4],
@@ -337,6 +341,10 @@ module.exports = {
"serbia": [44,21],
"belgrade": [44.8167,20.4667],
// Slovakia
"slovakia": [48.667, 19.5],
"bratislava": [48.15, 17.117],
// Slovenia
"slovenia": [46.134,14.766],
"ljubljana": [46.056,14.508],
@@ -449,6 +457,10 @@ module.exports = {
"china": [32.80,103.08],
"beijing": [39.92,116.38],
// Japan
"japan": [35, 136],
"tokyo": [35.683, 139.767],
// Kyrgyzstan
"kyrgyzstan": [41.267,74.983],
"bishkek": [42.867,74.567],
View
@@ -27,6 +27,9 @@ module.exports = {
"oesterreich": 7,
"austria": 7,
// Belarus
"belarus": 6,
// Belgium
"belgium": 8,
@@ -92,6 +95,9 @@ module.exports = {
// Serbia
"serbia": 7,
// Slovakia
"slovakia": 8,
// Slovenia
"slovenia": 8,
@@ -175,6 +181,10 @@ module.exports = {
"china": 4,
"beijing": 9,
// Japan
"japan": 5,
"tokyo": 9,
// Kyrgyzstan
"kyrgyzstan": 7,

0 comments on commit af24cf3

Please sign in to comment.