route4me / route4me-php-sdk

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

src/Route4Me/Member.php

Indentation +279 added lines, -279 removed lines

@@ -6,325 +6,325 @@
 
 class Member extends Common
 {
-    public $device_id;
-    public $device_type;
-    public $format;
+	public $device_id;
+	public $device_type;
+	public $format;
     
-    public $strEmail;
-    public $strPassword;
-    public $strPassword_1;
-    public $strPassword_2;
-    public $strFirstName;
-    public $strLastName;
-    public $strIndustry;
-    public $chkTerms;
-    public $plan;
+	public $strEmail;
+	public $strPassword;
+	public $strPassword_1;
+	public $strPassword_2;
+	public $strFirstName;
+	public $strLastName;
+	public $strIndustry;
+	public $chkTerms;
+	public $plan;
     
-    public $session_guid;
-    public $member_id;
+	public $session_guid;
+	public $member_id;
     
-    public $email_address;
-    public $first_name;
-    public $last_name;
-    public $phone_number;
-    public $company_name;
-    public $webinar_date;
+	public $email_address;
+	public $first_name;
+	public $last_name;
+	public $phone_number;
+	public $company_name;
+	public $webinar_date;
     
-    public $subscription_name;
-    public $token;
-    public $payload;
+	public $subscription_name;
+	public $token;
+	public $payload;
     
-    public $HIDE_ROUTED_ADDRESSES;
-    public $member_phone;
-    public $member_zipcode;
-    public $route_count;
-    public $member_email;
-    public $HIDE_VISITED_ADDRESSES;
-    public $READONLY_USER;
-    public $member_type;
-    public $date_of_birth;
-    public $member_first_name;
-    public $member_password;
-    public $HIDE_NONFUTURE_ROUTES;
-    public $member_last_name;
-    public $SHOW_ALL_VEHICLES;
-    public $SHOW_ALL_DRIVERS;
+	public $HIDE_ROUTED_ADDRESSES;
+	public $member_phone;
+	public $member_zipcode;
+	public $route_count;
+	public $member_email;
+	public $HIDE_VISITED_ADDRESSES;
+	public $READONLY_USER;
+	public $member_type;
+	public $date_of_birth;
+	public $member_first_name;
+	public $member_password;
+	public $HIDE_NONFUTURE_ROUTES;
+	public $member_last_name;
+	public $SHOW_ALL_VEHICLES;
+	public $SHOW_ALL_DRIVERS;
     
-    public $config_key;
-    public $config_value;
+	public $config_key;
+	public $config_value;
     
-    public $preferred_units;
-    public $preferred_language;
-    public $timezone;
-    public $OWNER_MEMBER_ID;
-    public $user_reg_state_id;
-    public $user_reg_country_id;
-    public $member_picture;
-    public $api_key;
-    public $custom_data;
+	public $preferred_units;
+	public $preferred_language;
+	public $timezone;
+	public $OWNER_MEMBER_ID;
+	public $user_reg_state_id;
+	public $user_reg_country_id;
+	public $member_picture;
+	public $api_key;
+	public $custom_data;
     
-    public static function fromArray(array $params) 
-    {
-        $member= new Member();
-        
-        foreach($params as $key => $value) {
-            if (property_exists($member, $key)) {
-                $member->{$key} = $value;
-            }
-        }
-        
-        return $member;
-    }
+	public static function fromArray(array $params) 
+	{
+		$member= new Member();
+        
+		foreach($params as $key => $value) {
+			if (property_exists($member, $key)) {
+				$member->{$key} = $value;
+			}
+		}
+        
+		return $member;
+	}
     
-    public static function getUsers()
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'GET'
-        ));
+	public static function getUsers()
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'GET'
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getUser($params)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'member_id' => isset($params['member_id']) ? $params['member_id'] : null
-            )
-        ));
+	public static function getUser($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'member_id' => isset($params['member_id']) ? $params['member_id'] : null
+			)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getUserLocations($param)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VIEW_USER_LOCATIONS,
-            'method' => 'GET',
-            'query'  => array(
-                'query' => $param
-            )
-        ));
+	public static function getUserLocations($param)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VIEW_USER_LOCATIONS,
+			'method' => 'GET',
+			'query'  => array(
+				'query' => $param
+			)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function addDeviceRecord($params)
-    {
-        $allQueryFields = array('device_id', 'device_type');
-        $allBodyFields = array('device_id', 'device_type', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VERIFY_DEVICE_LICENSE,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function addDeviceRecord($params)
+	{
+		$allQueryFields = array('device_id', 'device_type');
+		$allBodyFields = array('device_id', 'device_type', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VERIFY_DEVICE_LICENSE,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function createMember($params)
-    {
-        $excludeFields = array('session_guid', 'member_id', 'token', 'payload', 'webinar_date', 
-        'company_name', 'config_key', 'config_value', 'api_key');
+	public static function createMember($params)
+	{
+		$excludeFields = array('session_guid', 'member_id', 'token', 'payload', 'webinar_date', 
+		'company_name', 'config_key', 'config_value', 'api_key');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
 
-    public static function getRandomMemberByType($memberType)
-    {
-        $members = self::getUsers();
+	public static function getRandomMemberByType($memberType)
+	{
+		$members = self::getUsers();
         
-        if (is_null($members) || !isset($members['results'])) {
-            return null;
-        }
+		if (is_null($members) || !isset($members['results'])) {
+			return null;
+		}
         
-        $memberIDs = array();
+		$memberIDs = array();
         
-        foreach ($members['results'] as $memb) {
-            if (isset($memb['member_id']) && isset($memb['member_type'])) {
-                if ($memberType==$memb['member_type']) {
-                    $memberIDs[]=$memb['member_id'];
-                }
-            }
-        }
+		foreach ($members['results'] as $memb) {
+			if (isset($memb['member_id']) && isset($memb['member_type'])) {
+				if ($memberType==$memb['member_type']) {
+					$memberIDs[]=$memb['member_id'];
+				}
+			}
+		}
         
-        if (sizeof($memberIDs)<1) {
-            return null;
-        }
+		if (sizeof($memberIDs)<1) {
+			return null;
+		}
         
-        $randomIndex = rand(0, sizeof($memberIDs) - 1);
+		$randomIndex = rand(0, sizeof($memberIDs) - 1);
         
-        return $memberIDs[$randomIndex];
-    }
+		return $memberIDs[$randomIndex];
+	}
 
 
-    public static function updateMember($body)
-    {
-        $excludeFields = array('session_guid', 'token', 'payload', 'webinar_date', 
-        'company_name', 'config_key', 'config_value', 'api_key');
+	public static function updateMember($body)
+	{
+		$excludeFields = array('session_guid', 'token', 'payload', 'webinar_date', 
+		'company_name', 'config_key', 'config_value', 'api_key');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $body)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $body)
+		));
         
-        return $response;
-    }
+		return $response;
+	}
 
-    public static function deleteMember($body)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'DELETE',
-            'body'   => array(
-                'member_id' =>  isset($body->member_id) ? $body->member_id : null
-            )
+	public static function deleteMember($body)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'DELETE',
+			'body'   => array(
+				'member_id' =>  isset($body->member_id) ? $body->member_id : null
+			)
 
-        ));
+		));
         
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function newAccountRegistration($params)
-    {
-        $allQueryFields = array('plan');
-        $allBodyFields = array('strEmail', 'strPassword_1', 'strPassword_2', 'strFirstName', 
-        'strLastName', 'format', 'strIndustry', 'chkTerms', 'device_type', 'strSubAccountType', 
-        'blDisableMarketing', 'blDisableAccountActivationEmail');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::REGISTER_ACTION,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
-        
-        return $response;
-    }
+	public static function newAccountRegistration($params)
+	{
+		$allQueryFields = array('plan');
+		$allBodyFields = array('strEmail', 'strPassword_1', 'strPassword_2', 'strFirstName', 
+		'strLastName', 'format', 'strIndustry', 'chkTerms', 'device_type', 'strSubAccountType', 
+		'blDisableMarketing', 'blDisableAccountActivationEmail');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::REGISTER_ACTION,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
+        
+		return $response;
+	}
     
