diff --git a/config.php b/config.php index f905d35..d4d45b7 100644 --- a/config.php +++ b/config.php @@ -65,8 +65,8 @@ $arrTopic = array ( 2 => "Radverkehr", 1 => "Fußverkehr", 3 => "Bus und Bahn", -// 4 => "Pkw-Verkehr", -// 5 => "Lkw-Verkehr" + 4 => "Pkw-Verkehr", + 5 => "Lkw-Verkehr" ); $arrMarkerType = array ( @@ -90,8 +90,8 @@ $arrTransport = array ( ); $arrIcon = array ( - 1 => "", - 2 => "", + 1 => "", + 2 => "", 3 => "", 4 => "", 5 => "" diff --git a/datenschutz.php b/datenschutz.php index d3d0292..b88a674 100644 --- a/datenschutz.php +++ b/datenschutz.php @@ -21,9 +21,6 @@ -
@@ -34,9 +31,6 @@ -
diff --git a/db/unfallorte b/db/unfallorte index 84ac1e0..56a0b47 100644 Binary files a/db/unfallorte and b/db/unfallorte differ diff --git a/impressum.php b/impressum.php index 99131e6..2270d7a 100644 --- a/impressum.php +++ b/impressum.php @@ -19,10 +19,7 @@ @@ -49,7 +43,7 @@

Impressum

-

Der Ideenmelder wird zur Verfügung gestellt vom:

+

Die Unfallkarte basiert auf Daten des Statistischen Bundesamtes:

 

Logo

 

@@ -59,7 +53,7 @@

 

- Anfragen zum Ideenmelder an + Anfragen an

 

 

diff --git a/index.php b/index.php index 8b2889b..73ebdeb 100644 --- a/index.php +++ b/index.php @@ -6,14 +6,29 @@ $strIntro ="

".$strTitle."

"; $strIntro .= nl2br2($strIntroText); - $strSQL="SELECT * FROM Unfallorte"; + $numKey = (isset($_GET['key'])) ? $_GET['key'] : 1 ; + + switch ($numKey) { + case 1 : $strKey = "IstRad=1"; + break; + case 2: $strKey = "IstPKW=1"; + break; + case 3 : $strKey = "IstFuss=1"; + break; + } + + + $strSQL="SELECT * FROM Unfallorte2019_Hamm WHERE ".$strKey; + $result = $db->query($strSQL); $arrMarker = array(); $arrDescription = array(); while ($row = $result->fetchArray()) { - $id=$row['OBJECTID']; + + //print_r($row);echo "
"; + $id = $row[0]; $topic = 2; $numLng = $row['XGCSWGS84']; $numLat = $row['YGCSWGS84']; @@ -139,7 +154,7 @@ // markerIcons ------------------------------------------------------------------------------ var infoMarker = L.AwesomeMarkers.icon({icon: 'info', prefix: 'fa', markerColor: 'orange'}); - var bicycleMarker = L.AwesomeMarkers.icon({icon: 'bicycle', prefix: 'fa', markerColor: 'green'}); + var bicycleMarker = L.AwesomeMarkers.icon({icon: 'bicycle', prefix: 'fa', markerColor: 'red'}); var carMarker = L.AwesomeMarkers.icon({icon: 'car', prefix: 'fa', markerColor: 'red'}); var truckMarker = L.AwesomeMarkers.icon({icon: 'truck', prefix: 'fa', markerColor: 'beige'}); var trainMarker = L.AwesomeMarkers.icon({icon: 'bus', prefix: 'fa', markerColor: 'blue'});