route4me / route4me-php-sdk

src/Route4Me/Route.php

Spacing +24 added lines, -24 removed lines

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

src/Route4Me/curl_http_client.php

Spacing +57 added lines, -57 removed lines

@@ -3,7 +3,7 @@ 
 
 class Curl_HTTP_Client
 {
-	var $ch ;
+	var $ch;
 	var $debug = false;
 	var $error_msg;
 
@@ -21,7 +21,7 @@ 
 		//set error in case http return code bigger than 300
 		curl_setopt($this->ch, CURLOPT_FAILONERROR, true);
 		// use gzip if possible
-		curl_setopt($this->ch,CURLOPT_ENCODING , 'gzip, deflate');
+		curl_setopt($this->ch, CURLOPT_ENCODING, 'gzip, deflate');
 		// do not veryfy ssl
 		// this is important for windows
 		// as well for being able to access pages with non valid cert
@@ -33,7 +33,7 @@ 
 	 * @param string pass
 	 * @access public
 	 */
-	function set_credentials($username,$password)
+	function set_credentials($username, $password)
 	{
 		curl_setopt($this->ch, CURLOPT_USERPWD, "$username:$password");
 	}
@@ -83,22 +83,22 @@ 
 	 * @return string data
 	 * @access public
 	 */
-	function send_post_data($url, $postdata, $ip=null, $timeout=10)
+	function send_post_data($url, $postdata, $ip = null, $timeout = 10)
 	{
     
 		//set various curl options first
 		// set url to post to
-		curl_setopt($this->ch, CURLOPT_URL,$url);
+		curl_setopt($this->ch, CURLOPT_URL, $url);
 		// return into a variable rather than displaying it
-		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Binding to ip $ip\n";
 			}
-			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+			curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
 		}
 		//set curl function timeout to $timeout
 		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
@@ -109,13 +109,13 @@ 
 		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $postdata);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
         {
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Error Occured in Curl\n";
-				echo "Error number: " .curl_errno($this->ch) ."\n";
-				echo "Error message: " .curl_error($this->ch)."\n";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -133,35 +133,35 @@ 
 	 * @return string data
 	 * @access public
 	 */
-	function fetch_url($url, $ip=null, $timeout=5)
+	function fetch_url($url, $ip = null, $timeout = 5)
 	{
 		// set url to post to
-		curl_setopt($this->ch, CURLOPT_URL,$url);
+		curl_setopt($this->ch, CURLOPT_URL, $url);
         
 		//set method to get
-		curl_setopt($this->ch, CURLOPT_HTTPGET,true);
+		curl_setopt($this->ch, CURLOPT_HTTPGET, true);
 		// return into a variable rather than displaying it
-		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Binding to ip $ip\n";
 			}
-			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+			curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
 		}
 		//set curl function timeout to $timeout
 		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Error Occured in Curl\n";
-				echo "Error number: " .curl_errno($this->ch) ."\n";
-				echo "Error message: " .curl_error($this->ch)."\n";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -180,18 +180,18 @@ 
 	 * @return boolean true on success false othervise
 	 * @access public
 	 */
-	function fetch_into_file($url, $fp, $ip=null, $timeout=5)
+	function fetch_into_file($url, $fp, $ip = null, $timeout = 5)
 	{
 		// set url to post to
-		curl_setopt($this->ch, CURLOPT_URL,$url);
+		curl_setopt($this->ch, CURLOPT_URL, $url);
 		//set method to get
 		curl_setopt($this->ch, CURLOPT_HTTPGET, true);
 		// store data into file rather than displaying it
 		curl_setopt($this->ch, CURLOPT_FILE, $fp);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Binding to ip $ip\n";
 			}
@@ -201,13 +201,13 @@ 
 		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Error Occured in Curl\n";
-				echo "Error number: " .curl_errno($this->ch) ."\n";
-				echo "Error message: " .curl_error($this->ch)."\n";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -228,7 +228,7 @@ 
 	 * @return string data
 	 * @access public
 	 */
-	function send_multipart_post_data($url, $postdata, $file_field_array=array(), $ip=null, $timeout=30)
+	function send_multipart_post_data($url, $postdata, $file_field_array = array(), $ip = null, $timeout = 30)
 	{
 		//set various curl options first
 		// set url to post to
@@ -236,13 +236,13 @@ 
 		// return into a variable rather than displaying it
 		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Binding to ip $ip\n";
 			}
-			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+			curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
 		}
 		//set curl function timeout to $timeout
 		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
@@ -257,28 +257,28 @@ 
 		//generate post string
 		$post_array = array();
 		$post_string_array = array();
-		if(!is_array($postdata))
+		if (!is_array($postdata))
 		{
 			return false;
 		}
