From deb52f80ed1d47121ec3a478ab0fdb2c6f800494 Mon Sep 17 00:00:00 2001
From: Francisco Sanz <frasanz@bifi.es>
Date: Thu, 26 Sep 2024 13:09:02 +0000
Subject: [PATCH] modifying media folders to store georerefenced and original
 photos

---
 frontend/static/js/main.js      |  4 ++--
 frontend/templates/gettask.html |  3 ++-
 frontend/templates/index.html   |  3 ++-
 georeferencing/views.py         | 20 ++++++++++----------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/frontend/static/js/main.js b/frontend/static/js/main.js
index 66ae36e..8dcd20e 100644
--- a/frontend/static/js/main.js
+++ b/frontend/static/js/main.js
@@ -135,7 +135,7 @@ $(document).ready(function () {
 
                         success: function (response) {
                             georeferencingModal.hide();
-                            let noCacheUrl = './georeferenced/' + image_name + geoattempt_hash + '/{z}/{x}/{y}.png' + '?nocache=' + new Date().getTime();
+                            let noCacheUrl = '/media/georeferenced/' + image_name + geoattempt_hash + '/{z}/{x}/{y}.png' + '?nocache=' + new Date().getTime();
                             if (lyr)
                                 map.removeLayer(lyr);
 
@@ -264,7 +264,7 @@ $(document).ready(function () {
                     }
                 });
             });
-            const static_url = "/static/images/"; // Static URL
+            const static_url = "/media/original/"; // Static URL
             const imageUrl = static_url + image_name + '.JPG'; // Image URL
             console.log(response);
             const canvasWidth = $('#column-photo').width(); // Canvas width
diff --git a/frontend/templates/gettask.html b/frontend/templates/gettask.html
index fda777d..4bc159b 100644
--- a/frontend/templates/gettask.html
+++ b/frontend/templates/gettask.html
@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Lost At Night | Task</title>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/5.3.1/fabric.min.js"></script>
+    {% include '_google_analytics.html' %}
     {% bootstrap_css %}
     <!-- Include jQuery from a CDN -->
     <script src="https://code.jquery.com/jquery-3.7.1.min.js"
@@ -107,4 +108,4 @@ <h5 class="modal-title" id="exampleModalLabel">Georeferencing!</h5>
     <div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/frontend/templates/index.html b/frontend/templates/index.html
index 2f9645a..5a10294 100644
--- a/frontend/templates/index.html
+++ b/frontend/templates/index.html
@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Lost At Night</title>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/5.3.1/fabric.min.js"></script>
+    {% include '_google_analytics.html' %}
     {% bootstrap_css %}
     <!-- Include jQuery from a CDN -->
     <script src="https://code.jquery.com/jquery-3.7.1.min.js"
@@ -38,4 +39,4 @@ <h3>WELCOME TO LOST AT NIGHT</h3>
             </a>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/georeferencing/views.py b/georeferencing/views.py
index 7cc6f86..cdc71fe 100644
--- a/georeferencing/views.py
+++ b/georeferencing/views.py
@@ -185,16 +185,16 @@ def patch(self, request, pk=None):
                 print('Starting the testing process')
 
                 # Ensure the georeferenced directory exists
-                if not os.path.exists('georeferenced'):
-                    os.makedirs('georeferenced')
+                if not os.path.exists('media/georeferenced'):
+                    os.makedirs('media/georeferenced')
 
                 # First command: gdal_translate
                 command = 'gdal_translate -of GTiff'
                 for item in request.data['control_points']:
                     command += ' -gcp ' + str(item['actualPx']) + ' ' + str(item['actualPy'])
                     command += ' ' + str(item['lon']) + ' ' + str(item['lat'])
-                command += ' georeferencing/static/images/' + geoattemp.image.name + '.JPG '
-                command += ' georeferenced/' + geoattemp.image.name + geoattemp.hash + '.tif'
+                command += ' media/original/' + geoattemp.image.name + '.JPG '
+                command += ' media/georeferenced/' + geoattemp.image.name + geoattemp.hash + '.tif'
                 print(command)
                 try:
                     subprocess.run(command, shell=True, check=True, capture_output=True, text=True)
@@ -204,8 +204,8 @@ def patch(self, request, pk=None):
                 # Second command: gdalwarp
                 # Check the # of points before enable tps (-order n to pylynomial)
                 command = 'gdalwarp --config NUM_THREADS 4 -multi  -r bilinear -tps -t_srs EPSG:4326'
-                command += ' georeferenced/' + geoattemp.image.name + geoattemp.hash + '.tif'
-                command += ' georeferenced/' + geoattemp.image.name + geoattemp.hash + '.tif'
+                command += ' media/georeferenced/' + geoattemp.image.name + geoattemp.hash + '.tif'
+                command += ' media/georeferenced/' + geoattemp.image.name + geoattemp.hash + '.tif'
                 print(command)
 
                 try:    
@@ -214,9 +214,9 @@ def patch(self, request, pk=None):
                     return Response({"error": f"gdalwarp failed: {e.stderr}"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
                 
                 # Third command: Remove previous tiles
-                command = 'rm -r georeferenced/' + geoattemp.image.name + geoattemp.hash
+                command = 'rm -r media/georeferenced/' + geoattemp.image.name + geoattemp.hash
                 print(command)
-                if os.path.exists('georeferenced/' + geoattemp.image.name + geoattemp.hash):
+                if os.path.exists('media/georeferenced/' + geoattemp.image.name + geoattemp.hash):
                     try:
                         subprocess.run(command, shell=True, check=True, capture_output=True, text=True)
                     except subprocess.CalledProcessError as e:
@@ -224,8 +224,8 @@ def patch(self, request, pk=None):
                
                 # Fourth command:
                 command = 'gdal2tiles.py -z 7-12 -r bilinear -s EPSG:4326'
-                command += ' georeferenced/' + geoattemp.image.name + geoattemp.hash + '.tif'
-                command += ' georeferenced/' + geoattemp.image.name + geoattemp.hash
+                command += ' media/georeferenced/' + geoattemp.image.name + geoattemp.hash + '.tif'
+                command += ' media/georeferenced/' + geoattemp.image.name + geoattemp.hash
                 print(command)
 
                 try: