2023
This commit is contained in:
Walter Hupfeld
parent
f2900ee8ad
commit
d440ea29e4
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"editor.scrollbar.horizontal": "visible"
|
||||
}
|
||||
40
index.php
40
index.php
@ -30,6 +30,12 @@
|
||||
<link rel="stylesheet" href="css/leaflet.css" />
|
||||
<link rel="stylesheet" href="css/leaflet.awesome-markers.css" />
|
||||
<link rel="stylesheet" href="css/style.css" />
|
||||
|
||||
|
||||
<link rel="stylesheet" href="vendor/Leaflet.markercluster/dist/MarkerCluster.css" />
|
||||
<link rel="stylesheet" href="vendor/Leaflet.markercluster/dist/MarkerCluster.Default.css" />
|
||||
<script src="vendor/Leaflet.markercluster/dist/leaflet.markercluster-src.js"></script>
|
||||
|
||||
<title><?= $strTitle ?></title>
|
||||
</head>
|
||||
|
||||
@ -131,6 +137,8 @@
|
||||
<!-- row -->
|
||||
</div>
|
||||
<!-- container-fluid -->
|
||||
|
||||
|
||||
<script>
|
||||
// Map ----------------------------------------------------------------------
|
||||
var mymap = L.map('mapid').setView([<?=$numInfoLat ?>, <?=$numInfoLng ?>], <?=$numZoom ?>);
|
||||
@ -171,7 +179,6 @@
|
||||
}
|
||||
|
||||
//Hamm-Layer - todo invers area ---------------------------------------
|
||||
|
||||
var myStyle = {
|
||||
"color": "grey",
|
||||
"fillColor": "lightblue",
|
||||
@ -185,6 +192,32 @@
|
||||
});
|
||||
districtLayer.addTo(mymap);
|
||||
|
||||
|
||||
|
||||
|
||||
var geoJsonData = {
|
||||
"type": "FeatureCollection",
|
||||
"features": [
|
||||
{ "type": "Feature", "id":"1", "properties": { "address": "2" }, "geometry": { "type": "Point", "coordinates": [51.6792,7.77693] } },
|
||||
{ "type": "Feature", "id":"2", "properties": { "address": "151" }, "geometry": { "type": "Point", "coordinates": [51.6787,7.77699] } },
|
||||
{ "type": "Feature", "id":"3", "properties": { "address": "21" }, "geometry": { "type": "Point", "coordinates": [51.6777,7.77690] } },
|
||||
{ "type": "Feature", "id":"4", "properties": { "address": "14" }, "geometry": { "type": "Point", "coordinates": [51.6798,7.77692] } },
|
||||
{ "type": "Feature", "id":"5", "properties": { "address": "38B" }, "geometry": { "type": "Point", "coordinates": [51.6800,7.77700] } },
|
||||
{ "type": "Feature", "id":"6", "properties": { "address": "38" }, "geometry": { "type": "Point", "coordinates": [51.6747,7.77683] } }
|
||||
]
|
||||
};
|
||||
var markers = L.markerClusterGroup();
|
||||
|
||||
var geoJsonLayer = L.geoJson(geoJsonData, {
|
||||
onEachFeature: function (feature, layer) {
|
||||
layer.bindPopup(feature.properties.address);
|
||||
}
|
||||
});
|
||||
markers.addLayer(geoJsonLayer);
|
||||
|
||||
//mymap.addLayer(markers);
|
||||
// mymap.fitBounds(markers.getBounds());
|
||||
|
||||
// Marker from database -------------------------------------------------------
|
||||
|
||||
var marker = [];
|
||||
@ -200,16 +233,13 @@
|
||||
// Info-Marker für Start --------------------------------------------------------
|
||||
|
||||
var marker2 = L.marker([<?=$numInfoLat?>, <?=$numInfoLng?>], { icon: infoMarker }).addTo(mymap);
|
||||
|
||||
|
||||
<?php
|
||||
echo "marker2.bindPopup('".$strIntro."');";
|
||||
if ($numVehicle==0) {
|
||||
echo "marker2.openPopup();";
|
||||
}
|
||||
?>
|
||||
|
||||
|
||||
|
||||
|
||||
// Hide and show marker form checkbox ----------------------------------------
|
||||
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
<div class="col-5">
|
||||
<h4>Unfallverlauf von <?=$numLatestYear?> bis <?=$numStartYear?></h4>
|
||||
<table class='table table-sm'>
|
||||
<tr><th></th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><th></th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><td><?= $arrCategory[1]?></td><?= get_row($resultVerlauf,1) ?></tr>
|
||||
<tr><td><?= $arrCategory[2]?></td><?= get_row($resultVerlauf,2) ?></tr>
|
||||
<tr><td><?= $arrCategory[3]?></td><?= get_row($resultVerlauf,3) ?></tr>
|
||||
|
||||
@ -155,7 +155,7 @@ Highcharts.chart('c_unfallverlauf', {
|
||||
align: 'center'
|
||||
},
|
||||
xAxis: {
|
||||
categories: ['2022','2021','2020','2019']
|
||||
categories: ['2023','2022','2021','2020','2019']
|
||||
},
|
||||
yAxis: {
|
||||
min: 0,
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
|
||||
<h3>Weitere Auswertungen zu Fahrradunfällen</h3>
|
||||
<p>Auf den folgenden Seiten werden für Kreise bzw. Kreisfreie Städte und Gemeinden die
|
||||
Entwicklung der Unfallzahlen von 2019 bis 2022 dagestellt differenziert nach der
|
||||
Unfallkategorie. Weiterhin gibt es für das Jahr 2022 zu den Fahrradunfällen
|
||||
Entwicklung der Unfallzahlen von <?=$numStartYear?> bis <?=$numLatestYear?> dagestellt differenziert nach der
|
||||
Unfallkategorie. Weiterhin gibt es für das Jahr <?=$numLatestYear?> zu den Fahrradunfällen
|
||||
Statistiken zu Unfallart, Unfalltyp und Unfallbeteiligten.</p>
|
||||
<p>Alle Angaben basieren auf Daten des
|
||||
<a href="https://www.destatis.de" target_"blanc">Statistischen Bundesamtes</a>.
|
||||
|
||||
@ -68,7 +68,7 @@
|
||||
<div class="col-5">
|
||||
<h4>Unfallverlauf von <?=$numLatestYear?> bis <?=$numStartYear?></h4>
|
||||
<table class='table table-sm'>
|
||||
<tr><th></th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><th></th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><td><?= $arrCategory[1]?></td><?= get_row($resultVerlauf,1) ?></tr>
|
||||
<tr><td><?= $arrCategory[2]?></td><?= get_row($resultVerlauf,2) ?></tr>
|
||||
<tr><td><?= $arrCategory[3]?></td><?= get_row($resultVerlauf,3) ?></tr>
|
||||
|
||||
@ -27,18 +27,18 @@
|
||||
<thead>
|
||||
|
||||
<tr><th></th>
|
||||
<th colspan="4">Fahrradunfälle</th>
|
||||
<th colspan="4">Todesfälle</th>
|
||||
<th colspan="4">Schwerverletzte</th>
|
||||
<th colspan="4">Leichtverletzte</th>
|
||||
<th colspan="5">Fahrradunfälle</th>
|
||||
<th colspan="5">Todesfälle</th>
|
||||
<th colspan="5">Schwerverletzte</th>
|
||||
<th colspan="5">Leichtverletzte</th>
|
||||
<th></th><th></th>
|
||||
</tr>
|
||||
|
||||
<tr><th>Kreis</th>
|
||||
<th class="l">2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">Einw. in Tausend</th><th>Quote</th>
|
||||
|
||||
</tr>
|
||||
@ -50,27 +50,31 @@ require("../config.php");
|
||||
|
||||
$strSQL="SELECT d.title as Kreis,
|
||||
district,
|
||||
SUM(UJAHR=2023) as Jahr_2023,
|
||||
SUM(UJAHR=2022) as Jahr_2022,
|
||||
SUM(UJAHR=2021) as Jahr_2021,
|
||||
SUM(UJAHR=2020) as Jahr_2020,
|
||||
SUM(UJAHR=2019) as Jahr_2019,
|
||||
|
||||
SUM(UJAHR=2023 AND UKATEGORIE=1) as Tode_2023,
|
||||
SUM(UJAHR=2022 AND UKATEGORIE=1) as Tode_2022,
|
||||
SUM(UJAHR=2021 AND UKATEGORIE=1) as Tode_2021,
|
||||
SUM(UJAHR=2020 AND UKATEGORIE=1) as Tode_2020,
|
||||
SUM(UJAHR=2019 AND UKATEGORIE=1) as Tode_2019,
|
||||
|
||||
SUM(UJAHR=2023 AND UKATEGORIE=2) as Schwerverletzt_2023,
|
||||
SUM(UJAHR=2022 AND UKATEGORIE=2) as Schwerverletzt_2022,
|
||||
SUM(UJAHR=2021 AND UKATEGORIE=2) as Schwerverletzt_2021,
|
||||
SUM(UJAHR=2020 AND UKATEGORIE=2) as Schwerverletzt_2020,
|
||||
SUM(UJAHR=2019 AND UKATEGORIE=2) as Schwerverletzt_2019,
|
||||
|
||||
SUM(UJAHR=2023 AND UKATEGORIE=3) as Leichtverletzt_2023,
|
||||
SUM(UJAHR=2022 AND UKATEGORIE=3) as Leichtverletzt_2022,
|
||||
SUM(UJAHR=2021 AND UKATEGORIE=3) as Leichtverletzt_2021,
|
||||
SUM(UJAHR=2020 AND UKATEGORIE=3) as Leichtverletzt_2020,
|
||||
SUM(UJAHR=2019 AND UKATEGORIE=3) as Leichtverletzt_2019,
|
||||
d.Population as Population,
|
||||
SUM(UJAHR=2022)/d.Population*1000 as Quote_2022,
|
||||
SUM(UJAHR=2023)/d.Population*1000 as Quote_2023,
|
||||
s.ULAND,
|
||||
s.UREGBEZ ,
|
||||
s.UKREIS
|
||||
@ -78,31 +82,35 @@ $strSQL="SELECT d.title as Kreis,
|
||||
WHERE IstRad=1
|
||||
AND d.ULAND=s.ULAND AND d.UREGBEZ=s.UREGBEZ AND d.UKREIS=s.UKREIS
|
||||
GROUP BY s.ULAND, s.UREGBEZ, s.UKREIS
|
||||
ORDER BY Quote_2022 DESC;";
|
||||
ORDER BY Quote_2023 DESC;";
|
||||
|
||||
$result=$db->query($strSQL);
|
||||
|
||||
while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
|
||||
echo "<tr>";
|
||||
echo "<td><a href='kreis_details.php?regbez=".$row['UREGBEZ']."&kreis=".$row['UKREIS']."'>".$row['Kreis']."</a></td>";
|
||||
echo "<td class='l'>".$row['Jahr_2022']."</td>";
|
||||
echo "<td class='l'>".$row['Jahr_2023']."</td>";
|
||||
echo "<td>".$row['Jahr_2022']."</td>";
|
||||
echo "<td>".$row['Jahr_2021']."</td>";
|
||||
echo "<td>".$row['Jahr_2020']."</td>";
|
||||
echo "<td>".$row['Jahr_2019']."</td>";
|
||||
echo "<td class='l'>".$row['Tode_2022']."</td>";
|
||||
echo "<td class='l'>".$row['Tode_2023']."</td>";
|
||||
echo "<td>".$row['Tode_2022']."</td>";
|
||||
echo "<td>".$row['Tode_2021']."</td>";
|
||||
echo "<td>".$row['Tode_2020']."</td>";
|
||||
echo "<td>".$row['Tode_2019']."</td>";
|
||||
echo "<td class='l'>".$row['Schwerverletzt_2022']."</td>";
|
||||
echo "<td class='l'>".$row['Schwerverletzt_2023']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2022']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2021']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2020']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2019']."</td>";
|
||||
echo "<td class='l'>".$row['Leichtverletzt_2022']."</td>";
|
||||
echo "<td class='l'>".$row['Leichtverletzt_2023']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2022']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2021']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2020']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2019']."</td>";
|
||||
echo "<td class='l rechts'>".round($row['Population']/1000,0)."</td>";
|
||||
echo "<td class='rechts'>".round($row['Quote_2022'],2)."</td>";
|
||||
echo "<td class='rechts'>".round($row['Quote_2023'],2)."</td>";
|
||||
echo "</tr>\n";
|
||||
}
|
||||
?>
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
<div class="col-5">
|
||||
<h4>Unfallverlauf von <?=$numLatestYear?> bis <?=$numStartYear?></h4>
|
||||
<table class='table table-sm'>
|
||||
<tr><th></th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><th></th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><td><?= $arrCategory[1]?></td><?= get_row($resultVerlauf,1) ?></tr>
|
||||
<tr><td><?= $arrCategory[2]?></td><?= get_row($resultVerlauf,2) ?></tr>
|
||||
<tr><td><?= $arrCategory[3]?></td><?= get_row($resultVerlauf,3) ?></tr>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user