route4me / route4me-php-sdk

examples/Routes/GetRoutePathPointsCompressed.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 namespace Route4Me;
 
-$root=realpath(dirname(__FILE__).'/../../');
+$root = realpath(dirname(__FILE__).'/../../');
 require $root.'/vendor/autoload.php';
 
 use Route4Me\Route4Me;

Indentation +14 added lines, -14 removed lines

@@ -23,26 +23,26 @@
 
 // Get a route with the path points
 $params = array(
-    "route_path_output"     => "Points",
-    "compress_path_points"  => TRUE,
-    "route_id"              => $route_id
+	"route_path_output"     => "Points",
+	"compress_path_points"  => TRUE,
+	"route_id"              => $route_id
 );
 
 $routeResults = (array)$route->getRoutePoints($params);
 
 if (isset($routeResults['addresses'])) {
-    foreach ($routeResults['addresses'] as $key => $address) {
-        $araddress = (array)$address;
+	foreach ($routeResults['addresses'] as $key => $address) {
+		$araddress = (array)$address;
 
-        if (isset($araddress['route_destination_id'])) {
-            echo "route_destination_id=".$araddress['route_destination_id']."<br>";
-        }
+		if (isset($araddress['route_destination_id'])) {
+			echo "route_destination_id=".$araddress['route_destination_id']."<br>";
+		}
         
-        if (isset($araddress['path_to_next'])) {
-            echo "path_to_next:<br>";
-            Route4Me::simplePrint((array)$araddress['path_to_next']);
-        }
+		if (isset($araddress['path_to_next'])) {
+			echo "path_to_next:<br>";
+			Route4Me::simplePrint((array)$araddress['path_to_next']);
+		}
         
-        echo "<br>";
-    }
+		echo "<br>";
+	}
 }

examples/Routes/GetRouteDirections.php

Indentation +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
   
 // Get a route with the directions
 $params = array(
-    "directions" => 1,
-    "route_id"   => $route_id
+	"directions" => 1,
+	"route_id"   => $route_id
 );
 
 $routeResults = (array)$route->getRoutePoints($params);

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 namespace Route4Me;
 
-$root=realpath(dirname(__FILE__).'/../../');
+$root = realpath(dirname(__FILE__).'/../../');
 require $root.'/vendor/autoload.php';
 
 use Route4Me\Route4Me;

src/Route4Me/Track.php

Indentation +10 added lines, -10 removed lines

