diff --git a/include/db.class.php b/include/db.class.php
index 1cdc726..2922a47 100644
--- a/include/db.class.php
+++ b/include/db.class.php
@@ -170,7 +170,7 @@ class db
function getCurrentPlanes()
{
- $query = "SELECT idAvion as uid, UNIX_TIMESTAMP(deliveryTime) as deliveryTime, deliveryTZ, destLat, destLon, destName, UNIX_TIMESTAMP(startTime) as startTime, startTZ, startLon, startLat, startName, color FROM avionpoeme WHERE deliveryTimeServer>NOW()";
+ $query = "SELECT idAvion as uid, UNIX_TIMESTAMP(deliveryTime) as deliveryTime, deliveryTZ, destLat, destLon, destName, message, UNIX_TIMESTAMP(startTime) as startTime, startTZ, startLon, startLat, startName, color, message FROM avionpoeme WHERE deliveryTimeServer>NOW()";
$this->query($query);
$planes = $this->result->fetch_all(MYSQLI_ASSOC);
print json_encode($planes);
@@ -239,6 +239,3 @@ class db
return $this->avionJournalier;
}
}
-
-
-?>
diff --git a/index.php b/index.php
index 7f0bb1f..643b178 100644
--- a/index.php
+++ b/index.php
@@ -13,19 +13,46 @@
-
+
+
+
+
+
diff --git a/src/map.js b/src/map.js
index 4f0c221..27d2b51 100644
--- a/src/map.js
+++ b/src/map.js
@@ -303,12 +303,23 @@ loader.load(function(loader, resources) {
var queryString = window.location.search;
queryString = queryString.split('=')[1]
if(Number(queryString)==data.uid){
- setTimeout(
- function()
- {
- map.setView([data.currentPosition.geometry.coordinates[1],data.currentPosition.geometry.coordinates[0]], 15);
- openPopup(marker)
- }, 100);
+ /*
+ Activate anim place reverse
+ $("#back").attr("src","src/img/back-"+data.color+".jpg");
+ html = data.message;
+ var canvas1 = document.getElementById("blankCanvas1");
+ rasterizeHTML.drawHTML(html, canvas1,{zoom:0.7}).then(function success(renderResult) {
+ var canvas2 = document.getElementById("blankCanvas2");
+ var ctx = canvas2.getContext("2d");
+ ctx.fillStyle = "#" + data.color;
+ ctx.fillRect(0,0,400,400);
+ ctx.drawImage(canvas1, 0, 0,400,400)
+ ctx.font = "9px Courier";
+ $("#front").attr('src',document.getElementById("blankCanvas2").toDataURL())
+ $("#canvas3d").css('display','block')
+ animePlane();
+ })
+ */
}
}