-    public static function validateSession($params)
-    {
-        $allQueryFields = array('session_guid', 'member_id', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VALIDATE_SESSION,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function validateSession($params)
+	{
+		$allQueryFields = array('session_guid', 'member_id', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VALIDATE_SESSION,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function memberAuthentication($params)
-    {
-        $allBodyFields = array('strEmail', 'strPassword', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::AUTHENTICATE,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
-        
-        return $response;
-    }
+	public static function memberAuthentication($params)
+	{
+		$allBodyFields = array('strEmail', 'strPassword', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::AUTHENTICATE,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
+        
+		return $response;
+	}
     
-    public static function webinarRegistration($params)
-    {
-        $allBodyFields = array('email_address', 'first_name', 'last_name', 'phone_number', 
-        'company_name', 'member_id', 'webinar_date');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::WEBINAR_REGISTER,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function webinarRegistration($params)
+	{
+		$allBodyFields = array('email_address', 'first_name', 'last_name', 'phone_number', 
+		'company_name', 'member_id', 'webinar_date');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::WEBINAR_REGISTER,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function purchaseUserLicense($params)
-    {
-        $allQueryFields = array('device_id');
-        $allBodyFields = array('member_id', 'session_guid', 'device_id', 'device_type', 
-        'subscription_name', 'token', 'payload', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_LICENSE,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function purchaseUserLicense($params)
+	{
+		$allQueryFields = array('device_id');
+		$allBodyFields = array('member_id', 'session_guid', 'device_id', 'device_type', 
+		'subscription_name', 'token', 'payload', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_LICENSE,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function newMemberConfigKey($params)
-    {
-        $allBodyFields = array('config_key', 'config_value');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function newMemberConfigKey($params)
+	{
+		$allBodyFields = array('config_key', 'config_value');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function removeMemberConfigKey($params)
-    {
-        $allBodyFields = array('config_key');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'DELETE',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function removeMemberConfigKey($params)
+	{
+		$allBodyFields = array('config_key');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'DELETE',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function getMemberConfigData($params)
-    {
-        $allQueryFields = array('config_key');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function getMemberConfigData($params)
+	{
+		$allQueryFields = array('config_key');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+        
+		return $response;
+	}
 
-    public static function updateMemberConfigKey($params)
-    {
-        $allBodyFields = array('config_key', 'config_value');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function updateMemberConfigKey($params)
+	{
+		$allBodyFields = array('config_key', 'config_value');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
 }

src/Route4Me/Route.php

Indentation +336 added lines, -336 removed lines

@@ -9,410 +9,410 @@
 
 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();
+		if (isset($params['addresses'])) {
+			$addresses = array();
             
-            foreach ($params['addresses'] as $address) {
-                $addresses[] = Address::fromArray($address);
-            }
+			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);
-        } else {
-            $routes = array();
-            foreach ($result as $route) {
-                $routes[] = Route::fromArray($route);
-            }
-            return $routes;
-        }
-    }
+		if (isset($params['route_id'])) {
+			return Route::fromArray($result);
+		} 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;
+	}
 }

src/Route4Me/Vehicle.php

Indentation +130 added lines, -130 removed lines

@@ -6,157 +6,157 @@
 
 class Vehicle extends Common
 {
-    public $vehicle_id;
-    public $member_id;
-    public $is_deleted;
-    public $vehicle_alias;
-    public $vehicle_vin;
-    public $vehicle_reg_state_id;
-    public $vehicle_reg_country_id;
-    public $vehicle_license_plate;
-    public $vehicle_type_id;
-    public $vehicle_make;
-    public $vehicle_model_year;
-    public $vehicle_model;
-    public $vehicle_year_acquired;
-    public $vehicle_cost_new;
-    public $purchased_new;
-    public $license_start_date;
-    public $license_end_date;
-    public $vehicle_axle_count;
-    public $is_operational;
-    public $mpg_city;
-    public $mpg_highway;
-    public $fuel_type;
-    public $height_inches;
-    public $weight_lb;
-    public $external_telematics_vehicle_id;
-    public $has_trailer;
-    public $heightInInches;
-    public $lengthInInches;
-    public $widthInInches;
-    public $maxWeightPerAxleGroupInPounds;
-    public $numAxles;
-    public $weightInPounds;
-    public $HazmatType;
-    public $LowEmissionZonePref;
-    public $Use53FootTrailerRouting;
-    public $UseNationalNetwork;
-    public $UseTruckRestrictions;
-    public $AvoidFerries;
-    public $DividedHighwayAvoidPreference;
-    public $FreewayAvoidPreference;
-    public $InternationalBordersOpen;
-    public $TollRoadUsage;
-    public $hwy_only;
-    public $long_combination_vehicle;
-    public $avoid_highways;
-    public $side_street_adherence;
-    public $truck_config;
-    public $height_metric;
-    public $length_metric;
-    public $width_metric;
-    public $weight_metric;
-    public $max_weight_per_axle_group_metric;
+	public $vehicle_id;
+	public $member_id;
+	public $is_deleted;
+	public $vehicle_alias;
+	public $vehicle_vin;
+	public $vehicle_reg_state_id;
+	public $vehicle_reg_country_id;
+	public $vehicle_license_plate;
+	public $vehicle_type_id;
+	public $vehicle_make;
+	public $vehicle_model_year;
+	public $vehicle_model;
+	public $vehicle_year_acquired;
+	public $vehicle_cost_new;
+	public $purchased_new;
+	public $license_start_date;
+	public $license_end_date;
+	public $vehicle_axle_count;
+	public $is_operational;
+	public $mpg_city;
+	public $mpg_highway;
+	public $fuel_type;
+	public $height_inches;
+	public $weight_lb;
+	public $external_telematics_vehicle_id;
+	public $has_trailer;
+	public $heightInInches;
+	public $lengthInInches;
+	public $widthInInches;
+	public $maxWeightPerAxleGroupInPounds;
+	public $numAxles;
+	public $weightInPounds;
+	public $HazmatType;
+	public $LowEmissionZonePref;
+	public $Use53FootTrailerRouting;
+	public $UseNationalNetwork;
+	public $UseTruckRestrictions;
+	public $AvoidFerries;
+	public $DividedHighwayAvoidPreference;
+	public $FreewayAvoidPreference;
+	public $InternationalBordersOpen;
+	public $TollRoadUsage;
+	public $hwy_only;
+	public $long_combination_vehicle;
+	public $avoid_highways;
+	public $side_street_adherence;
+	public $truck_config;
+	public $height_metric;
+	public $length_metric;
+	public $width_metric;
+	public $weight_metric;
+	public $max_weight_per_axle_group_metric;
     
-    public function __construct () 
-    {
-        Route4Me::setBaseUrl(Endpoint::WH_BASE_URL);
-    }
+	public function __construct () 
+	{
+		Route4Me::setBaseUrl(Endpoint::WH_BASE_URL);
+	}
     
-    public static function fromArray(array $params) {
-        $vehicle= new Vehicle();
-        foreach ($params as $key => $value) {
-            if (property_exists($vehicle, $key)) {
-                $vehicle->{$key} = $value;
-            }
-        }
+	public static function fromArray(array $params) {
+		$vehicle= new Vehicle();
+		foreach ($params as $key => $value) {
+			if (property_exists($vehicle, $key)) {
+				$vehicle->{$key} = $value;
+			}
+		}
         
-        return $vehicle;
-    }
+		return $vehicle;
+	}
     
-    public static function getVehicles($params)
-    {
-        $allQueryFields = array('with_pagination', 'page', 'perPage');
+	public static function getVehicles($params)
+	{
+		$allQueryFields = array('with_pagination', 'page', 'perPage');
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VEHICLE_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VEHICLE_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function getRandomVehicleId($page,$perPage)
-    {
-        $params = array(
-            'page'             => isset($page) ? $page : 1,
-            'perPage'          => isset($perPage) ? $perPage : 10,
-            'with_pagination'  => true
-        );
+	public function getRandomVehicleId($page,$perPage)
+	{
+		$params = array(
+			'page'             => isset($page) ? $page : 1,
+			'perPage'          => isset($perPage) ? $perPage : 10,
+			'with_pagination'  => true
+		);
         
-        $vehicles = $this->getVehicles($params);
+		$vehicles = $this->getVehicles($params);
 
-        if (is_null($vehicles) || !isset($vehicles['data']) || sizeof($vehicles['data'])<1) {
-            return null;
-        }
+		if (is_null($vehicles) || !isset($vehicles['data']) || sizeof($vehicles['data'])<1) {
+			return null;
+		}
         
-        $randomIndex = rand(0, sizeof($vehicles['data']) - 1);
+		$randomIndex = rand(0, sizeof($vehicles['data']) - 1);
         
-        return $vehicles['data'][$randomIndex]['vehicle_id'];
-    }
+		return $vehicles['data'][$randomIndex]['vehicle_id'];
+	}
     
-    public function getVehicleByID($vehicleID)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VEHICLE_V4.'/'.$vehicleID,
-            'method' => 'GET'
-        ));
+	public function getVehicleByID($vehicleID)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VEHICLE_V4.'/'.$vehicleID,
+			'method' => 'GET'
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function updateVehicle($params)
-    {
-        $vehicleID = isset($params->vehicle_id) ? $params->vehicle_id : null;
+	public function updateVehicle($params)
+	{
+		$vehicleID = isset($params->vehicle_id) ? $params->vehicle_id : null;
         
-        $allBodyFields = Route4Me::getObjectProperties(new Vehicle(), array('vehicle_id'));
+		$allBodyFields = Route4Me::getObjectProperties(new Vehicle(), array('vehicle_id'));
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VEHICLE_V4.'/'.$vehicleID,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: application/json'
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VEHICLE_V4.'/'.$vehicleID,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: application/json'
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function createVehicle($params)
-    {
-        $allBodyFields = Route4Me::getObjectProperties(new Vehicle(), array('vehicle_id'));
+	public function createVehicle($params)
+	{
+		$allBodyFields = Route4Me::getObjectProperties(new Vehicle(), array('vehicle_id'));
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VEHICLE_V4,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: application/json'
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VEHICLE_V4,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: application/json'
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function removeVehicle($params)
-    {
-        $vehicleID = isset($params->vehicle_id) ? $params->vehicle_id : null;
+	public function removeVehicle($params)
+	{
+		$vehicleID = isset($params->vehicle_id) ? $params->vehicle_id : null;
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VEHICLE_V4.'/'.$vehicleID,
-            'method' => 'DELETE',
-            'HTTPHEADER'  => 'Content-Type: application/json'
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VEHICLE_V4.'/'.$vehicleID,
+			'method' => 'DELETE',
+			'HTTPHEADER'  => 'Content-Type: application/json'
+		));
 
-        return $response;
-    }
+		return $response;
+	}
 }

src/Route4Me/RouteParameters.php

Indentation +66 added lines, -66 removed lines

@@ -5,74 +5,74 @@
 
 class RouteParameters extends Common
 {
-    public $is_upload;
-    public $rt;
-    public $route_name;
-    public $route_date;
-    public $route_time;
-    public $shared_publicly;
-    public $disable_optimization;
-    public $optimize;
-    public $lock_last;
-    public $vehicle_capacity;
-    public $vehicle_max_distance_mi;
-    public $distance_unit;
-    public $travel_mode;
-    public $avoid;
-    public $vehicle_id;
-    public $dev_lat;
-    public $dev_lng;
-    public $route_max_duration;
-    public $route_email;
-    public $route_type = "api";
-    public $store_route = true;
-    public $metric;
-    public $algorithm_type;
-    public $member_id;
-    public $ip;
-    public $dm;
-    public $dirm;
-    public $parts;
-    public $device_id;
-    public $device_type;
-    public $has_trailer;
-    public $trailer_weight_t;
-    public $limited_weight_t;
-    public $weight_per_axle_t;
-    public $truck_height_meters;
-    public $truck_width_meters;
-    public $truck_length_meters;
-    public $truck_hazardous_goods;
+	public $is_upload;
+	public $rt;
+	public $route_name;
+	public $route_date;
+	public $route_time;
+	public $shared_publicly;
+	public $disable_optimization;
+	public $optimize;
+	public $lock_last;
+	public $vehicle_capacity;
+	public $vehicle_max_distance_mi;
+	public $distance_unit;
+	public $travel_mode;
+	public $avoid;
+	public $vehicle_id;
+	public $dev_lat;
+	public $dev_lng;
+	public $route_max_duration;
+	public $route_email;
+	public $route_type = "api";
+	public $store_route = true;
+	public $metric;
+	public $algorithm_type;
+	public $member_id;
+	public $ip;
+	public $dm;
+	public $dirm;
+	public $parts;
+	public $device_id;
+	public $device_type;
+	public $has_trailer;
+	public $trailer_weight_t;
+	public $limited_weight_t;
+	public $weight_per_axle_t;
+	public $truck_height_meters;
+	public $truck_width_meters;
+	public $truck_length_meters;
+	public $truck_hazardous_goods;
     
-    public $vehicle_max_cargo_weight;
-    public $vehicle_max_cargo_volume;
-    public $subtour_max_revenue;
-    public $avoidance_zones;
-    public $driver_id;
-    public $parts_min;
-    public $first_drive_then_wait_between_stops;
-    public $truck_height;
-    public $truck_width;
-    public $truck_length;
-    public $optimization_quality;
-    public $override_addresses;
-    public $max_tour_size;
-    public $min_tour_size;
-    public $uturn;
-    public $leftturn;
-    public $rightturn;
+	public $vehicle_max_cargo_weight;
+	public $vehicle_max_cargo_volume;
+	public $subtour_max_revenue;
+	public $avoidance_zones;
+	public $driver_id;
+	public $parts_min;
+	public $first_drive_then_wait_between_stops;
+	public $truck_height;
+	public $truck_width;
+	public $truck_length;
+	public $optimization_quality;
+	public $override_addresses;
+	public $max_tour_size;
+	public $min_tour_size;
+	public $uturn;
+	public $leftturn;
+	public $rightturn;
     
-    public $optimized_callback_url;
+	public $optimized_callback_url;
 
-    public static function fromArray(array $params)
-    {
-        $routeParams = new RouteParameters();
-        foreach ($params as $key => $value) {
-            if (property_exists($routeParams, $key)) {
-                $routeParams->{$key} = $value;
-            }
-        }
+	public static function fromArray(array $params)
+	{
+		$routeParams = new RouteParameters();
+		foreach ($params as $key => $value) {
+			if (property_exists($routeParams, $key)) {
+				$routeParams->{$key} = $value;
+			}
+		}
 
-        return $routeParams;
-    }
+		return $routeParams;
+	}
 }

src/Route4Me/Common.php

Indentation +11 added lines, -11 removed lines

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

examples/MultipleDepotMultipleDriverWith24StopsTimeWindow.php

Indentation +20 added lines, -20 removed lines

@@ -26,22 +26,22 @@ 
 
 $addresses = array();
 foreach ($json as $address) {
-    $addresses[] = Address::fromArray($address);
+	$addresses[] = Address::fromArray($address);
 }
 
 $parameters = RouteParameters::fromArray(array(
-    "algorithm_type"          => Algorithmtype::CVRP_TW_SD,
-    "route_name"              => "Multiple Depot, Multiple Driver with 24 Stops, Time Window",
-    "route_date"              => time() + 24*60*60,
-    "route_time"              => 60 * 60 * 7,
-    "distance_unit"           => DistanceUnit::MILES,
-    "device_type"             => DeviceType::WEB,
-    "optimize"                => OptimizationType::DISTANCE,
-    "metric"                  => Metric::GEODESIC,
-    "route_max_duration"      => 86400,
-    "travel_mode"             => TravelMode::DRIVING,
-    "vehicle_capacity"        => 1,
-    "vehicle_max_distance_mi" => 10000
+	"algorithm_type"          => Algorithmtype::CVRP_TW_SD,
+	"route_name"              => "Multiple Depot, Multiple Driver with 24 Stops, Time Window",
+	"route_date"              => time() + 24*60*60,
+	"route_time"              => 60 * 60 * 7,
+	"distance_unit"           => DistanceUnit::MILES,
+	"device_type"             => DeviceType::WEB,
+	"optimize"                => OptimizationType::DISTANCE,
+	"metric"                  => Metric::GEODESIC,
+	"route_max_duration"      => 86400,
+	"travel_mode"             => TravelMode::DRIVING,
+	"vehicle_capacity"        => 1,
+	"vehicle_max_distance_mi" => 10000
 ));
 
 $optimizationParams = new OptimizationProblemParams;
@@ -51,11 +51,11 @@ 
 $problem = OptimizationProblem::optimize($optimizationParams);
 
 foreach ((array)$problem as $key => $value) {
-    if (is_string($value)) {
-        echo $key." --> ".$value."<br>";
-    } else {
-        echo "************ $key ************* <br>";
-        Route4Me::simplePrint((array)$value, true);
-        echo "******************************* <br>";
-    }
+	if (is_string($value)) {
+		echo $key." --> ".$value."<br>";
+	} else {
+		echo "************ $key ************* <br>";
+		Route4Me::simplePrint((array)$value, true);
+		echo "******************************* <br>";
+	}
 }

examples/single_driver_route_ten_stops.php

Indentation +9 added lines, -9 removed lines

@@ -26,18 +26,18 @@
 
 $addresses = array();
 foreach ($json as $address) {
-    $addresses[] = Address::fromArray($address);
+	$addresses[] = Address::fromArray($address);
 }
 
 $parameters = RouteParameters::fromArray(array(
-    "algorithm_type"          => AlgorithmType::TSP,
-    "distance_unit"           => DistanceUnit::MILES,
-    "device_type"             => DeviceType::WEB,
-    "optimize"                => OptimizationType::DISTANCE,
-    "travel_mode"             => TravelMode::DRIVING,
-    "route_max_duration"      => 86400,
-    "vehicle_capacity"        => 1,
-    "vehicle_max_distance_mi" => 10000
+	"algorithm_type"          => AlgorithmType::TSP,
+	"distance_unit"           => DistanceUnit::MILES,
+	"device_type"             => DeviceType::WEB,
+	"optimize"                => OptimizationType::DISTANCE,
+	"travel_mode"             => TravelMode::DRIVING,
+	"route_max_duration"      => 86400,
+	"vehicle_capacity"        => 1,
+	"vehicle_max_distance_mi" => 10000
 ));
 
 $optimizationParams = new OptimizationProblemParams;

src/Route4Me/Geocoding.php

Indentation +78 added lines, -78 removed lines

@@ -6,109 +6,109 @@
 
 class Geocoding extends Common
 {
-    public $strExportFormat;
-    public $format;
-    public $addresses;
-    public $pk;
-    public $offset;
-    public $limit;
-    public $housenumber;
-    public $zipcode;
+	public $strExportFormat;
+	public $format;
+	public $addresses;
+	public $pk;
+	public $offset;
+	public $limit;
+	public $housenumber;
+	public $zipcode;
     
-    public static function fromArray(array $params) 
-    {
-        $geocoding = new Geocoding();
+	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;
-    }
+		return $geocoding;
+	}
     
-    public static function forwardGeocoding($params)
-    {
-        $allBodyFields = array('strExportFormat', 'addresses');
+	public static function forwardGeocoding($params)
+	{
+		$allBodyFields = array('strExportFormat', 'addresses');
 
-        $fgCoding = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GEOCODER,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+		$fgCoding = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GEOCODER,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
         
-        return $fgCoding;
-    }
+		return $fgCoding;
+	}
     
-    public static function reverseGeocoding($params)
-    {
-        $allQueryFields = array('format', 'addresses', 'detailed');
+	public static function reverseGeocoding($params)
+	{
+		$allQueryFields = array('format', 'addresses', 'detailed');
 
-        $fgcoding = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GEOCODER,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$fgcoding = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GEOCODER,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
         
-        return $fgcoding;
-    }
+		return $fgcoding;
+	}
     
-    public static function getStreetData($params)
-    {
-        Route4Me::setBaseUrl(Endpoint::STREET_DATA);
+	public static function getStreetData($params)
+	{
+		Route4Me::setBaseUrl(Endpoint::STREET_DATA);
 
-        $allPathFields = array('pk', 'offset', 'limit');
+		$allPathFields = array('pk', 'offset', 'limit');
 
-        $url_query = Route4Me::generateUrlPath($allPathFields, $params);
+		$url_query = Route4Me::generateUrlPath($allPathFields, $params);
 
-        $query = array();
+		$query = array();
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => $url_query,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => $url_query,
+			'method' => 'GET',
+			'query'  => $query
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getZipCode($params)
-    {
-        Route4Me::setBaseUrl(Endpoint::STREET_DATA_ZIPCODE);
+	public static function getZipCode($params)
+	{
+		Route4Me::setBaseUrl(Endpoint::STREET_DATA_ZIPCODE);
 
-        $allPathFields = array('zipcode', 'offset', 'limit');
+		$allPathFields = array('zipcode', 'offset', 'limit');
 
-        $url_query = Route4Me::generateUrlPath($allPathFields, $params);
+		$url_query = Route4Me::generateUrlPath($allPathFields, $params);
 
-        $query = array();
+		$query = array();
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => $url_query,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => $url_query,
+			'method' => 'GET',
+			'query'  => $query
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getService($params)
-    {
-        Route4Me::setBaseUrl(Endpoint::STREET_DATA_SERVICE);
+	public static function getService($params)
+	{
+		Route4Me::setBaseUrl(Endpoint::STREET_DATA_SERVICE);
         
-        $allPathFields = array('zipcode', 'housenumber', 'offset', 'limit');
+		$allPathFields = array('zipcode', 'housenumber', 'offset', 'limit');
 
-        $url_query = Route4Me::generateUrlPath($allPathFields, $params);
+		$url_query = Route4Me::generateUrlPath($allPathFields, $params);
         
-        $query = array();
+		$query = array();
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => $url_query,
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => $url_query,
+			'method' => 'GET',
+			'query'  => $query
+		));
         
-        return $response;
-    }
+		return $response;
+	}
 }