route4me / route4me-php-sdk

src/Route4Me/Route.php

Indentation +336 added lines, -336 removed lines

@@ -9,409 +9,409 @@
 
 class Route extends Common
 {
-    public $route_id;
-    public $member_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 $destination_count;
-    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;
-    public $time;
+	public $route_id;
+	public $member_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 $destination_count;
+	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;
+	public $time;
     
-    public $dev_lat;
-    public $dev_lng;
+	public $dev_lat;
+	public $dev_lng;
     
-    public $user_route_rating;
-    public $member_email;
-    public $member_first_name;
-    public $member_last_name;
-    public $channel_name;
-    public $route_cost;
-    public $route_revenue;
-    public $net_revenue_per_distance_unit;
-    public $created_timestamp;
-    public $planned_total_route_duration;
-    public $actual_travel_distance;
-    public $actual_travel_time;
-    public $actual_footsteps;
-    public $working_time;
-    public $driving_time;
-    public $idling_time;
-    public $paying_miles;
-    public $geofence_polygon_type;
-    public $geofence_polygon_size;
-    public $notes;
-    public $member_config_storage;
+	public $user_route_rating;
+	public $member_email;
+	public $member_first_name;
+	public $member_last_name;
+	public $channel_name;
+	public $route_cost;
+	public $route_revenue;
+	public $net_revenue_per_distance_unit;
+	public $created_timestamp;
+	public $planned_total_route_duration;
+	public $actual_travel_distance;
+	public $actual_travel_time;
+	public $actual_footsteps;
+	public $working_time;
+	public $driving_time;
+	public $idling_time;
+	public $paying_miles;
+	public $geofence_polygon_type;
+	public $geofence_polygon_size;
+	public $notes;
+	public $member_config_storage;
 
-    public static function fromArray(array $params) 
-    {
-        $route = new Route();
-        $route->route_id                = Common::getValue($params, 'route_id');
-        $route->member_id               = Common::getValue($params, 'member_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->destination_count       = Common::getvalue($params, 'destination_count');
-        $route->is_unrouted             = Common::getvalue($params, 'is_unrouted');
+	public static function fromArray(array $params) 
+	{
+		$route = new Route();
+		$route->route_id                = Common::getValue($params, 'route_id');
+		$route->member_id               = Common::getValue($params, 'member_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->destination_count       = Common::getvalue($params, 'destination_count');
+		$route->is_unrouted             = Common::getvalue($params, 'is_unrouted');
 
-        // Make RouteParameters
-        if (isset($params['parameters'])) {
-            $route->parameters = RouteParameters::fromArray($params['parameters']);
-        }
+		// 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);
-            }
+		if (isset($params['addresses'])) {
+			$addresses = array();
+			foreach ($params['addresses'] as $address) {
+				$addresses[] = Address::fromArray($address);
+			}
 
-            $route->addresses = $addresses;
-        }
+			$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());
+		$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;
-    }
+		return $route;
+	}
 
-    public static function getRoutes($params = null)
-    {
-        $allQueryFields = array('route_id', 'route_path_output', 'query', 'directions', 'device_tracking_history', 'limit', 'offset');
+	public static function getRoutes($params = null)
+	{
+		$allQueryFields = array('route_id', 'route_path_output', 'query', 'directions', 'device_tracking_history', 'limit', 'offset');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        if (isset($params['route_id'])) {
-            return Route::fromArray($result); die("");
-        } else {
-            $routes = array();
-            foreach ($result as $route) {
-                $routes[] = Route::fromArray($route);
-            }
-            return $routes;
-        }
-    }
+		if (isset($params['route_id'])) {
+			return Route::fromArray($result); die("");
+		} else {
+			$routes = array();
+			foreach ($result as $route) {
+				$routes[] = Route::fromArray($route);
+			}
+			return $routes;
+		}
+	}
 
-    public function getRoutePoints($params)
-    {
-        $allQueryFields = array('route_id', 'route_path_output', 'compress_path_points', 'directions');
+	public function getRoutePoints($params)
+	{
+		$allQueryFields = array('route_id', 'route_path_output', 'compress_path_points', 'directions');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function duplicateRoute($route_id)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_DUPLICATE,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id' => $route_id,
-                'to'       => 'none',
-            )
-        ));
+	public function duplicateRoute($route_id)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_DUPLICATE,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id' => $route_id,
+				'to'       => 'none',
+			)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function resequenceRoute($params)
-    {
-        $allQueryFields = array('route_id', 'route_destination_id');
-        $allBodyFields = array('addresses');
+	public function resequenceRoute($params)
+	{
+		$allQueryFields = array('route_id', 'route_destination_id');
+		$allBodyFields = array('addresses');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function resequenceAllAddresses($params)
-    {
-        $allQueryFields = array('route_id', 'disable_optimization', 'optimize');
+	public function resequenceAllAddresses($params)
+	{
+		$allQueryFields = array('route_id', 'disable_optimization', 'optimize');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::REOPTIMIZE_V3_2,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::REOPTIMIZE_V3_2,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
 
-    public function mergeRoutes($params)
-    {
-        $allBodyFields = array('route_ids', 'depot_address', 'remove_origin', 'depot_lat',  'depot_lng');
+	public function mergeRoutes($params)
+	{
+		$allBodyFields = array('route_ids', 'depot_address', 'remove_origin', 'depot_lat',  'depot_lng');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTES_MERGE,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTES_MERGE,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function shareRoute($params)
-    {
-        $allQueryFields = array('route_id', 'response_format');
-        $allBodyFields = array('recipient_email');
+	public function shareRoute($params)
+	{
+		$allQueryFields = array('route_id', 'response_format');
+		$allBodyFields = array('recipient_email');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_SHARE,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_SHARE,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    // Returns random route_id from existing routes between $offset and $offset+$limit
-    public function getRandomRouteId($offset, $limit)
-    {
-        $params = array(
-            'offset' => !is_null($offset) ? $offset : 0,
-            'limit'  => !is_null($limit) ? $limit : 30
-        );
+	// Returns random route_id from existing routes between $offset and $offset+$limit
+	public function getRandomRouteId($offset, $limit)
+	{
+		$params = array(
+			'offset' => !is_null($offset) ? $offset : 0,
+			'limit'  => !is_null($limit) ? $limit : 30
+		);
         
-        $routes = $this->getRoutes($params);
+		$routes = $this->getRoutes($params);
         
-        if (is_null($routes) || sizeof($routes)<1) {
-            echo "<br> There are no routes in the account. Please, create the routes first. <br>";
-            return null;
-        } 
+		if (is_null($routes) || sizeof($routes)<1) {
+			echo "<br> There are no routes in the account. Please, create the routes first. <br>";
+			return null;
+		} 
         
-        $randomIndex = rand(0, sizeof($routes) - 1);
+		$randomIndex = rand(0, sizeof($routes) - 1);
         
-        return $routes[$randomIndex]->route_id;
-    }
+		return $routes[$randomIndex]->route_id;
+	}
 
-    public function update()
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id'  => isset($this->route_id) ? $this->route_id : null
-            ),
-            'body' => array(
-                'parameters' => $this->parameters,
-                ),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+	public function update()
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id'  => isset($this->route_id) ? $this->route_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($address = null)
-    {
-        $body = sizeof($this->addresses)<1 ? get_object_vars($this->parameters) 
-            : (isset($this->addresses[0]) ? $this->addresses[0] : get_object_vars($this->parameters));
+	public function updateAddress($address = null)
+	{
+		$body = sizeof($this->addresses)<1 ? get_object_vars($this->parameters) 
+			: (isset($this->addresses[0]) ? $this->addresses[0] : get_object_vars($this->parameters));
 
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            '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'        => $body,
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'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'        => $body,
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function updateRouteAddress()
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            '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" => isset($this->parameters) ? get_object_vars($this->parameters) : null,
-                "addresses"  => isset($this->addresses) ? $this->addresses : null
-            ),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+	public function updateRouteAddress()
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'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" => isset($this->parameters) ? get_object_vars($this->parameters) : null,
+				"addresses"  => isset($this->addresses) ? $this->addresses : null
+			),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function addAddresses($params)
-    {
-        $allQueryFields = array('route_id');
-        $allBodyFields = array('addresses');
+	public function addAddresses($params)
+	{
+		$allQueryFields = array('route_id');
+		$allBodyFields = array('addresses');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function insertAddressOptimalPosition(array $params)
-    {
-        $allQueryFields = array('route_id');
-        $allBodyFields = array('addresses', 'optimal_position');
+	public function insertAddressOptimalPosition(array $params)
+	{
+		$allQueryFields = array('route_id');
+		$allBodyFields = array('addresses', 'optimal_position');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function addNoteFile($params)
-    {
-        $fname = isset($params['strFilename']) ? $params['strFilename'] : null;
-        $rpath = realpath($fname);
+	public function addNoteFile($params)
+	{
+		$fname = isset($params['strFilename']) ? $params['strFilename'] : null;
+		$rpath = realpath($fname);
         
-        $allQueryFields = array('route_id', 'address_id', 'dev_lat', 'dev_lng', 'device_type');
-        $allBodyFields = array('strUpdateType', 'strFilename', 'strNoteContents');
+		$allQueryFields = array('route_id', 'address_id', 'dev_lat', 'dev_lng', 'device_type');
+		$allBodyFields = array('strUpdateType', 'strFilename', 'strNoteContents');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_NOTES_ADD,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'FILE'   => $rpath,
-            'HTTPHEADER' => array(
-                'Content-Type: application/x-www-form-urlencoded'
-            )
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_NOTES_ADD,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'FILE'   => $rpath,
+			'HTTPHEADER' => array(
+				'Content-Type: application/x-www-form-urlencoded'
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function deleteRoutes($route_id)
-    {
-         $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTES_DELETE,
-            'method' => 'DELETE',
-            'query'  => array(
-                'route_id' => $route_id,
-            )
-        ));
+	public function deleteRoutes($route_id)
+	{
+		 $result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTES_DELETE,
+			'method' => 'DELETE',
+			'query'  => array(
+				'route_id' => $route_id,
+			)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function GetAddressesFromRoute($route_id)
-    {
-        $route1 = Route::getRoutes(array('route_id' => $route_id));
+	public function GetAddressesFromRoute($route_id)
+	{
+		$route1 = Route::getRoutes(array('route_id' => $route_id));
         
-        if (isset($route1)) {
-            return $route1->addresses;
-        } else {
-            return null;
-        }
-    }
+		if (isset($route1)) {
+			return $route1->addresses;
+		} else {
+			return null;
+		}
+	}
     
-    public function GetRandomAddressFromRoute($route_id)
-    {
-        $route1 = Route::getRoutes(array('route_id' => $route_id));
+	public function GetRandomAddressFromRoute($route_id)
+	{
+		$route1 = Route::getRoutes(array('route_id' => $route_id));
         
-        if (isset($route1)) {
-            $addresses = $route1->addresses;
+		if (isset($route1)) {
+			$addresses = $route1->addresses;
             
-            $rnd = rand(0, sizeof($addresses) - 1);
+			$rnd = rand(0, sizeof($addresses) - 1);
             
-            return $addresses[$rnd];
-        } else {
-            return null;
-        }
-    }
+			return $addresses[$rnd];
+		} 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)
-    {
-        $allQueryFields = array('route_id', 'device_tracking_history');
+	public function GetLastLocation(array $params)
+	{
+		$allQueryFields = array('route_id', 'device_tracking_history');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function GetTrackingHistoryFromTimeRange(array $params)
-    {
-        $allQueryFields = array('route_id', 'format', 'time_period', 'start_date', 'end_date');
+	public function GetTrackingHistoryFromTimeRange(array $params)
+	{
+		$allQueryFields = array('route_id', 'format', 'time_period', 'start_date', 'end_date');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GET_DEVICE_LOCATION,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GET_DEVICE_LOCATION,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $route;
-    }
+		return $route;
+	}
     
-    public function GetAssetTracking(array $params)
-    {
-        $allQueryFields = array('tracking');
+	public function GetAssetTracking(array $params)
+	{
+		$allQueryFields = array('tracking');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::STATUS_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::STATUS_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $route;
-    }
+		return $route;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
 
     public function mergeRoutes($params)
     {
-        $allBodyFields = array('route_ids', 'depot_address', 'remove_origin', 'depot_lat',  'depot_lng');
+        $allBodyFields = array('route_ids', 'depot_address', 'remove_origin', 'depot_lat', 'depot_lng');
         
         $result = Route4Me::makeRequst(array(
             'url'    => Endpoint::ROUTES_MERGE,

src/Route4Me/OptimizationProblem.php

Indentation +208 added lines, -208 removed lines

@@ -11,236 +11,236 @@
 
 class OptimizationProblem extends Common
 {
-    public $optimization_problem_id;
-    public $user_errors = array();
-    public $state;
-    public $optimization_errors = array();
-    public $parameters;
-    public $sent_to_background;
-    public $created_timestamp;
-    public $scheduled_for;
-    public $optimization_completed_timestamp;
-    public $addresses = array();
-    public $routes = array();
-    public $links = array();
-
-    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());
-
-        if (isset($params['parameters'])) {
-            $problem->parameters = RouteParameters::fromArray($params['parameters']);
-        }
-
-        if (isset($params['addresses'])) {
-            $addresses = array();
+	public $optimization_problem_id;
+	public $user_errors = array();
+	public $state;
+	public $optimization_errors = array();
+	public $parameters;
+	public $sent_to_background;
+	public $created_timestamp;
+	public $scheduled_for;
+	public $optimization_completed_timestamp;
+	public $addresses = array();
+	public $routes = array();
+	public $links = array();
+
+	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());
+
+		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);
-            }
+			foreach ($params['addresses'] as $address) {
+				$addresses[] = Address::fromArray($address);
+			}
             
-            $problem->addresses = $addresses;
-        }
+			$problem->addresses = $addresses;
+		}
 
-        if (isset($params['routes'])) {
-            $routes = array();
+		if (isset($params['routes'])) {
+			$routes = array();
             
-            foreach ($params['routes'] as $route) {
-                $routes[] = Route::fromArray($route);
-            }
+			foreach ($params['routes'] as $route) {
+				$routes[] = Route::fromArray($route);
+			}
             
-            $problem->routes = $routes;
-        }
-
-        return $problem;
-    }
-
-    public static function optimize(OptimizationProblemParams $params)
-    {
-        $allQueryFields = array('redirect', 'directions', 'format', 'route_path_output', 'optimized_callback_url');
-        
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => array(
-                'addresses'  => $params->getAddressesArray(),
-                'parameters' => $params->getParametersArray()
-            )
-        ));
-
-        return OptimizationProblem::fromArray($optimize);
-    }
-
-    public static function get($params)
-    {
-        $allQueryFields = array('state', 'limit', 'format', 'offset', 
-        'optimization_problem_id', 'wait_for_final_state');
-        
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-
-        if (isset($optimize['optimizations'])) {
-            $problems = array();
+			$problem->routes = $routes;
+		}
+
+		return $problem;
+	}
+
+	public static function optimize(OptimizationProblemParams $params)
+	{
+		$allQueryFields = array('redirect', 'directions', 'format', 'route_path_output', 'optimized_callback_url');
+        
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => array(
+				'addresses'  => $params->getAddressesArray(),
+				'parameters' => $params->getParametersArray()
+			)
+		));
+
+		return OptimizationProblem::fromArray($optimize);
+	}
+
+	public static function get($params)
+	{
+		$allQueryFields = array('state', 'limit', 'format', 'offset', 
+		'optimization_problem_id', 'wait_for_final_state');
+        
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+
+		if (isset($optimize['optimizations'])) {
+			$problems = array();
             
-            foreach ($optimize['optimizations'] as $problem) {
-                $problems[] = OptimizationProblem::fromArray($problem);
-            }
+			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;
-
-        return self::update((array)$param);
-    }
-
-    public static function update($params)
-    {
-        $allQueryFields = array('optimization_problem_id', 'reoptimize');
-        $allBodyFields = array('addresses');
-        
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'  => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $optimize;
-    }
-
-    public function getOptimizationId()
-    {
-        return $this->optimization_problem_id;
-    }
-
-    public function getRoutes()
-    {
-        return $this->routes;
-    }
+			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;
+
+		return self::update((array)$param);
+	}
+
+	public static function update($params)
+	{
+		$allQueryFields = array('optimization_problem_id', 'reoptimize');
+		$allBodyFields = array('addresses');
+        
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'  => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $optimize;
+	}
+
+	public function getOptimizationId()
+	{
+		return $this->optimization_problem_id;
+	}
+
+	public function getRoutes()
+	{
+		return $this->routes;
+	}
     
-    public function getRandomOptimizationId($offset, $limit)
-    {
-        $optimizations = self::get(array('offset' => $offset, 'limit' => $limit));
+	public function getRandomOptimizationId($offset, $limit)
+	{
+		$optimizations = self::get(array('offset' => $offset, 'limit' => $limit));
             
-        $rOptimization = $optimizations[rand(0,sizeof($optimizations)-1)];
-        
-        if(!isset($rOptimization->optimization_problem_id)) {
-            if (sizeof($optimizations)>9) {
-                $this->getRandomOptimizationId($offset, $limit);
-            } else {
-                return null;
-            }
-        }
+		$rOptimization = $optimizations[rand(0,sizeof($optimizations)-1)];
+        
+		if(!isset($rOptimization->optimization_problem_id)) {
+			if (sizeof($optimizations)>9) {
+				$this->getRandomOptimizationId($offset, $limit);
+			} else {
+				return null;
+			}
+		}
                 
-        return $rOptimization->optimization_problem_id;
-    }
+		return $rOptimization->optimization_problem_id;
+	}
     
-    public function getAddresses($opt_id)
-    {
-        if ($opt_id==null) {
-            return null;
-        }
+	public function getAddresses($opt_id)
+	{
+		if ($opt_id==null) {
+			return null;
+		}
         
-        $params = array("optimization_problem_id" => $opt_id );
+		$params = array("optimization_problem_id" => $opt_id );
         
-        $optimization = (array)$this->get($params);
+		$optimization = (array)$this->get($params);
         
-        $addresses = $optimization["addresses"];
+		$addresses = $optimization["addresses"];
         
-        return $addresses;
-    }
+		return $addresses;
+	}
     
-    public function getRandomAddressFromOptimization($opt_id)
-    {
-        $addresses = (array)$this->getAddresses($opt_id);
+	public function getRandomAddressFromOptimization($opt_id)
+	{
+		$addresses = (array)$this->getAddresses($opt_id);
         
-        if ($addresses==null) {
-            echo "There are no addresses in this optimization!.. Try again.";
-            return null;
-        }
+		if ($addresses==null) {
+			echo "There are no addresses in this optimization!.. Try again.";
+			return null;
+		}
         
-        $num = rand(0, sizeof($addresses)-1);
+		$num = rand(0, sizeof($addresses)-1);
         
-        $rAddress = $addresses[$num];
+		$rAddress = $addresses[$num];
         
-        return $rAddress;
-    }
+		return $rAddress;
+	}
     
-    public function removeAddress($params)
-    {
-        $allQueryFields = array('optimization_problem_id', 'route_destination_id');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'DELETE',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-        
-        return $response;
-    }
+	public function removeAddress($params)
+	{
+		$allQueryFields = array('optimization_problem_id', 'route_destination_id');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'DELETE',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public function removeOptimization($params)
-    {
-        $allQueryFields = array('redirect');
-        $allBodyFields = array('optimization_problem_ids');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'DELETE',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public function removeOptimization($params)
+	{
+		$allQueryFields = array('redirect');
+		$allBodyFields = array('optimization_problem_ids');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'DELETE',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public function getHybridOptimization($params)
-    {
-        $allQueryFields = array('target_date_string', 'timezone_offset_minutes');
-        
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::HYBRID_DATE_OPTIMIZATION,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-
-        return $optimize;
-    }
+	public function getHybridOptimization($params)
+	{
+		$allQueryFields = array('target_date_string', 'timezone_offset_minutes');
+        
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::HYBRID_DATE_OPTIMIZATION,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+
+		return $optimize;
+	}
     
-    Public function addDepotsToHybrid($params)
-    {
-        $allQueryFields = array('optimization_problem_id');
-        $allBodyFields = array('optimization_problem_id', 'delete_old_depots', 'new_depots');
-        
-        $depots = Route4Me::makeRequst(array( 
-            'url'    => Endpoint::CHANGE_HYBRID_OPTIMIZATION_DEPOT,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $depots;
-    }
+	Public function addDepotsToHybrid($params)
+	{
+		$allQueryFields = array('optimization_problem_id');
+		$allBodyFields = array('optimization_problem_id', 'delete_old_depots', 'new_depots');
+        
+		$depots = Route4Me::makeRequst(array( 
+			'url'    => Endpoint::CHANGE_HYBRID_OPTIMIZATION_DEPOT,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $depots;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -144,9 +144,9 @@ 
     {
         $optimizations = self::get(array('offset' => $offset, 'limit' => $limit));
             
-        $rOptimization = $optimizations[rand(0,sizeof($optimizations)-1)];
+        $rOptimization = $optimizations[rand(0, sizeof($optimizations) - 1)];
         
-        if(!isset($rOptimization->optimization_problem_id)) {
+        if (!isset($rOptimization->optimization_problem_id)) {
             if (sizeof($optimizations)>9) {
                 $this->getRandomOptimizationId($offset, $limit);
             } else {
@@ -163,7 +163,7 @@ 
             return null;
         }
         
-        $params = array("optimization_problem_id" => $opt_id );
+        $params = array("optimization_problem_id" => $opt_id);
         
         $optimization = (array)$this->get($params);
         
@@ -181,7 +181,7 @@ 
             return null;
         }
         
-        $num = rand(0, sizeof($addresses)-1);
+        $num = rand(0, sizeof($addresses) - 1);
         
         $rAddress = $addresses[$num];