route4me / route4me-php-sdk

examples/Routes/GetRoutePathPointsCompressed.php

Indentation +12 added lines, -12 removed lines

@@ -23,24 +23,24 @@
 
 // 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);

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

Indentation +61 added lines, -61 removed lines

@@ -6,79 +6,79 @@
 
 class ActivityParameters extends Common
 {
-    public $route_id;
-    public $device_id;
-    public $member_id;
-    public $team;
-    public $limit;
-    public $offset;
-    public $start;
-    public $end;
-    public $activity_type;
-    public $activity_message;
+	public $route_id;
+	public $device_id;
+	public $member_id;
+	public $team;
+	public $limit;
+	public $offset;
+	public $start;
+	public $end;
+	public $activity_type;
+	public $activity_message;
     
-    public $activity_id;
-    public $activity_timestamp;
-    public $route_destination_id;
-    public $note_id;
-    public $member;
-    public $note_type;
-    public $note_contents;
-    public $route_name;
-    public $note_file;
-    public $destination_name;
-    public $destination_alias;
+	public $activity_id;
+	public $activity_timestamp;
+	public $route_destination_id;
+	public $note_id;
+	public $member;
+	public $note_type;
+	public $note_contents;
+	public $route_name;
+	public $note_file;
+	public $destination_name;
+	public $destination_alias;
     
-    public static function fromArray(array $params) 
-    {
-        $activityparameters = new ActivityParameters();
+	public static function fromArray(array $params) 
+	{
+		$activityparameters = new ActivityParameters();
         
-        foreach($params as $key => $value) {
-            if (property_exists($activityparameters, $key)) {
-                $activityparameters->{$key} = $value;
-            }
-        }
+		foreach($params as $key => $value) {
+			if (property_exists($activityparameters, $key)) {
+				$activityparameters->{$key} = $value;
+			}
+		}
         
-        return $activityparameters;
-    }
+		return $activityparameters;
+	}
     
-    public static function get($params)
-    {
-        $allQueryFields = array('route_id', 'team', 'limit', 'offset', 'start');
+	public static function get($params)
+	{
+		$allQueryFields = array('route_id', 'team', 'limit', 'offset', 'start');
         
-        $activity = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GET_ACTIVITIES,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$activity = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GET_ACTIVITIES,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $activity;
-    }
+		return $activity;
+	}
 
-    public static function searcActivities($params)
-    {
-        $allQueryFields = array('route_id', 'limit', 'offset', 'activity_type');
+	public static function searcActivities($params)
+	{
+		$allQueryFields = array('route_id', 'limit', 'offset', 'activity_type');
         
-        $activity = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GET_ACTIVITIES,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$activity = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GET_ACTIVITIES,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $activity;
-    }
+		return $activity;
+	}
     
-    public static function sendUserMessage($params)
-    {
-        $allBodyFields = array('activity_type', 'activity_message', 'route_id');
+	public static function sendUserMessage($params)
+	{
+		$allBodyFields = array('activity_type', 'activity_message', 'route_id');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ACTIVITY_FEED,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ACTIVITY_FEED,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
 }

src/Route4Me/Order.php

Indentation +258 added lines, -258 removed lines

@@ -6,333 +6,333 @@
 
 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)) {
-            return null;
-        }
+		if (is_null($randomOrder)) {
+			return null;
+		}
         
-        if (!isset($randomOrder)) {
-            return null;
-        }
+		if (!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)) {
-            return null;
-        }
+		if (is_null($orders)) {
+			return null;
+		}
         
