From 062e9eb1773375b5c45d3efad891cfd32d392725 Mon Sep 17 00:00:00 2001
From: RyanBirtch-aot <ryan.birtch@aot-technologies.com>
Date: Mon, 29 Jul 2024 17:09:30 +0000
Subject: [PATCH 1/4] init, added marker png to component folder

---
 .../src/components/Map/Common/marker-icon.png    | Bin 0 -> 1466 bytes
 .../src/components/Map/services/MapService.ts    |   6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 components/src/components/Map/Common/marker-icon.png

diff --git a/components/src/components/Map/Common/marker-icon.png b/components/src/components/Map/Common/marker-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..950edf24677ded147df13b26f91baa2b0fa70513
GIT binary patch
literal 1466
zcmV;r1x5OaP)<h;3K|Lk000e1NJLTq000>P001cn1^@s6z>|W`000GnNkl<Zcmb_f
z1CV1`6wTU&we8*5X`5@?-nJb~+YH)cvo*HjWNq8Zc<%o5tM=Ds+UfpPr(V7H?mg!`
zC%oj>GNuHDcIX17Zdjl&3`L?0sTjIws<{((Dh&g-s0<@jYQyl?D*X^?%13;ml^gy>
ziMrY_^1WI=(g@LMizu=zCoA>C`6|QEq1eV92k*7m>G65*&@&6)<M8DCx9R>aC&e}G
zI)pf-Za|N`DT&Cn1J|o`19mumxW~hiKiKyc-P`S@q)rdTo84@QI@;0yXrG%9uhI>A
zG5QHb6s4=<6xy{1<C=CHW}WuDMe!y##Z3alAwHpb=Mm&HJok+$f`w%|f4|pcqeuJS
zp#-ysVvO!71M$ei)GA8X{H-opcg1LtlGOvzwVMt;+V?iaw7V#JG|-NbP1w)o*KIw>
z@NMxEkryp{LS44%z$3lP^cX!9+2-;CTt3wM4(k*#C{aiIiLuB>jJj;KPhPzIC00bL
zU3a#;aJld94lCW=`4&aAy8M7PY=HQ>O%$YEP4c4UY#CRxfgbE~(|uiI=YS8q;O9y6
zmIkXzR`}p7ti|PrM3a}WMnR=3NVnWdAAR>b9X@)DKL6=YsvmH%?I24wdq?Gh54_;#
z$?_LvgjEdspdQlf<N!wxb~7&Ltfju~@6lM_fa5a?)vd(t!c_U?gAcsmXGXGkRdn4p
zb}oaPoE)%Y5}S9^y)^@L?D%mS?|Zs+J;gO_AC-?fc)`z;<}Ug!sm)4Jt!~mZI5{MA
zcqyu8GnKE{PZNE{^&X0<9KqE3<%18r;OB|6=ly|7c(aSt^$rdYL2}ceV?vR>t#4CQ
z`2Zyvy?*)N1Ftw|{_hakhG9WjS?Az@I@+IZ8JbWewR<x~R&An~HqV&(;O7am`V1lZ
zfx~g_9#YggIAF-h9WGK8ETHZ0d^x6o=d&M4nKz$t?7(9C<%2I+KX^!#-K*t^)4K0g
z<SqOg!<E(8{}0ZMGIuU5+x;H9eeq!<j5t3bP5uI`8%8lI7ku*Eg@1|CyOMbPH!YWn
z(mRhOwll672hu7#2YEH?h+-P{u!Q1_E=tfZC23|4D;!n36KjV!zdZ1OPn6bm6#VS9
zB24SvA6mYV!kgSAuC)6>!XUK4&6346+d#~gsE0SY(LX8&JfY>Aj)RxGy96nwhs2rv
zzW6pTn<T0j8;WWt1=YDwjvI$|@Q5<{e8LpdeVoYc8C|CfQp~@F*X$&9os$IRwt#_r
z@bFX2Kj5Y0L;%4X#&TR}k<A{ubB-+_KqR__*#voueGFgrsP_a5#7x`4@S45sbljo0
zO&iDyt=diCx%G{<3r-N>MpFkDSkT*a*6Dx|u@ds6ISVn0@^RmIsKZ5Y<t~y{I_Xxe
zb;`gtMxNkJ^WT!!I?fwc1Q5Py)Jw7#`mk-0d~@04Kpf)5S@V2?H%$eT{v?76xY3mF
zAW6A{ZYs4-3XB@@{1nq4$e&aMfE&09u63~_Hx%z57wAVE&Kb9(rXq6t3tea7+$eQh
zNj%3%*B9*{7Z@$#m~-(9@}?{T2vUrxaHpwpF^;WtZQ=e=Ks)+zx|z|xKJ6dexCL-(
z<=V|8G}!5yf_<ZacJw0-@zWFG4rs^AqO@M0s>;bazbc;tTSq(kg(=481ODrPyNB6n
z-$+U}(w$m6U6H$w17Bw+wDaFIe~GvNMYvnw31MpY0eQKT9l>SU``8k7w4)z!GZKMI
z#_cEKq7k~i%nlK@6c-K?+R;B#5$?T#YpKD`t_4bAs^#E+@5QW$@OX3*<N95=$GH&|
z3>`;(#{U^d-vY)&xEE>n5lYl&T?Am<I|XUI$5Em_%Oc!pA{h|MSr!?6c}_RyUp2En
U8Uiq3+yDRo07*qoM6N<$g8DDw*Z=?k

literal 0
HcmV?d00001

diff --git a/components/src/components/Map/services/MapService.ts b/components/src/components/Map/services/MapService.ts
index 06b110b23..174d27471 100644
--- a/components/src/components/Map/services/MapService.ts
+++ b/components/src/components/Map/services/MapService.ts
@@ -9,6 +9,7 @@ const DEFAULT_LAYER_ATTRIBUTION =
 const DEFAULT_MAP_ZOOM = 5;
 const DECIMALS_LATLNG = 5; // the number of decimals of latitude and longitude to be displayed in the marker popup
 const COMPONENT_EDIT_CLASS = 'component-edit-tabs';
+const CUSTOM_MARKER_URI = '../Common/marker-icon.png/';
 
 interface MapServiceOptions {
   mapContainer: HTMLElement;
@@ -43,6 +44,8 @@ class MapService {
             .setContent('<p>Only one marker for submission</p>')
             .openOn(map);
         } else {
+          console.log(layer);
+          layer.icon({ iconUrl: CUSTOM_MARKER_URI });
           drawnItems.addLayer(layer);
         }
         this.bindPopupToLayer(layer);
@@ -68,7 +71,6 @@ class MapService {
       viewMode,
     } = options;
 
-
     if (drawOptions.rectangle) {
       drawOptions.rectangle.showArea = false;
     }
@@ -81,6 +83,8 @@ class MapService {
     }).addTo(map);
     // Initialize Draw Layer
     let drawnItems = new L.FeatureGroup();
+    //({ iconUrl: '../common/marker-icon.png/' });
+
     map.addLayer(drawnItems);
     // Add Drawing Controllers
 

From f459450222d76a463371bbb61cb5edb641ea5ffe Mon Sep 17 00:00:00 2001
From: RyanBirtch-aot <ryan.birtch@aot-technologies.com>
Date: Wed, 31 Jul 2024 19:20:30 +0000
Subject: [PATCH 2/4] Added custom marker, placeholder marker image

---
 .../src/components/Map/services/MapService.ts    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/components/src/components/Map/services/MapService.ts b/components/src/components/Map/services/MapService.ts
index 174d27471..9a456aeed 100644
--- a/components/src/components/Map/services/MapService.ts
+++ b/components/src/components/Map/services/MapService.ts
@@ -9,7 +9,8 @@ const DEFAULT_LAYER_ATTRIBUTION =
 const DEFAULT_MAP_ZOOM = 5;
 const DECIMALS_LATLNG = 5; // the number of decimals of latitude and longitude to be displayed in the marker popup
 const COMPONENT_EDIT_CLASS = 'component-edit-tabs';
-const CUSTOM_MARKER_URI = '../Common/marker-icon.png/';
+const CUSTOM_MARKER_PATH =
+  'http://leafletjs.com/examples/custom-icons/leaf-green.png';
 
 interface MapServiceOptions {
   mapContainer: HTMLElement;
@@ -45,7 +46,10 @@ class MapService {
             .openOn(map);
         } else {
           console.log(layer);
-          layer.icon({ iconUrl: CUSTOM_MARKER_URI });
+          if (layer.type === 'marker') {
+            layer.setIcon(this.customMarker);
+            console.log('Adding marker' + layer);
+          }
           drawnItems.addLayer(layer);
         }
         this.bindPopupToLayer(layer);
@@ -157,7 +161,8 @@ class MapService {
     items.forEach((item) => {
       let layer;
       if (item.type === 'marker') {
-        layer = L.marker(item.coordinates);
+        layer = L.marker(item.coordinates).setIcon(this.customMarker); //layer.setIcon(this.customMarker);
+        console.log('Loading Marker' + layer);
       } else if (item.type === 'rectangle') {
         layer = L.rectangle(item.bounds);
       } else if (item.type === 'circle') {
@@ -184,5 +189,10 @@ class MapService {
     }
     return false;
   }
+  customMarker = L.icon({
+    iconUrl: CUSTOM_MARKER_PATH,
+    iconSize: [25, 41],
+    iconAnchor: [12, 20],
+  });
 }
 export default MapService;

From 6decb87633a6ff27c2de8f03f44fbccd98f651f0 Mon Sep 17 00:00:00 2001
From: RyanBirtch-aot <ryan.birtch@aot-technologies.com>
Date: Thu, 1 Aug 2024 17:31:53 +0000
Subject: [PATCH 3/4] Added fixes for marker centering

---
 components/src/components/Map/services/MapService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/src/components/Map/services/MapService.ts b/components/src/components/Map/services/MapService.ts
index 9a456aeed..24b69e0fa 100644
--- a/components/src/components/Map/services/MapService.ts
+++ b/components/src/components/Map/services/MapService.ts
@@ -10,7 +10,7 @@ const DEFAULT_MAP_ZOOM = 5;
 const DECIMALS_LATLNG = 5; // the number of decimals of latitude and longitude to be displayed in the marker popup
 const COMPONENT_EDIT_CLASS = 'component-edit-tabs';
 const CUSTOM_MARKER_PATH =
-  'http://leafletjs.com/examples/custom-icons/leaf-green.png';
+  'https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon.png';
 
 interface MapServiceOptions {
   mapContainer: HTMLElement;
@@ -192,7 +192,7 @@ class MapService {
   customMarker = L.icon({
     iconUrl: CUSTOM_MARKER_PATH,
     iconSize: [25, 41],
-    iconAnchor: [12, 20],
+    iconAnchor: [12, 41],
   });
 }
 export default MapService;

From 174dfb1801c36af3185d44a22f52c46226e5d3de Mon Sep 17 00:00:00 2001
From: RyanBirtch-aot <ryan.birtch@aot-technologies.com>
Date: Thu, 1 Aug 2024 20:55:38 +0000
Subject: [PATCH 4/4] Removed comments, and logs

---
 components/src/components/Map/services/MapService.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/src/components/Map/services/MapService.ts b/components/src/components/Map/services/MapService.ts
index 24b69e0fa..55aaca367 100644
--- a/components/src/components/Map/services/MapService.ts
+++ b/components/src/components/Map/services/MapService.ts
@@ -45,10 +45,8 @@ class MapService {
             .setContent('<p>Only one marker for submission</p>')
             .openOn(map);
         } else {
-          console.log(layer);
           if (layer.type === 'marker') {
             layer.setIcon(this.customMarker);
-            console.log('Adding marker' + layer);
           }
           drawnItems.addLayer(layer);
         }
@@ -162,7 +160,6 @@ class MapService {
       let layer;
       if (item.type === 'marker') {
         layer = L.marker(item.coordinates).setIcon(this.customMarker); //layer.setIcon(this.customMarker);
-        console.log('Loading Marker' + layer);
       } else if (item.type === 'rectangle') {
         layer = L.rectangle(item.bounds);
       } else if (item.type === 'circle') {