fix: use longitude reference for static maps

Tobi · Tobi · commit b07cec182969 · 2014-10-03T09:59:50.000+02:00
diff --git a/includes/classes/MapProjection.class.php b/includes/classes/MapProjection.class.php
@@ -14,6 +14,7 @@ class BoMapProjection
 	var $ImageCoor;
 	var $SatLon;
 	var $StrikeBounds = array();
+	var $LonRef;
 	
 	public $UseSql = false;
 	
@@ -42,6 +43,9 @@ function __construct($proj = '', $w, $h, $coord)
 		$this->ImageOffsetX = $x1 * $this->ImageCalibrationX - $cW;
 		$this->ImageOffsetY = $y1 * $this->ImageCalibrationY + $cS;
 		
+		//Longitude Reference point (middle for most projections)
+		$this->LonRef = ($coord[1] - $coord[3]) / 2;
+		
 		
 		//Strike bounds
 		if (isset($coord[9]) && isset($coord[10]) && isset($coord[11]) && isset($coord[12]))
@@ -54,6 +58,11 @@ function __construct($proj = '', $w, $h, $coord)
 		
 	}
 	
+	function SetLonRef($lon)
+	{
+		$this->LonRef = $lon;
+	}
+	
 	function SqlSelect($lat_name, $lon_name, $as_x = '', $as_y = '')
 	{
 		switch ($this->Method)
@@ -106,6 +115,12 @@ function Calculate($lat, $lon, $no_sql = false)
 			return array($lon, $lat);
 		}
 		
+		if ($lon < $this->LonRef-180)
+			$lon = $lon+360;
+		else if ($lon > $this->LonRef+180)
+			$lon = $lon-360;
+			
+		
 		switch ($this->Method)
 		{
 
diff --git a/includes/image.inc.php b/includes/image.inc.php
@@ -1363,7 +1363,8 @@ function bo_add_stations2image($I, $cfg, $w, $h, $Projection, $strike_id = 0)
 		$strike_lat = $row['lat'];
 		$strike_lon = $row['lon'];
 		list($strike_x, $strike_y) = $Projection->LatLon2Image($strike_lat, $strike_lon, true);
-	
+		$Projection->SetLonRef($strike_lon);
+		
 		$strike_dists = array();
 		$sql = "SELECT ss.station_id id
 				FROM ".BO_DB_PREF."stations_strikes ss