-        if (!isset($orders['results'])) {
-            return null;
-        }
+		if (!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 (variable) {
-            case 'cached_lat':
-            case 'curbside_lat':
-                if ($lat>90 || $lat<-90) {
-                    return false;
-                }
-                break;
-            case 'cached_lng':
-            case 'curbside_lng':
-                if ($lng>180 || $lng<-180) {
-                    return false;
-                }
-                break;
-        }
+		switch (variable) {
+			case 'cached_lat':
+			case 'curbside_lat':
+				if ($lat>90 || $lat<-90) {
+					return false;
+				}
+				break;
+			case 'cached_lng':
+			case 'curbside_lng':
+				if ($lng>180 || $lng<-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/Vehicle.php

Indentation +130 added lines, -130 removed lines

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

src/Route4Me/Route4Me.php

Indentation +347 added lines, -347 removed lines

@@ -7,415 +7,415 @@
 
 class Route4Me
 {
-    static public $apiKey;
-    static public $baseUrl = Endpoint::BASE_URL;
+	static public $apiKey;
+	static public $baseUrl = Endpoint::BASE_URL;
 
-    public static function setApiKey($apiKey)
-    {
-        self::$apiKey = $apiKey;
-    }
+	public static function setApiKey($apiKey)
+	{
+		self::$apiKey = $apiKey;
+	}
 
-    public static function getApiKey()
-    {
-        return self::$apiKey;
-    }
+	public static function getApiKey()
+	{
+		return self::$apiKey;
+	}
 
-    public static function setBaseUrl($baseUrl)
-    {
-        self::$baseUrl = $baseUrl;
-    }
+	public static function setBaseUrl($baseUrl)
+	{
+		self::$baseUrl = $baseUrl;
+	}
 
-    public static function getBaseUrl()
-    {
-        return self::$baseUrl;
-    }
+	public static function getBaseUrl()
+	{
+		return self::$baseUrl;
+	}
     
-    public static function fileUploadRequest($options) {
-        $query = isset($options['query']) ? array_filter($options['query']) : array();
+	public static function fileUploadRequest($options) {
+		$query = isset($options['query']) ? array_filter($options['query']) : array();
 
-        if (sizeof($query)==0) {
-            return null;
+		if (sizeof($query)==0) {
+			return null;
             
-        }
+		}
         
-        $body = isset($options['body']) ? array_filter($options['body']) : null;
+		$body = isset($options['body']) ? array_filter($options['body']) : null;
             
-        $fname = isset($body['strFilename']) ? $body['strFilename'] : '';
+		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
         
-        if ($fname=='') {
-            return null;  
-        } 
+		if ($fname=='') {
+			return null;  
+		} 
 
-        $rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fname)) : '@'.realpath($fname);
+		$rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fname)) : '@'.realpath($fname);
         
-        $url = self::$baseUrl.$options['url'].'?'.http_build_query(array_merge(array('api_key' => self::getApiKey()), $query));
+		$url = self::$baseUrl.$options['url'].'?'.http_build_query(array_merge(array('api_key' => self::getApiKey()), $query));
         
-        $ch = curl_init($url);
+		$ch = curl_init($url);
         
-        $curlOpts = array(
-            CURLOPT_POST => true,
-            CURLOPT_RETURNTRANSFER => false,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE
-        );
+		$curlOpts = array(
+			CURLOPT_POST => true,
+			CURLOPT_RETURNTRANSFER => false,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE
+		);
         
-        curl_setopt_array($ch, $curlOpts);
+		curl_setopt_array($ch, $curlOpts);
         
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
         
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array(
-            "Content-Type: multipart/form-data",
-            'Content-Disposition: form-data; name="strFilename"'
-        ));
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($ch, CURLOPT_POSTFIELDS, array('strFilename' => $rpath)); 
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+			"Content-Type: multipart/form-data",
+			'Content-Disposition: form-data; name="strFilename"'
+		));
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+		curl_setopt($ch, CURLOPT_POSTFIELDS, array('strFilename' => $rpath)); 
         
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
 
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 
-        $json = json_decode($result, true);
+		$json = json_decode($result, true);
         
