route4me / route4me-php-sdk

src/Route4Me/Route.php

Indentation +263 added lines, -263 removed lines

@@ -11,7 +11,7 @@ 
 
 class Route extends Common
 {
-    static public $apiUrl = '/api.v4/route.php';
+	static public $apiUrl = '/api.v4/route.php';
 	static public $apiUrlAddress = '/api.v4/address.php';
 	static public $apiUrlDuplicate='/actions/duplicate_route.php';
 	static public $apiUrlDelete='/actions/delete_routes.php';
@@ -22,121 +22,121 @@ 
 	static public $apiUrlAsset='/api.v4/status.php';
 	static public $apiUrlDeviceLocation='/api/track/get_device_location.php';
 	//static public $apiUrlMove='/actions/route/move_route_destination.php';
-    public $route_id;
+	public $route_id;
 	public $route_destination_id;
-    public $optimization_problem_id;
-    public $vehicle_alias;
-    public $driver_alias;
-    public $trip_distance;
-    public $mpg;
-    public $gas_price;
-    public $route_duration_sec;
-    public $parameters;
-    public $addresses = array();
-    public $links = array();
-    public $directions = array();
-    public $path = array();
-    public $tracking_history = array();
+	public $optimization_problem_id;
+	public $vehicle_alias;
+	public $driver_alias;
+	public $trip_distance;
+	public $mpg;
+	public $gas_price;
+	public $route_duration_sec;
+	public $parameters;
+	public $addresses = array();
+	public $links = array();
+	public $directions = array();
+	public $path = array();
+	public $tracking_history = array();
 	public $recipient_email;
 	public $httpheaders;
 	
 	public $dev_lat;
 	public $dev_lng;
 
-    public static function fromArray(array $params) 
-    {
-        $route = new Route();
-        $route->route_id = Common::getValue($params, 'route_id');
-        $route->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
-        $route->vehicle_alias = Common::getValue($params, 'vehicle_alias');
-        $route->driver_alias = Common::getValue($params, 'driver_alias');
-        $route->trip_distance = Common::getValue($params, 'trip_distance');
-        $route->mpg = Common::getValue($params, 'mpg');
-        $route->gas_price = Common::getValue($params, 'gas_price');
-        $route->route_duration_sec = Common::getvalue($params, 'route_duration_sec');
-
-        // Make RouteParameters
-        if (isset($params['parameters'])) {
-            $route->parameters = RouteParameters::fromArray($params['parameters']);
-        }
-
-        if (isset($params['addresses'])) {
-            $addresses = array();
-            foreach ($params['addresses'] as $address) {
-                $addresses[] = Address::fromArray($address);
-            }
-
-            $route->addresses = $addresses;
-        }
-
-        $route->links = Common::getValue($params, 'links', array());
-        $route->directions = Common::getValue($params, 'directions', array());
-        $route->path = Common::getValue($params, 'path', array());
-        $route->tracking_history = Common::getValue($params, 'tracking_history', array());
-
-        return $route;
-    }
-
-    public static function getRoutes($routeId=null, $params=null)
-    {
-        $query = array(
-            'api_key' => Route4Me::getApiKey()
-        );
-
-        if ($routeId) {
-            $query['route_id'] = implode(',', (array) $routeId);
-        }
-
-        if ($params) {
-            if (isset($params['directions'])) {
-                $query['directions'] = $params['directions'];
-            }
-
-            if (isset($params['route_path_output'])) {
-                $query['route_path_output'] = $params['route_path_output'];
-            }
-
-            if (isset($params['device_tracking_history'])) {
-                $query['device_tracking_history'] = $params['device_tracking_history'];
-            }
+	public static function fromArray(array $params) 
+	{
+		$route = new Route();
+		$route->route_id = Common::getValue($params, 'route_id');
+		$route->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
+		$route->vehicle_alias = Common::getValue($params, 'vehicle_alias');
+		$route->driver_alias = Common::getValue($params, 'driver_alias');
+		$route->trip_distance = Common::getValue($params, 'trip_distance');
+		$route->mpg = Common::getValue($params, 'mpg');
+		$route->gas_price = Common::getValue($params, 'gas_price');
+		$route->route_duration_sec = Common::getvalue($params, 'route_duration_sec');
+
+		// Make RouteParameters
+		if (isset($params['parameters'])) {
+			$route->parameters = RouteParameters::fromArray($params['parameters']);
+		}
+
+		if (isset($params['addresses'])) {
+			$addresses = array();
+			foreach ($params['addresses'] as $address) {
+				$addresses[] = Address::fromArray($address);
+			}
+
+			$route->addresses = $addresses;
+		}
+
+		$route->links = Common::getValue($params, 'links', array());
+		$route->directions = Common::getValue($params, 'directions', array());
+		$route->path = Common::getValue($params, 'path', array());
+		$route->tracking_history = Common::getValue($params, 'tracking_history', array());
+
+		return $route;
+	}
+
+	public static function getRoutes($routeId=null, $params=null)
+	{
+		$query = array(
+			'api_key' => Route4Me::getApiKey()
+		);
+
+		if ($routeId) {
+			$query['route_id'] = implode(',', (array) $routeId);
+		}
+
+		if ($params) {
+			if (isset($params['directions'])) {
+				$query['directions'] = $params['directions'];
+			}
+
+			if (isset($params['route_path_output'])) {
+				$query['route_path_output'] = $params['route_path_output'];
+			}
+
+			if (isset($params['device_tracking_history'])) {
+				$query['device_tracking_history'] = $params['device_tracking_history'];
+			}
 			
 			if (isset($params['query'])) {
-                $query['query'] = $params['query'];
-            }
-
-            $query['limit'] = isset($params['limit']) ? $params['limit'] : 30;
-            $query['offset'] = isset($params['offset']) ? $params['offset'] : 0;
-        }
+				$query['query'] = $params['query'];
+			}
 
-        $json = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+			$query['limit'] = isset($params['limit']) ? $params['limit'] : 30;
+			$query['offset'] = isset($params['offset']) ? $params['offset'] : 0;
+		}
 
-        if ($routeId) {
-            return Route::fromArray($json); die("");
-        } else {
-            $routes = array();
-            foreach($json as $route) {
-                $routes[] = Route::fromArray($route);
-            }
-            return $routes;
-        }
-    }
+		$json = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'GET',
+			'query'  => $query
+		));
+
+		if ($routeId) {
+			return Route::fromArray($json); die("");
+		} else {
+			$routes = array();
+			foreach($json as $route) {
+				$routes[] = Route::fromArray($route);
+			}
+			return $routes;
+		}
+	}
 
 	public function getRoutePoints($routeId, $params)
 	{
 		$result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'GET',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'route_id' => $routeId,
-                'route_path_output' => isset($params['route_path_output']) ? $params['route_path_output'] : null,
-                'directions' => isset($params['directions']) ? $params['directions'] : null,
-            )
-        ));
+			'url'    => self::$apiUrl,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => $routeId,
+				'route_path_output' => isset($params['route_path_output']) ? $params['route_path_output'] : null,
+				'directions' => isset($params['directions']) ? $params['directions'] : null,
+			)
+		));
 
 		return $result;
 	}
@@ -144,14 +144,14 @@ 
 	public function duplicateRoute($route_id)
 	{
 		$result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlDuplicate,
-            'method' => 'GET',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'route_id' => $route_id,
-                'to' => 'none',
-            )
-        ));
+			'url'    => self::$apiUrlDuplicate,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => $route_id,
+				'to' => 'none',
+			)
+		));
 		
 		return $result;
 	}
@@ -159,17 +159,17 @@ 
 	public function resequenceRoute($params)
 	{
 		$result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'PUT',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
-                'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
-            ),
-            'body'  => array(
+			'url'    => self::$apiUrl,
+			'method' => 'PUT',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
+				'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
+			),
+			'body'  => array(
 				'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
 			)
-        ));
+		));
 		
 		return $result;
 	}
@@ -177,15 +177,15 @@ 
 	public function resequenceAllAddresses($params)
 	{
 		$result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlReseq,
-            'method' => 'GET',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
-                'disable_optimization' => isset($params['disable_optimization']) ? $params['disable_optimization'] : null,
-                'optimize' => isset($params['optimize']) ? $params['optimize'] : null,
-            )
-        ));
+			'url'    => self::$apiUrlReseq,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
+				'disable_optimization' => isset($params['disable_optimization']) ? $params['disable_optimization'] : null,
+				'optimize' => isset($params['optimize']) ? $params['optimize'] : null,
+			)
+		));
 		
 		return $result;
 		
@@ -194,16 +194,16 @@ 
 	public function mergeRoutes($params)
 	{
 		$result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlMerge,
-            'method' => 'POST',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-            ),
-            'body'  => array(
+			'url'    => self::$apiUrlMerge,
+			'method' => 'POST',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+			),
+			'body'  => array(
 				'route_ids' => isset($params['route_ids']) ? $params['route_ids'] : null,
 			),
 			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+		));
 		
 		return $result;
 	}
@@ -211,17 +211,17 @@ 
 	public function shareRoute($params)
 	{
 		$result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlShare,
-            'method' => 'POST',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-            	'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
-            ),
-            'body'  => array(
+			'url'    => self::$apiUrlShare,
+			'method' => 'POST',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
+			),
+			'body'  => array(
 				'recipient_email' => isset($params['recipient_email']) ? $params['recipient_email'] : null,
 			),
 			'Content-Type' => 'multipart/form-data'
-        ));
+		));
 		
 		return $result;
 	}
@@ -230,18 +230,18 @@ 
 	public function getRandomRouteId($offset,$limit)
 	{
 		$query['limit'] = isset($params['limit']) ? $params['limit'] : 30;
-        $query['offset'] = isset($params['offset']) ? $params['offset'] : 0;
+		$query['offset'] = isset($params['offset']) ? $params['offset'] : 0;
 			
 		$json = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+			'url'    => self::$apiUrl,
+			'method' => 'GET',
+			'query'  => $query
+		));
 		
 		$routes = array();
-            foreach($json as $route) {
-                $routes[] = Route::fromArray($route);
-            }
+			foreach($json as $route) {
+				$routes[] = Route::fromArray($route);
+			}
 			
 			$num=rand(0,sizeof($routes)-1);
 			$rRoute=(array)$routes[$num];
@@ -253,71 +253,71 @@ 
 			else return null;
 	}
 
