route4me / route4me-php-sdk

src/Route4Me/AddressBookLocation.php

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

Indentation +11 added lines, -11 removed lines

@@ -26,20 +26,20 @@
 
 $addresses = array();
 foreach ($json as $address) {
-    $addresses[] = Address::fromArray($address);
+	$addresses[] = Address::fromArray($address);
 }
 
 $parameters = RouteParameters::fromArray(array(
-    "algorithm_type"          => AlgorithmType::CVRP_TW_SD,
-    "distance_unit"           => DistanceUnit::MILES,
-    "device_type"             => DeviceType::WEB,
-    "optimize"                => OptimizationType::DISTANCE,
-    "metric"                  => Metric::GEODESIC,
-    "route_max_duration"      => 86400 * 2,
-    "travel_mode"             => TravelMode::DRIVING,
-    "vehicle_capacity"        => 50,
-    "vehicle_max_distance_mi" => 10000,
-    "parts"                   => 50
+	"algorithm_type"          => AlgorithmType::CVRP_TW_SD,
+	"distance_unit"           => DistanceUnit::MILES,
+	"device_type"             => DeviceType::WEB,
+	"optimize"                => OptimizationType::DISTANCE,
+	"metric"                  => Metric::GEODESIC,
+	"route_max_duration"      => 86400 * 2,
+	"travel_mode"             => TravelMode::DRIVING,
+	"vehicle_capacity"        => 50,
+	"vehicle_max_distance_mi" => 10000,
+	"parts"                   => 50
 ));
 
 $optimizationParams = new OptimizationProblemParams;

examples/SingleDriverMultipleTimeWindows.php

Indentation +16 added lines, -16 removed lines

@@ -25,18 +25,18 @@ 
 
 $addresses = array();
 foreach ($json as $address) {
-    $addresses[] = Address::fromArray($address);
+	$addresses[] = Address::fromArray($address);
 }
 
 $parameters = RouteParameters::fromArray(array(
-    "algorithm_type"     => Algorithmtype::TSP,
-    "route_name"         => "Single Driver Multiple TimeWindows 12 Stops",
-    "route_date"         => time() + 24 * 60 * 60,
-    "route_time"         => 5 * 3600 + 30 * 60,
-    "distance_unit"      => DistanceUnit::MILES,
-    "device_type"        => DeviceType::WEB,
-    "optimize"           => OptimizationType::DISTANCE,
-    "metric"             => Metric::GEODESIC
+	"algorithm_type"     => Algorithmtype::TSP,
+	"route_name"         => "Single Driver Multiple TimeWindows 12 Stops",
+	"route_date"         => time() + 24 * 60 * 60,
+	"route_time"         => 5 * 3600 + 30 * 60,
+	"distance_unit"      => DistanceUnit::MILES,
+	"device_type"        => DeviceType::WEB,
+	"optimize"           => OptimizationType::DISTANCE,
+	"metric"             => Metric::GEODESIC
 ));
 
 $optimizationParams = new OptimizationProblemParams;
@@ -46,11 +46,11 @@ 
 $problem = OptimizationProblem::optimize($optimizationParams);
 
 foreach ((array)$problem as $key => $value) {
-    if (is_string($value)) {
-        echo $key." --> ".$value."<br>";
-    } else {
-        echo "************ $key ************* <br>";
-        Route4Me::simplePrint((array)$value, true);
-        echo "******************************* <br>";
-    }
+	if (is_string($value)) {
+		echo $key." --> ".$value."<br>";
+	} else {
+		echo "************ $key ************* <br>";
+		Route4Me::simplePrint((array)$value, true);
+		echo "******************************* <br>";
+	}
 }

examples/SingleDepotMultipleDriverNoTimeWindow.php

Indentation +22 added lines, -22 removed lines

@@ -26,24 +26,24 @@ 
 
 $addresses = array();
 foreach ($json as $address) {
-    $addresses[] = Address::fromArray($address);
+	$addresses[] = Address::fromArray($address);
 }
 
 $parameters = RouteParameters::fromArray(array(
-    "algorithm_type"          => Algorithmtype::CVRP_TW_SD,
-    "route_name"              => "Single Depot, Multiple Driver, No Time Window",
-    "route_date"              => time() + 24 * 60 * 60,
-    "route_time"              => 60 * 60 * 7,
-    "rt"                      => TRUE,
-    "distance_unit"           => DistanceUnit::MILES,
-    "device_type"             => DeviceType::WEB,
-    "optimize"                => OptimizationType::TIME,
-    "metric"                  => Metric::GEODESIC,
-    "route_max_duration"      => 86400,
-    "travel_mode"             => TravelMode::DRIVING,
-    "vehicle_capacity"        => 20,
-    "vehicle_max_distance_mi" => 99999,
-    "parts"                   => 4
+	"algorithm_type"          => Algorithmtype::CVRP_TW_SD,
+	"route_name"              => "Single Depot, Multiple Driver, No Time Window",
+	"route_date"              => time() + 24 * 60 * 60,
+	"route_time"              => 60 * 60 * 7,
+	"rt"                      => TRUE,
+	"distance_unit"           => DistanceUnit::MILES,
+	"device_type"             => DeviceType::WEB,
+	"optimize"                => OptimizationType::TIME,
+	"metric"                  => Metric::GEODESIC,
+	"route_max_duration"      => 86400,
+	"travel_mode"             => TravelMode::DRIVING,
+	"vehicle_capacity"        => 20,
+	"vehicle_max_distance_mi" => 99999,
+	"parts"                   => 4
 ));
 
 $optimizationParams = new OptimizationProblemParams;
@@ -53,11 +53,11 @@ 
 $problem = OptimizationProblem::optimize($optimizationParams);
 
 foreach ((array)$problem as $key => $value) {
-    if (is_string($value)) {
-        echo $key." --> ".$value."<br>";
-    } else {
-        echo "************ $key ************* <br>";
-        Route4Me::simplePrint((array)$value, true);
-        echo "******************************* <br>";
-    }
+	if (is_string($value)) {
+		echo $key." --> ".$value."<br>";
+	} else {
+		echo "************ $key ************* <br>";
+		Route4Me::simplePrint((array)$value, true);
+		echo "******************************* <br>";
+	}
 }

examples/single_driver_round_trip.php

Indentation +17 added lines, -17 removed lines

@@ -27,19 +27,19 @@ 
 $addresses = array();
 
 foreach ($json as $address) {
-    $addresses[] = Address::fromArray($address);
+	$addresses[] = Address::fromArray($address);
 }
 
 $parameters = RouteParameters::fromArray(array(
-    "algorithm_type"          => AlgorithmType::TSP,
-    "distance_unit"           => DistanceUnit::MILES,
-    "device_type"             => DeviceType::WEB,
-    "optimize"                => OptimizationType::DISTANCE,
-    "travel_mode"             => TravelMode::DRIVING,
-    "route_max_duration"      => 86400,
-    "vehicle_capacity"        => 1,
-    "vehicle_max_distance_mi" => 10000,
-    "rt"                      => true
+	"algorithm_type"          => AlgorithmType::TSP,
+	"distance_unit"           => DistanceUnit::MILES,
+	"device_type"             => DeviceType::WEB,
+	"optimize"                => OptimizationType::DISTANCE,
+	"travel_mode"             => TravelMode::DRIVING,
+	"route_max_duration"      => 86400,
+	"vehicle_capacity"        => 1,
+	"vehicle_max_distance_mi" => 10000,
+	"rt"                      => true
 ));
 
 $optimizationParams = new OptimizationProblemParams;
@@ -49,11 +49,11 @@ 
 $problems = OptimizationProblem::optimize($optimizationParams);
 
 foreach ($problems as $problem) {
-    if (is_array($problem) || is_object($problem)) {
-        foreach ($problem as $key => $value) {
-            if (!is_object($value)) {
-                echo $key." --> ".$value."<br>";
-            }
-        }
-    }
+	if (is_array($problem) || is_object($problem)) {
+		foreach ($problem as $key => $value) {
+			if (!is_object($value)) {
+				echo $key." --> ".$value."<br>";
+			}
+		}
+	}
 }

examples/Members/create_device_record.php

Indentation +3 added lines, -3 removed lines

@@ -13,9 +13,9 @@
 Route4Me::setApiKey('11111111111111111111111111111111');
 
 $recordParameters = Member::fromArray(array(
-    'device_id'   => '546546516',
-    'device_type' => 'IPAD',
-    'format'      => 'json',
+	'device_id'   => '546546516',
+	'device_type' => 'IPAD',
+	'format'      => 'json',
 ));
 
 $member = new Member();

