route4me / route4me-php-sdk

examples/Members/member_authenticate.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Member;

examples/Members/member_create.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Member;

examples/Members/purchase_user_license.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Member;

examples/Members/get_users.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Member;

examples/GarageDoorOpener/myq_login.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\MyQ;
 	

src/Route4Me/Member.php

Indentation +146 added lines, -146 removed lines

@@ -68,60 +68,60 @@ 
 		
 		public static function fromArray(array $params) {
 			$member= new Member();
-	        foreach($params as $key => $value) {
-	            if (property_exists($member, $key)) {
-	                $member->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($member, $key)) {
+					$member->{$key} = $value;
+				}
 			}
 			
 			return $member;
 		}
 		
 		public static function getUsers()
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET'
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET'
+			));
 			//var_dump($response); die("");
 			return $response;
 		}
 		
 		public static function getUser($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	            	'member_id' => isset($params['member_id']) ? $params['member_id'] : null
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'member_id' => isset($params['member_id']) ? $params['member_id'] : null
 				)
-	        ));
+			));
 			//var_dump($response); die("");
 			return $response;
 		}
 		
 		public static function getUserLocations($param)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUserLocations,
-	            'method' => 'GET',
-	            'query'  => array(
-	            	'query' => $param
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUserLocations,
+				'method' => 'GET',
+				'query'  => array(
+					'query' => $param
 				)
-	        ));
+			));
 			//var_dump($response); die("");
 			return $response;
 		}
 		
 		public static function addDeviceRecord($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlDevice,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlDevice,
+				'method' => 'POST',
+				'body'  => array(
 					'device_id' => 	isset($body->device_id) ? $body->device_id: null,
-	                'device_type' => isset($body->device_type) ? $body->device_type : null,
-	                'format' => isset($body->format) ? $body->format : null
+					'device_type' => isset($body->device_type) ? $body->device_type : null,
+					'format' => isset($body->format) ? $body->format : null
 				)
 
 			));
@@ -129,25 +129,25 @@ 
 		}
 		
 		public static function createMember($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'body'  => array(
 					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
-	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
-	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
-	                'route_count' => isset($body->route_count) ? $body->route_count : null,
-	                'member_email' => isset($body->member_email) ? $body->member_email : null,
-	                'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
-	                'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
-	                'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
-	                'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
-	                'member_password' => isset($body->member_password) ? $body->member_password : null,
-	                'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
-	                'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
-	                'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
-	                'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
+					'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
+					'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
+					'route_count' => isset($body->route_count) ? $body->route_count : null,
+					'member_email' => isset($body->member_email) ? $body->member_email : null,
+					'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
+					'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
+					'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
+					'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
+					'member_password' => isset($body->member_password) ? $body->member_password : null,
+					'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
+					'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
+					'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
+					'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
 				)
 
 			));
@@ -155,26 +155,26 @@ 
 		}
 
 		public static function updateMember($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'body'  => array(
 					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
-	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
-	                'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
-	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
-	                'route_count' => isset($body->route_count) ? $body->route_count : null,
-	                'member_email' => isset($body->member_email) ? $body->member_email : null,
-	                'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
-	                'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
-	                'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
-	                'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
-	                'member_password' => isset($body->member_password) ? $body->member_password : null,
-	                'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
-	                'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
-	                'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
-	                'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
+					'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
+					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
+					'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
+					'route_count' => isset($body->route_count) ? $body->route_count : null,
+					'member_email' => isset($body->member_email) ? $body->member_email : null,
+					'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
+					'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
+					'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
+					'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
+					'member_password' => isset($body->member_password) ? $body->member_password : null,
+					'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
+					'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
+					'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
+					'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
 				)
 
 			));
@@ -182,11 +182,11 @@ 
 		}
 
 		public static function deleteMember($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETE',
+				'body'  => array(
 					'member_id' => 	isset($body->member_id) ? $body->member_id: null
 				)
 
@@ -195,50 +195,50 @@ 
 		}
 		
 		public static function newAccountRegistration($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlRegistr,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlRegistr,
+				'method' => 'POST',
+				'body'  => array(
 					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
-	                'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null,
-	                'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null,
-	                'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName: null,
-	                'strLastName' => 	isset($body->strLastName) ? $body->strLastName: null,
-	                'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry: null,
-	                'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms: null,
-	                'plan' => 	isset($body->plan) ? $body->plan: null,
-	                'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType: null,
-	                'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false,
-	                'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false
+					'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null,
+					'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null,
+					'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName: null,
+					'strLastName' => 	isset($body->strLastName) ? $body->strLastName: null,
+					'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry: null,
+					'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms: null,
+					'plan' => 	isset($body->plan) ? $body->plan: null,
+					'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType: null,
+					'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false,
+					'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false
 				)
 			));
 			return $response;
 		}
 		
 		public static function validateSession($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlSessValid,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlSessValid,
+				'method' => 'GET',
+				'query'  => array(
 					'session_guid' => 	isset($params->session_guid) ? $params->session_guid: null,
-	                'member_id' => isset($params->member_id) ? $params->member_id : null,
-	                'format' => isset($params->format) ? $params->format : null
+					'member_id' => isset($params->member_id) ? $params->member_id : null,
+					'format' => isset($params->format) ? $params->format : null
 				)
 			));
 			return $response;
 		}
 		
 		public static function memberAuthentication($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlAuthen,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlAuthen,
+				'method' => 'POST',
+				'body'  => array(
 					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
-	                'strPassword' => isset($body->strPassword) ? $body->strPassword : null,
-	                'format' => isset($body->format) ? $body->format : null
+					'strPassword' => isset($body->strPassword) ? $body->strPassword : null,
+					'format' => isset($body->format) ? $body->format : null
 				)
 
 			));
@@ -246,18 +246,18 @@ 
 		}
 		
 		public static function webinarRegistration($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlWebinar,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlWebinar,
+				'method' => 'POST',
+				'body'  => array(
 					'email_address' => 	isset($body->email_address) ? $body->email_address: null,
-	                'first_name' => isset($body->first_name) ? $body->first_name : null,
-	                'last_name' => isset($body->last_name) ? $body->last_name : null,
-	                'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
-	                'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
-	                'member_id' => isset($body->member_id) ? $body->member_id : null,
-	                'webiinar_date' => isset($body->webiinar_date) ? $body->webiinar_date : null,
+					'first_name' => isset($body->first_name) ? $body->first_name : null,
+					'last_name' => isset($body->last_name) ? $body->last_name : null,
+					'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
+					'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
+					'member_id' => isset($body->member_id) ? $body->member_id : null,
+					'webiinar_date' => isset($body->webiinar_date) ? $body->webiinar_date : null,
 				)
 
 			));
@@ -265,19 +265,19 @@ 
 		}
 		
 		public static function purchaseUserLicense($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlLicense,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlLicense,
+				'method' => 'POST',
+				'body'  => array(
 					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
-	                'session_guid' => isset($body->session_guid) ? $body->session_guid : null,
-	                'device_id' => isset($body->device_id) ? $body->device_id : null,
-	                'device_type' => isset($body->device_type) ? $body->device_type : null,
-	                'subscription_name' => isset($body->subscription_name) ? $body->subscription_name : null,
-	                'token' => isset($body->token) ? $body->token : null,
-	                'payload' => isset($body->payload) ? $body->payload : null,
-	                'format' => isset($body->format) ? $body->format : null,
+					'session_guid' => isset($body->session_guid) ? $body->session_guid : null,
+					'device_id' => isset($body->device_id) ? $body->device_id : null,
+					'device_type' => isset($body->device_type) ? $body->device_type : null,
+					'subscription_name' => isset($body->subscription_name) ? $body->subscription_name : null,
+					'token' => isset($body->token) ? $body->token : null,
+					'payload' => isset($body->payload) ? $body->payload : null,
+					'format' => isset($body->format) ? $body->format : null,
 				)
 
 			));
@@ -285,24 +285,24 @@ 
 		}
 		
 		public static function newMemberConfigKey($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'POST',
+				'body'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
-	                'config_value' => isset($body->config_value) ? $body->config_value : null
+					'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));
 			return $response;
 		}
 		
 		public static function removeMemberConfigKey($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'DELETE',
+				'body'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null
 				)
 			));
@@ -310,11 +310,11 @@ 
 		}
 		
 		public static function getMemberConfigData($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'GET',
+				'query'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null
 				)
 			));
@@ -322,13 +322,13 @@ 
 		}
 
 		public static function updateMemberConfigKey($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'PUT',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'PUT',
+				'body'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
-	                'config_value' => isset($body->config_value) ? $body->config_value : null
+					'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));
 			return $response;

src/Route4Me/OptimizationProblem.php

Indentation +160 added lines, -160 removed lines

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

src/Route4Me/Route4Me.php

Indentation +135 added lines, -135 removed lines

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

examples/Optimizations/hybridOptimization.php

Indentation +71 added lines, -71 removed lines

@@ -43,21 +43,21 @@ 
 $locationsFieldsMapping['monthly_nth_wwhat']=17;
 
 if (($handle = fopen("$source_file", "r")) !== FALSE) {
-        $oAbook = new AddressBookLocation();
+		$oAbook = new AddressBookLocation();
 
-        $results=$oAbook->addLocationsFromCsvFile($handle, $locationsFieldsMapping); //Temporarry
+		$results=$oAbook->addLocationsFromCsvFile($handle, $locationsFieldsMapping); //Temporarry
         
-        echo "Errors: <br><br>";
-        foreach ($results['fail'] as $evalue) {
-            echo $evalue."<br>";
-        }
+		echo "Errors: <br><br>";
+		foreach ($results['fail'] as $evalue) {
+			echo $evalue."<br>";
+		}
         
-        echo "Successes: <br><br>";
-        foreach ($results['success'] as $svalue) {
-            echo $svalue."<br>";
-        }
+		echo "Successes: <br><br>";
+		foreach ($results['success'] as $svalue) {
+			echo $svalue."<br>";
+		}
 
-    }
+	}
 
 /* Add orders with schedules from a CSV file  */
 
