route4me / route4me-php-sdk

src/Route4Me/Enum/TravelMode.php

Indentation +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@
 
 class TravelMode
 {
-    const DRIVING = 'Driving';
-    const WALKING = 'Walking';
-    const TRUCKING = 'Trucking';
+	const DRIVING = 'Driving';
+	const WALKING = 'Walking';
+	const TRUCKING = 'Trucking';
 }

src/Route4Me/Enum/DirectionMethod.php

Indentation +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@
 
 class DirectionMethod
 {
-    const VIRTUALEARTH = 1;
-    const GOOGLE = 2;
-    const HERE = 3;
+	const VIRTUALEARTH = 1;
+	const GOOGLE = 2;
+	const HERE = 3;
 }

src/Route4Me/Enum/AlgorithmType.php

Indentation +7 added lines, -7 removed lines

@@ -4,11 +4,11 @@
 
 class AlgorithmType
 {
-    const TSP = 1;
-    const VRP = 2;
-    const CVRP_TW_SD = 3;
-    const CVRP_TW_MD = 4;
-    const TSP_TW = 5;
-    const TSP_TW_CR = 6;
-    const BBCVRP = 7;
+	const TSP = 1;
+	const VRP = 2;
+	const CVRP_TW_SD = 3;
+	const CVRP_TW_MD = 4;
+	const TSP_TW = 5;
+	const TSP_TW_CR = 6;
+	const BBCVRP = 7;
 }

src/Route4Me/Route4Me.php

Indentation +99 added lines, -99 removed lines

@@ -6,74 +6,74 @@ 
 
 class Route4Me
 {
-    static public $apiKey;
-    static public $baseUrl = 'https://route4me.com';
+	static public $apiKey;
+	static public $baseUrl = 'https://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 makeRequst($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;
+	public static function makeRequst($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;
 		$httpHeader = isset($options['HTTPHEADER']) ? $options['HTTPHEADER'] : null;
 			
-        $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
-        ));
+		$ch = curl_init();
+		$url = $options['url'] . '?' . http_build_query(array_merge(
+			$query, array( 'api_key' => self::getApiKey())
+		));
 		
 		//$jfile=json_encode($body); echo $jfile; die("");
 		$baseUrl=self::getBaseUrl();
 		
 		if (strpos($url,'move_route_destination')>0) $baseUrl='https://www.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     => array(
-                'User-Agent' => 'Route4Me php-sdk'
-            )
-        );
+		$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     => array(
+				'User-Agent' => 'Route4Me php-sdk'
+			)
+		);
 		//echo "url=".$baseUrl.$url."<br>";die("");
-        curl_setopt_array($ch, $curlOpts);
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		curl_setopt_array($ch, $curlOpts);
+		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));
 			}
@@ -82,10 +82,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)) {
@@ -93,12 +93,12 @@ 
 			} 
 			break;
 		case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
 		if ($httpHeader!=null) curl_setopt($ch, CURLOPT_HTTPHEADER, $httpHeader);
 		
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
 		//var_dump($result); die("");
 		$isxml=FALSE;
 		$jxml="";
@@ -109,58 +109,58 @@ 
 			$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);
 		//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 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));
 			}
@@ -169,10 +169,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)) {
@@ -180,8 +180,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);
 		$isxml=FALSE;
@@ -193,20 +193,20 @@ 
 			$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');
+		}
 	}
 	
 	/**

src/Route4Me/OptimizationProblemParams.php

Indentation +69 added lines, -69 removed lines

@@ -8,85 +8,85 @@
 
 class OptimizationProblemParams extends Common
 {
-    public $optimization_problem_id;
-    public $reoptimize;
-    public $addresses = array();
-    public $parameters;
-    public $directions;
-    public $format;
-    public $route_path_output;
-    public $optimized_callback_url;
+	public $optimization_problem_id;
+	public $reoptimize;
+	public $addresses = array();
+	public $parameters;
+	public $directions;
+	public $format;
+	public $route_path_output;
+	public $optimized_callback_url;
 
-    public static function fromArray($params)
-    {
-        $param = new OptimizationProblemParams;
-        if (!isset($params['addresses'])) {
-            throw new BadParam('addresses must be provided.');
-        }
+	public static function fromArray($params)
+	{
+		$param = new OptimizationProblemParams;
+		if (!isset($params['addresses'])) {
+			throw new BadParam('addresses must be provided.');
+		}
 
-        if (!isset($params['parameters'])) {
-            throw new BadParam('parameters must be provided.');
-        }
+		if (!isset($params['parameters'])) {
+			throw new BadParam('parameters must be provided.');
+		}
 
-        if ($params['parameters'] instanceof RouteParameters) {
-            $param->setParameters($params['parameters']);
-        } else {
-            $param->setParameters(RouteParameters::fromArray($params['parameters']));
-        }
+		if ($params['parameters'] instanceof RouteParameters) {
+			$param->setParameters($params['parameters']);
+		} else {
+			$param->setParameters(RouteParameters::fromArray($params['parameters']));
+		}
 
-        foreach($params['addresses'] as $address) {
-            if (!($address instanceof Address)) {
-                $address = Address::fromArray($address);
-            }
-            $param->addAddress($address);
-        }
+		foreach($params['addresses'] as $address) {
+			if (!($address instanceof Address)) {
+				$address = Address::fromArray($address);
+			}
+			$param->addAddress($address);
+		}
 
-        $param->directions = self::getValue($params, 'directions');
-        $param->format = self::getValue($params, 'format');
-        $param->route_path_output = self::getValue($params, 'route_path_output');
-        $param->optimized_callback_url = self::getValue($params, 'optimized_callback_url');
-        $param->optimization_problem_id = self::getValue($params, 'optimization_problem_id');
-        $param->reoptimize = self::getValue($params, 'reoptimize');
+		$param->directions = self::getValue($params, 'directions');
+		$param->format = self::getValue($params, 'format');
+		$param->route_path_output = self::getValue($params, 'route_path_output');
+		$param->optimized_callback_url = self::getValue($params, 'optimized_callback_url');
+		$param->optimization_problem_id = self::getValue($params, 'optimization_problem_id');
+		$param->reoptimize = self::getValue($params, 'reoptimize');
 
-        return $param;
-    }
+		return $param;
+	}
 
-    public function __construct()
-    {
-        $this->parameters = new RouteParameters;
-    }
+	public function __construct()
+	{
+		$this->parameters = new RouteParameters;
+	}
 
-    public function setParameters(RouteParameters $params)
-    {
-        $this->parameters = $params;
-        return $this;
-    }
+	public function setParameters(RouteParameters $params)
+	{
+		$this->parameters = $params;
+		return $this;
+	}
 
-    public function addAddress(Address $address)
-    {
-        $this->addresses[] = $address;
-        return $this;
-    }
+	public function addAddress(Address $address)
+	{
+		$this->addresses[] = $address;
+		return $this;
+	}
     
-    public function getAddressesArray()
-    {
-        $addresses = array();
-        foreach($this->addresses as $address) {
-            $addresses[] = $address->toArray();
-        }
-        return $addresses;
-    }
+	public function getAddressesArray()
+	{
+		$addresses = array();
+		foreach($this->addresses as $address) {
+			$addresses[] = $address->toArray();
+		}
+		return $addresses;
+	}
 
-    public function getParametersArray()
-    {
-        return $this->parameters->toArray();
-    }
+	public function getParametersArray()
+	{
+		return $this->parameters->toArray();
+	}
 
-    public function setAddresses(array $addresses)
-    {
-        foreach ($addresses as $address) {
-            $this->addAddress($address);
-        }
-        return $this;
-    }
+	public function setAddresses(array $addresses)
+	{
+		foreach ($addresses as $address) {
+			$this->addAddress($address);
+		}
+		return $this;
+	}
 }

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/Order.php

Indentation +60 added lines, -60 removed lines

@@ -37,45 +37,45 @@ 
 		
 		public static function fromArray(array $params) {
 			$order= new Order();
-	        foreach($params as $key => $value) {
-	            if (property_exists($order, $key)) {
-	                $order->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($order, $key)) {
+					$order->{$key} = $value;
+				}
 			}
 			
 			return $order;
 		}
 		
 		public static function addOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'body'  => array(
 					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
-	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
-	                'address_city' => 	isset($params->address_1) ? $params->address_city: null,
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
+					'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
+					'address_city' => 	isset($params->address_1) ? $params->address_city: null,
+					'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
+					'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
+					'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
+					'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
+					'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}
 
 		public static function addOrder2Route($params,$body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlRoute,
-	            'method' => 'PUT',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlRoute,
+				'method' => 'PUT',
+				'query'  => array(
 					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
+					'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
 			));
@@ -84,13 +84,13 @@ 
 		}
 		
 		public static function addOrder2Destination($params,$body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlOpt,
-	            'method' => 'PUT',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlOpt,
+				'method' => 'PUT',
+				'query'  => array(
 					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
+					'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
 			));
@@ -99,58 +99,58 @@ 
 		}
 		
 		public static function getOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
 					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}
 		
 		public static function getOrders()
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET'
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET'
+			));
 
 			return $response;
 		}
 		
 		public static function removeOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETE',
+				'body'  => array(
 					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
 				)
-	        ));
+			));
 
 			return $response;
 		}
 		
 		public static function updateOrder($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'body'  => (array)$body
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'body'  => (array)$body
+			));
 
 			return $response;
 		}
 		
 		public static function searchOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
 					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
 					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
 					'fields' => 	isset($params->fields) ? $params->fields: null,
@@ -158,7 +158,7 @@ 
 					'limit' => 	isset($params->limit) ? $params->limit: null,
 					'query' => 	isset($params->query) ? $params->query: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}

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