From 371d12af327c5faee3f82a24ac0ba8f880c8726e Mon Sep 17 00:00:00 2001
From: Samuel ORTION <samuel.ortion@orange.fr>
Date: Mon, 29 Mar 2021 12:56:03 +0200
Subject: [PATCH] Corrected verify map

---
 .gitignore                        |   1 +
 public/database/chiro-canto.odb   | Bin 0 -> 2582 bytes
 public/upload/scripts/checkmap.js |  33 +++++++++++++++---------------
 public/upload/scripts/map.js      |   3 +--
 public/upload/verify.php          |   4 +---
 5 files changed, 20 insertions(+), 21 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 public/database/chiro-canto.odb

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..512c50f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+public/storage
\ No newline at end of file
diff --git a/public/database/chiro-canto.odb b/public/database/chiro-canto.odb
new file mode 100644
index 0000000000000000000000000000000000000000..4d9d43d6b1bf243e9f44d3687d34b5661723cf7c
GIT binary patch
literal 2582
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
Wt-USJ4)$-n;FSfk;=vyKfPVm>WCOnd

literal 0
HcmV?d00001

diff --git a/public/upload/scripts/checkmap.js b/public/upload/scripts/checkmap.js
index 6e05d7c..d3240a9 100644
--- a/public/upload/scripts/checkmap.js
+++ b/public/upload/scripts/checkmap.js
@@ -1,18 +1,19 @@
 
+let span = document.getElementById('latlng');
+let coordinates = span.innerHTML;
+
+lat = coordinates.split(",")[0];
+lng = coordinates.split(",")[1];
+let latlng = L.LatLng(lat, lng);
+var mymap = L.map('checkmap').setView([lat, lng], 13);
+
 
-if (typeof coordinates !== 'undefined') {
-    lat = coordinates.split(",")[0];
-    lng = coordinates.split(",")[1];
-    let latlng = L.LatLng(lat, lng);
-    let marker = L.marker(latlng, draggable=false).addTo(mycheckmap);
-    let mycheckmap = L.map('checkmap').setLatLng(latlng);
-
-    L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
-        attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
-        maxZoom: 18,
-        id: 'mapbox/streets-v11',
-        tileSize: 512,
-        zoomOffset: -1,
-        accessToken: 'pk.eyJ1IjoidW5jbGVzYW11bHVzIiwiYSI6ImNrbXQwNDl5MTBtc2gybm82b3c0M3VoNncifQ.qUqAuCuMDF38NcyrAC1RJQ'
-    }).addTo(mycheckmap);
-}
+L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
+    attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
+    maxZoom: 18,
+    id: 'mapbox/streets-v11',
+    tileSize: 512,
+    zoomOffset: -1,
+    accessToken: 'pk.eyJ1IjoidW5jbGVzYW11bHVzIiwiYSI6ImNrbXVmanF1bzEwd2Mybm82Nzlobm42bHAifQ.fKY7fUnY-MpzZUcseao0zg'
+}).addTo(mymap);
+let marker = L.marker([lat, lng], draggable=false).addTo(mymap);
diff --git a/public/upload/scripts/map.js b/public/upload/scripts/map.js
index 5fe74db..c2842db 100644
--- a/public/upload/scripts/map.js
+++ b/public/upload/scripts/map.js
@@ -5,7 +5,7 @@ L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_toke
     id: 'mapbox/streets-v11',
     tileSize: 512,
     zoomOffset: -1,
-    accessToken: 'pk.eyJ1IjoidW5jbGVzYW11bHVzIiwiYSI6ImNrbXQwNDl5MTBtc2gybm82b3c0M3VoNncifQ.qUqAuCuMDF38NcyrAC1RJQ'
+    accessToken: 'pk.eyJ1IjoidW5jbGVzYW11bHVzIiwiYSI6ImNrbXVmanF1bzEwd2Mybm82Nzlobm42bHAifQ.fKY7fUnY-MpzZUcseao0zg'
 }).addTo(mymap);
 
 var marker = L.marker([0, 0], draggable=true).addTo(mymap);
@@ -26,4 +26,3 @@ function onMapClick(e) {
 }
 
 mymap.on('click', onMapClick);
-
diff --git a/public/upload/verify.php b/public/upload/verify.php
index a0a1f56..e3898fb 100644
--- a/public/upload/verify.php
+++ b/public/upload/verify.php
@@ -55,7 +55,7 @@
     </tr>
     </tbody></table>
 <h2>Location</h2>
-
+<span id="latlng"><?=$_SESSION['observation']['latlng']?></span>
 <div id="checkmap" style="height: 250px; border: 1px solid #AAA;"></div>
 
 <script type='text/javascript' src='/scripts/jquery/script.js'></script>
@@ -63,10 +63,8 @@
    integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
    crossorigin=""></script>
 <script src="scripts/checkmap.js">
-    let coordinates = <?= $_SESSION['observation']['latlng']?>; 
 </script>
 
-
 <form action="submitobservation" method="post">
     <input type="checkbox" id="allok" name="allok">
     <label for="allok">All informations are ok.</label><br>