From f112a4fbd5a10d9ae15501cf22ff6d4feccb1de9 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Thu, 30 Apr 2020 09:31:01 +0200 Subject: [PATCH] update Do 30. Apr 09:31:01 CEST 2020 --- views/overviews/overview_dbrd.pug | 30 +++++++++--------------------- views/overviews/overview_waip.pug | 8 ++++---- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/views/overviews/overview_dbrd.pug b/views/overviews/overview_dbrd.pug index e89f7b3..3281c6e 100755 --- a/views/overviews/overview_dbrd.pug +++ b/views/overviews/overview_dbrd.pug @@ -31,40 +31,28 @@ block content p= val.ort + ', ' + val.ortsteil else p= val.ort - .w-100.rounded( id='map' + val.uuid style='height:200px') + .w-100.rounded( id='map' + val.uuid style='height:150px') .card-footer.text-right a.btn.btn-primary.mx-2.ion-md-arrow-round-forward(href='/dbrd/' + val.uuid, role='button') Dashboard aufrufen script(src='/js/leaflet.js') - script. - + script. // TODO: internen Kartendienst nutzen - //var map_tile = !{JSON.stringify(public.map_tile).replace(/<\//g, '<\\/')} + // var map_tile = !{JSON.stringify(public.map_tile).replace(/<\//g, '<\\/')} var data = !{JSON.stringify(dataSet).replace(/<\//g, '<\\/')} - console.log(data); - for (let i in data) { - console.log(i); // logs "0", "1", "2", "foo" + for (var i in data) { // Karte definieren var map = L.map('map'+data[i].uuid, { zoomControl: false }); - // Layer der Karte - mapLink = L.tileLayer( - + mapLink = L.tileLayer( 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { - //map_tile, { maxZoom: 12 }).addTo(map); - - // Karte setzen - - - var geojson = L.geoJSON(JSON.parse(data[i].wgs84_area)).addTo(map); - map.fitBounds(geojson.getBounds()); - map.setZoom(13); - } - - + var geojson = L.geoJSON(JSON.parse(data[i].wgs84_area)).addTo(map); + map.fitBounds(geojson.getBounds()); + map.setZoom(13); + }; \ No newline at end of file diff --git a/views/overviews/overview_waip.pug b/views/overviews/overview_waip.pug index a9c8e56..f0e4ba0 100755 --- a/views/overviews/overview_waip.pug +++ b/views/overviews/overview_waip.pug @@ -32,7 +32,7 @@ block content .col-12.d-flex.align-self-stretch.p-3 .card.border-success.w-100.h-100 .card-header - h1.text-success Alle Wachalarme + h2.text-success Alle Wachalarme .card-body p.text-muted Zeigt Wachalarme aller Wachen an. .card-footer.text-right @@ -40,7 +40,7 @@ block content .col-12.col-xl-4.d-flex.align-self-stretch.p-3 .card.w-100.h-100 .card-header - h1.text-info Alarmmonitor Wache + h2.text-info Alarmmonitor Wache .card-body p.text-muted Zeigt den Wachalarm einer einzelnen Wache (z.B. Feuerwache, Rettungswache etc.) an. .card-footer.text-right @@ -54,7 +54,7 @@ block content .col-12.col-xl-4.d-flex.align-self-stretch.p-3 .card.w-100.h-100 .card-header - h1.text-info Alarmmonitor Träger + h2.text-info Alarmmonitor Träger .card-body p.text-muted Zeigt alle Wachalarme der Wachen eines Trägers (Amt, amtsfreie Gemeinde, Stadt) an. .card-footer.text-right @@ -68,7 +68,7 @@ block content .col-12.col-xl-4.d-flex.align-self-stretch.p-3 .card.w-100.h-100 .card-header - h1.text-info Alarmmonitor Kreis + h2.text-info Alarmmonitor Kreis .card-body p.text-muted Zeigt alle Wachalarme des gesamten Kreises (egal ob fü Feuerwehr oder Rettungsdienst) an. .card-footer.text-right