@@ -7,16 +7,16 @@
 
 class Track extends Common
 {
-    public static function set(TrackSetParams $params)
-    {
-        $allQueryFields = Route4Me::getObjectProperties(new TrackSetParams(), array('tx_id'));
+	public static function set(TrackSetParams $params)
+	{
+		$allQueryFields = Route4Me::getObjectProperties(new TrackSetParams(), array('tx_id'));
 
-        $json = Route4Me::makeRequst(array(
-            'url'    => Endpoint::TRACK_SET,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$json = Route4Me::makeRequst(array(
+			'url'    => Endpoint::TRACK_SET,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $json;
-    }
+		return $json;
+	}
 }

src/Route4Me/Order.php

Spacing +3 added lines, -3 removed lines

@@ -215,7 +215,7 @@ 
     
     public static function searchOrder($params)
     {
-        $allQueryFields = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
+        $allQueryFields = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit');
         
         $response = Route4Me::makeRequst(array(
             'url'    => Endpoint::ORDER_V4,
@@ -269,11 +269,11 @@ 
         $allOrderFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
         
         if (!empty($columns)) {
-             array_push($results['fail'],'Empty CSV table');
+             array_push($results['fail'], 'Empty CSV table');
              return ($results);
         }
                  
-        $iRow=1;
+        $iRow = 1;
         
         while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
             if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null)!==$rows) {

Indentation +251 added lines, -251 removed lines

@@ -6,324 +6,324 @@
 
 class Order extends Common
 {
-    public $address_1;
-    public $address_2;
-    public $cached_lat;
-    public $cached_lng;
-    public $curbside_lat;
-    public $curbside_lng;
-    public $address_alias;
-    public $address_city;
-    public $EXT_FIELD_first_name;
-    public $EXT_FIELD_last_name;
-    public $EXT_FIELD_email;
-    public $EXT_FIELD_phone;
-    public $EXT_FIELD_custom_data;
+	public $address_1;
+	public $address_2;
+	public $cached_lat;
+	public $cached_lng;
+	public $curbside_lat;
+	public $curbside_lng;
+	public $address_alias;
+	public $address_city;
+	public $EXT_FIELD_first_name;
+	public $EXT_FIELD_last_name;
+	public $EXT_FIELD_email;
+	public $EXT_FIELD_phone;
+	public $EXT_FIELD_custom_data;
     
-    public $color;
-    public $order_icon;
-    public $local_time_window_start;
-    public $local_time_window_end;
-    public $local_time_window_start_2;
-    public $local_time_window_end_2;
-    public $service_time;
+	public $color;
+	public $order_icon;
+	public $local_time_window_start;
+	public $local_time_window_end;
+	public $local_time_window_start_2;
+	public $local_time_window_end_2;
+	public $service_time;
     
-    public $day_scheduled_for_YYMMDD;
+	public $day_scheduled_for_YYMMDD;
     
-    public $route_id;
-    public $redirect;
-    public $optimization_problem_id;
-    public $order_id;
-    public $order_ids;
+	public $route_id;
+	public $redirect;
+	public $optimization_problem_id;
+	public $order_id;
+	public $order_ids;
     
-    public $day_added_YYMMDD;
-    public $scheduled_for_YYMMDD;
-    public $fields;
-    public $offset;
-    public $limit;
-    public $query;
+	public $day_added_YYMMDD;
+	public $scheduled_for_YYMMDD;
+	public $fields;
+	public $offset;
+	public $limit;
+	public $query;
     
-    public $created_timestamp;
-    public $order_status_id;
-    public $member_id;
-    public $address_state_id;
-    public $address_country_id;
-    public $address_zip;
-    public $in_route_count;
-    public $last_visited_timestamp;
-    public $last_routed_timestamp;
-    public $local_timezone_string;
-    public $is_validated;
-    public $is_pending;
-    public $is_accepted;
-    public $is_started;
-    public $is_completed;
-    public $custom_user_fields;
+	public $created_timestamp;
+	public $order_status_id;
+	public $member_id;
+	public $address_state_id;
+	public $address_country_id;
+	public $address_zip;
+	public $in_route_count;
+	public $last_visited_timestamp;
+	public $last_routed_timestamp;
+	public $local_timezone_string;
+	public $is_validated;
+	public $is_pending;
+	public $is_accepted;
+	public $is_started;
+	public $is_completed;
+	public $custom_user_fields;
     
-    public $addresses = array();
+	public $addresses = array();
     
-    public static function fromArray(array $params) {
-        $order = new Order();
-        foreach ($params as $key => $value) {
-            if (property_exists($order, $key)) {
-                $order->{$key} = $value;
-            }
-        }
+	public static function fromArray(array $params) {
+		$order = new Order();
+		foreach ($params as $key => $value) {
+			if (property_exists($order, $key)) {
+				$order->{$key} = $value;
+			}
+		}
         
-        return $order;
-    }
+		return $order;
+	}
     
-    /**
-     * @param Order $params
-     */
-    public static function addOrder($params)
-    {
-        $excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 'order_id', 
-        'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
+	/**
+	 * @param Order $params
+	 */
+	public static function addOrder($params)
+	{
+		$excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 'order_id', 
+		'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
 
-    public static function addOrder2Route($params)
-    {
-        $allQueryFields = array('route_id', 'redirect');
-        $allBodyFields = array('addresses');
+	public static function addOrder2Route($params)
+	{
+		$allQueryFields = array('route_id', 'redirect');
+		$allBodyFields = array('addresses');
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function addOrder2Optimization($params)
-    {
-        $allQueryFields = array('optimization_problem_id', 'redirect', 'device_type');
-        $allBodyFields = array('addresses');
+	public static function addOrder2Optimization($params)
+	{
+		$allQueryFields = array('optimization_problem_id', 'redirect', 'device_type');
+		$allBodyFields = array('addresses');
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getOrder($params)
-    {
-        $allQueryFields = array('order_id', 'fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit');
+	public static function getOrder($params)
+	{
+		$allQueryFields = array('order_id', 'fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit');
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getOrders($params)
-    {
-        $allQueryFields = array('offset', 'limit');
+	public static function getOrders($params)
+	{
+		$allQueryFields = array('offset', 'limit');
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function getRandomOrderId($offset, $limit)
-    {
-        $randomOrder = $this->getRandomOrder($offset, $limit);
+	public function getRandomOrderId($offset, $limit)
+	{
+		$randomOrder = $this->getRandomOrder($offset, $limit);
         
-        if (is_null($randomOrder) || !isset($randomOrder)) {
-            return null;
-        }
+		if (is_null($randomOrder) || !isset($randomOrder)) {
+			return null;
+		}
         
-        return $randomOrder['order_id'];
-    }
+		return $randomOrder['order_id'];
+	}
     
-    public function getRandomOrder($offset, $limit)
-    {
-        $params = array('offset' => $offset, 'limit' => $limit);
+	public function getRandomOrder($offset, $limit)
+	{
+		$params = array('offset' => $offset, 'limit' => $limit);
         
-        $orders = self::getOrders($params);
+		$orders = self::getOrders($params);
         
-        if (is_null($orders) || !isset($orders['results'])) {
-            return null;
-        }
+		if (is_null($orders) || !isset($orders['results'])) {
+			return null;
+		}
         
-        $randomIndex = rand(0, sizeof($orders['results']) - 1);
+		$randomIndex = rand(0, sizeof($orders['results']) - 1);
         
-        $order = $orders['results'][$randomIndex];
+		$order = $orders['results'][$randomIndex];
         
-        return $order;
-    }
+		return $order;
+	}
     
-    public static function removeOrder($params)
-    {
-        $allBodyFields = array('order_ids');
+	public static function removeOrder($params)
+	{
+		$allBodyFields = array('order_ids');
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'DELETE',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'DELETE',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function updateOrder($params)
-    {
-        $excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 
-        'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
+	public static function updateOrder($params)
+	{
+		$excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 
+		'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function searchOrder($params)
-    {
-        $allQueryFields = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
+	public static function searchOrder($params)
+	{
+		$allQueryFields = array('fields', 'day_added_YYMMDD', 'scheduled_for_YYMMDD', 'query', 'offset', 'limit' );
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ORDER_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ORDER_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function validateCoordinate($coord)
-    {
-        $key = key($coord);
+	public static function validateCoordinate($coord)
+	{
+		$key = key($coord);
         
-        if (!is_numeric($coord[$key])) {
-            return false;
-        }
+		if (!is_numeric($coord[$key])) {
+			return false;
+		}
         
-        switch ($key) {
-        case 'cached_lat':
-        case 'curbside_lat':
-            if ($coord[$key]>90 || $coord[$key]<-90) {
-                return false;
-            }
-            break;
-        case 'cached_lng':
-        case 'curbside_lng':
-            if ($coord[$key]>180 || $coord[$key]<-180) {
-                return false;
-            }
-            break;
-        }
+		switch ($key) {
+		case 'cached_lat':
+		case 'curbside_lat':
+			if ($coord[$key]>90 || $coord[$key]<-90) {
+				return false;
+			}
+			break;
+		case 'cached_lng':
+		case 'curbside_lng':
+			if ($coord[$key]>180 || $coord[$key]<-180) {
+				return false;
+			}
+			break;
+		}
         
-        return true;
-    }
+		return true;
+	}
     
-    public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping)
-    {
-        $max_line_length = 512;
-        $delemietr = ',';
+	public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping)
+	{
+		$max_line_length = 512;
+		$delemietr = ',';
         
-        $results = array();
-        $results['fail'] = array();
-        $results['success'] = array();
+		$results = array();
+		$results['fail'] = array();
+		$results['success'] = array();
         
-        $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
+		$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
         
-        $excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 'order_id', 
-        'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
+		$excludeFields = array('route_id', 'redirect', 'optimization_problem_id', 'order_id', 
+		'order_ids', 'fields', 'offset', 'limit', 'query', 'created_timestamp');
         
-        $allOrderFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
+		$allOrderFields = Route4Me::getObjectProperties(new Order(), $excludeFields);
         
-        if (!empty($columns)) {
-             array_push($results['fail'],'Empty CSV table');
-             return ($results);
-        }
+		if (!empty($columns)) {
+			 array_push($results['fail'],'Empty CSV table');
+			 return ($results);
+		}
                  
-        $iRow=1;
+		$iRow=1;
         
-        while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
-            if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null)!==$rows) {
+		while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
+			if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null)!==$rows) {
                 
-                $cached_lat = 0.000;
-                $cached_lng = 0.000;
+				$cached_lat = 0.000;
+				$cached_lng = 0.000;
                 
-                foreach (array('cached_lat', 'cached_lng', 'curbside_lat', 'curbside_lng') as $coord) {
-                    if (!$this->validateCoordinate(array($coord => $rows[$ordersFieldsMapping[$coord]]))) {
-                        array_push($results['fail'], "$iRow --> Wrong "+$coord); 
-                        $iRow++;
-                        continue;
-                    } else {
-                        switch ($coord) {
-                        case 'cached_lat':
-                            $cached_lat = doubleval($rows[$ordersFieldsMapping[$coord]]);
-                            break;
-                        case 'cached_lng':
-                            $cached_lng = doubleval($rows[$ordersFieldsMapping[$coord]]);
-                            break;
-                        }
-                    }
-                }
+				foreach (array('cached_lat', 'cached_lng', 'curbside_lat', 'curbside_lng') as $coord) {
+					if (!$this->validateCoordinate(array($coord => $rows[$ordersFieldsMapping[$coord]]))) {
+						array_push($results['fail'], "$iRow --> Wrong "+$coord); 
+						$iRow++;
+						continue;
+					} else {
+						switch ($coord) {
+						case 'cached_lat':
+							$cached_lat = doubleval($rows[$ordersFieldsMapping[$coord]]);
+							break;
+						case 'cached_lng':
+							$cached_lng = doubleval($rows[$ordersFieldsMapping[$coord]]);
+							break;
+						}
+					}
+				}
                 
-                $address = $rows[$ordersFieldsMapping['address_1']];
+				$address = $rows[$ordersFieldsMapping['address_1']];
                 
-                foreach (array('order_city', 'order_state_id', 'order_zip_code', 'order_country_id') as $addressPart) {
-                    if (isset($ordersFieldsMapping[$addressPart])) {
-                        $address .= ', '.$rows[$ordersFieldsMapping[$addressPart]];
-                    }
-                }
+				foreach (array('order_city', 'order_state_id', 'order_zip_code', 'order_country_id') as $addressPart) {
+					if (isset($ordersFieldsMapping[$addressPart])) {
+						$address .= ', '.$rows[$ordersFieldsMapping[$addressPart]];
+					}
+				}
 
-                echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
+				echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
                 
-                $parametersArray = array();
+				$parametersArray = array();
                 
-                $parametersArray["cached_lat"] = $cached_lat;
-                $parametersArray["cached_lng"] = $cached_lng;
+				$parametersArray["cached_lat"] = $cached_lat;
+				$parametersArray["cached_lng"] = $cached_lng;
                 
                 
-                foreach ($allOrderFields as $orderField) {
-                    if (isset($ordersFieldsMapping[$orderField])) {
-                        $parametersArray[$orderField] = $rows[$ordersFieldsMapping[$orderField]];
-                    }
-                }
+				foreach ($allOrderFields as $orderField) {
+					if (isset($ordersFieldsMapping[$orderField])) {
+						$parametersArray[$orderField] = $rows[$ordersFieldsMapping[$orderField]];
+					}
+				}
                 
-                $orderParameters = Order::fromArray($parametersArray);
+				$orderParameters = Order::fromArray($parametersArray);
 
-                $order = new Order();
+				$order = new Order();
                 
-                $orderResults = $order->addOrder($orderParameters);
+				$orderResults = $order->addOrder($orderParameters);
                 
-                array_push($results['success'], "The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
-            } else {
-                array_push($results['fail'], "$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
-            }
+				array_push($results['success'], "The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
+			} else {
+				array_push($results['fail'], "$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
+			}
             
-            $iRow++;
-        }
-    }
+			$iRow++;
+		}
+	}
 }

src/Route4Me/Territory.php

Indentation +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
 	
 	public static function getTerritory($params)
 	{
-	    $allQueryFields = array('territory_id', 'addresses');
+		$allQueryFields = array('territory_id', 'addresses');
         
 		$territory = Route4Me::makeRequst(array(
 			'url'    => Endpoint::TERRITORY_V4,
@@ -53,7 +53,7 @@ 
 	
 	public static function getTerritories($params)
 	{
-	    $allQueryFields = array('offset', 'limit', 'addresses');
+		$allQueryFields = array('offset', 'limit', 'addresses');
         
 		$response = Route4Me::makeRequst(array(
 			'url'    => Endpoint::TERRITORY_V4,
@@ -66,7 +66,7 @@ 
 
 	public static function addTerritory($params)
 	{
-	    $allBodyFields = array('territory_name', 'member_id', 'territory_color', 'territory');
+		$allBodyFields = array('territory_name', 'member_id', 'territory_color', 'territory');
         
 		$response = Route4Me::makeRequst(array(
 			'url'    => Endpoint::TERRITORY_V4,
@@ -92,14 +92,14 @@ 
 	
 	public function updateTerritory($params)
 	{
-	    $allQueryFields = array('territory_id');
-        $allBodyFields = array('territory_name', 'member_id', 'territory_color', 'territory');
+		$allQueryFields = array('territory_id');
+		$allBodyFields = array('territory_name', 'member_id', 'territory_color', 'territory');
         
 		$response = Route4Me::makeRequst(array(
 			'url'    => Endpoint::TERRITORY_V4,
 			'method' => 'PUT',
 			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
 		));
 
 		return $response;

src/Route4Me/Geocoding.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     {
         $geocoding = new Geocoding();
         
-        foreach($params as $key => $value) {
+        foreach ($params as $key => $value) {
             if (property_exists($geocoding, $key)) {
                 $geocoding->{$key} = $value;
             }

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

src/Route4Me/Route.php

Spacing +1 added lines, -1 removed lines

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

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/AddressBookLocation.php

Switch Indentation +54 added lines, -54 removed lines

@@ -351,70 +351,70 @@
             
             if ($mode!='daily') {
                 switch ($mode) {
-                    case 'weekly':
-                        if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                            if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                 $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                            } else {
-                                array_push($results['fail'], "$iRow --> Wrong weekdays"); 
-                            }
+                case 'weekly':
+                    if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+                        if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+                             $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
                         } else {
-                            array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
+                            array_push($results['fail'], "$iRow --> Wrong weekdays"); 
                         }
-                        break;
-                    case 'monthly':
-                        $monthlyMode = "";
-                        if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
-                            if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                 $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
-                                 $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                            } else {
-                                array_push($results['fail'], "$iRow --> Wrong monthly mode"); 
-                            }
+                    } else {
+                        array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
+                    }
+                    break;
+                case 'monthly':
+                    $monthlyMode = "";
+                    if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
+                        if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
+                             $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
+                             $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
                         } else {
-                            array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
+                            array_push($results['fail'], "$iRow --> Wrong monthly mode"); 
                         }
+                    } else {
+                        array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
+                    }
                         
-                        if ($monthlyMode!="") {
-                            switch ($monthlyMode) {
-                                case 'dates':
-                                    if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                        if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                             $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> Wrong monthly dates"); 
-                                        }
-                                    }
-                                    break;
-                                case 'nth':
-                                    if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                        if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                             $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); 
-                                        }
-                                    } else {
-                                        array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
-                                    }
+                    if ($monthlyMode!="") {
+                        switch ($monthlyMode) {
+                        case 'dates':
+                        if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
+                        if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
+                             $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+                        } else {
+                            array_push($results['fail'], "$iRow --> Wrong monthly dates"); 
+                        }
+                        }
+                        break;
+                        case 'nth':
+                        if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+                        if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+                             $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+                        } else {
+                            array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); 
+                        }
+                        } else {
+                        array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
+                        }
                                     
-                                    if ($curSchedule!="") {
-                                        if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                            if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                 $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                            } else {
-                                                array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
-                                            }
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
-                                        }
-                                    }
-                                    break;
+                        if ($curSchedule!="") {
+                        if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+                            if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+                                 $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+                            } else {
+                                array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
                             }
+                        } else {
+                            array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
+                        }
                         }
                         break;
-                    default:
-                        $curSchedule = "";
+                        }
+                        }
                         break;
+                default:
+                    $curSchedule = "";
+                    break;
                 }
             }
 

Indentation +371 added lines, -371 removed lines

@@ -6,452 +6,452 @@
 
 class AddressBookLocation extends Common
 {
-    public $address_id;
-    public $address_group;
-    public $address_alias;
-    public $address_1;
-    public $address_2;
-    public $first_name;
-    public $last_name;
-    public $address_email;
-    public $address_phone_number;
-    public $address_city;
-    public $address_state_id;
-    public $address_country_id;
-    public $address_zip;
-    public $cached_lat;
-    public $cached_lng;
-    public $curbside_lat;
-    public $curbside_lng;
-    public $color;
-    public $address_custom_data;
-    public $schedule;
+	public $address_id;
+	public $address_group;
+	public $address_alias;
+	public $address_1;
+	public $address_2;
+	public $first_name;
+	public $last_name;
+	public $address_email;
+	public $address_phone_number;
+	public $address_city;
+	public $address_state_id;
+	public $address_country_id;
+	public $address_zip;
+	public $cached_lat;
+	public $cached_lng;
+	public $curbside_lat;
+	public $curbside_lng;
+	public $color;
+	public $address_custom_data;
+	public $schedule;
     
-    public $created_timestamp;
-    public $member_id;
-    public $schedule_blacklist;
-    public $in_route_count;
-    public $last_visited_timestamp;
-    public $last_routed_timestamp;
-    public $local_time_window_start;
-    public $local_time_window_end;
-    public $local_time_window_start_2;
-    public $local_time_window_end_2;
-    public $service_time;
-    public $local_timezone_string;
-    public $address_icon;
-    public $address_stop_type;
-    public $address_cube;
-    public $address_pieces;
-    public $address_reference_no;
-    public $address_revenue;
-    public $address_weight;
-    public $address_priority;
-    public $address_customer_po;
+	public $created_timestamp;
+	public $member_id;
+	public $schedule_blacklist;
+	public $in_route_count;
+	public $last_visited_timestamp;
+	public $last_routed_timestamp;
+	public $local_time_window_start;
+	public $local_time_window_end;
+	public $local_time_window_start_2;
+	public $local_time_window_end_2;
+	public $service_time;
+	public $local_timezone_string;
+	public $address_icon;
+	public $address_stop_type;
+	public $address_cube;
+	public $address_pieces;
+	public $address_reference_no;
+	public $address_revenue;
+	public $address_weight;
+	public $address_priority;
+	public $address_customer_po;
     
-    public static function fromArray(array $params)
-    {
-        $addressbooklocation = new AddressBookLocation();
+	public static function fromArray(array $params)
+	{
+		$addressbooklocation = new AddressBookLocation();
         
-        foreach ($params as $key => $value) {
-            if (property_exists($addressbooklocation, $key)) {
-                $addressbooklocation->{$key} = $value;
-            }
-        }
+		foreach ($params as $key => $value) {
+			if (property_exists($addressbooklocation, $key)) {
+				$addressbooklocation->{$key} = $value;
+			}
+		}
         
-        return $addressbooklocation;
-    }
+		return $addressbooklocation;
+	}
     
     
     
-    public static function getAddressBookLocation($addressId)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'query' => $addressId,
-                'limit' => 30
-            )
-        ));
+	public static function getAddressBookLocation($addressId)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'query' => $addressId,
+				'limit' => 30
+			)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function searchAddressBookLocations($params)
-    {
-        $allQueryFields = array('display', 'query', 'fields', 'limit', 'offset');
+	public static function searchAddressBookLocations($params)
+	{
+		$allQueryFields = array('display', 'query', 'fields', 'limit', 'offset');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public static function getAddressBookLocations($params)
-    {
-        $allQueryFields = array('limit', 'offset', 'address_id');
+	public static function getAddressBookLocations($params)
+	{
+		$allQueryFields = array('limit', 'offset', 'address_id');
         
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function getRandomAddressBookLocation($params)
-    {
-        $ablocations = self::getAddressBookLocations($params);
+	public static function getRandomAddressBookLocation($params)
+	{
+		$ablocations = self::getAddressBookLocations($params);
         
-        if (isset($ablocations["results"])) {
-            $locationsSize = sizeof($ablocations["results"]);
+		if (isset($ablocations["results"])) {
+			$locationsSize = sizeof($ablocations["results"]);
             
-            if ($locationsSize>0) {
-                $randomLocationIndex = rand(0, $locationsSize - 1);
-                return $ablocations["results"][$randomLocationIndex];
-            } 
-        } 
+			if ($locationsSize>0) {
+				$randomLocationIndex = rand(0, $locationsSize - 1);
+				return $ablocations["results"][$randomLocationIndex];
+			} 
+		} 
 
-        return null;
-    }
+		return null;
+	}
     
-    /**
-     * @param AddressBookLocation $params
-    */
-    public static function addAdressBookLocation($params)
-    {
-        $allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
+	/**
+	 * @param AddressBookLocation $params
+	 */
+	public static function addAdressBookLocation($params)
+	{
+		$allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function deleteAdressBookLocation($address_ids)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'DELETEARRAY',
-            'query'  => array(
-                'address_ids' => $address_ids
-            )
-        ));
+	public function deleteAdressBookLocation($address_ids)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'DELETEARRAY',
+			'query'  => array(
+				'address_ids' => $address_ids
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function updateAdressBookLocation($params)
-    {
-        $allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('in_route_count'));
+	public function updateAdressBookLocation($params)
+	{
+		$allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('in_route_count'));
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
         
-    public static function validateScheduleMode($scheduleMode)
-    {
-        $schedMmodes = array("daily", "weekly", "monthly", "annually");
+	public static function validateScheduleMode($scheduleMode)
+	{
+		$schedMmodes = array("daily", "weekly", "monthly", "annually");
         
-        if (in_array($scheduleMode, $schedMmodes)) {
-            return TRUE; 
-        } else {
-            return FALSE;
-        }
-    }
+		if (in_array($scheduleMode, $schedMmodes)) {
+			return TRUE; 
+		} else {
+			return FALSE;
+		}
+	}
     
-    public static function validateScheduleEnable($scheduleEnabled)
-    {
-        $schedEnables = array(TRUE, FALSE);
+	public static function validateScheduleEnable($scheduleEnabled)
+	{
+		$schedEnables = array(TRUE, FALSE);
         
-        if (in_array($scheduleEnabled, $schedEnables)) {
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
+		if (in_array($scheduleEnabled, $schedEnables)) {
+			return TRUE;
+		} else {
+			return FALSE;
+		}
+	}
     
-    public static function validateScheduleEvery($scheduleEvery)
-    {
-        if (is_numeric($scheduleEvery)) {
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
+	public static function validateScheduleEvery($scheduleEvery)
+	{
+		if (is_numeric($scheduleEvery)) {
+			return TRUE;
+		} else {
+			return FALSE;
+		}
+	}
     
-    public static function validateScheduleWeekDays($scheduleWeekDays)
-    {
-        $weekdays = explode(',', $scheduleWeekDays);
-        $weekdaysSize = sizeof($weekdays);
+	public static function validateScheduleWeekDays($scheduleWeekDays)
+	{
+		$weekdays = explode(',', $scheduleWeekDays);
+		$weekdaysSize = sizeof($weekdays);
         
-        if ($weekdaysSize<1) {
-            return FALSE;
-        }
+		if ($weekdaysSize<1) {
+			return FALSE;
+		}
         
-        $isValid = TRUE;
+		$isValid = TRUE;
         
-        for ($i = 0; $i<$weekdaysSize; $i++) { 
-            if (is_numeric($weekdays[$i])) {
-                $wday = intval($weekdays[$i]);
-                if ($wday<1 || $wday>7) {
-                    $isValid = FALSE;
-                }
-            } else {
-                $isValid = FALSE;
-            }
-        }
+		for ($i = 0; $i<$weekdaysSize; $i++) { 
+			if (is_numeric($weekdays[$i])) {
+				$wday = intval($weekdays[$i]);
+				if ($wday<1 || $wday>7) {
+					$isValid = FALSE;
+				}
+			} else {
+				$isValid = FALSE;
+			}
+		}
         
-        return $isValid;
-    }
+		return $isValid;
+	}
     
-    public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
-    {
-        $schedMonthlyMmodes = array("dates", "nth");
+	public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
+	{
+		$schedMonthlyMmodes = array("dates", "nth");
         
-        if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) {
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
+		if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) {
+			return TRUE;
+		} else {
+			return FALSE;
+		}
+	}
     
-    public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
-    {
-        $monthlyDates = explode(',', $scheduleMonthlyDates);
-        $monthlyDatesSize = sizeof($monthlyDates);
+	public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
+	{
+		$monthlyDates = explode(',', $scheduleMonthlyDates);
+		$monthlyDatesSize = sizeof($monthlyDates);
         
-        if ($monthlyDatesSize<1) {
-            return FALSE;
-        }
+		if ($monthlyDatesSize<1) {
+			return FALSE;
+		}
         
-        $isValid = TRUE;
+		$isValid = TRUE;
         
-        for ($i = 0; $i<$monthlyDatesSize; $i++) { 
-            if (is_numeric($monthlyDates[$i])) {
-                $mday = intval($monthlyDates[$i]);
-                if ($mday<1 || $mday>31) {
-                    $isValid = FALSE;
-                }
-            } else {
-                $isValid = FALSE;
-            }
-        }
+		for ($i = 0; $i<$monthlyDatesSize; $i++) { 
+			if (is_numeric($monthlyDates[$i])) {
+				$mday = intval($monthlyDates[$i]);
+				if ($mday<1 || $mday>31) {
+					$isValid = FALSE;
+				}
+			} else {
+				$isValid = FALSE;
+			}
+		}
 
-        return $isValid;
-    }
+		return $isValid;
+	}
     
-    public static function validateScheduleNthN($scheduleNthN)
-    {
-        if (!is_numeric($scheduleNthN)) {
-            return FALSE;
-        }
+	public static function validateScheduleNthN($scheduleNthN)
+	{
+		if (!is_numeric($scheduleNthN)) {
+			return FALSE;
+		}
         
-        $schedNthNs = array(1, 2, 3, 4, 5, -1);
+		$schedNthNs = array(1, 2, 3, 4, 5, -1);
         
-        if (in_array($scheduleNthN, $schedNthNs)) {
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
+		if (in_array($scheduleNthN, $schedNthNs)) {
+			return TRUE;
+		} else {
+			return FALSE;
+		}
+	}
     
-    public static function validateScheduleNthWhat($scheduleNthWhat)
-    {
-        if (!is_numeric($scheduleNthWhat)) {
-            return FALSE;
-        }
+	public static function validateScheduleNthWhat($scheduleNthWhat)
+	{
+		if (!is_numeric($scheduleNthWhat)) {
+			return FALSE;
+		}
         
-        $schedNthWhats = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+		$schedNthWhats = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
         
-        if (in_array($scheduleNthWhat, $schedNthWhats)) {
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
+		if (in_array($scheduleNthWhat, $schedNthWhats)) {
+			return TRUE;
+		} else {
+			return FALSE;
+		}
+	}
     
-    /** Function adds the locations (with/without schedule) from the CSV file. 
-     * $csvFileHandle - a file handler.
-     * Returns array $results which contains two arrays: fail and succes.
-     */
-    public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
-    {
-        $max_line_length = 512;
-        $delemietr = ',';
+	/** Function adds the locations (with/without schedule) from the CSV file. 
+	 * $csvFileHandle - a file handler.
+	 * Returns array $results which contains two arrays: fail and succes.
+	 */
+	public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
+	{
+		$max_line_length = 512;
+		$delemietr = ',';
         
-        $results = array();
-        $results['fail'] = array();
-        $results['success'] = array();
+		$results = array();
+		$results['fail'] = array();
+		$results['success'] = array();
         
-        $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
+		$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
         
-        $addressBookFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
+		$addressBookFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
 
-        if (empty($columns)) {
-            array_push($results['fail'], 'Empty CSV table');
-            return ($results);
-        }
+		if (empty($columns)) {
+			array_push($results['fail'], 'Empty CSV table');
+			return ($results);
+		}
 
-        $iRow = 1;
+		$iRow = 1;
         
-        while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
-            if (!isset($rows[$locationsFieldsMapping['cached_lat']]) || !isset($rows[$locationsFieldsMapping['cached_lng']]) 
-                  || !isset($rows[$locationsFieldsMapping['address_1']]) || array(null)==$rows) {
-                continue;
-            }
+		while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
+			if (!isset($rows[$locationsFieldsMapping['cached_lat']]) || !isset($rows[$locationsFieldsMapping['cached_lng']]) 
+				  || !isset($rows[$locationsFieldsMapping['address_1']]) || array(null)==$rows) {
+				continue;
+			}
                       
-            $curSchedule = "";
-            $mode = "";
+			$curSchedule = "";
+			$mode = "";
             
-            $failCount = sizeof($results['fail']); 
+			$failCount = sizeof($results['fail']); 
             
-            if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
-                if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
-                    $curSchedule = '"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
-                    $mode = $rows[$locationsFieldsMapping['schedule_mode']];
-                } else {
-                    array_push($results['fail'], "$iRow --> Wrong schedule mode parameter"); 
-                }
-            } else {
-                array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); 
-            }
+			if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
+				if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
+					$curSchedule = '"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
+					$mode = $rows[$locationsFieldsMapping['schedule_mode']];
+				} else {
+					array_push($results['fail'], "$iRow --> Wrong schedule mode parameter"); 
+				}
+			} else {
+				array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); 
+			}
             
-            if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
-                if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
-                    $curSchedule .= '"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
-                } else {
-                    array_push($results['fail'], "$iRow --> The schedule enabled parameter is not set ");  
-                }
-            }
+			if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
+				if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
+					$curSchedule .= '"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
+				} else {
+					array_push($results['fail'], "$iRow --> The schedule enabled parameter is not set ");  
+				}
+			}
             
-            if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
-                if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
-                    $curSchedule .= '"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
-                    if ($mode=='daily') {
-                        $curSchedule = trim($curSchedule, ',');
-                        $curSchedule .= '}';
-                    }
-                } else {
-                    array_push($results['fail'], "$iRow --> The parameter sched_every is not set"); 
-                }
-            }
+			if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
+				if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
+					$curSchedule .= '"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
+					if ($mode=='daily') {
+						$curSchedule = trim($curSchedule, ',');
+						$curSchedule .= '}';
+					}
+				} else {
+					array_push($results['fail'], "$iRow --> The parameter sched_every is not set"); 
+				}
+			}
             
-            if ($mode!='daily') {
-                switch ($mode) {
-                    case 'weekly':
-                        if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                            if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                 $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                            } else {
-                                array_push($results['fail'], "$iRow --> Wrong weekdays"); 
-                            }
-                        } else {
-                            array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
-                        }
-                        break;
-                    case 'monthly':
-                        $monthlyMode = "";
-                        if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
-                            if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                 $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
-                                 $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                            } else {
-                                array_push($results['fail'], "$iRow --> Wrong monthly mode"); 
-                            }
-                        } else {
-                            array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
-                        }
+			if ($mode!='daily') {
+				switch ($mode) {
+					case 'weekly':
+						if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+							if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+								 $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
+							} else {
+								array_push($results['fail'], "$iRow --> Wrong weekdays"); 
+							}
+						} else {
+							array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
+						}
+						break;
+					case 'monthly':
+						$monthlyMode = "";
+						if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
+							if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
+								 $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
+								 $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
+							} else {
+								array_push($results['fail'], "$iRow --> Wrong monthly mode"); 
+							}
+						} else {
+							array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
+						}
                         
-                        if ($monthlyMode!="") {
-                            switch ($monthlyMode) {
-                                case 'dates':
-                                    if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                        if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                             $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> Wrong monthly dates"); 
-                                        }
-                                    }
-                                    break;
-                                case 'nth':
-                                    if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                        if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                             $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); 
-                                        }
-                                    } else {
-                                        array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
-                                    }
+						if ($monthlyMode!="") {
+							switch ($monthlyMode) {
+								case 'dates':
+									if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
+										if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
+											 $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+										} else {
+											array_push($results['fail'], "$iRow --> Wrong monthly dates"); 
+										}
+									}
+									break;
+								case 'nth':
+									if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+										if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+											 $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+										} else {
+											array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); 
+										}
+									} else {
+										array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
+									}
                                     
-                                    if ($curSchedule!="") {
-                                        if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                            if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                 $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                            } else {
-                                                array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
-                                            }
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
-                                        }
-                                    }
-                                    break;
-                            }
-                        }
-                        break;
-                    default:
-                        $curSchedule = "";
-                        break;
-                }
-            }
+									if ($curSchedule!="") {
+										if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+											if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+												 $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+											} else {
+												array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
+											}
+										} else {
+											array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
+										}
+									}
+									break;
+							}
+						}
+						break;
+					default:
+						$curSchedule = "";
+						break;
+				}
+			}
 