examples/Members/purchase_user_license.php

Indentation +8 added lines, -8 removed lines

@@ -13,14 +13,14 @@
 Route4Me::setApiKey('11111111111111111111111111111111');
 
 $recordParameters = Member::fromArray(array(
-    'member_id'         => 77777,
-    'session_guid'      => '454563',
-    'device_id'         => '54564',
-    'device_type'       =>'ipad',
-    'subscription_name' =>'IPAD_MONTHLY',
-    'token'             =>'4/P7q7W91a-oMsCeLvIaQm6bTrgtp7',
-    'payload'           =>'APA91bHun4MxP5egoKMwt2KZFBaFUH-1RYqx',
-    'format'            =>'json'
+	'member_id'         => 77777,
+	'session_guid'      => '454563',
+	'device_id'         => '54564',
+	'device_type'       =>'ipad',
+	'subscription_name' =>'IPAD_MONTHLY',
+	'token'             =>'4/P7q7W91a-oMsCeLvIaQm6bTrgtp7',
+	'payload'           =>'APA91bHun4MxP5egoKMwt2KZFBaFUH-1RYqx',
+	'format'            =>'json'
 ));
 
 $member = new Member();

src/Route4Me/Address.php

Indentation +236 added lines, -236 removed lines

@@ -7,284 +7,284 @@
 
 class Address extends Common
 {
-    public $route_destination_id;
-    public $alias;
-    public $member_id;
-    public $address;
-    public $addressUpdate;
-    public $is_depot = false;
-    public $lat;
-    public $lng;
-    public $route_id;
-    public $original_route_id;
-    public $optimization_problem_id;
-    public $sequence_no;
-    public $geocoded;
-    public $preferred_geocoding;
-    public $failed_geocoding;
-    public $geocodings = array();
-    public $contact_id;
-    public $is_visited;
-    public $customer_po;
-    public $invoice_no;
-    public $reference_no;
-    public $order_no;
-    public $weight;
-    public $cost;
-    public $revenue;
-    public $cube;
-    public $pieces;
-    public $email;
-    public $phone;
-    public $tracking_number;
-    public $destination_note_count;
-    public $drive_time_to_next_destination;
-    public $distance_to_next_destination;
-    public $generated_time_window_start;
-    public $generated_time_window_end;
-    public $time_window_start;
-    public $time_window_end;
-    public $time;
-    public $notes;
-    public $timestamp_last_visited;
-    public $custom_fields = array();
-    public $manifest = array();
+	public $route_destination_id;
+	public $alias;
+	public $member_id;
+	public $address;
+	public $addressUpdate;
+	public $is_depot = false;
+	public $lat;
+	public $lng;
+	public $route_id;
+	public $original_route_id;
+	public $optimization_problem_id;
+	public $sequence_no;
+	public $geocoded;
+	public $preferred_geocoding;
+	public $failed_geocoding;
+	public $geocodings = array();
+	public $contact_id;
+	public $is_visited;
+	public $customer_po;
+	public $invoice_no;
+	public $reference_no;
+	public $order_no;
+	public $weight;
+	public $cost;
+	public $revenue;
+	public $cube;
+	public $pieces;
+	public $email;
+	public $phone;
+	public $tracking_number;
+	public $destination_note_count;
+	public $drive_time_to_next_destination;
+	public $distance_to_next_destination;
+	public $generated_time_window_start;
+	public $generated_time_window_end;
+	public $time_window_start;
+	public $time_window_end;
+	public $time;
+	public $notes;
+	public $timestamp_last_visited;
+	public $custom_fields = array();
+	public $manifest = array();
     
-    public $first_name;
-    public $last_name;
-    public $is_departed;
-    public $timestamp_last_departed;
-    public $order_id;
-    public $priority;
-    public $curbside_lat;
-    public $curbside_lng;
-    public $time_window_start_2;
-    public $time_window_end_2;
+	public $first_name;
+	public $last_name;
+	public $is_departed;
+	public $timestamp_last_departed;
+	public $order_id;
+	public $priority;
+	public $curbside_lat;
+	public $curbside_lng;
+	public $time_window_start_2;
+	public $time_window_end_2;
 
-    public static function fromArray(array $params)
-    {
-        $address = new Address();
-        foreach ($params as $key => $value) {
-            if (property_exists($address, $key)) {
-                $address->{$key} = $value;
-            }
-        }
+	public static function fromArray(array $params)
+	{
+		$address = new Address();
+		foreach ($params as $key => $value) {
+			if (property_exists($address, $key)) {
+				$address->{$key} = $value;
+			}
+		}
         
-        return $address;
-    }
+		return $address;
+	}
 
-    public static function getAddress($routeId, $addressId)
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'             => $routeId,
-                'route_destination_id' => $addressId,
-            )
-        ));
+	public static function getAddress($routeId, $addressId)
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'             => $routeId,
+				'route_destination_id' => $addressId,
+			)
+		));
     
