route4me / route4me-php-sdk

src/Route4Me/Route.php

Indentation +274 added lines, -274 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['query'] = $params['query'];
+			}
 
-            $query['limit'] = isset($params['limit']) ? $params['limit'] : 30;
-            $query['offset'] = isset($params['offset']) ? $params['offset'] : 0;
-        }
-
-        $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,98 +232,98 @@ 
 	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
+		));
         
-        if (sizeof($json)>0) {
-            $routes = array();
-            foreach($json as $route) {
-                $routes[] = Route::fromArray($route);
-            }
+		if (sizeof($json)>0) {
+			$routes = array();
+			foreach($json as $route) {
+				$routes[] = Route::fromArray($route);
+			}
             
-            $num=rand(0,sizeof($routes)-1);
-            $rRoute=(array)$routes[$num];
+			$num=rand(0,sizeof($routes)-1);
+			$rRoute=(array)$routes[$num];
             
-            if (is_array($rRoute)) 
-            {
-                return $rRoute["route_id"];
-            }
-            else return null;
-        } else return null;
+			if (is_array($rRoute)) 
+			{
+				return $rRoute["route_id"];
+			}
+			else return null;
+		} 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)
@@ -332,18 +332,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,
@@ -353,18 +353,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 
 		/*
@@ -377,8 +377,8 @@ 
             )
         ));
 		*/
-        return $result;
-    }
+		return $result;
+	}
 	
 	public function GetAddressesFromRoute($route_id)
 	{
@@ -402,63 +402,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;
 		
 	}
 }

Spacing +24 added lines, -24 removed lines

@@ -13,14 +13,14 @@ 
 {
     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';
-	static public $apiUrlReseq='/api.v3/route/reoptimize_2.php';
-	static public $apiUrlMerge='/actions/merge_routes.php';
-	static public $apiUrlShare='/actions/route/share_route.php';
-	static public $apiUrlNoteFile='/actions/addRouteNotes.php';
-	static public $apiUrlAsset='/api.v4/status.php';
-	static public $apiUrlDeviceLocation='/api/track/get_device_location.php';
+	static public $apiUrlDuplicate = '/actions/duplicate_route.php';
+	static public $apiUrlDelete = '/actions/delete_routes.php';
+	static public $apiUrlReseq = '/api.v3/route/reoptimize_2.php';
+	static public $apiUrlMerge = '/actions/merge_routes.php';
+	static public $apiUrlShare = '/actions/route/share_route.php';
+	static public $apiUrlNoteFile = '/actions/addRouteNotes.php';
+	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_destination_id;
@@ -79,14 +79,14 @@ 
         return $route;
     }
 
-    public static function getRoutes($routeId=null, $params=null)
+    public static function getRoutes($routeId = null, $params = null)
     {
         $query = array(
             'api_key' => Route4Me::getApiKey()
         );
 
         if ($routeId) {
-            $query['route_id'] = implode(',', (array) $routeId);
+            $query['route_id'] = implode(',', (array)$routeId);
         }
 
         if ($params) {
@@ -120,7 +120,7 @@ 
             return Route::fromArray($json); die("");
         } else {
             $routes = array();
-            foreach($json as $route) {
+            foreach ($json as $route) {
                 $routes[] = Route::fromArray($route);
             }
             return $routes;
@@ -229,7 +229,7 @@ 
 	}
 	
 	// Getting random route_id from existing routes between $offset and $offset+$limit
-	public function getRandomRouteId($offset,$limit)
+	public function getRandomRouteId($offset, $limit)
 	{
 		$query['limit'] = isset($params['limit']) ? $params['limit'] : 30;
         $query['offset'] = isset($params['offset']) ? $params['offset'] : 0;
@@ -242,12 +242,12 @@ 
         
         if (sizeof($json)>0) {
             $routes = array();
-            foreach($json as $route) {
+            foreach ($json as $route) {
                 $routes[] = Route::fromArray($route);
             }
             
-            $num=rand(0,sizeof($routes)-1);
-            $rRoute=(array)$routes[$num];
+            $num = rand(0, sizeof($routes) - 1);
+            $rRoute = (array)$routes[$num];
             
             if (is_array($rRoute)) 
             {
@@ -268,7 +268,7 @@ 
                 '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 (
+            'body' => array(
             	'parameters' => $this->parameters,
             	),
             'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
@@ -331,7 +331,7 @@ 
 		$fname = isset($params['strFilename']) ? $params['strFilename'] : null;
 		$rpath = realpath($fname);
 		//echo $rpath;die("");
-		$result= Route4Me::makeRequst(array(
+		$result = Route4Me::makeRequst(array(
             'url'    => self::$apiUrlNoteFile,
             'method' => 'POST',
             'query'  => array(
@@ -363,7 +363,7 @@ 
         $result = Route4Me::makeRequst(array(
             'url'    => self::$apiUrl,
             'method' => 'DELETE',
-            'query'  => array( 'route_id' => $route_id )
+            'query'  => array('route_id' => $route_id)
         ));
 		
 		// The code below doesn't work, altough this method is described as workable in REST API 
@@ -382,24 +382,24 @@ 
 	
 	public function GetAddressesFromRoute($route_id)
 	{
-		$route1=Route::getRoutes($route_id,null);
+		$route1 = Route::getRoutes($route_id, null);
 		if (isset($route1)) {
 			return $route1->addresses();
-		} else { return null;}
+		} else { return null; }
 	}
 	
 	public function GetRandomAddressFromRoute($route_id)
 	{
-		$route1=Route::getRoutes($route_id,null);
+		$route1 = Route::getRoutes($route_id, null);
 		
 		if (isset($route1)) {
-			$addresses=$route1->addresses;
+			$addresses = $route1->addresses;
 			
-			$rnd=rand(0,sizeof($addresses)-1);
+			$rnd = rand(0, sizeof($addresses) - 1);
 			
 			return $addresses[$rnd];
 			
-		} else { return null;}
+		} else { return null; }
 	}
 
     public function getRouteId()

Braces +5 added lines, -2 removed lines

@@ -252,9 +252,12 @@
             if (is_array($rRoute)) 
             {
                 return $rRoute["route_id"];
+            } else {
+            	return null;
             }
-            else return null;
-        } else return null;
+        } else {
+        	return null;
+        }
 		
 		
 	}

src/Route4Me/Address.php

Indentation +157 added lines, -157 removed lines

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