Add shape types

OutSystems · May 8, 2023 · df7380a · df7380a
1 parent 33e4bd6
commit df7380a
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 45 deletions.
diff --git a/src/OSFramework/Maps/Event/Shape/ShapeProviderEvent.ts b/src/OSFramework/Maps/Event/Shape/ShapeProviderEvent.ts
@@ -21,7 +21,7 @@ namespace OSFramework.Maps.Event.Shape {
             mapId: string,
             shapeId: string,
             eventName: string,
-            args: any
+            args: OSFramework.Maps.OSStructures.OSMap.OSShapeCoordinates
         ): void {
             this.handlers
                 .slice(0)

diff --git a/src/OSFramework/Maps/OSStructures/OSMap.Coordinates.ts b/src/OSFramework/Maps/OSStructures/OSMap.Coordinates.ts
@@ -17,4 +17,27 @@ namespace OSFramework.Maps.OSStructures.OSMap {
             this.Lng = lng;
         }
     }
+
+    export type PolylineCoordinates = {
+        coordinates: Array<OSCoordinates>;
+        location: Array<string>;
+    };
+
+    export type CircleCoordinates = {
+        coordinates: OSCoordinates;
+        location: {
+            location: string;
+            radius: number;
+        };
+    };
+
+    export type RectangleCoordinates = {
+        coordinates: Bounds;
+        location: Bounds;
+    };
+
+    export type OSShapeCoordinates =
+        | PolylineCoordinates // Polyline and Polygon type
+        | CircleCoordinates
+        | RectangleCoordinates;
 }