-        if (200==$code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+		if (200==$code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
 
-    public static function makeRequst($options) {
-        $errorHandler = new myErrorHandler();
+	public static function makeRequst($options) {
+		$errorHandler = new myErrorHandler();
         
-        $old_error_handler = set_error_handler(array($errorHandler, "proc_error"));
+		$old_error_handler = set_error_handler(array($errorHandler, "proc_error"));
         
-        $method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ? array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
+		$method = isset($options['method']) ? $options['method'] : 'GET';
+		$query = isset($options['query']) ? array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
 
-        $body = isset($options['body']) ? $options['body'] : null;
-        $file = isset($options['FILE']) ? $options['FILE'] : null;
-        $headers = array(
-            "User-Agent: Route4Me php-sdk"
-        );
+		$body = isset($options['body']) ? $options['body'] : null;
+		$file = isset($options['FILE']) ? $options['FILE'] : null;
+		$headers = array(
+			"User-Agent: Route4Me php-sdk"
+		);
         
-        if (isset($options['HTTPHEADER'])) {
-            $headers[] = $options['HTTPHEADER'];
-        }
+		if (isset($options['HTTPHEADER'])) {
+			$headers[] = $options['HTTPHEADER'];
+		}
          
-        if (isset($options['HTTPHEADERS'])) {
-            foreach ($options['HTTPHEADERS'] As $header) {
-                $headers[] = $header;
-            } 
-        }
+		if (isset($options['HTTPHEADERS'])) {
+			foreach ($options['HTTPHEADERS'] As $header) {
+				$headers[] = $header;
+			} 
+		}
 
-        $ch = curl_init();
+		$ch = curl_init();
         
-        $url = $options['url'].'?'.http_build_query(array_merge(
-            $query, array('api_key' => self::getApiKey())
-        ));
+		$url = $options['url'].'?'.http_build_query(array_merge(
+			$query, array('api_key' => self::getApiKey())
+		));
 
-        $baseUrl = self::getBaseUrl();
+		$baseUrl = self::getBaseUrl();
 
-        $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl.$url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 80,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => $headers
-        );
+		$curlOpts = arraY(
+			CURLOPT_URL            => $baseUrl.$url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 80,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => $headers
+		);
         
-        curl_setopt_array($ch, $curlOpts);
+		curl_setopt_array($ch, $curlOpts);
         
-        if ($file!=null) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-            $fp=fopen($file, 'r');
-            curl_setopt($ch, CURLOPT_INFILE, $fp);
-            curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
-        }
+		if ($file!=null) {
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
+			$fp=fopen($file, 'r');
+			curl_setopt($ch, CURLOPT_INFILE, $fp);
+			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
+		}
 
-        switch ($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            break;
-        case 'DELETEARRAY':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
-            break;
-        case 'POST':
-           if (isset($body)) {
-                $bodyData = json_encode($body);
-               if (isset($options['HTTPHEADER'])) {
-                  if (strpos($options['HTTPHEADER'], "multipart/form-data")>0) {
-                      $bodyData = $body;
-                  }
-               }
+		switch ($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+			break;
+		case 'DELETEARRAY':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			break;
+		case 'POST':
+		   if (isset($body)) {
+				$bodyData = json_encode($body);
+			   if (isset($options['HTTPHEADER'])) {
+				  if (strpos($options['HTTPHEADER'], "multipart/form-data")>0) {
+					  $bodyData = $body;
+				  }
+			   }
                
-               curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData); 
-            } 
-            break;
-        case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			   curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData); 
+			} 
+			break;
+		case 'ADD':
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
-        if (is_numeric(array_search($method, array('DELETE', 'PUT')))) {
-            if (isset($body)) {
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
-            } 
-        }
+		if (is_numeric(array_search($method, array('DELETE', 'PUT')))) {
+			if (isset($body)) {
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
+			} 
+		}
 
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
 
-        $isxml = FALSE;
-        $jxml = "";
-        if (strpos($result, '<?xml')>-1) {
-            $xml = simplexml_load_string($result);
-            //$jxml = json_encode($xml);
-            $jxml = self::object2array($xml);
-            $isxml = TRUE;
-        }
+		$isxml = FALSE;
+		$jxml = "";
+		if (strpos($result, '<?xml')>-1) {
+			$xml = simplexml_load_string($result);
+			//$jxml = json_encode($xml);
+			$jxml = self::object2array($xml);
+			$isxml = TRUE;
+		}
         
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
         
-        if (200==$code) {
-            if ($isxml) {
-                $json = $jxml;
-            } else {
-                $json = json_decode($result, true);
-            }
+		if (200==$code) {
+			if ($isxml) {
+				$json = $jxml;
+			} else {
+				$json = json_decode($result, true);
+			}
             
-            if (isset($json['errors'])) {
-                throw new ApiError(implode(', ', $json['errors']));
-            } else {
-                return $json;
-            }
-        }  elseif (409==$code) {
-            throw new ApiError('Wrong API key');
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+			if (isset($json['errors'])) {
+				throw new ApiError(implode(', ', $json['errors']));
+			} else {
+				return $json;
+			}
+		}  elseif (409==$code) {
+			throw new ApiError('Wrong API key');
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
 
-    /**
-     * @param $object: JSON object
-     */
-    public static function object2array($object)
-    {
-        return @json_decode(@json_encode($object), 1);
-    }
+	/**
+	 * @param $object: JSON object
+	 */
+	public static function object2array($object)
+	{
+		return @json_decode(@json_encode($object), 1);
+	}
 
-    public static function makeUrlRequst($url, $options) {
-        $method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
-        $body = isset($options['body']) ? $options['body'] : null;
-        $ch = curl_init();
+	public static function makeUrlRequst($url, $options) {
+		$method = isset($options['method']) ? $options['method'] : 'GET';
+		$query = isset($options['query']) ?
+			array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
+		$body = isset($options['body']) ? $options['body'] : null;
+		$ch = curl_init();
         
-        $curlOpts = arraY(
-            CURLOPT_URL            => $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => array(
-                'User-Agent' => 'Route4Me php-sdk'
-            )
-        );
+		$curlOpts = arraY(
+			CURLOPT_URL            => $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => array(
+				'User-Agent' => 'Route4Me php-sdk'
+			)
+		);
         
-        curl_setopt_array($ch, $curlOpts);
+		curl_setopt_array($ch, $curlOpts);
         
-        switch ($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            break;
-        case 'DELETEARRAY':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
-            break;
-        case 'POST':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); 
-            break;
-        case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+		switch ($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+			break;
+		case 'DELETEARRAY':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			break;
+		case 'POST':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); 
+			break;
+		case 'ADD':
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
         
-        if (is_numeric(array_search($method, array('DELETE', 'PUT', 'POST')))) {
-            if (isset($body)) {
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
-            } 
-        }
+		if (is_numeric(array_search($method, array('DELETE', 'PUT', 'POST')))) {
+			if (isset($body)) {
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
+			} 
+		}
 
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
         
-        $isxml = FALSE;
-        $jxml = "";
+		$isxml = FALSE;
+		$jxml = "";
         
-        if (strpos($result, '<?xml')>-1) {
-            $xml = simplexml_load_string($result);
-            $jxml = json_encode($xml);
-            $isxml = TRUE;
-        }
+		if (strpos($result, '<?xml')>-1) {
+			$xml = simplexml_load_string($result);
+			$jxml = json_encode($xml);
+			$isxml = TRUE;
+		}
         
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
         
-        if ($isxml) {
-            $json = $jxml;
-        } else {
-            $json = json_decode($result, true);
-        }
+		if ($isxml) {
+			$json = $jxml;
+		} else {
+			$json = json_decode($result, true);
+		}
         
-        if (200==$code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+		if (200==$code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
     
-    /**
-     * Prints on the screen main keys and values of the array 
-     * @param $results: object to be printed on the screen.
-     * @param $deepPrinting: if true, object will be printed recursively.
-     */
-    public static function simplePrint($results, $deepPrinting = null)
-    {
-        if (isset($results)) {
-            if (is_array($results)) {
-                foreach ($results as $key=>$result) {
-                    if (is_array($result)) {
-                        foreach ($result as $key1=>$result1) {
-                            if (is_array($result1)) {
-                                  if ($deepPrinting) {
-                                      echo "<br>$key1 ------><br>";
-                                      Route4Me::simplePrint($result1, true);
-                                      echo "------<br>";
-                                  } else {
-                                      echo $key1." --> "."Array() <br>";
-                                  } 
-                            } else {
-                                if (is_object($result1)) {
-                                    if ($deepPrinting) {
-                                        echo "<br>$key1 ------><br>";
-                                        $oarray = (array)$result1;
-                                        Route4Me::simplePrint($oarray, true);
-                                        echo "------<br>";
-                                    } else {
-                                        echo $key1." --> "."Object <br>";
-                                    } 
-                                } else {
-                                    if (!is_null($result1)) {
-                                        echo $key1." --> ".$result1."<br>"; 
-                                    }   
-                                }
-                            }
-                        }
-                    } else {
-                        if (is_object($result)) {
-                            if ($deepPrinting) {
-                                echo "<br>$key ------><br>";
-                                $oarray = (array)$result;
-                                Route4Me::simplePrint($oarray, true);
-                                echo "------<br>";
-                            } else {
-                                echo $key." --> "."Object <br>";
-                            } 
-                        } else {
-                            if (!is_null($result)) {
-                                echo $key." --> ".$result."<br>";
-                            }
-                        }
+	/**
+	 * Prints on the screen main keys and values of the array 
+	 * @param $results: object to be printed on the screen.
+	 * @param $deepPrinting: if true, object will be printed recursively.
+	 */
+	public static function simplePrint($results, $deepPrinting = null)
+	{
+		if (isset($results)) {
+			if (is_array($results)) {
+				foreach ($results as $key=>$result) {
+					if (is_array($result)) {
+						foreach ($result as $key1=>$result1) {
+							if (is_array($result1)) {
+								  if ($deepPrinting) {
+									  echo "<br>$key1 ------><br>";
+									  Route4Me::simplePrint($result1, true);
+									  echo "------<br>";
+								  } else {
+									  echo $key1." --> "."Array() <br>";
+								  } 
+							} else {
+								if (is_object($result1)) {
+									if ($deepPrinting) {
+										echo "<br>$key1 ------><br>";
+										$oarray = (array)$result1;
+										Route4Me::simplePrint($oarray, true);
+										echo "------<br>";
+									} else {
+										echo $key1." --> "."Object <br>";
+									} 
+								} else {
+									if (!is_null($result1)) {
+										echo $key1." --> ".$result1."<br>"; 
+									}   
+								}
+							}
+						}
+					} else {
+						if (is_object($result)) {
+							if ($deepPrinting) {
+								echo "<br>$key ------><br>";
+								$oarray = (array)$result;
+								Route4Me::simplePrint($oarray, true);
+								echo "------<br>";
+							} else {
+								echo $key." --> "."Object <br>";
+							} 
+						} else {
+							if (!is_null($result)) {
+								echo $key." --> ".$result."<br>";
+							}
+						}
                         
-                    }
-                    //echo "<br>";
-                }
-            } 
-        }
-    }
+					}
+					//echo "<br>";
+				}
+			} 
+		}
+	}
 
-    /**
-     * Generates query or body parameters.
-     * @param $allFields: all known fields could be used for parameters generation.
-     * @param $params: input parameters (array or object)
-     */
-    public static function generateRequestParameters($allFields, $params)
-    {
-        $generatedParams = array();
+	/**
+	 * Generates query or body parameters.
+	 * @param $allFields: all known fields could be used for parameters generation.
+	 * @param $params: input parameters (array or object)
+	 */
+	public static function generateRequestParameters($allFields, $params)
+	{
+		$generatedParams = array();
         
-        if (is_array($params)) {
-            foreach ($allFields as $field) {
-                if (isset($params[$field])) {
-                    $generatedParams[$field] = $params[$field];
-                }
-            }
-        } elseif (is_object($params)) {
-            foreach ($allFields as $field) {
-                if (isset($params->{$field})) {
-                    $generatedParams[$field] = $params->{$field};
-                }
-            }
-        }
+		if (is_array($params)) {
+			foreach ($allFields as $field) {
+				if (isset($params[$field])) {
+					$generatedParams[$field] = $params[$field];
+				}
+			}
+		} elseif (is_object($params)) {
+			foreach ($allFields as $field) {
+				if (isset($params->{$field})) {
+					$generatedParams[$field] = $params->{$field};
+				}
+			}
+		}
 
-        return $generatedParams;
-    }
+		return $generatedParams;
+	}
     
-    /**
-     * Returns an array of the object properties
-     * @param $object: An object.
-     * @param $exclude: array of the object parameters to be excluded from the returned array.
-     */
-    public static function getObjectProperties($object, $exclude)
-    {
-        $objectParameters = array();
+	/**
+	 * Returns an array of the object properties
+	 * @param $object: An object.
+	 * @param $exclude: array of the object parameters to be excluded from the returned array.
+	 */
+	public static function getObjectProperties($object, $exclude)
+	{
+		$objectParameters = array();
         
-        foreach (get_object_vars($object) as $key => $value) {
-            if (property_exists($object, $key)) {
-                if (!is_numeric(array_search($key, $exclude))) {
-                    array_push($objectParameters, $key);
-                }
-            }
-        }
+		foreach (get_object_vars($object) as $key => $value) {
+			if (property_exists($object, $key)) {
+				if (!is_numeric(array_search($key, $exclude))) {
+					array_push($objectParameters, $key);
+				}
+			}
+		}
         
-        return $objectParameters;
-    }
+		return $objectParameters;
+	}
     
-    /**
-     * Returns url path generated from the array of the fields and parameters.
-     * @param $allFields; array of the paossible fields (parameter names).
-     * @param $params: input parameters (array or object).
-     */
-    public static function generateUrlPath($allFields, $params)
-    {
-        $generatedPath = "";
+	/**
+	 * Returns url path generated from the array of the fields and parameters.
+	 * @param $allFields; array of the paossible fields (parameter names).
+	 * @param $params: input parameters (array or object).
+	 */
+	public static function generateUrlPath($allFields, $params)
+	{
+		$generatedPath = "";
 
-        if (is_array($params)) {
-            foreach ($allFields as $field) {
-                if (isset($params[$field])) {
-                    $generatedPath .= $params[$field].'/';
-                }
-            }
-        } elseif (is_object($params)) {
-            foreach ($allFields as $field) {
-                if (isset($params->{$field})) {
-                    $generatedPath .= $params->{$field}.'/';
-                }
-            }
-        }
+		if (is_array($params)) {
+			foreach ($allFields as $field) {
+				if (isset($params[$field])) {
+					$generatedPath .= $params[$field].'/';
+				}
+			}
+		} elseif (is_object($params)) {
+			foreach ($allFields as $field) {
+				if (isset($params->{$field})) {
+					$generatedPath .= $params->{$field}.'/';
+				}
+			}
+		}
         
-        return $generatedPath;
-    }
+		return $generatedPath;
+	}
 }

src/Route4Me/Geocoding.php

Indentation +75 added lines, -75 removed lines

@@ -6,106 +6,106 @@
 
 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)
-    {
-        $url_query = Endpoint::STREET_DATA;
+	public static function getStreetData($params)
+	{
+		$url_query = 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::makeUrlRequst($url_query, array(
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeUrlRequst($url_query, array(
+			'method' => 'GET',
+			'query'  => $query
+		));
         
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getZipCode($params)
-    {
-        $url_query = Endpoint::STREET_DATA_ZIPCODE;
+	public static function getZipCode($params)
+	{
+		$url_query = 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::makeUrlRequst($url_query, array(
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeUrlRequst($url_query, array(
+			'method' => 'GET',
+			'query'  => $query
+		));
         
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getService($params)
-    {
-        $url_query = Endpoint::STREET_DATA_SERVICE;
+	public static function getService($params)
+	{
+		$url_query = 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::makeUrlRequst($url_query, array(
-            'method' => 'GET',
-            'query'  => $query
-        ));
+		$response = Route4Me::makeUrlRequst($url_query, array(
+			'method' => 'GET',
+			'query'  => $query
+		));
         
-        return $response;
-    }
+		return $response;
+	}
 }