From 49bf426f9161e5c33e4221f8a48248564e072b29 Mon Sep 17 00:00:00 2001
From: vadik likholetov <vadikas@gmail.com>
Date: Sat, 2 Dec 2023 12:23:28 +0200
Subject: [PATCH] fixed comment delete routine

---
 .idea/SARBase.iml           |  5 +++++
 .idea/jsLibraryMappings.xml |  2 +-
 sar_calls.py                |  6 ++++++
 templates/sar_details.html  | 41 +++++++++++++++++++++++++++++++++++--
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/.idea/SARBase.iml b/.idea/SARBase.iml
index fc5987a..b701b06 100644
--- a/.idea/SARBase.iml
+++ b/.idea/SARBase.iml
@@ -9,7 +9,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Python 3.9 (SARBase)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="leaflet.draw" level="application" />
     <orderEntry type="library" name="leaflet-control-geocoder" level="application" />
+    <orderEntry type="library" name="leaflet" level="application" />
+    <orderEntry type="library" name="jquery-3.5.1.slim" level="application" />
+    <orderEntry type="library" name="@turf/turf" level="application" />
+    <orderEntry type="library" name="leaflet-gpx" level="application" />
   </component>
   <component name="PackageRequirementsSettings">
     <option name="removeUnused" value="true" />
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index 265df42..6a19350 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{leaflet-control-geocoder}" />
+    <file url="file://$PROJECT_DIR$" libraries="{@turf/turf, jquery-3.5.1.slim, leaflet, leaflet-gpx, leaflet.draw}" />
   </component>
 </project>
\ No newline at end of file
diff --git a/sar_calls.py b/sar_calls.py
index b0d0880..9e79f53 100644
--- a/sar_calls.py
+++ b/sar_calls.py
@@ -208,6 +208,12 @@ def delete_comment(id):
     comment = Comment.query.get_or_404(id)
     # if current_user.id != comment.user_id and current_user.id != 1 and current_user.id != comment.sar_call.user_id:
     #     abort(403)
+
+    # delete associated GPX files
+    gpx_tracks= GPSTrack.query.filter_by(comment_id=comment.id).all()
+    for track in gpx_tracks:
+        db.session.delete(track)
+
     db.session.delete(comment)
     db.session.commit()
     flash('Comment deleted successfully!', 'success')
diff --git a/templates/sar_details.html b/templates/sar_details.html
index 7b2d456..476fb6b 100644
--- a/templates/sar_details.html
+++ b/templates/sar_details.html
@@ -17,6 +17,7 @@
     <!-- Include leaflet-gpx plugin -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-gpx/1.7.0/gpx.min.js"></script>
 
+    <script src='https://unpkg.com/@turf/turf@6/turf.min.js'></script>
     <script src="/static/togpx.js"></script>
 
     <style>
@@ -424,6 +425,11 @@
                 });
             });
         });
+
+        $('#uploadGPXModal').on('hie', function (e) {
+            // Refresh the parent page (assuming you want to refresh the entire page)
+            location.reload(); // This will refresh the current page
+        });
     </script>
 
     <script>
@@ -444,7 +450,32 @@
 
         // Function to convert GeoJSON to GPX
         function geoJSONToGPX(geoJSONData) {
-            var gpx = togpx(geoJSONData);
+
+            // Convert each point to a circle polygon
+            let convertedFeatures = geoJSONData.features.map(feature => {
+                console.log(feature);
+                if (feature.geometry.type === 'Point' && feature.properties.radius) {
+                    // Convert radius from meters to kilometers for turf.circle
+                    let radiusInKm = feature.properties.radius / 1000;
+
+                    // Create a circular polygon
+                    let circle = turf.circle(feature.geometry.coordinates, radiusInKm);
+
+                    // Optional: transfer other properties to the new feature
+                    circle.properties = {...feature.properties};
+
+                    return circle;
+                }
+                return feature;
+            });
+
+            // Create a new GeoJSON FeatureCollection
+            let convertedGeoJSON = {
+                "type": "FeatureCollection",
+                "features": convertedFeatures
+            };
+            console.log(convertedGeoJSON);
+            var gpx = togpx(convertedGeoJSON);
             return gpx;
         }
 
@@ -455,7 +486,7 @@
             var trackComment = document.getElementById('track-comment').value;
             var sarID = document.getElementById('sarIdForGPX').value;
 
-            // Get the track data (replace 'getTrackData()' with your method to obtain the track data)
+            // Get the track data
             var trackData = getTrackData();
 
             // Send trackName, trackComment, and trackData to the server
@@ -481,6 +512,12 @@
             // Close the modal
             $('#saveTrackModal').modal('hide');
         });
+
+        $('#saveTrackModal').on('hidden.bs.modal', function (e) {
+            // Refresh the parent page (assuming you want to refresh the entire page)
+            location.reload(); // This will refresh the current page
+        });
+
     </script>