-    public function update()
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id' => isset($this->route_id) ? $this->route_id : null,
-                'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
-            ),
-            'body' => array (
-            	'parameters' => $this->parameters,
-            	),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+	public function update()
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id' => isset($this->route_id) ? $this->route_id : null,
+				'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
+			),
+			'body' => array (
+				'parameters' => $this->parameters,
+				),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
 	
 	public function updateAddress()
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlAddress,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id' => isset($this->route_id) ? $this->route_id : null,
-                'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
-            ),
-            'body' => get_object_vars($this->parameters),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrlAddress,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id' => isset($this->route_id) ? $this->route_id : null,
+				'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
+			),
+			'body' => get_object_vars($this->parameters),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function addAddresses(array $params)
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'PUT',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
-                'addresses' => isset($params['addresses']) ? $params['addresses'] : null
-            )
-        ));
+	public function addAddresses(array $params)
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'PUT',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
+				'addresses' => isset($params['addresses']) ? $params['addresses'] : null
+			)
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
 	
 	public function insertAddressOptimalPosition(array $params)
 	{
 		$route = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'PUT',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
-            ),
-            'body'  => array(
+			'url'    => self::$apiUrl,
+			'method' => 'PUT',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
+			),
+			'body'  => array(
 				'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
 				'optimal_position' => isset($params['optimal_position']) ? $params['optimal_position'] : null,
 			)
-        ));
+		));
 
-        return Route::fromArray($route);
+		return Route::fromArray($route);
 	}
 	
 	public function addNoteFile($params)
@@ -326,18 +326,18 @@ 
 		$rpath = realpath($fname);
 		//echo $rpath;die("");
 		$result= Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlNoteFile,
-            'method' => 'POST',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
-                'address_id' => isset($params['address_id']) ? $params['address_id'] : null,
-                'dev_lat' => isset($params['dev_lat']) ? $params['dev_lat'] : null,
-                'dev_lng' => isset($params['dev_lng']) ? $params['dev_lng'] : null,
-                'device_type' => isset($params['device_type']) ? $params['device_type'] : null,
-                'dev_lng' => isset($params['dev_lng']) ? $params['dev_lng'] : null,
-            ),
-            'body'  => array(
+			'url'    => self::$apiUrlNoteFile,
+			'method' => 'POST',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
+				'address_id' => isset($params['address_id']) ? $params['address_id'] : null,
+				'dev_lat' => isset($params['dev_lat']) ? $params['dev_lat'] : null,
+				'dev_lng' => isset($params['dev_lng']) ? $params['dev_lng'] : null,
+				'device_type' => isset($params['device_type']) ? $params['device_type'] : null,
+				'dev_lng' => isset($params['dev_lng']) ? $params['dev_lng'] : null,
+			),
+			'body'  => array(
 				'strUpdateType' => isset($params['strUpdateType']) ? $params['strUpdateType'] : null,
 				'strFilename' => isset($params['strFilename']) ? $params['strFilename'] : null,
 				'strNoteContents' => isset($params['strNoteContents']) ? $params['strNoteContents'] : null,
@@ -347,18 +347,18 @@ 
 			'HTTPHEADER' => array(
 				'Content-Type: application/x-www-form-urlencoded'
 			)
-        ));
+		));
 
-        return $result;
+		return $result;
 	}
 
-    public function delete($route_id)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'DELETE',
-            'query'  => array( 'route_id' => $route_id )
-        ));
+	public function delete($route_id)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'DELETE',
+			'query'  => array( 'route_id' => $route_id )
+		));
 		
 		// The code below doesn't work, altough this method is described as workable in REST API 
 		/*
@@ -371,8 +371,8 @@ 
             )
         ));
 		*/
-        return $result;
-    }
+		return $result;
+	}
 	
 	public function GetAddressesFromRoute($route_id)
 	{
@@ -396,63 +396,63 @@ 
 		} else { return null;}
 	}
 
-    public function getRouteId()
-    {
-        return $this->route_id;
-    }
+	public function getRouteId()
+	{
+		return $this->route_id;
+	}
 
-    public function getOptimizationId()
-    {
-        return $this->optimization_problem_id;
-    }
+	public function getOptimizationId()
+	{
+		return $this->optimization_problem_id;
+	}
 	
 	public function GetLastLocation(array $params)
 	{
 		$route = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'GET',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
-                'device_tracking_history' => isset($params['device_tracking_history']) ? $params['device_tracking_history'] : null
-            )
-        ));
+			'url'    => self::$apiUrl,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
+				'device_tracking_history' => isset($params['device_tracking_history']) ? $params['device_tracking_history'] : null
+			)
+		));
 
-        return Route::fromArray($route);
+		return Route::fromArray($route);
 		
 	}
 	
 	public function GetTrackingHistoryFromTimeRange(array $params)
 	{
 		$route = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlDeviceLocation,
-            'method' => 'GET',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
-                'format' => isset($params['format']) ? $params['format'] : null,
-                'time_period' => isset($params['time_period']) ? $params['time_period'] : null,
-                'start_date' => isset($params['start_date']) ? $params['start_date'] : null,
-                'end_date' => isset($params['end_date']) ? $params['end_date'] : null
-                )
-        ));
-
-        return $route;
+			'url'    => self::$apiUrlDeviceLocation,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'route_id' => isset($params['route_id']) ? $params['route_id'] : null,
+				'format' => isset($params['format']) ? $params['format'] : null,
+				'time_period' => isset($params['time_period']) ? $params['time_period'] : null,
+				'start_date' => isset($params['start_date']) ? $params['start_date'] : null,
+				'end_date' => isset($params['end_date']) ? $params['end_date'] : null
+				)
+		));
+
+		return $route;
 		
 	}
 	
 	public function GetAssetTracking(array $params)
 	{
 		$route = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlAsset,
-            'method' => 'GET',
-            'query'  => array(
-            	'api_key' => Route4Me::getApiKey(),
-                'tracking' => isset($params['tracking']) ? $params['tracking'] : null
-                )
-        ));
-
-        return $route;
+			'url'    => self::$apiUrlAsset,
+			'method' => 'GET',
+			'query'  => array(
+				'api_key' => Route4Me::getApiKey(),
+				'tracking' => isset($params['tracking']) ? $params['tracking'] : null
+				)
+		));
+
+		return $route;
 		
 	}
 }

src/Route4Me/curl_http_client.php

Indentation +46 added lines, -46 removed lines

@@ -110,7 +110,7 @@ 
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
 		if(curl_errno($this->ch))
-        {
+		{
 			if($this->debug)
 			{
 				echo "Error Occured in Curl\n";
@@ -120,7 +120,7 @@ 
 			return false;
 		}
 		else
-        {
+		{
 			return $result;
 		}
 	}
@@ -372,53 +372,53 @@ 
  */
 function curl_exec_redir($ch)
 {
-    static $curl_loops = 0;
-    static $curl_max_loops = 20;
-    if ($curl_loops++ >= $curl_max_loops)
-    {
-        $curl_loops = 0;
-        return FALSE;
-    }
-    curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
-    curl_setopt($ch, CURLOPT_HEADER, true);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($ch, CURLOPT_VERBOSE, false);
-    $data = curl_exec($ch);
-    $data = str_replace("\r", "\n", str_replace("\r\n", "\n", $data));
-    list($header, $data) = explode("\n\n", $data, 2);
-    $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+	static $curl_loops = 0;
+	static $curl_max_loops = 20;
+	if ($curl_loops++ >= $curl_max_loops)
+	{
+		$curl_loops = 0;
+		return FALSE;
+	}
+	curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
+	curl_setopt($ch, CURLOPT_HEADER, true);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($ch, CURLOPT_VERBOSE, false);
+	$data = curl_exec($ch);
+	$data = str_replace("\r", "\n", str_replace("\r\n", "\n", $data));
+	list($header, $data) = explode("\n\n", $data, 2);
+	$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     
-    //echo "*** Got HTTP code: $http_code ***\n";
-    //echo "**  Got headers: \n$header\n\n";
+	//echo "*** Got HTTP code: $http_code ***\n";
+	//echo "**  Got headers: \n$header\n\n";
     
-    if ( $http_code == 301 || $http_code == 302 )
-    {
-        // If we're redirected, we should revert to GET
+	if ( $http_code == 301 || $http_code == 302 )
+	{
+		// If we're redirected, we should revert to GET
 		curl_setopt($ch, CURLOPT_HTTPGET,true);
         
-        $matches = array();
-        preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
-        $url = @parse_url(trim($matches[1]));
-        if (!$url)
-        {
-            //couldn't process the url to redirect to
-            $curl_loops = 0;
-            return $data;
-        }
-        $last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
-        if (empty($url['scheme']))
-            $url['scheme'] = $last_url['scheme'];
-        if (empty($url['host']))
-            $url['host'] = $last_url['host'];
-        if (empty($url['path']))
-            $url['path'] = $last_url['path'];
-        $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
-        //echo "Being redirected to $new_url\n";
-        curl_setopt($ch, CURLOPT_URL, $new_url);
-        return curl_exec_redir($ch);
-    } else {
-        $curl_loops=0;
-        return $data;
-    }
+		$matches = array();
+		preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
+		$url = @parse_url(trim($matches[1]));
+		if (!$url)
+		{
+			//couldn't process the url to redirect to
+			$curl_loops = 0;
+			return $data;
+		}
+		$last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
+		if (empty($url['scheme']))
+			$url['scheme'] = $last_url['scheme'];
+		if (empty($url['host']))
+			$url['host'] = $last_url['host'];
+		if (empty($url['path']))
+			$url['path'] = $last_url['path'];
+		$new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
+		//echo "Being redirected to $new_url\n";
+		curl_setopt($ch, CURLOPT_URL, $new_url);
+		return curl_exec_redir($ch);
+	} else {
+		$curl_loops=0;
+		return $data;
+	}
 }
 ?>

src/Route4Me/Geocoding.php

Indentation +20 added lines, -20 removed lines

@@ -23,10 +23,10 @@ 
 		
 		public static function fromArray(array $params) {
 			$geocoding = new Geocoding();
-	        foreach($params as $key => $value) {
-	            if (property_exists($geocoding, $key)) {
-	                $geocoding->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($geocoding, $key)) {
+					$geocoding->{$key} = $value;
+				}
 			}
 			return $geocoding;
 		}
@@ -35,15 +35,15 @@ 
 		{
 			//Route4Me::simplePrint($params);
 			$query = array(
-	                'format' => isset($params['format']) ? $params['format']: null,
-	                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
-	            );
+					'format' => isset($params['format']) ? $params['format']: null,
+					'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
+				);
 			//var_dump($query);
 			$fgcoding = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'query'  => $query
-	        ));
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'query'  => $query
+			));
 			
 			return $fgcoding;
 		}
@@ -64,9 +64,9 @@ 
 			$query = array();
 			
 			$response = Route4Me::makeUrlRequst($url_query, array(
-	            'method' => 'GET',
-	            'query'  => $query
-	        ));
+				'method' => 'GET',
+				'query'  => $query
+			));
 			
 			return $response;
 		}
@@ -87,9 +87,9 @@ 
 			$query = array();
 			
 			$response = Route4Me::makeUrlRequst($url_query, array(
-	            'method' => 'GET',
-	            'query'  => $query
-	        ));
+				'method' => 'GET',
+				'query'  => $query
+			));
 			
 			return $response;
 		}
@@ -113,9 +113,9 @@ 
 			$query = array();
 			
 			$response = Route4Me::makeUrlRequst($url_query, array(
-	            'method' => 'GET',
-	            'query'  => $query
-	        ));
+				'method' => 'GET',
+				'query'  => $query
+			));
 			
 			return $response;
 		}

src/Route4Me/Common.php

Indentation +11 added lines, -11 removed lines

@@ -4,17 +4,17 @@
 
 class Common
 {
-    static public function getValue($array, $item, $default = null)
-    {
-        return (isset($array[$item])) ? $array[$item] : $default;
-    }
+	static public function getValue($array, $item, $default = null)
+	{
+		return (isset($array[$item])) ? $array[$item] : $default;
+	}
 
-    public function toArray()
-    {
-        $params = array_filter(get_object_vars($this), function($item) {
-            return ($item !== null) && !(is_array($item) && !count($item));
-        });
+	public function toArray()
+	{
+		$params = array_filter(get_object_vars($this), function($item) {
+			return ($item !== null) && !(is_array($item) && !count($item));
+		});
 
-        return $params;
-    }
+		return $params;
+	}
 }

src/Route4Me/AvoidanceZone.php

Indentation +59 added lines, -59 removed lines

@@ -20,93 +20,93 @@
 		
 		public static function fromArray(array $params) {
 			if (!isset($params['territory_name'])) {
-	            throw new BadParam('Territory name must be provided');
-	        }
+				throw new BadParam('Territory name must be provided');
+			}
 			
 			if (!isset($params['territory_color'])) {
-	            throw new BadParam('Territory color must be provided');
-	        }
+				throw new BadParam('Territory color must be provided');
+			}
 			
 			if (!isset($params['territory'])) {
-	            throw new BadParam('Territory must be provided');
-	        }
+				throw new BadParam('Territory must be provided');
+			}
 			
 			$avoidancezoneparameters = new AvoidanceZone();
-	        foreach($params as $key => $value) {
-	            if (property_exists($avoidancezoneparameters, $key)) {
-	                $avoidancezoneparameters->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($avoidancezoneparameters, $key)) {
+					$avoidancezoneparameters->{$key} = $value;
+				}
 			}
 			
 			return $avoidancezoneparameters;
 		}
 		
 		public static function getAvoidanceZone($territory_id)
-	    {
-	        $avoidancezone = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'territory_id'             => $territory_id
-	            )
-	        ));
+		{
+			$avoidancezone = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'territory_id'             => $territory_id
+				)
+			));
 	
-	        return $avoidancezone;
-	    }
+			return $avoidancezone;
+		}
 		
 		public static function getAvoidanceZones($params)
-	    {
-	        $avoidancezones = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
-	            )
-	        ));
+		{
+			$avoidancezones = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'offset'  => isset($params->offset) ? $params->offset: null,
+					'limit'   => isset($params->limit) ? $params->limit: null,
+				)
+			));
 	
-	        return $avoidancezones;
-	    }
+			return $avoidancezones;
+		}
 
 		public static function addAvoidanceZone($params)
-	    {
-	    	$abcontacts = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'ADD',
-	            'query'  => array(
-	            	'territory_name' => 	isset($params->territory_name) ? $params->territory_name: null,
-	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
-	                'territory' => isset($params->territory) ? $params->territory : null,
-	            )
-	        ));
+		{
+			$abcontacts = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'ADD',
+				'query'  => array(
+					'territory_name' => 	isset($params->territory_name) ? $params->territory_name: null,
+					'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
+					'territory' => isset($params->territory) ? $params->territory : null,
+				)
+			));
 
 			return $abcontacts;
 		}
 		
 		public function deleteAvoidanceZone($territory_id)
-	    {
-	        $result = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETEARRAY',
-	            'query'  => array(
-	                'territory_id'     => $territory_id
-	            )
-	        ));
+		{
+			$result = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETEARRAY',
+				'query'  => array(
+					'territory_id'     => $territory_id
+				)
+			));
 	
-	        return $result;
-	    }
+			return $result;
+		}
 		
 		public function updateAvoidanceZone($params)
-	    {
-	        $avoidancezone = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'query'   => (array)$params,
+		{
+			$avoidancezone = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'query'   => (array)$params,
 
-	        ));
+			));
 	
-	        return $avoidancezone;
-	    }
+			return $avoidancezone;
+		}
 	}
 	
 ?>
\ No newline at end of file

src/Route4Me/Address.php

Indentation +142 added lines, -142 removed lines

@@ -9,55 +9,55 @@ 
 
 class Address extends Common
 {
-    static public $apiUrl = '/api.v4/address.php';
+	static public $apiUrl = '/api.v4/address.php';
 	static public $apiUrlMove='/actions/route/move_route_destination.php';
 	static public $apiUrDeparted='/api/route/mark_address_departed.php';
 	static public $apiUrVisited='/actions/address/update_address_visited.php';
 
-    public $route_destination_id;
-    public $alias;
-    public $member_id;
-    public $address;
-    public $is_depot = false;
-    public $lat;
-    public $lng;
-    public $route_id;
-    public $original_route_id;
-    public $optimization_problem_id;
-    public $sequence_no;
-    public $geocoded;
-    public $preferred_geocoding;
-    public $failed_geocoding;
-    public $geocodings = array();
-    public $contact_id;
-    public $is_visited;
-    public $customer_po;
-    public $invoice_no;
-    public $reference_no;
-    public $order_no;
-    public $weight;
-    public $cost;
-    public $revenue;
-    public $cube;
-    public $pieces;
-    public $email;
-    public $phone;
-    public $destination_note_count;
-    public $drive_time_to_next_destination;
-    public $distance_to_next_destination;
-    public $generated_time_window_start;
-    public $generated_time_window_end;
-    public $time_window_start;
-    public $time_window_end;
-    public $time;
+	public $route_destination_id;
+	public $alias;
+	public $member_id;
+	public $address;
+	public $is_depot = false;
+	public $lat;
+	public $lng;
+	public $route_id;
+	public $original_route_id;
+	public $optimization_problem_id;
+	public $sequence_no;
+	public $geocoded;
+	public $preferred_geocoding;
+	public $failed_geocoding;
+	public $geocodings = array();
+	public $contact_id;
+	public $is_visited;
+	public $customer_po;
+	public $invoice_no;
+	public $reference_no;
+	public $order_no;
+	public $weight;
+	public $cost;
+	public $revenue;
+	public $cube;
+	public $pieces;
+	public $email;
+	public $phone;
+	public $destination_note_count;
+	public $drive_time_to_next_destination;
+	public $distance_to_next_destination;
+	public $generated_time_window_start;
+	public $generated_time_window_end;
+	public $time_window_start;
+	public $time_window_end;
+	public $time;
 	public $notes;
-    public $timestamp_last_visited;
-    public $custom_fields = array();
-    public $manifest = array();
+	public $timestamp_last_visited;
+	public $custom_fields = array();
+	public $manifest = array();
 
-    public static function fromArray(array $params)
-    {
-        /*if (!isset($params['address'])) {
+	public static function fromArray(array $params)
+	{
+		/*if (!isset($params['address'])) {
             throw new BadParam('address must be provided');
         }
 
@@ -69,124 +69,124 @@ 
             throw new BadParam('lng must be provided');
         }*/
 
-        $address = new Address();
-        foreach($params as $key => $value) {
-            if (property_exists($address, $key)) {
-                $address->{$key} = $value;
-            }
-        }
+		$address = new Address();
+		foreach($params as $key => $value) {
+			if (property_exists($address, $key)) {
+				$address->{$key} = $value;
+			}
+		}
+
+		return $address;
+	}
+
+	public static function getAddress($routeId, $addressId)
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'             => $routeId,
+				'route_destination_id' => $addressId,
+			)
+		));
+
+		return Address::fromArray($address);
+	}
 
-        return $address;
-    }
-
-    public static function getAddress($routeId, $addressId)
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'             => $routeId,
-                'route_destination_id' => $addressId,
-            )
-        ));
-
-        return Address::fromArray($address);
-    }
-
-    public function update()
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'PUT',
-            'body'   => $this->toArray(),
-            'query'  => array(
-                'route_id'             => $this->route_id,
-                'route_destination_id' => $this->route_destination_id,
-            ),
-        ));
-
-        return Address::fromArray($address);
-    }
+	public function update()
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'PUT',
+			'body'   => $this->toArray(),
+			'query'  => array(
+				'route_id'             => $this->route_id,
+				'route_destination_id' => $this->route_destination_id,
+			),
+		));
+
+		return Address::fromArray($address);
+	}
 	
 	public function markAddress($params, $body)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id'  => isset($params['route_id']) ? $params['route_id']: null, 
-                'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
-            ),
-            'body'   => $body
-        ));
-
-        return $result;
-    }
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id'  => isset($params['route_id']) ? $params['route_id']: null, 
+				'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
+			),
+			'body'   => $body
+		));
+
+		return $result;
+	}
 	
 	public function markAsDeparted($params)
 	{
 		$address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrDeparted,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_departed'   => isset($params['is_departed']) ? $params['is_departed']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
-            ),
-        ));
-
-        return $address;
+			'url'    => self::$apiUrDeparted,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
+				'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
+				'is_departed'   => isset($params['is_departed']) ? $params['is_departed']: null,
+				'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+			),
+		));
+
+		return $address;
 	}
 	
 	public function markAsVisited($params)
 	{
 		$address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrVisited,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_visited'   => isset($params['is_visited']) ? $params['is_visited']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
-            ),
-        ));
-
-        return $address;
+			'url'    => self::$apiUrVisited,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
+				'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
+				'is_visited'   => isset($params['is_visited']) ? $params['is_visited']: null,
+				'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+			),
+		));
+
+		return $address;
 	}
 
-    public function delete()
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'DELETE',
-            'query'  => array(
-                'route_id'             => $this->route_id,
-                'route_destination_id' => $this->route_destination_id,
-            )
-        ));
-
-        return (bool)$address['deleted'];
-    }
+	public function delete()
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'DELETE',
+			'query'  => array(
+				'route_id'             => $this->route_id,
+				'route_destination_id' => $this->route_destination_id,
+			)
+		));
+
+		return (bool)$address['deleted'];
+	}
 	
 	public function MoveDestinationToRoute($params)
 	{
 		$result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlMove,
-            'method' => 'POST',
-            'query'  => array(
-                'to_route_id' => isset($params['to_route_id']) ? $params['to_route_id'] : null,
-                'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
-                'after_destination_id' => isset($params['after_destination_id']) ? $params['after_destination_id'] : null
-            )
-        ));
-
-        return $result;
+			'url'    => self::$apiUrlMove,
+			'method' => 'POST',
+			'query'  => array(
+				'to_route_id' => isset($params['to_route_id']) ? $params['to_route_id'] : null,
+				'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
+				'after_destination_id' => isset($params['after_destination_id']) ? $params['after_destination_id'] : null
+			)
+		));
+
+		return $result;
 		
 	}
 
-    function getAddressId()
-    {
-        return $this->route_destination_id;
-    }
+	function getAddressId()
+	{
+		return $this->route_destination_id;
+	}
 }

src/Route4Me/TrackSetParams.php

Indentation +98 added lines, -98 removed lines

@@ -9,102 +9,102 @@
 
 class TrackSetParams extends Common
 {
-    public $format;
-    public $member_id;
-    public $route_id;
-    public $tx_id;
-    public $vehicle_id;
-    public $course;
-    public $speed;
-    public $lat;
-    public $lng;
-    public $altitude;
-    public $device_type;
-    public $device_guid;
-    public $device_timestamp;
-    public $app_version;
-
-    public static function fromArray(array $params)
-    {
-        $param = new TrackSetParams;
-
-        if (!isset($params['format'])) {
-            throw new BadParam("format must be provided.");
-        }
-
-        $types = array(
-            Format::SERIALIZED,
-            Format::CSV,
-            Format::XML
-        );
-        if (!in_array($params['format'], $types)) {
-            throw new BadParam("format is invalid.");
-        }
-
-        if (!isset($params['route_id'])) {
-            throw new BadParam("route_id must be provided.");
-        }
-
-        if (!isset($params['member_id'])) {
-            throw new BadParam("member_id must be provided.");
-        }
-
-        if (!isset($params['course'])) {
-            throw new BadParam("course must be provided.");
-        }
-
-        if (!isset($params['speed'])) {
-            throw new BadParam("speed must be provided.");
-        }
-
-        if (!isset($params['lat'])) {
-            throw new BadParam("lat must be provided.");
-        }
-
-        if (!isset($params['lng'])) {
-            throw new BadParam("lng must be provided.");
-        }
-
-        if (!isset($params['device_type'])) {
-            throw new BadParam("device_type must be provided.");
-        }
-
-        $deviceTypes = array(
-            DeviceType::IPHONE,
-            DeviceType::IPAD,
-            DeviceType::ANDROID_PHONE,
-            DeviceType::ANDROID_TABLET
-        );
-        if (!in_array($params['device_type'], $deviceTypes)) {
-            throw new BadParam("device_type is invalid.");
-        }
-
-        if (!isset($params['device_guid'])) {
-            throw new BadParam("device_guid must be provided.");
-        }
-
-        if (isset($params['device_timestamp'])) {
-            $template = '/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/i';
-            if (!preg_match($template, $params['device_timestamp'])) {
-                throw new BadParam("device_timestamp is invalid.");
-            }
-        }
-
-        $param->format = self::getValue($params, 'format');
-        $param->route_id = self::getValue($params, 'route_id');
-        $param->member_id = self::getValue($params, 'member_id');
-        $param->course = self::getValue($params, 'course');
-        $param->speed = self::getValue($params, 'speed');
-        $param->lat = self::getValue($params, 'lat');
-        $param->lng = self::getValue($params, 'lng');
-        $param->device_type = self::getValue($params, 'device_type');
-        $param->device_guid = self::getValue($params, 'device_guid');
-        $param->device_timestamp = self::getValue($params, 'device_timestamp');
-        $param->vehicle_id = self::getValue($params, 'vehicle_id');
-        $param->altitude = self::getValue($params, 'altitude');
-        $param->app_version = self::getValue($params, 'app_version');
-        $param->tx_id = self::getValue($params, 'tx_id');
-
-        return $param;
-    }
+	public $format;
+	public $member_id;
+	public $route_id;
+	public $tx_id;
+	public $vehicle_id;
+	public $course;
+	public $speed;
+	public $lat;
+	public $lng;
+	public $altitude;
+	public $device_type;
+	public $device_guid;
+	public $device_timestamp;
+	public $app_version;
+
+	public static function fromArray(array $params)
+	{
+		$param = new TrackSetParams;
+
+		if (!isset($params['format'])) {
+			throw new BadParam("format must be provided.");
+		}
+
+		$types = array(
+			Format::SERIALIZED,
+			Format::CSV,
+			Format::XML
+		);
+		if (!in_array($params['format'], $types)) {
+			throw new BadParam("format is invalid.");
+		}
+
+		if (!isset($params['route_id'])) {
+			throw new BadParam("route_id must be provided.");
+		}
+
+		if (!isset($params['member_id'])) {
+			throw new BadParam("member_id must be provided.");
+		}
+
+		if (!isset($params['course'])) {
+			throw new BadParam("course must be provided.");
+		}
+
+		if (!isset($params['speed'])) {
+			throw new BadParam("speed must be provided.");
+		}
+
+		if (!isset($params['lat'])) {
+			throw new BadParam("lat must be provided.");
+		}
+
+		if (!isset($params['lng'])) {
+			throw new BadParam("lng must be provided.");
+		}
+
+		if (!isset($params['device_type'])) {
+			throw new BadParam("device_type must be provided.");
+		}
+
+		$deviceTypes = array(
+			DeviceType::IPHONE,
+			DeviceType::IPAD,
+			DeviceType::ANDROID_PHONE,
+			DeviceType::ANDROID_TABLET
+		);
+		if (!in_array($params['device_type'], $deviceTypes)) {
+			throw new BadParam("device_type is invalid.");
+		}
+
+		if (!isset($params['device_guid'])) {
+			throw new BadParam("device_guid must be provided.");
+		}
+
+		if (isset($params['device_timestamp'])) {
+			$template = '/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/i';
+			if (!preg_match($template, $params['device_timestamp'])) {
+				throw new BadParam("device_timestamp is invalid.");
+			}
+		}
+
+		$param->format = self::getValue($params, 'format');
+		$param->route_id = self::getValue($params, 'route_id');
+		$param->member_id = self::getValue($params, 'member_id');
+		$param->course = self::getValue($params, 'course');
+		$param->speed = self::getValue($params, 'speed');
+		$param->lat = self::getValue($params, 'lat');
+		$param->lng = self::getValue($params, 'lng');
+		$param->device_type = self::getValue($params, 'device_type');
+		$param->device_guid = self::getValue($params, 'device_guid');
+		$param->device_timestamp = self::getValue($params, 'device_timestamp');
+		$param->vehicle_id = self::getValue($params, 'vehicle_id');
+		$param->altitude = self::getValue($params, 'altitude');
+		$param->app_version = self::getValue($params, 'app_version');
+		$param->tx_id = self::getValue($params, 'tx_id');
+
+		return $param;
+	}
 }

