route4me / route4me-php-sdk

src/Route4Me/OptimizationProblem.php

Indentation +160 added lines, -160 removed lines

@@ -12,156 +12,156 @@ 
 
 class OptimizationProblem extends Common
 {
-    static public $apiUrl = '/api.v4/optimization_problem.php';
+	static public $apiUrl = '/api.v4/optimization_problem.php';
 	static public $apiUrl_addr = '/api.v4/address.php';
-    static public $apiHybridUrl = '/api.v4/hybrid_date_optimization.php';
-    static public $apiHybridDepotUrl = '/api/change_hybrid_optimization_depot.php';
+	static public $apiHybridUrl = '/api.v4/hybrid_date_optimization.php';
+	static public $apiHybridDepotUrl = '/api/change_hybrid_optimization_depot.php';
 
-    public $optimization_problem_id;
-    public $user_errors = array();
-    public $state;
-    public $parameters;
-    public $sent_to_background;
-    public $addresses = array();
-    public $routes = array();
-    public $links = array();
+	public $optimization_problem_id;
+	public $user_errors = array();
+	public $state;
+	public $parameters;
+	public $sent_to_background;
+	public $addresses = array();
+	public $routes = array();
+	public $links = array();
 
-    function __construct()
-    {
-        $this->parameters = new RouteParameters;
-    }
+	function __construct()
+	{
+		$this->parameters = new RouteParameters;
+	}
 
-    public static function fromArray(array $params)
-    {
-        $problem = new OptimizationProblem;
-        $problem->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
-        $problem->user_errors = Common::getValue($params, 'user_errors', array());
-        $problem->state = Common::getValue($params, 'state', array());
-        $problem->sent_to_background = Common::getValue($params, 'sent_to_background', array());
-        $problem->links = Common::getValue($params, 'links', array());
+	public static function fromArray(array $params)
+	{
+		$problem = new OptimizationProblem;
+		$problem->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
+		$problem->user_errors = Common::getValue($params, 'user_errors', array());
+		$problem->state = Common::getValue($params, 'state', array());
+		$problem->sent_to_background = Common::getValue($params, 'sent_to_background', array());
+		$problem->links = Common::getValue($params, 'links', array());
 
-        if (isset($params['parameters'])) {
-            $problem->parameters = RouteParameters::fromArray($params['parameters']);
-        }
+		if (isset($params['parameters'])) {
+			$problem->parameters = RouteParameters::fromArray($params['parameters']);
+		}
 
-        if (isset($params['addresses'])) {
-            $addresses = array();
-            foreach ($params['addresses'] as $address) {
-                $addresses[] = Address::fromArray($address);
-            }
-            $problem->addresses = $addresses;
-        }
+		if (isset($params['addresses'])) {
+			$addresses = array();
+			foreach ($params['addresses'] as $address) {
+				$addresses[] = Address::fromArray($address);
+			}
+			$problem->addresses = $addresses;
+		}
 
-        if (isset($params['routes'])) {
-            $routes = array();
-            foreach ($params['routes'] as $route) {
-                $routes[] = Route::fromArray($route);
-            }
-            $problem->routes = $routes;
-        }
+		if (isset($params['routes'])) {
+			$routes = array();
+			foreach ($params['routes'] as $route) {
+				$routes[] = Route::fromArray($route);
+			}
+			$problem->routes = $routes;
+		}
 
-        return $problem;
-    }
+		return $problem;
+	}
 
-    public static function optimize(OptimizationProblemParams $params)
-    {
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'POST',
-            'query'  => array(
-                'directions'             => isset($params->directions) ? $params->directions: null, 
-                'format'                 => isset($params->format) ? $params->format: null,
-                'route_path_output'      => isset($params->route_path_output) ? $params->route_path_output: null,
-                'optimized_callback_url' => isset($params->optimized_callback_url) ? $params->optimized_callback_url: null
-            ),
-            'body'   => array(
-                'addresses'  => $params->getAddressesArray(),
-                'parameters' => $params->getParametersArray()
-            )
-        ));
+	public static function optimize(OptimizationProblemParams $params)
+	{
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'POST',
+			'query'  => array(
+				'directions'             => isset($params->directions) ? $params->directions: null, 
+				'format'                 => isset($params->format) ? $params->format: null,
+				'route_path_output'      => isset($params->route_path_output) ? $params->route_path_output: null,
+				'optimized_callback_url' => isset($params->optimized_callback_url) ? $params->optimized_callback_url: null
+			),
+			'body'   => array(
+				'addresses'  => $params->getAddressesArray(),
+				'parameters' => $params->getParametersArray()
+			)
+		));
 
-        return OptimizationProblem::fromArray($optimize);
-    }
+		return OptimizationProblem::fromArray($optimize);
+	}
 
-    public static function get($params)
-    {
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'GET',
-            'query'  => array(
-                'state' => isset($params['state']) ? $params['state'] : null,
-                'limit' => isset($params['limit']) ? $params['limit'] : null,
-                'offset' => isset($params['offset']) ? $params['offset'] : null,
-                'optimization_problem_id' => isset($params['optimization_problem_id']) 
-                    ? $params['optimization_problem_id'] : null,
-                'wait_for_final_state' => isset($params['wait_for_final_state']) 
-                    ? $params['wait_for_final_state'] : null,
-            )
-        ));
+	public static function get($params)
+	{
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'GET',
+			'query'  => array(
+				'state' => isset($params['state']) ? $params['state'] : null,
+				'limit' => isset($params['limit']) ? $params['limit'] : null,
+				'offset' => isset($params['offset']) ? $params['offset'] : null,
+				'optimization_problem_id' => isset($params['optimization_problem_id']) 
+					? $params['optimization_problem_id'] : null,
+				'wait_for_final_state' => isset($params['wait_for_final_state']) 
+					? $params['wait_for_final_state'] : null,
+			)
+		));
 
-        if (isset($optimize['optimizations'])) {
-            $problems = array();
-            foreach($optimize['optimizations'] as $problem) {
-                $problems[] = OptimizationProblem::fromArray($problem);
-            }
-            return $problems;
-        } else {
-            return OptimizationProblem::fromArray($optimize);
-        }
-    }
+		if (isset($optimize['optimizations'])) {
+			$problems = array();
+			foreach($optimize['optimizations'] as $problem) {
+				$problems[] = OptimizationProblem::fromArray($problem);
+			}
+			return $problems;
+		} else {
+			return OptimizationProblem::fromArray($optimize);
+		}
+	}
 
-    public static function reoptimize($params)
-    {
-        $param = new OptimizationProblemParams;
-        $param->optimization_problem_id = isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null;
-        $param->reoptimize = 1;
+	public static function reoptimize($params)
+	{
+		$param = new OptimizationProblemParams;
+		$param->optimization_problem_id = isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null;
+		$param->reoptimize = 1;
 
-        return self::update((array)$param);
-    }
+		return self::update((array)$param);
+	}
 
-    public static function update($params)
-    {
+	public static function update($params)
+	{
 		$optimize = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'PUT',
-            'query'  => array(
-                'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
-                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
-                'reoptimize' => isset($params['reoptimize']) ? $params['reoptimize'] : null,
-            )
-        ));
+			'url'    => self::$apiUrl,
+			'method' => 'PUT',
+			'query'  => array(
+				'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
+				'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
+				'reoptimize' => isset($params['reoptimize']) ? $params['reoptimize'] : null,
+			)
+		));
 		
 		return $optimize;
-    }
+	}
 
-    public function getOptimizationId()
-    {
-        return $this->optimization_problem_id;
-    }
+	public function getOptimizationId()
+	{
+		return $this->optimization_problem_id;
+	}
 
-    public function getRoutes()
-    {
-        return $this->routes;
-    }
+	public function getRoutes()
+	{
+		return $this->routes;
+	}
 	
 	public function getRandomOptimizationId($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
+		));
 		
 		$optimizations = array();
-            foreach($json as $optimization) {
+			foreach($json as $optimization) {
 				if (gettype($optimization)!="array") continue;
 				foreach ($optimization as $otp1) {
 					$optimizations[] = $otp1;
 				}
-            }
+			}
 			
 			$num=rand(0,sizeof($optimizations)-1);
 			//echo "num=$num.<br>".sizeof($optimizations)."<br>";
@@ -201,13 +201,13 @@ 
 	public function removeAddress($params)
 	{
 		$response = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl_addr,
-            'method' => 'DELETE',
-            'query'  => array(
-                'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
-                'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
-            )
-        ));
+			'url'    => self::$apiUrl_addr,
+			'method' => 'DELETE',
+			'query'  => array(
+				'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
+				'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
+			)
+		));
 		
 		return $response;
 	}
@@ -215,48 +215,48 @@ 
 	public function removeOptimization($params)
 	{
 		$response = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'DELETE',
-            'query'  => array(
-                'redirect' => isset($params['redirect']) ? $params['redirect'] : null,
-            ),
-            'body'  => array(
+			'url'    => self::$apiUrl,
+			'method' => 'DELETE',
+			'query'  => array(
+				'redirect' => isset($params['redirect']) ? $params['redirect'] : null,
+			),
+			'body'  => array(
 				'optimization_problem_ids' => isset($params['optimization_problem_ids']) ? $params['optimization_problem_ids'] : null,
 			)
-        ));
+		));
 		
 		return $response;
 	}
     
-    public function getHybridOptimization($params)
-    {
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => self::$apiHybridUrl,
-            'method' => 'GET',
-            'query'  => array(
-                'target_date_string' => isset($params['target_date_string']) ? $params['target_date_string'] : null,
-                'timezone_offset_minutes' => isset($params['timezone_offset_minutes']) ? $params['timezone_offset_minutes'] : null
-            )
-        ));
+	public function getHybridOptimization($params)
+	{
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => self::$apiHybridUrl,
+			'method' => 'GET',
+			'query'  => array(
+				'target_date_string' => isset($params['target_date_string']) ? $params['target_date_string'] : null,
+				'timezone_offset_minutes' => isset($params['timezone_offset_minutes']) ? $params['timezone_offset_minutes'] : null
+			)
+		));
 
-        return $optimize;
-    }
+		return $optimize;
+	}
     
-    Public function addDepotsToHybrid($params)
-    {
-        $depots = Route4Me::makeRequst(array( 
-            'url'    => self::$apiHybridDepotUrl,
-            'method' => 'POST',
-            'query'  => array(
-                'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
-                ),
-            'body'  => array(
-                'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
-                'delete_old_depots' => isset($params['delete_old_depots']) ? $params['delete_old_depots'] : null,
-                'new_depots' => isset($params['new_depots']) ? $params['new_depots'] : null,
-            )
-        ));
+	Public function addDepotsToHybrid($params)
+	{
+		$depots = Route4Me::makeRequst(array( 
+			'url'    => self::$apiHybridDepotUrl,
+			'method' => 'POST',
+			'query'  => array(
+				'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
+				),
+			'body'  => array(
+				'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null,
+				'delete_old_depots' => isset($params['delete_old_depots']) ? $params['delete_old_depots'] : null,
+				'new_depots' => isset($params['new_depots']) ? $params['new_depots'] : null,
+			)
+		));
         
-        return $depots;
-    }
+		return $depots;
+	}
 }

src/Route4Me/Route.php

Indentation +264 added lines, -264 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,21 +22,21 @@ 
 	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 $is_unrouted;
@@ -44,101 +44,101 @@ 
 	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');
-        $route->is_unrouted = Common::getvalue($params, 'is_unrouted');
-
-        // 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');
+		$route->is_unrouted = Common::getvalue($params, 'is_unrouted');
+
+		// 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;
 	}
@@ -146,14 +146,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;
 	}
@@ -161,17 +161,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;
 	}
@@ -179,15 +179,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;
 		
@@ -196,16 +196,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;
 	}
@@ -213,17 +213,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;
 	}
@@ -232,18 +232,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];
@@ -255,71 +255,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)
@@ -328,18 +328,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,
@@ -349,18 +349,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 
 		/*
@@ -373,8 +373,8 @@ 
             )
         ));
 		*/
-        return $result;
-    }
+		return $result;
+	}
 	
 	public function GetAddressesFromRoute($route_id)
 	{
@@ -398,63 +398,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/Route4Me.php

Indentation +135 added lines, -135 removed lines

@@ -7,37 +7,37 @@ 
 
 class Route4Me
 {
-    static public $apiKey;
-    static public $baseUrl = 'https://api.route4me.com';
+	static public $apiKey;
+	static public $baseUrl = 'https://api.route4me.com';
 
-    public static function setApiKey($apiKey)
-    {
-        self::$apiKey = $apiKey;
-    }
+	public static function setApiKey($apiKey)
+	{
+		self::$apiKey = $apiKey;
+	}
 
-    public static function getApiKey()
-    {
-        return self::$apiKey;
-    }
+	public static function getApiKey()
+	{
+		return self::$apiKey;
+	}
 
-    public static function setBaseUrl($baseUrl)
-    {
-        self::$baseUrl = $baseUrl;
-    }
+	public static function setBaseUrl($baseUrl)
+	{
+		self::$baseUrl = $baseUrl;
+	}
 
-    public static function getBaseUrl()
-    {
-        return self::$baseUrl;
-    }
+	public static function getBaseUrl()
+	{
+		return self::$baseUrl;
+	}
 	
 	public static function fileUploadRequest($options) {
 		$query = isset($options['query']) ?
-            array_filter($options['query']) : array();
+			array_filter($options['query']) : array();
 
 		if (sizeof($query)==0) return null;
 
 		$body = isset($options['body']) ?
-            array_filter($options['body']) : null;
+			array_filter($options['body']) : null;
 			
 		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
 		if ($fname=='') return null;
@@ -47,8 +47,8 @@ 
 		$fp=fopen(realpath($fname),"r");
 		
 		$url = self::$baseUrl.$options['url'] . '?' . http_build_query(array_merge(
-            array( 'api_key' => self::getApiKey()), $query)
-        );
+			array( 'api_key' => self::getApiKey()), $query)
+		);
 		
 		//self::simplePrint($body);die("");
 		//echo "url=".$url."<br>";die("");
@@ -56,12 +56,12 @@ 
 		$ch = curl_init($url);
 		
 		$curlOpts = array(
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE
-        );
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE
+		);
 		
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
 		
@@ -77,65 +77,65 @@ 
 		fclose($fp);
 		//var_dump($result); die('');
 		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		curl_close($ch);
 		//echo "code = $code <br>";
 		$json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
 	}
 
-    public static function makeRequst($options) {
-        $errorHandler = new myErrorHandler();
+	public static function makeRequst($options) {
+		$errorHandler = new myErrorHandler();
     
-        $old_error_handler = set_error_handler(array( $errorHandler, "proc_error"));
-        $method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query']) : array();
+		$old_error_handler = set_error_handler(array( $errorHandler, "proc_error"));
+		$method = isset($options['method']) ? $options['method'] : 'GET';
+		$query = isset($options['query']) ?
+			array_filter($options['query']) : array();
 		//echo "query=".$query['member_id'];die("");
-        $body = isset($options['body']) ?
-            array_filter($options['body']) : null;
+		$body = isset($options['body']) ?
+			array_filter($options['body']) : null;
 		$file = isset($options['FILE']) ? $options['FILE'] : null;
-        $headers = array(
-            "User-Agent: Route4Me php-sdk"
-        );
+		$headers = array(
+			"User-Agent: Route4Me php-sdk"
+		);
         
-        if (isset($options['HTTPHEADER'])) {
-            $headers[]=$options['HTTPHEADER'];
-        }
+		if (isset($options['HTTPHEADER'])) {
+			$headers[]=$options['HTTPHEADER'];
+		}
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
-        }
-        //self::simplePrint($headers); die("");
-        $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
-        ));
+			foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		}
+		//self::simplePrint($headers); die("");
+		$ch = curl_init();
+		$url = $options['url'] . '?' . http_build_query(array_merge(
+			$query, array( 'api_key' => self::getApiKey())
+		));
 		//var_dump($body); echo "<br><br>";
 		//$jfile=json_encode($body); echo "<br><br>".$jfile; die("STOPPPP");
 
-        //self::simplePrint($headers); die("");
+		//self::simplePrint($headers); die("");
 		$baseUrl=self::getBaseUrl();
 		
 		if (strpos($url,'move_route_destination')>0) $baseUrl='https://api.route4me.com';
-        $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => $headers
-        );
+		$curlOpts = arraY(
+			CURLOPT_URL            => $baseUrl. $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => $headers
+		);
 		
 		//echo "url=".$baseUrl.$url."<br>";die("");
-        curl_setopt_array($ch, $curlOpts);
+		curl_setopt_array($ch, $curlOpts);
 		
 		if ($file !=null) {
 			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
@@ -144,21 +144,21 @@ 
 			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
 		}
 		
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
 			if (isset($body)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
-            break;
+			break;
 		case 'DELETEARRAY':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
 			//$jfile=json_encode($body); echo $jfile; die("");
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
 			if (isset($query)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
 			}
@@ -167,9 +167,9 @@ 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
 			break;
-        case 'POST':
+		case 'POST':
 			if (isset($query)) {
-            	curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
+				curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
             
 			//echo "<br><br>". json_encode($body); 
@@ -178,10 +178,10 @@ 
 			} 
 			break;
 		case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
 		//var_dump($result); die("");
 		$isxml=FALSE;
 		$jxml="";
@@ -192,63 +192,63 @@ 
 			$isxml = TRUE;
 		}
 		
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 		//echo "code -> $code <br>";
 		
-        if (200 == $code) {
-            if ($isxml) {
-                $json = $jxml;
-            } else $json = json_decode($result, true);
-            //var_dump($json); die("");
-            if (isset($json['errors'])) {
-                throw new ApiError(implode(', ', $json['errors']));
-            } else {
-                return $json;
-            }
-        }  elseif (409 == $code) {
-            throw new ApiError('Wrong API key');
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+		if (200 == $code) {
+			if ($isxml) {
+				$json = $jxml;
+			} else $json = json_decode($result, true);
+			//var_dump($json); die("");
+			if (isset($json['errors'])) {
+				throw new ApiError(implode(', ', $json['errors']));
+			} else {
+				return $json;
+			}
+		}  elseif (409 == $code) {
+			throw new ApiError('Wrong API key');
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
 
 	public static function makeUrlRequst($url, $options) {
 		$method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query']) : array();
-        $body = isset($options['body']) ?
-            array_filter($options['body']) : null;
-        $ch = curl_init();
+		$query = isset($options['query']) ?
+			array_filter($options['query']) : array();
+		$body = isset($options['body']) ?
+			array_filter($options['body']) : null;
+		$ch = curl_init();
 		
 		$curlOpts = arraY(
-            CURLOPT_URL            => $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => array(
-                'User-Agent' => 'Route4Me php-sdk'
-            )
-        );
+			CURLOPT_URL            => $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => array(
+				'User-Agent' => 'Route4Me php-sdk'
+			)
+		);
 		
 		curl_setopt_array($ch, $curlOpts);
 		
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
 			if (isset($body)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
-            break;
+			break;
 		case 'DELETEARRAY':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
 			if (isset($query)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
 			}
@@ -257,10 +257,10 @@ 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
 			break;
-        case 'POST':
+		case 'POST':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); 
 			if (isset($query)) {
-            	curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
 
 			if (isset($body)) {
@@ -268,8 +268,8 @@ 
 			} 
 			break;
 		case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
 		$result = curl_exec($ch);
         
@@ -282,21 +282,21 @@ 
 			$isxml = TRUE;
 		}
 		
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 		
 		if ($isxml) {
 			$json = $jxml;
 		} else $json = json_decode($result, true);
 		
 		
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
 	}
 	
 	/**

Spacing +25 added lines, -25 removed lines

@@ -44,10 +44,10 @@ 
 
 		$rpath = realpath($fname);
 		
-		$fp=fopen(realpath($fname),"r");
+		$fp = fopen(realpath($fname), "r");
 		
-		$url = self::$baseUrl.$options['url'] . '?' . http_build_query(array_merge(
-            array( 'api_key' => self::getApiKey()), $query)
+		$url = self::$baseUrl.$options['url'].'?'.http_build_query(array_merge(
+            array('api_key' => self::getApiKey()), $query)
         );
 		
 		//self::simplePrint($body);die("");
@@ -81,7 +81,7 @@ 
 		//echo "code = $code <br>";
 		$json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));
@@ -93,7 +93,7 @@ 
     public static function makeRequst($options) {
         $errorHandler = new myErrorHandler();
     
-        $old_error_handler = set_error_handler(array( $errorHandler, "proc_error"));
+        $old_error_handler = set_error_handler(array($errorHandler, "proc_error"));
         $method = isset($options['method']) ? $options['method'] : 'GET';
         $query = isset($options['query']) ?
             array_filter($options['query']) : array();
@@ -106,26 +106,26 @@ 
         );
         
         if (isset($options['HTTPHEADER'])) {
-            $headers[]=$options['HTTPHEADER'];
+            $headers[] = $options['HTTPHEADER'];
         }
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		    foreach ($options['HTTPHEADERS'] As $header) $headers[] = $header;
         }
         //self::simplePrint($headers); die("");
         $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
+        $url = $options['url'].'?'.http_build_query(array_merge(
+            $query, array('api_key' => self::getApiKey())
         ));
 		//var_dump($body); echo "<br><br>";
 		//$jfile=json_encode($body); echo "<br><br>".$jfile; die("STOPPPP");
 
         //self::simplePrint($headers); die("");
-		$baseUrl=self::getBaseUrl();
+		$baseUrl = self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://api.route4me.com';
+		if (strpos($url, 'move_route_destination')>0) $baseUrl = 'https://api.route4me.com';
         $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
+            CURLOPT_URL            => $baseUrl.$url,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT        => 60,
             CURLOPT_FOLLOWLOCATION => true,
@@ -137,14 +137,14 @@ 
 		//echo "url=".$baseUrl.$url."<br>";die("");
         curl_setopt_array($ch, $curlOpts);
 		
-		if ($file !=null) {
+		if ($file!=null) {
 			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-			$fp=fopen($file,'r');
-			curl_setopt($ch, CURLOPT_INFILE , $fp);
+			$fp = fopen($file, 'r');
+			curl_setopt($ch, CURLOPT_INFILE, $fp);
 			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
 		}
 		
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -169,7 +169,7 @@ 
 			break;
         case 'POST':
 			if (isset($query)) {
-            	curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
+            	curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
             
 			//echo "<br><br>". json_encode($body); 
@@ -183,8 +183,8 @@ 
 
         $result = curl_exec($ch);
 		//var_dump($result); die("");
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -196,7 +196,7 @@ 
         curl_close($ch);
 		//echo "code -> $code <br>";
 		
-        if (200 == $code) {
+        if (200==$code) {
             if ($isxml) {
                 $json = $jxml;
             } else $json = json_decode($result, true);
@@ -206,7 +206,7 @@ 
             } else {
                 return $json;
             }
-        }  elseif (409 == $code) {
+        }  elseif (409==$code) {
             throw new ApiError('Wrong API key');
         } else {
             throw new ApiError('Something wrong');
@@ -235,7 +235,7 @@ 
 		
 		curl_setopt_array($ch, $curlOpts);
 		
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -273,8 +273,8 @@ 
 
 		$result = curl_exec($ch);
         
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -290,7 +290,7 @@ 
 		} else $json = json_decode($result, true);
 		
 		
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));

Braces +19 added lines, -7 removed lines

@@ -34,13 +34,17 @@ 
 		$query = isset($options['query']) ?
             array_filter($options['query']) : array();
 
-		if (sizeof($query)==0) return null;
+		if (sizeof($query)==0) {
+			return null;
+		}
 
 		$body = isset($options['body']) ?
             array_filter($options['body']) : null;
 			
 		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
-		if ($fname=='') return null;
+		if ($fname=='') {
+			return null;
+		}
 
 		$rpath = realpath($fname);
 		
@@ -110,7 +114,9 @@ 
         }
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		    foreach ($options['HTTPHEADERS'] As $header) {
+		    	$headers[]=$header;
+		    }
         }
         //self::simplePrint($headers); die("");
         $ch = curl_init();
@@ -123,7 +129,9 @@ 
         //self::simplePrint($headers); die("");
 		$baseUrl=self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://api.route4me.com';
+		if (strpos($url,'move_route_destination')>0) {
+			$baseUrl='https://api.route4me.com';
+		}
         $curlOpts = arraY(
             CURLOPT_URL            => $baseUrl. $url,
             CURLOPT_RETURNTRANSFER => true,
@@ -199,14 +207,16 @@ 
         if (200 == $code) {
             if ($isxml) {
                 $json = $jxml;
-            } else $json = json_decode($result, true);
+            } else {
+            	$json = json_decode($result, true);
+            }
             //var_dump($json); die("");
             if (isset($json['errors'])) {
                 throw new ApiError(implode(', ', $json['errors']));
             } else {
                 return $json;
             }
-        }  elseif (409 == $code) {
+        } elseif (409 == $code) {
             throw new ApiError('Wrong API key');
         } else {
             throw new ApiError('Something wrong');
@@ -287,7 +297,9 @@ 
 		
 		if ($isxml) {
 			$json = $jxml;
-		} else $json = json_decode($result, true);
+		} else {
+			$json = json_decode($result, true);
+		}
 		
 		
         if (200 == $code) {