Merge branch 'main' into rc1.6.5

Author: gnbm

src/Providers/Maps/Google/Configuration/Shape/CircleShapeConfig.ts

@@ -1,7 +1,11 @@
 /// <reference path="./FilledShapeConfig.ts" />
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+<<<<<<<< HEAD:src/Providers/Maps/Google/Configuration/Shape/CircleShapeConfig.ts
 namespace Provider.Maps.Google.Configuration.Shape {
+========
+namespace Provider.Maps.Leaflet.Configuration.Shape {
+>>>>>>>> rc1.6.3:src/Providers/Maps/Leaflet/Configuration/Shape/CircleShapeConfig.ts
     export class CircleShapeConfig extends FilledShapeConfig {
         public center: string;
         public radius: number;

src/Providers/Maps/Google/Configuration/Shape/RectangleShapeConfig.ts

@@ -1,7 +1,11 @@
 /// <reference path="./FilledShapeConfig.ts" />
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+<<<<<<<< HEAD:src/Providers/Maps/Google/Configuration/Shape/RectangleShapeConfig.ts
 namespace Provider.Maps.Google.Configuration.Shape {
+========
+namespace Provider.Maps.Leaflet.Configuration.Shape {
+>>>>>>>> rc1.6.3:src/Providers/Maps/Leaflet/Configuration/Shape/RectangleShapeConfig.ts
     export class RectangleShapeConfig extends FilledShapeConfig {
         public bounds: string;
 

src/Providers/Maps/Leaflet/Configuration/Shape/CircleShapeConfig.ts

@@ -1,7 +1,11 @@
 /// <reference path="./FilledShapeConfig.ts" />
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+<<<<<<<< HEAD:src/Providers/Maps/Leaflet/Configuration/Shape/CircleShapeConfig.ts
 namespace Provider.Maps.Leaflet.Configuration.Shape {
+========
+namespace Provider.Maps.Google.Configuration.Shape {
+>>>>>>>> rc1.6.3:src/Providers/Maps/Google/Configuration/Shape/CircleShapeConfig.ts
     export class CircleShapeConfig extends FilledShapeConfig {
         public center: string;
         public radius: number;

src/Providers/Maps/Leaflet/Configuration/Shape/RectangleShapeConfig.ts

@@ -1,7 +1,11 @@
 /// <reference path="./FilledShapeConfig.ts" />
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+<<<<<<<< HEAD:src/Providers/Maps/Leaflet/Configuration/Shape/RectangleShapeConfig.ts
 namespace Provider.Maps.Leaflet.Configuration.Shape {
+========
+namespace Provider.Maps.Google.Configuration.Shape {
+>>>>>>>> rc1.6.3:src/Providers/Maps/Google/Configuration/Shape/RectangleShapeConfig.ts
     export class RectangleShapeConfig extends FilledShapeConfig {
         public bounds: string;
 

src/Providers/Maps/Leaflet/OSMap/OSMap.ts

@@ -81,10 +81,10 @@ namespace Provider.Maps.Leaflet.OSMap {
                                         .ProviderEvent,
                                     this,
                                     eventName,
-                                    e && e.latlng !== undefined
+                                    e && e.target.getLatLng() !== undefined
                                         ? JSON.stringify({
-                                              Lat: e.latlng.lat,
-                                              Lng: e.latlng.lng
+                                              Lat: e.target.getLatLng().lat,
+                                              Lng: e.target.getLatLng().lng
                                           })
                                         : undefined
                                 );