src/Route4Me/Vehicle.php

Indentation +9 added lines, -9 removed lines

@@ -11,21 +11,21 @@
 		
 		public static function fromArray(array $params) {
 			$vehicle= new Vehicle();
-	        foreach($params as $key => $value) {
-	            if (property_exists($vehicle, $key)) {
-	                $vehicle->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($vehicle, $key)) {
+					$vehicle->{$key} = $value;
+				}
 			}
 			
 			return $order;
 		}
 		
 		public static function getVehicles()
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET'
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET'
+			));
 
 			return $response;
 		}

src/Route4Me/Territory.php

Indentation +60 added lines, -60 removed lines

@@ -21,94 +21,94 @@
 		
 		public static function fromArray(array $params) {
 			if (!isset($params['territory_name'])) {
-	            throw new BadParam('Territory name must be provided');
-	        }
+				throw new BadParam('Territory name must be provided');
+			}
 			
 			if (!isset($params['territory_color'])) {
-	            throw new BadParam('Territory color must be provided');
-	        }
+				throw new BadParam('Territory color must be provided');
+			}
 			
 			if (!isset($params['territory'])) {
-	            throw new BadParam('Territory must be provided');
-	        }
+				throw new BadParam('Territory must be provided');
+			}
 			
 			$territoryparameters = new Territory();
-	        foreach($params as $key => $value) {
-	            if (property_exists($territoryparameters, $key)) {
-	                $territoryparameters->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($territoryparameters, $key)) {
+					$territoryparameters->{$key} = $value;
+				}
 			}
 			
 			return $territoryparameters;
 		}
 		
 		public static function getTerritory($params)
-	    {
-	        $territory = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'territory_id' => isset($params['territory_id']) ? $params['territory_id']: null,
-	                'addresses' => isset($params['addresses']) ? $params['addresses']: null,
-	            )
-	        ));
+		{
+			$territory = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'territory_id' => isset($params['territory_id']) ? $params['territory_id']: null,
+					'addresses' => isset($params['addresses']) ? $params['addresses']: null,
+				)
+			));
 	
-	        return $territory;
-	    }
+			return $territory;
+		}
 		
 		public static function getTerritories($params)
-	    {
-	        $response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
-	            )
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'offset'  => isset($params->offset) ? $params->offset: null,
+					'limit'   => isset($params->limit) ? $params->limit: null,
+				)
+			));
 	
-	        return $response;
-	    }
+			return $response;
+		}
 
 		public static function addTerritory($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'ADD',
-	            'query'  => array(
-	            	'territory_name' => isset($params->territory_name) ? $params->territory_name: null,
-	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
-	                'territory' => isset($params->territory) ? $params->territory : null,
-	            )
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'ADD',
+				'query'  => array(
+					'territory_name' => isset($params->territory_name) ? $params->territory_name: null,
+					'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
+					'territory' => isset($params->territory) ? $params->territory : null,
+				)
+			));
 
 			return $response;
 		}
 		
 		public function deleteTerritory($territory_id)
-	    {
-	        $result = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETEARRAY',
-	            'query'  => array(
-	                'territory_id'  => $territory_id
-	            )
-	        ));
+		{
+			$result = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETEARRAY',
+				'query'  => array(
+					'territory_id'  => $territory_id
+				)
+			));
 	
-	        return $result;
-	    }
+			return $result;
+		}
 		
 		public function updateTerritory($params)
-	    {
-	        $response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'query'   => (array)$params,
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'query'   => (array)$params,
 
-	        ));
+			));
 	
-	        return $response;
-	    }
+			return $response;
+		}
 	}
 	
 ?>
\ No newline at end of file