more fixes for issue #310

IonosatMicro · Feb 15, 2020 · 693445d · 693445d
1 parent 70dd0a9
commit 693445d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/backend/promis/backend_api/serializer.py b/backend/promis/backend_api/serializer.py
@@ -294,6 +294,10 @@ def gen_selection():
                     # Intersection of search polygon and the orbit
                     isect = obj.session.geo_line.intersection(poly)
 
+                    #django docs say that GEOSGeometry.dims returns -1 for empty GeometryCollection
+                    if isect.dims == -1:
+                        return
+
                     # Making sure isect is a collection of geolines, not a single one
                     if type(isect) is not MultiLineString:
                         isect = [ isect ]

diff --git a/frontend/app/constants/Selection.js b/frontend/app/constants/Selection.js
@@ -60,11 +60,20 @@ export function selectionToPolygon(selection) {
         case Types.Rect:
             let bounds = Leaflet.latLngBounds(selection.data[0], selection.data[1]);
             //let center = bounds.getCenter();
-
             points.push(bounds.getSouthWest());
             points.push(bounds.getSouthEast());
+            // had to add these two intermidiate points to overcome the bug
+            // "Antipodal (180 degrees long) edge detected!"
+            if (selection.data[0][0] == -90 && selection.data[1][0] == 90)
+            {
+                points.push({lat: 0, lng: bounds.getSouthEast().lng})
+            }
             points.push(bounds.getNorthEast());
             points.push(bounds.getNorthWest());
+            if (selection.data[0][0] == -90 && selection.data[1][0] == 90)
+            {
+                points.push({lat: 0, lng: bounds.getNorthWest().lng})
+            }
         break;
 
         case Types.Circle: