Merge branch 'anim-plane-reverse' of DTux/avion-poeme into master

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;
 	}
 }
-
-
-?>

index.php

@@ -13,6 +13,31 @@
 	<canvas id="blankCanvas2" width="400" height="400" style="border:1px solid #d3d3d3; display:none"></canvas>
 	<img style="display:none;" id="front" src="src/img/front.jpg" />
 	<img style="display:none;" id="back" src="src/img/back-FF5555.jpg" />
+	<?php
+	if (isset($_GET['avionpoeme']) && $_GET['avionpoeme'] !== '') { ?>
+		<script id="planeFoldScript.txt" type="not-javascript"> <!-- From https://github.com/RemiKoutcherawy/OriSim3D-JS  was fun to code -->
+			d -200 200 -200 -200 200 -200 200 200
+			c 0 1 c 0 3 c 0 2 c 1 3
+			c 0 8 c 8 3 c 0 4 c 4 1
+			c 6 0 c 6 1 c 6 2 c 6 3
+			iad t 0 ty 6 tx -3)
+			t 0 r 48 -179.99 21 0 10 r 55 -179.99 17 3 19 )
+			t 0 r 43 160 1 4 0 21 24 12 11 13 9 10)
+			t 0 ty -80)
+			t 0 tx -60)
+			t 0 r 27 -80 3 19 5 22 2 a 3)
+			t 0 r 23 -80 0 21 4 24 1 a 0)
+			t 500 r 23 80 0 21 4 24 1 a 0)
+			t 0 r 23 -90 0 a 0)
+			t 500 r 27 80 3 19 5 22 2 a 3)
+			t 0 r 27 -90 3 a 3)
+			t 700 tx 60)
+			t 700 ty 80)
+			t 750 r 43 -160 1 4 0 21 24 12 11 13 9 10)
+			t 750 r 48 179.99 21 0 10 r 55 179.99 17 3 19 )
+			iad t 1200 ty -6 tx 3)
+		</script>
+	<?php } else { ?>
 		<script id="planeFoldScript.txt" type="not-javascript"> <!-- From https://github.com/RemiKoutcherawy/OriSim3D-JS  was fun to code -->
 			d -200 200 -200 -200 200 -200 200 200
 			c 0 1 c 0 3 c 0 2 c 1 3
@@ -26,6 +51,8 @@
 			t 500 r 23 -80 0 21 4 24 1 a 0)
 			t 1000 tx -35 z 0 0 0 il 100 100)
 		</script>
+	<?php }
+	?>
 	<!-- Modal new plane-->
 	<div class="modal fade" id="newPlaneModal" tabindex="-1" role="dialog" aria-labelledby="newPlaneModal" aria-hidden="true">
 		<div class="modal-dialog modal-lg" role="document">

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() 
+						Activate anim place reverse
-						  {
+						$("#back").attr("src","src/img/back-"+data.color+".jpg");
-								map.setView([data.currentPosition.geometry.coordinates[1],data.currentPosition.geometry.coordinates[0]], 15);
+						html = data.message;
-								openPopup(marker)
+						var canvas1 = document.getElementById("blankCanvas1");
-						  }, 100);
+						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();
+						})
+						*/
 					}
 					
 				}