-		foreach($postdata as $key=>$value)
+		foreach ($postdata as $key=>$value)
 		{
 			$post_array[$key] = $value;
 			$post_string_array[] = urlencode($key)."=".urlencode($value);
 		}
-		$post_string = implode("&",$post_string_array);
-		if($this->debug)
+		$post_string = implode("&", $post_string_array);
+		if ($this->debug)
 		{
 			echo "Post String: $post_string\n";
 		}
 		// set post string
 		//curl_setopt($this->ch, CURLOPT_POSTFIELDS, $post_string);
 		// set multipart form data - file array field-value pairs
-		if(!empty($file_field_array))
+		if (!empty($file_field_array))
 		{
-			foreach($file_field_array as $var_name => $var_value)
+			foreach ($file_field_array as $var_name => $var_value)
 			{
-				if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+				if (strpos(PHP_OS, "WIN")!==false) $var_value = str_replace("/", "\\", $var_value); // win hack
 				$file_field_array[$var_name] = "@".$var_value;
 			}
 		}
@@ -287,13 +287,13 @@ 
 		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $result_post);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Error Occured in Curl\n";
-				echo "Error number: " .curl_errno($this->ch) ."\n";
-				echo "Error message: " .curl_error($this->ch)."\n";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -310,8 +310,8 @@ 
 	function store_cookies($cookie_file)
 	{
 		// use cookies on each request (cookies stored in $cookie_file)
-		curl_setopt ($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
-		curl_setopt ($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
+		curl_setopt($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
+		curl_setopt($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
 	}
 	
 	/**
@@ -321,7 +321,7 @@ 
 	 */
 	function set_cookie($cookie)
 	{		
-		curl_setopt ($this->ch, CURLOPT_COOKIE, $cookie);
+		curl_setopt($this->ch, CURLOPT_COOKIE, $cookie);
 	}
 	/**
 	 * Get last URL info 
@@ -349,8 +349,8 @@ 
 	 */
 	function get_error_msg()
 	{
-		$err = "Error number: " .curl_errno($this->ch) ."\n";
-		$err .="Error message: " .curl_error($this->ch)."\n";
+		$err = "Error number: ".curl_errno($this->ch)."\n";
+		$err .= "Error message: ".curl_error($this->ch)."\n";
 		return $err;
 	}
 	
@@ -374,7 +374,7 @@ 
 {
     static $curl_loops = 0;
     static $curl_max_loops = 20;
-    if ($curl_loops++ >= $curl_max_loops)
+    if ($curl_loops++>=$curl_max_loops)
     {
         $curl_loops = 0;
         return FALSE;
@@ -391,10 +391,10 @@ 
     //echo "*** Got HTTP code: $http_code ***\n";
     //echo "**  Got headers: \n$header\n\n";
     
-    if ( $http_code == 301 || $http_code == 302 )
+    if ($http_code==301 || $http_code==302)
     {
         // If we're redirected, we should revert to GET
-		curl_setopt($ch, CURLOPT_HTTPGET,true);
+		curl_setopt($ch, CURLOPT_HTTPGET, true);
         
         $matches = array();
         preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
@@ -412,12 +412,12 @@ 
             $url['host'] = $last_url['host'];
         if (empty($url['path']))
             $url['path'] = $last_url['path'];
-        $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
+        $new_url = $url['scheme'].'://'.$url['host'].$url['path'].(!empty($url['query']) ? '?'.$url['query'] : '');
         //echo "Being redirected to $new_url\n";
         curl_setopt($ch, CURLOPT_URL, $new_url);
         return curl_exec_redir($ch);
     } else {
-        $curl_loops=0;
+        $curl_loops = 0;
         return $data;
     }
 }

src/Route4Me/Geocoding.php

Spacing +13 added lines, -13 removed lines

@@ -19,11 +19,11 @@ 
 		public $housenumber;
 		public $zipcode;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
 			$geocoding = new Geocoding();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($geocoding, $key)) {
 	                $geocoding->{$key} = $value;
 	            }
@@ -35,7 +35,7 @@ 
 		{
 			//Route4Me::simplePrint($params);
 			$query = array(
-	                'format' => isset($params['format']) ? $params['format']: null,
+	                'format' => isset($params['format']) ? $params['format'] : null,
 	                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
 	            );
 			//var_dump($query);
@@ -52,13 +52,13 @@ 
 		{
 			$url_query = self::$api_street;
 			if (isset($params['pk'])) {
-				$url_query.=$params['pk'].'/';
+				$url_query .= $params['pk'].'/';
 			}
 			if (isset($params['offset'])) {
-				$url_query.=$params['offset'].'/';
+				$url_query .= $params['offset'].'/';
 			}
 			if (isset($params['limit'])) {
-				$url_query.=$params['limit'].'/';
+				$url_query .= $params['limit'].'/';
 			}
 
 			$query = array();
@@ -75,13 +75,13 @@ 
 		{
 			$url_query = self::$api_zipcode;
 			if (isset($params['zipcode'])) {
-				$url_query.=$params['zipcode'].'/';
+				$url_query .= $params['zipcode'].'/';
 			}
 			if (isset($params['offset'])) {
-				$url_query.=$params['offset'].'/';
+				$url_query .= $params['offset'].'/';
 			}
 			if (isset($params['limit'])) {
-				$url_query.=$params['limit'].'/';
+				$url_query .= $params['limit'].'/';
 			}
 
 			$query = array();
@@ -98,16 +98,16 @@ 
 		{
 			$url_query = self::$api_service;
 			if (isset($params['zipcode'])) {
-				$url_query.=$params['zipcode'].'/';
+				$url_query .= $params['zipcode'].'/';
 			}
 			if (isset($params['housenumber'])) {
-				$url_query.=$params['housenumber'].'/';
+				$url_query .= $params['housenumber'].'/';
 			}
 			if (isset($params['offset'])) {
-				$url_query.=$params['offset'].'/';
+				$url_query .= $params['offset'].'/';
 			}
 			if (isset($params['limit'])) {
-				$url_query.=$params['limit'].'/';
+				$url_query .= $params['limit'].'/';
 			}
 
 			$query = array();

src/Route4Me/Common.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     public function toArray()
     {
         $params = array_filter(get_object_vars($this), function($item) {
-            return ($item !== null) && !(is_array($item) && !count($item));
+            return ($item!==null) && !(is_array($item) && !count($item));
         });
 
         return $params;

src/Route4Me/AvoidanceZone.php

Spacing +6 added lines, -6 removed lines

@@ -8,13 +8,13 @@ 
 	{
 		static public $apiUrl = '/api.v4/avoidance.php';
 	
-		public $territory_id;  // Avoidance zone id
+		public $territory_id; // Avoidance zone id
 		public $territory_name; 
 		public $territory_color;
 		public $member_id;
 		public $territory; // Territory parameters
 		
-		public function __construct () {
+		public function __construct() {
 			
 		}
 		
@@ -32,7 +32,7 @@ 
 	        }
 			
 			$avoidancezoneparameters = new AvoidanceZone();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($avoidancezoneparameters, $key)) {
 	                $avoidancezoneparameters->{$key} = $value;
 	            }
@@ -60,8 +60,8 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
+	                'offset'  => isset($params->offset) ? $params->offset : null,
+	                'limit'   => isset($params->limit) ? $params->limit : null,
 	            )
 	        ));
 	
@@ -74,7 +74,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'ADD',
 	            'query'  => array(
-	            	'territory_name' => 	isset($params->territory_name) ? $params->territory_name: null,
+	            	'territory_name' => 	isset($params->territory_name) ? $params->territory_name : null,
 	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
 	                'territory' => isset($params->territory) ? $params->territory : null,
 	            )

src/Route4Me/Address.php

Spacing +13 added lines, -13 removed lines

@@ -10,9 +10,9 @@ 
 class Address extends Common
 {
     static public $apiUrl = '/api.v4/address.php';
-	static public $apiUrlMove='/actions/route/move_route_destination.php';
-	static public $apiUrDeparted='/api/route/mark_address_departed.php';
-	static public $apiUrVisited='/actions/address/update_address_visited.php';
+	static public $apiUrlMove = '/actions/route/move_route_destination.php';
+	static public $apiUrDeparted = '/api/route/mark_address_departed.php';
+	static public $apiUrVisited = '/actions/address/update_address_visited.php';
 
     public $route_destination_id;
     public $alias;
@@ -70,7 +70,7 @@ 
         }*/
 
         $address = new Address();
-        foreach($params as $key => $value) {
+        foreach ($params as $key => $value) {
             if (property_exists($address, $key)) {
                 $address->{$key} = $value;
             }
@@ -114,7 +114,7 @@ 
             'url'    => self::$apiUrl,
             'method' => 'PUT',
             'query'  => array(
-                'route_id'  => isset($params['route_id']) ? $params['route_id']: null, 
+                'route_id'  => isset($params['route_id']) ? $params['route_id'] : null, 
                 'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
             ),
             'body'   => $body
@@ -129,10 +129,10 @@ 
             'url'    => self::$apiUrDeparted,
             'method' => 'GET',
             'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_departed'   => isset($params['is_departed']) ? $params['is_departed']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+                'route_id'   => isset($params['route_id']) ? $params['route_id'] : null,
+                'address_id'   => isset($params['address_id']) ? $params['address_id'] : null,
+                'is_departed'   => isset($params['is_departed']) ? $params['is_departed'] : null,
+                'member_id'   => isset($params['member_id']) ? $params['member_id'] : null,
             ),
         ));
 
@@ -145,10 +145,10 @@ 
             'url'    => self::$apiUrVisited,
             'method' => 'GET',
             'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_visited'   => isset($params['is_visited']) ? $params['is_visited']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+                'route_id'   => isset($params['route_id']) ? $params['route_id'] : null,
+                'address_id'   => isset($params['address_id']) ? $params['address_id'] : null,
+                'is_visited'   => isset($params['is_visited']) ? $params['is_visited'] : null,
+                'member_id'   => isset($params['member_id']) ? $params['member_id'] : null,
             ),
         ));
 

src/Route4Me/Vehicle.php

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
 	{
 		static public $apiUrl = '/api/vehicles/view_vehicles.php';
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
-			$vehicle= new Vehicle();
-	        foreach($params as $key => $value) {
+			$vehicle = new Vehicle();
+	        foreach ($params as $key => $value) {
 	            if (property_exists($vehicle, $key)) {
 	                $vehicle->{$key} = $value;
 	            }

src/Route4Me/Territory.php

Spacing +8 added lines, -8 removed lines

@@ -8,14 +8,14 @@ 
 	{
 		static public $apiUrl = '/api.v4/territory.php';
 	
-		public $territory_id;  // Territory id
+		public $territory_id; // Territory id
 		public $territory_name; 
 		public $territory_color;
 		public $addresses;
 		public $member_id;
 		public $territory; // Territory parameters
 		
-		public function __construct () {
+		public function __construct() {
 			
 		}
 		
@@ -33,7 +33,7 @@ 
 	        }
 			
 			$territoryparameters = new Territory();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($territoryparameters, $key)) {
 	                $territoryparameters->{$key} = $value;
 	            }
@@ -48,8 +48,8 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'territory_id' => isset($params['territory_id']) ? $params['territory_id']: null,
-	                'addresses' => isset($params['addresses']) ? $params['addresses']: null,
+	                'territory_id' => isset($params['territory_id']) ? $params['territory_id'] : null,
+	                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
 	            )
 	        ));
 	
@@ -62,8 +62,8 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
+	                'offset'  => isset($params->offset) ? $params->offset : null,
+	                'limit'   => isset($params->limit) ? $params->limit : null,
 	            )
 	        ));
 	