diff --git a/src/Providers/Maps/Google/DrawingTools/AbstractDrawShape.ts b/src/Providers/Maps/Google/DrawingTools/AbstractDrawShape.ts
@@ -26,7 +26,7 @@ namespace Provider.Maps.Google.DrawingTools {
                     mapId: string,
                     shapeId: string,
                     eventName: string,
-                    shapeProperties: any
+                    shapeCoordinates: OSFramework.Maps.OSStructures.OSMap.OSShapeCoordinates
                 ) => {
                     this.drawingTools.drawingToolsEvents.trigger(
                         // EventType
@@ -38,9 +38,9 @@ namespace Provider.Maps.Google.DrawingTools {
                         {
                             uniqueId: _shape.uniqueId,
                             isNewElement: false,
-                            location: JSON.stringify(shapeProperties.location),
+                            location: JSON.stringify(shapeCoordinates.location),
                             coordinates: JSON.stringify(
-                                shapeProperties.coordinates
+                                shapeCoordinates.coordinates
                             )
                         }
                     );

diff --git a/src/Providers/Maps/Google/Shape/Circle.ts b/src/Providers/Maps/Google/Shape/Circle.ts
@@ -67,13 +67,7 @@ namespace Provider.Maps.Google.Shape {
                 .CFG_InvalidCircleShapeCenter;
         }
 
-        protected getShapeProperties(): {
-            coordinates: OSFramework.Maps.OSStructures.OSMap.OSCoordinates;
-            location: {
-                location: string;
-                radius: number;
-            };
-        } {
+        protected getShapeCoordinates(): OSFramework.Maps.OSStructures.OSMap.CircleCoordinates {
             return {
                 coordinates: {
                     Lat: this.providerCenter.lat,

diff --git a/src/Providers/Maps/Google/Shape/Polygon.ts b/src/Providers/Maps/Google/Shape/Polygon.ts
@@ -36,10 +36,7 @@ namespace Provider.Maps.Google.Shape {
             });
         }
 
-        protected getShapeProperties(): {
-            coordinates: Array<OSFramework.Maps.OSStructures.OSMap.OSCoordinates>;
-            location: Array<string>;
-        } {
+        protected getShapeCoordinates(): OSFramework.Maps.OSStructures.OSMap.PolylineCoordinates {
             const locations = this.providerObjectPath
                 .getArray()
                 .map((elm) => `${elm.lat()},${elm.lng()}`);

diff --git a/src/Providers/Maps/Google/Shape/Polyline.ts b/src/Providers/Maps/Google/Shape/Polyline.ts
@@ -34,10 +34,7 @@ namespace Provider.Maps.Google.Shape {
             });
         }
 
-        protected getShapeProperties(): {
-            coordinates: Array<OSFramework.Maps.OSStructures.OSMap.OSCoordinates>;
-            location: Array<string>;
-        } {
+        protected getShapeCoordinates(): OSFramework.Maps.OSStructures.OSMap.PolylineCoordinates {
             const locations = this.providerObjectPath
                 .getArray()
                 .map((elm) => `${elm.lat()},${elm.lng()}`);

diff --git a/src/Providers/Maps/Google/Shape/Rectangle.ts b/src/Providers/Maps/Google/Shape/Rectangle.ts
@@ -105,10 +105,7 @@ namespace Provider.Maps.Google.Shape {
             });
         }
 
-        protected getShapeProperties(): {
-            coordinates: OSFramework.Maps.OSStructures.OSMap.Bounds;
-            location: OSFramework.Maps.OSStructures.OSMap.Bounds;
-        } {
+        protected getShapeCoordinates(): OSFramework.Maps.OSStructures.OSMap.RectangleCoordinates {
             const bounds = {
                 north: this.bounds.north,
                 south: this.bounds.south,

diff --git a/src/Providers/Maps/Leaflet/DrawingTools/AbstractDrawShape.ts b/src/Providers/Maps/Leaflet/DrawingTools/AbstractDrawShape.ts
@@ -26,7 +26,7 @@ namespace Provider.Maps.Leaflet.DrawingTools {
                     mapId: string,
                     shapeId: string,
                     eventName: string,
-                    shapeProperties: any
+                    shapeCoordinates: OSFramework.Maps.OSStructures.OSMap.OSShapeCoordinates
                 ) => {
                     this.drawingTools.drawingToolsEvents.trigger(
                         // EventType
@@ -38,9 +38,9 @@ namespace Provider.Maps.Leaflet.DrawingTools {
                         {
                             uniqueId: _shape.uniqueId,
                             isNewElement: false,
-                            location: JSON.stringify(shapeProperties.location),
+                            location: JSON.stringify(shapeCoordinates.location),
                             coordinates: JSON.stringify(
-                                shapeProperties.coordinates
+                                shapeCoordinates.coordinates
                             )
                         }
                     );

diff --git a/src/Providers/Maps/Leaflet/Shape/Circle.ts b/src/Providers/Maps/Leaflet/Shape/Circle.ts
@@ -97,13 +97,7 @@ namespace Provider.Maps.Leaflet.Shape {
             return new L.Circle(center, this.getProviderConfig());
         }
 
-        protected getShapeProperties(): {
-            coordinates: OSFramework.Maps.OSStructures.OSMap.OSCoordinates;
-            location: {
-                location: string;
-                radius: number;
-            };
-        } {
+        protected getShapeCoordinates(): OSFramework.Maps.OSStructures.OSMap.CircleCoordinates {
             return {
                 coordinates: {
                     Lat: this.providerCenter.lat,

diff --git a/src/Providers/Maps/Leaflet/Shape/Polygon.ts b/src/Providers/Maps/Leaflet/Shape/Polygon.ts
@@ -44,10 +44,7 @@ namespace Provider.Maps.Leaflet.Shape {
             return new L.Polygon(path, this.getProviderConfig());
         }
 
-        protected getShapeProperties(): {
-            coordinates: Array<OSFramework.Maps.OSStructures.OSMap.OSCoordinates>;
-            location: Array<string>;
-        } {
+        protected getShapeCoordinates(): OSFramework.Maps.OSStructures.OSMap.PolylineCoordinates {
             const locations = (this.providerObjectPath as Array<L.LatLng>).map(
                 (elm) => `${elm.lat},${elm.lng}`
             );

diff --git a/src/Providers/Maps/Leaflet/Shape/Polyline.ts b/src/Providers/Maps/Leaflet/Shape/Polyline.ts
@@ -42,10 +42,7 @@ namespace Provider.Maps.Leaflet.Shape {
             return new L.Polyline(path, this.getProviderConfig());
         }
 
-        protected getShapeProperties(): {
-            coordinates: Array<OSFramework.Maps.OSStructures.OSMap.OSCoordinates>;
-            location: Array<string>;
-        } {
+        protected getShapeCoordinates(): OSFramework.Maps.OSStructures.OSMap.PolylineCoordinates {
             const locations = (this.providerObjectPath as Array<L.LatLng>).map(
                 (elm) => `${elm.lat},${elm.lng}`
             );

diff --git a/src/Providers/Maps/Leaflet/Shape/Rectangle.ts b/src/Providers/Maps/Leaflet/Shape/Rectangle.ts
@@ -130,10 +130,7 @@ namespace Provider.Maps.Leaflet.Shape {
             });
         }
 
-        protected getShapeProperties(): {
-            coordinates: OSFramework.Maps.OSStructures.OSMap.Bounds;
-            location: OSFramework.Maps.OSStructures.OSMap.Bounds;
-        } {
+        protected getShapeCoordinates(): OSFramework.Maps.OSStructures.OSMap.RectangleCoordinates {
             const bounds = {
                 north: this.bounds.north,
                 south: this.bounds.south,