From aaf767bd0399ca17d07cac47938f332ea59aca13 Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Wed, 14 Sep 2022 22:41:47 +0200
Subject: [PATCH] feat(leaflet): add vehicle positions to map

---
 leaflet/app/components/map/map.jsx      | 20 +++++++++++++---
 leaflet/app/components/vehicleMarker.js | 32 +++++++++++++++++++++++++
 leaflet/app/pages/home.jsx              |  2 +-
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 leaflet/app/components/vehicleMarker.js

diff --git a/leaflet/app/components/map/map.jsx b/leaflet/app/components/map/map.jsx
index 0a4fbf9..ab2c7d2 100644
--- a/leaflet/app/components/map/map.jsx
+++ b/leaflet/app/components/map/map.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { MapContainer, TileLayer, Marker, Popup } from 'react-leaflet'
 /*JS module import (vs cdn or style link)*/
 import 'leaflet/dist/leaflet.css'
@@ -12,12 +13,16 @@ import BoatMarker from './marker-boat';
 import MarkerBFly from './marker-butterfly';
 /**/
 import MarkerBFlyBlack from './marker-butterfly-black';
-const Map = () => {
-    const position = [51.505, -0.09]
+/**/
+import VehicleMarker from '../vehicleMarker';
+const Map = ({ vehPos }) => {
+    const position = [53.2206976, 7.7585528]
     const positionP = [51.504, -0.09]
     return (
 	<>
-	    <h2>Map</h2>
+	    <h2>
+		vehPos.length: {vehPos.length}
+	    </h2>
 	    <MapContainer center={position} zoom={13} scrollWheelZoom={false}>
 		<TileLayer
 		    attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
@@ -33,8 +38,17 @@ const Map = () => {
 		<BoatMarker/>
 		<MarkerBFly/>
 		<MarkerBFlyBlack/>
+		{vehPos.map(function(value,key) {
+		    console.log(`key: ${key}, value: ${value}`);
+                    return <VehicleMarker key={key} index={key} location={value}/>;
+                })
+            }
 	    </MapContainer>
 	</>
     );
 }
 export default Map
+
+Map.propTypes = {
+    vehPos: PropTypes.array
+};
diff --git a/leaflet/app/components/vehicleMarker.js b/leaflet/app/components/vehicleMarker.js
new file mode 100644
index 0000000..919d8c0
--- /dev/null
+++ b/leaflet/app/components/vehicleMarker.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {Marker,Popup} from 'react-leaflet';
+import bfly from '../assets/Logo_SIB_electricindigo.svg';
+const VehicleRealTimeMarker = ({ index,location }) => {
+    const myIcon = new L.Icon({
+	iconUrl: bfly,
+	iconRetinaUrl: bfly,
+	popupAnchor:  [-0, -0],
+	iconSize: [32,45],
+    });
+    return(
+	<>
+	    <Marker
+		index={index}
+		position={[location.lat,location.lon]}
+		icon={myIcon}
+	    >
+		<Popup>
+		    Popup
+		</Popup>
+	    </Marker>
+	</>
+    );
+}
+export default VehicleRealTimeMarker;
+
+
+VehicleRealTimeMarker.propTypes = {
+    index: PropTypes.number,
+    location: PropTypes.object
+};
diff --git a/leaflet/app/pages/home.jsx b/leaflet/app/pages/home.jsx
index 65edf8c..0b0209e 100644
--- a/leaflet/app/pages/home.jsx
+++ b/leaflet/app/pages/home.jsx
@@ -115,7 +115,7 @@ const Home = () => {
 	    <p>
 		vehicle position count: {vehPos.length}
 	    </p>
-	    <Map />
+	    <Map vehPos={vehPos}/>
 	</>
     );
 }