@@ -76,7 +76,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'ADD',
 	            'query'  => array(
-	            	'territory_name' => isset($params->territory_name) ? $params->territory_name: null,
+	            	'territory_name' => isset($params->territory_name) ? $params->territory_name : null,
 	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
 	                'territory' => isset($params->territory) ? $params->territory : null,
 	            )

src/Route4Me/ActivityParameters.php

Spacing +6 added lines, -6 removed lines

@@ -19,13 +19,13 @@ 
 		public $activity_type;
 		public $activity_message;
 		
-		public function __construct () {
+		public function __construct() {
 			
 		}
 		
 		public static function fromArray(array $params) {
 			$activityparameters = new ActivityParameters();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($activityparameters, $key)) {
 	                $activityparameters->{$key} = $value;
 	            }
@@ -41,8 +41,8 @@ 
 	            'method' => 'GET',
 	            'query'  => array(
 	                'route_id' => isset($params->route_id) ? $params->route_id : null,
-	                'team' => isset($params->team) ? $params->team: null,
-	                'limit' => isset($params->limit) ? $params->limit: null,
+	                'team' => isset($params->team) ? $params->team : null,
+	                'limit' => isset($params->limit) ? $params->limit : null,
 	                'offset' => isset($params->offset) ? $params->offset : null,
 	            )
 	        ));
@@ -57,7 +57,7 @@ 
 	            'method' => 'GET',
 	            'query'  => array(
 	                'route_id' => isset($params->route_id) ? $params->route_id : null,
-	                'limit' => isset($params->limit) ? $params->limit: null,
+	                'limit' => isset($params->limit) ? $params->limit : null,
 	                'offset' => isset($params->offset) ? $params->offset : null,
 	                'activity_type' => isset($params->activity_type) ? $params->activity_type : null,
 	            )
@@ -73,7 +73,7 @@ 
 	            'method' => 'POST',
 	            'body'  => array(
 	            	'activity_type' => isset($postParameters->activity_type) ? $postParameters->activity_type : null,
-	            	'activity_message' => isset($postParameters->activity_message) ? $postParameters->activity_message: null,
+	            	'activity_message' => isset($postParameters->activity_message) ? $postParameters->activity_message : null,
 	                'route_id' => isset($postParameters->route_id) ? $postParameters->route_id : null,
 	            )
 	        ));