Update acars map

Author: Nabeel Shahzad

core/app.config.php

@@ -100,7 +100,7 @@
 # Google Map Options
 Config::Set('MAP_WIDTH', '800px');
 Config::Set('MAP_HEIGHT', '600px');
-Config::Set('MAP_TYPE', 'G_PHYSICAL_MAP');
+Config::Set('MAP_TYPE', 'OpenStreetMap.Mapnik');
 Config::Set('MAP_LINE_COLOR', '#ff0000');
 Config::Set('MAP_CENTER_LAT', '45.484400');
 Config::Set('MAP_CENTER_LNG', '-62.334821');

core/classes/ezdb/ezdb.class.php

@@ -88,15 +88,16 @@ public static function init($type='mysqli')
 	{
 		$class_name = strtolower('ezdb_'.$type);
 		include dirname(__FILE__).DIRECTORY_SEPARATOR.$class_name.'.class.php';
-
+		
 		if(!self::$DB = new $class_name())
 		{
 			self::$error = self::$DB->error;
 			self::$errno = self::$DB->errno;
-
+			
 			return false;
 		}
-
+		
+		self::set_caching(Config::Get('DBASE_USE_CACHE'));
 		return true;
 	}
 

core/templates/acarsmap.tpl

@@ -20,29 +20,6 @@
  * table.acarsmap tbody tr.odd { } 
  */
 ?>
-<script type="text/javascript">
-<?php 
-/* These are the settings for the Google map. You can see the
-	Google API reference if you want to add more options.
-	
-	There's two options I've added:
-	
-	autozoom: This will automatically center in on/zoom 
-	  so all your current flights are visible. If false,
-	  then the zoom and center you specify will be used instead
-	  
-	refreshTime: Time, in seconds * 1000 to refresh the map.
-	  The default is 10000 (10 seconds)
-*/
-?>
-var acars_map_defaults = {
-	autozoom: true,
-	zoom: 4,
-    center: new google.maps.LatLng("<?php echo Config::Get('MAP_CENTER_LAT'); ?>", "<?php echo Config::Get('MAP_CENTER_LNG'); ?>"),
-    mapTypeId: google.maps.MapTypeId.TERRAIN,
-    refreshTime: 10000
-};
-</script>
 <div class="mapcenter" align="center">
 	<div id="acarsmap" style="width:<?php echo  Config::Get('MAP_WIDTH');?>; height: <?php echo Config::Get('MAP_HEIGHT')?>"></div>
 </div>
@@ -64,7 +41,8 @@ var acars_map_defaults = {
 </thead>
 <tbody id="pilotlist"></tbody>
 </table>
-<script type="text/javascript" src="<?php echo fileurl('/lib/js/acarsmap.js');?>"></script>
+<script src="<?php echo SITE_URL?>/lib/js/base_map.js"></script>
+<script src="<?php echo SITE_URL?>/lib/js/acarsmap.js"></script>
 <?php
 /* This is the template which is used in the table above, for each row. 
 	Be careful modifying it. You can simply add/remove columns, combine 
@@ -155,3 +133,29 @@ var acars_map_defaults = {
 <% } %>
 </span>
 </script>
+<script type="text/javascript">
+<?php 
+/* These are the settings for the Google map. You can see the
+	Google API reference if you want to add more options.
+	
+	There's two options I've added:
+	
+	autozoom: This will automatically center in on/zoom 
+	  so all your current flights are visible. If false,
+	  then the zoom and center you specify will be used instead
+	  
+	refreshTime: Time, in seconds * 1000 to refresh the map.
+	  The default is 10000 (10 seconds)
+*/
+?>
+const opts = {
+	render_elem: 'acarsmap',
+	provider: '<?php echo Config::Get("MAP_TYPE"); ?>',
+	autozoom: true,
+	zoom: 5,
+    center: L.latLng("<?php echo Config::Get('MAP_CENTER_LAT'); ?>", "<?php echo Config::Get('MAP_CENTER_LNG'); ?>"),
+    refreshTime: 10000
+};
+
+renderAcarsMap(opts);
+</script>

core/templates/route_map.tpl

@@ -69,27 +69,19 @@ if(isset($schedule))
 
 const map = createMap({
 	render_elem: 'routemap',
+	provider: '<?php echo Config::Get("MAP_TYPE"); ?>',
 });
 
 const depCoords = L.latLng(<?php echo $mapdata->deplat?>, <?php echo $mapdata->deplng;?>);
 const depMarker = L.marker(depCoords, {
-	icon: L.icon({ iconUrl: depicon, iconSize: [35, 35] })
+	icon: MapFeatures.icons.departure,
 }).bindPopup("<?php echo $mapdata->depname;?>").addTo(map);
 
 const arrCoords = L.latLng(<?php echo $mapdata->arrlat?>, <?php echo $mapdata->arrlng;?>);
 const arrMarker = L.marker(arrCoords, {
-	icon: L.icon({ iconUrl: arricon, iconSize: [35, 35] })
+	icon: MapFeatures.icons.arrival,
 }).bindPopup("<?php echo $mapdata->arrname;?>").addTo(map);
 
-const icon_vor = L.icon({ 
-	iconUrl: "<?php echo fileurl('/lib/images/icon_vor.png') ?>",
-	iconSize: [19, 20],
-})
-const icon_fix = L.icon({ 
-	iconUrl: "<?php echo fileurl('/lib/images/icon_fix.png') ?>",
-	iconSize: [12, 15],
-})
-
 // for drawing the line
 let points = [];
 points.push(depCoords);
@@ -98,9 +90,9 @@ points.push(depCoords);
 if(is_array($mapdata->route_details)) {
 	foreach($mapdata->route_details as $route) {
 		if($route->type == NAV_VOR)
-			$icon = 'icon_vor';
+			$icon = 'MapFeatures.icons.vor';
 		else
-			$icon = 'icon_fix';
+			$icon = 'MapFeatures.icons.fix';
 		
 		//	Build info array for the bubble
 		?>