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

Braces +5 added lines, -2 removed lines

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