-            if (sizeof($results['fail'])>$failCount) {
-                $curSchedule = "";
-            }
+			if (sizeof($results['fail'])>$failCount) {
+				$curSchedule = "";
+			}
 
-            if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {
-                $iRow++; 
-                continue;
-            }
+			if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {
+				$iRow++; 
+				continue;
+			}
             
-            $curSchedule = strtolower($curSchedule);
+			$curSchedule = strtolower($curSchedule);
             
-            $curSchedule = '[{'.$curSchedule.'}]';
+			$curSchedule = '[{'.$curSchedule.'}]';
 
-            $oSchedule = json_decode($curSchedule, TRUE);
+			$oSchedule = json_decode($curSchedule, TRUE);
             
-            $parametersArray = array();
+			$parametersArray = array();
             
-            foreach ($addressBookFields as $addressBookField) {
-                if (isset($locationsFieldsMapping[$addressBookField])) {
-                    $parametersArray[$addressBookField] = $rows[$locationsFieldsMapping[$addressBookField]];
-                }
-            }
+			foreach ($addressBookFields as $addressBookField) {
+				if (isset($locationsFieldsMapping[$addressBookField])) {
+					$parametersArray[$addressBookField] = $rows[$locationsFieldsMapping[$addressBookField]];
+				}
+			}
             
-            $AdressBookLocationParameters = AddressBookLocation::fromArray($parametersArray);
+			$AdressBookLocationParameters = AddressBookLocation::fromArray($parametersArray);
             
-            $abContacts = new AddressBookLocation();
+			$abContacts = new AddressBookLocation();
 
-            $abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
+			$abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
             
-            array_push($results['success'], "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
-        }
+			array_push($results['success'], "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
+		}
 
-        return $results;
-    }
+		return $results;
+	}
  }
  
\ No newline at end of file

examples/Members/webinar_registration.php

Indentation +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@
 Route4Me::setApiKey('11111111111111111111111111111111');
 
 $recordParameters = Member::fromArray(array(
-    'email_address' => 'oooooo@yahoo.com',
-    'first_name'    => 'Mmmmm',
-    'last_name'     => 'Ccccc',
-    'phone_number'  => '454-454544',
-    'company_name'  => 'c_name',
-    'member_id'     => '123456',
-    'webinar_date'  => '2016-06-05 10:00:00'
+	'email_address' => 'oooooo@yahoo.com',
+	'first_name'    => 'Mmmmm',
+	'last_name'     => 'Ccccc',
+	'phone_number'  => '454-454544',
+	'company_name'  => 'c_name',
+	'member_id'     => '123456',
+	'webinar_date'  => '2016-06-05 10:00:00'
 ));
 
 $member = new Member();