-        return Address::fromArray($address);
-    }
+		return Address::fromArray($address);
+	}
     
-    /*Get notes from the specified route destination
+	/*Get notes from the specified route destination
      * Returns an address object with notes, if an address exists, otherwise - return null.
      */
-    public static function GetAddressesNotes($noteParams)
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'             => isset($noteParams['route_id']) ? $noteParams['route_id'] : null, 
-                'route_destination_id' => isset($noteParams['route_destination_id']) 
-                                             ? $noteParams['route_destination_id'] : null,
-                'notes'                => 1,
-            )
-        ));
+	public static function GetAddressesNotes($noteParams)
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'             => isset($noteParams['route_id']) ? $noteParams['route_id'] : null, 
+				'route_destination_id' => isset($noteParams['route_destination_id']) 
+											 ? $noteParams['route_destination_id'] : null,
+				'notes'                => 1,
+			)
+		));
     
-        return $address;
-    }
+		return $address;
+	}
 
-    public function update()
-    {
-        $addressUpdate = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'PUT',
-            'body'   => $this->toArray(),
-            'query'  => array(
-                'route_id'             => $this->route_id,
-                'route_destination_id' => $this->route_destination_id,
-            ),
-        ));
+	public function update()
+	{
+		$addressUpdate = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'PUT',
+			'body'   => $this->toArray(),
+			'query'  => array(
+				'route_id'             => $this->route_id,
+				'route_destination_id' => $this->route_destination_id,
+			),
+		));
     
-        return Address::fromArray($addressUpdate);
-    }
+		return Address::fromArray($addressUpdate);
+	}
     
-    public function markAddress($params)
-    {
-        $allQueryFields = array('route_id', 'route_destination_id');
-        $allBodyFields = array('is_visited', 'is_departed');
+	public function markAddress($params)
+	{
+		$allQueryFields = array('route_id', 'route_destination_id');
+		$allBodyFields = array('is_visited', 'is_departed');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
     
-        return $result;
-    }
+		return $result;
+	}
     
-    public function markAsDeparted($params)
-    {
-        $allQueryFields = array('route_id', 'address_id', 'is_departed', 'member_id');
+	public function markAsDeparted($params)
+	{
+		$allQueryFields = array('route_id', 'address_id', 'is_departed', 'member_id');
         
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::MARK_ADDRESS_DEPARTED,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::MARK_ADDRESS_DEPARTED,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
     
-        return $address;
-    }
+		return $address;
+	}
     
-    public function markAsVisited($params)
-    {
-        $allQueryFields = array('route_id', 'address_id', 'is_visited', 'member_id');
+	public function markAsVisited($params)
+	{
+		$allQueryFields = array('route_id', 'address_id', 'is_visited', 'member_id');
         
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::UPDATE_ADDRESS_VISITED,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::UPDATE_ADDRESS_VISITED,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
     
-        return $address;
-    }
+		return $address;
+	}
 
-    public function deleteAddress()
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'DELETE',
-            'query'  => array(
-                'route_id'             => $this->route_id,
-                'route_destination_id' => $this->route_destination_id,
-            )
-        ));
+	public function deleteAddress()
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'DELETE',
+			'query'  => array(
+				'route_id'             => $this->route_id,
+				'route_destination_id' => $this->route_destination_id,
+			)
+		));
     
-        return (bool)$address['deleted'];
-    }
+		return (bool)$address['deleted'];
+	}
     
-    public function moveDestinationToRoute($params)
-    {
-        $allBodyFields = array('to_route_id', 'route_destination_id', 'after_destination_id');
+	public function moveDestinationToRoute($params)
+	{
+		$allBodyFields = array('to_route_id', 'route_destination_id', 'after_destination_id');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::MOVE_ROUTE_DESTINATION,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::MOVE_ROUTE_DESTINATION,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function AddAddressNote($params)
-    {
-        $allQueryFields = array('route_id', 'address_id', 'dev_lat', 'dev_lng', 'device_type');
-        $allBodyFields = array('strNoteContents', 'strUpdateType');
+	public function AddAddressNote($params)
+	{
+		$allQueryFields = array('route_id', 'address_id', 'dev_lat', 'dev_lng', 'device_type');
+		$allBodyFields = array('strNoteContents', 'strUpdateType');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_NOTES_ADD,
-            '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_NOTES_ADD,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function AddNoteFile($params)
-    {
-        $allQueryFields = array('route_id', 'address_id', 'dev_lat', 'dev_lng', 'device_type', 'strUpdateType');
+	public function AddNoteFile($params)
+	{
+		$allQueryFields = array('route_id', 'address_id', 'dev_lat', 'dev_lng', 'device_type', 'strUpdateType');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_NOTES_ADD,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => array(
-                'strFilename'  => isset($params['strFilename']) ? Route4Me::getFileRealPath($params['strFilename']) : "" 
-            ),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_NOTES_ADD,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => array(
+				'strFilename'  => isset($params['strFilename']) ? Route4Me::getFileRealPath($params['strFilename']) : "" 
+			),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function createCustomNoteType($params)
-    {
-        $allBodyFields = array('type', 'values');
+	public function createCustomNoteType($params)
+	{
+		$allBodyFields = array('type', 'values');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function removeCustomNoteType($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
-            'method' => 'DELETE',
-            'body'   => array(
-                'id' => isset($params['id']) ? $params['id'] : null
-            )
-        ));
+	public function removeCustomNoteType($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
+			'method' => 'DELETE',
+			'body'   => array(
+				'id' => isset($params['id']) ? $params['id'] : null
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function getAllCustomNoteTypes()
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
-            'method' => 'GET'
-        ));
+	public function getAllCustomNoteTypes()
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
+			'method' => 'GET'
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function addCustomNoteToRoute($params)
-    {
-        $customArray = array();
+	public function addCustomNoteToRoute($params)
+	{
+		$customArray = array();
         
-        foreach ($params as $key => $value) {
-            if (strpos($key, "custom_note_type")!==false) {
-                $customArray[$key] = $value;
-            }
-        }
+		foreach ($params as $key => $value) {
+			if (strpos($key, "custom_note_type")!==false) {
+				$customArray[$key] = $value;
+			}
+		}
         
-        $allQueryFields = array('route_id', 'address_id', 'format', 'dev_lat', 'dev_lng');
-        $allBodyFields = array('strUpdateType', 'strUpdateType', 'strNoteContents');
+		$allQueryFields = array('route_id', 'address_id', 'format', 'dev_lat', 'dev_lng');
+		$allBodyFields = array('strUpdateType', 'strUpdateType', 'strNoteContents');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_NOTES_ADD,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'  => array_merge(Route4Me::generateRequestParameters($allBodyFields, $params), $customArray),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_NOTES_ADD,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'  => array_merge(Route4Me::generateRequestParameters($allBodyFields, $params), $customArray),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    function getAddressId()
-    {
-        return $this->route_destination_id;
-    }
+	function getAddressId()
+	{
+		return $this->route_destination_id;
+	}
 }

src/Route4Me/Route4Me.php

Indentation +248 added lines, -248 removed lines

@@ -7,291 +7,291 @@
 
 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 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 = isset($options['url']) ? $options['url'].'?'.http_build_query(array_merge(
-            $query, array('api_key' => self::getApiKey())
-        )) : "";
+		$url = isset($options['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);
+	}
 
     
-    /**
-     * 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;
+	}
     
-    public static function getFileRealPath($fileName)
-    {
-        $rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fileName)) : '@'.realpath($fileName);
+	public static function getFileRealPath($fileName)
+	{
+		$rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fileName)) : '@'.realpath($fileName);
         
-        return $rpath;
-    }
+		return $rpath;
+	}
 }