@@ -76,91 +76,91 @@ 
 $ordersFieldsMapping['day_scheduled_for_YYMMDD']=8;
 
 if (($handle = fopen("$orders_file", "r")) !== FALSE) {
-        $order = new Order();
-        $results=$order->addOrdersFromCsvFile($handle, $ordersFieldsMapping);
+		$order = new Order();
+		$results=$order->addOrdersFromCsvFile($handle, $ordersFieldsMapping);
         
-        echo "Errors: <br><br>";
-        foreach ($results['fail'] as $evalue) {
-            echo $evalue."<br>";
-        }
+		echo "Errors: <br><br>";
+		foreach ($results['fail'] as $evalue) {
+			echo $evalue."<br>";
+		}
         
-        echo "Successes: <br><br>";
-        foreach ($results['success'] as $svalue) {
-            echo $svalue."<br>";
-        }
+		echo "Successes: <br><br>";
+		foreach ($results['success'] as $svalue) {
+			echo $svalue."<br>";
+		}
   
-    }
+	}
 
 /* Get Hybrid Optimization */
 
-    $ep = time()+604800;
-    $sched_date = date("Y-m-d", $ep);
+	$ep = time()+604800;
+	$sched_date = date("Y-m-d", $ep);
 
-    $hybridParams = array(
-        "target_date_string" => $sched_date,
-        "timezone_offset_minutes" => 480
-    );
+	$hybridParams = array(
+		"target_date_string" => $sched_date,
+		"timezone_offset_minutes" => 480
+	);
     
-    $optimization = new OptimizationProblem(); 
-    $hybridOptimization = $optimization->getHybridOptimization($hybridParams);
+	$optimization = new OptimizationProblem(); 
+	$hybridOptimization = $optimization->getHybridOptimization($hybridParams);
     
-    if ($hybridOptimization!=null) {
+	if ($hybridOptimization!=null) {
         
-        if (isset($hybridOptimization['optimization_problem_id'])) {
-            $optid = $hybridOptimization['optimization_problem_id'];
+		if (isset($hybridOptimization['optimization_problem_id'])) {
+			$optid = $hybridOptimization['optimization_problem_id'];
             
-            echo "Hibrid optimization with optimization_problem_id=$optid <br><br>";
+			echo "Hibrid optimization with optimization_problem_id=$optid <br><br>";
             
-            /* Add depots to the Hybrid Optimization */
-            $depotfile = "depots.csv";
+			/* Add depots to the Hybrid Optimization */
+			$depotfile = "depots.csv";
             
-            if (($handle = fopen("$depotfile", "r")) !== FALSE) {
+			if (($handle = fopen("$depotfile", "r")) !== FALSE) {
                 
-                $columns = fgetcsv($handle, $max_line_length, $delemietr);
+				$columns = fgetcsv($handle, $max_line_length, $delemietr);
                 
-                if (!$columns) {
-                    $error['message'] = 'Empty';
-                     return ($error);
-                }
+				if (!$columns) {
+					$error['message'] = 'Empty';
+					 return ($error);
+				}
                 
-                $depotsParams = array(
-                    'optimization_problem_id' => $optid,
-                    'delete_old_depots'  => true,
-                );
+				$depotsParams = array(
+					'optimization_problem_id' => $optid,
+					'delete_old_depots'  => true,
+				);
                 
-                $iRow=1;
-                $depotAddresses = array();
+				$iRow=1;
+				$depotAddresses = array();
                 
-                while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
-                    if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) {
-                        $depotAddress['lat']= $rows[0];
-                        $depotAddress['lng']= $rows[1];
-                        $depotAddress['address']= $rows[3];   
-                        array_push($depotAddresses,$depotAddress);
-                    }
-                }
+				while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
+					if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) {
+						$depotAddress['lat']= $rows[0];
+						$depotAddress['lng']= $rows[1];
+						$depotAddress['address']= $rows[3];   
+						array_push($depotAddresses,$depotAddress);
+					}
+				}
                 
-                $depotsParams['new_depots'] = $depotAddresses;
+				$depotsParams['new_depots'] = $depotAddresses;
                 
-                $optProblem = new OptimizationProblem();
+				$optProblem = new OptimizationProblem();
                 
-                $resultDepots = $optProblem->addDepotsToHybrid($depotsParams);
+				$resultDepots = $optProblem->addDepotsToHybrid($depotsParams);
                 
-                var_dump($resultDepots);
+				var_dump($resultDepots);
                 
-                /* Reoptimize hybrid optimization */
+				/* Reoptimize hybrid optimization */
                 
-                if ($resultDepots!=null) {
-                    $problemParams = array(
-                        'optimization_problem_id'  =>  $optid
-                    );
-                    $problem = OptimizationProblem::reoptimize($problemParams);
+				if ($resultDepots!=null) {
+					$problemParams = array(
+						'optimization_problem_id'  =>  $optid
+					);
+					$problem = OptimizationProblem::reoptimize($problemParams);
                     
-                    Route4Me::simplePrint($problem);
-                }
-            }
+					Route4Me::simplePrint($problem);
+				}
+			}
                 
-        }
+		}
 
-    }
+	}
 ?>
\ No newline at end of file