route4me / route4me-php-sdk

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

src/Route4Me/Route.php

Indentation +336 added lines, -336 removed lines

@@ -9,409 +9,409 @@
 
 class Route extends Common
 {
-    public $route_id;
-    public $member_id;
-    public $route_destination_id;
-    public $optimization_problem_id;
-    public $vehicle_alias;
-    public $driver_alias;
-    public $trip_distance;
-    public $mpg;
-    public $gas_price;
-    public $route_duration_sec;
-    public $destination_count;
-    public $parameters;
-    public $addresses = array();
-    public $links = array();
-    public $directions = array();
-    public $path = array();
-    public $tracking_history = array();
-    public $recipient_email;
-    public $httpheaders;
-    public $is_unrouted;
-    public $time;
+	public $route_id;
+	public $member_id;
+	public $route_destination_id;
+	public $optimization_problem_id;
+	public $vehicle_alias;
+	public $driver_alias;
+	public $trip_distance;
+	public $mpg;
+	public $gas_price;
+	public $route_duration_sec;
+	public $destination_count;
+	public $parameters;
+	public $addresses = array();
+	public $links = array();
+	public $directions = array();
+	public $path = array();
+	public $tracking_history = array();
+	public $recipient_email;
+	public $httpheaders;
+	public $is_unrouted;
+	public $time;
     
-    public $dev_lat;
-    public $dev_lng;
+	public $dev_lat;
+	public $dev_lng;
     
-    public $user_route_rating;
-    public $member_email;
-    public $member_first_name;
-    public $member_last_name;
-    public $channel_name;
-    public $route_cost;
-    public $route_revenue;
-    public $net_revenue_per_distance_unit;
-    public $created_timestamp;
-    public $planned_total_route_duration;
-    public $actual_travel_distance;
-    public $actual_travel_time;
-    public $actual_footsteps;
-    public $working_time;
-    public $driving_time;
-    public $idling_time;
-    public $paying_miles;
-    public $geofence_polygon_type;
-    public $geofence_polygon_size;
-    public $notes;
-    public $member_config_storage;
+	public $user_route_rating;
+	public $member_email;
+	public $member_first_name;
+	public $member_last_name;
+	public $channel_name;
+	public $route_cost;
+	public $route_revenue;
+	public $net_revenue_per_distance_unit;
+	public $created_timestamp;
+	public $planned_total_route_duration;
+	public $actual_travel_distance;
+	public $actual_travel_time;
+	public $actual_footsteps;
+	public $working_time;
+	public $driving_time;
+	public $idling_time;
+	public $paying_miles;
+	public $geofence_polygon_type;
+	public $geofence_polygon_size;
+	public $notes;
+	public $member_config_storage;
 
-    public static function fromArray(array $params) 
-    {
-        $route = new Route();
-        $route->route_id                = Common::getValue($params, 'route_id');
-        $route->member_id               = Common::getValue($params, 'member_id');
-        $route->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
-        $route->vehicle_alias           = Common::getValue($params, 'vehicle_alias');
-        $route->driver_alias            = Common::getValue($params, 'driver_alias');
-        $route->trip_distance           = Common::getValue($params, 'trip_distance');
-        $route->mpg                     = Common::getValue($params, 'mpg');
-        $route->gas_price               = Common::getValue($params, 'gas_price');
-        $route->route_duration_sec      = Common::getvalue($params, 'route_duration_sec');
-        $route->destination_count       = Common::getvalue($params, 'destination_count');
-        $route->is_unrouted             = Common::getvalue($params, 'is_unrouted');
+	public static function fromArray(array $params) 
+	{
+		$route = new Route();
+		$route->route_id                = Common::getValue($params, 'route_id');
+		$route->member_id               = Common::getValue($params, 'member_id');
+		$route->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
+		$route->vehicle_alias           = Common::getValue($params, 'vehicle_alias');
+		$route->driver_alias            = Common::getValue($params, 'driver_alias');
+		$route->trip_distance           = Common::getValue($params, 'trip_distance');
+		$route->mpg                     = Common::getValue($params, 'mpg');
+		$route->gas_price               = Common::getValue($params, 'gas_price');
+		$route->route_duration_sec      = Common::getvalue($params, 'route_duration_sec');
+		$route->destination_count       = Common::getvalue($params, 'destination_count');
+		$route->is_unrouted             = Common::getvalue($params, 'is_unrouted');
 
-        // Make RouteParameters
-        if (isset($params['parameters'])) {
-            $route->parameters = RouteParameters::fromArray($params['parameters']);
-        }
+		// Make RouteParameters
+		if (isset($params['parameters'])) {
+			$route->parameters = RouteParameters::fromArray($params['parameters']);
+		}
 
-        if (isset($params['addresses'])) {
-            $addresses = array();
-            foreach ($params['addresses'] as $address) {
-                $addresses[] = Address::fromArray($address);
-            }
+		if (isset($params['addresses'])) {
+			$addresses = array();
+			foreach ($params['addresses'] as $address) {
+				$addresses[] = Address::fromArray($address);
+			}
 
-            $route->addresses = $addresses;
-        }
+			$route->addresses = $addresses;
+		}
 
-        $route->links            = Common::getValue($params, 'links', array());
-        $route->directions       = Common::getValue($params, 'directions', array());
-        $route->path             = Common::getValue($params, 'path', array());
-        $route->tracking_history = Common::getValue($params, 'tracking_history', array());
+		$route->links            = Common::getValue($params, 'links', array());
+		$route->directions       = Common::getValue($params, 'directions', array());
+		$route->path             = Common::getValue($params, 'path', array());
+		$route->tracking_history = Common::getValue($params, 'tracking_history', array());
 
-        return $route;
-    }
+		return $route;
+	}
 
-    public static function getRoutes($params = null)
-    {
-        $allQueryFields = array('route_id', 'route_path_output', 'query', 'directions', 'device_tracking_history', 'limit', 'offset');
+	public static function getRoutes($params = null)
+	{
+		$allQueryFields = array('route_id', 'route_path_output', 'query', 'directions', 'device_tracking_history', 'limit', 'offset');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        if (isset($params['route_id'])) {
-            return Route::fromArray($result); die("");
-        } else {
-            $routes = array();
-            foreach ($result as $route) {
-                $routes[] = Route::fromArray($route);
-            }
-            return $routes;
-        }
-    }
+		if (isset($params['route_id'])) {
+			return Route::fromArray($result); die("");
+		} else {
+			$routes = array();
+			foreach ($result as $route) {
+				$routes[] = Route::fromArray($route);
+			}
+			return $routes;
+		}
+	}
 
-    public function getRoutePoints($params)
-    {
-        $allQueryFields = array('route_id', 'route_path_output', 'compress_path_points', 'directions');
+	public function getRoutePoints($params)
+	{
+		$allQueryFields = array('route_id', 'route_path_output', 'compress_path_points', 'directions');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function duplicateRoute($route_id)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_DUPLICATE,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id' => $route_id,
-                'to'       => 'none',
-            )
-        ));
+	public function duplicateRoute($route_id)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_DUPLICATE,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id' => $route_id,
+				'to'       => 'none',
+			)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function resequenceRoute($params)
-    {
-        $allQueryFields = array('route_id', 'route_destination_id');
-        $allBodyFields = array('addresses');
+	public function resequenceRoute($params)
+	{
+		$allQueryFields = array('route_id', 'route_destination_id');
+		$allBodyFields = array('addresses');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function resequenceAllAddresses($params)
-    {
-        $allQueryFields = array('route_id', 'disable_optimization', 'optimize');
+	public function resequenceAllAddresses($params)
+	{
+		$allQueryFields = array('route_id', 'disable_optimization', 'optimize');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::REOPTIMIZE_V3_2,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::REOPTIMIZE_V3_2,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
 
-    public function mergeRoutes($params)
-    {
-        $allBodyFields = array('route_ids', 'depot_address', 'remove_origin', 'depot_lat',  'depot_lng');
+	public function mergeRoutes($params)
+	{
+		$allBodyFields = array('route_ids', 'depot_address', 'remove_origin', 'depot_lat',  'depot_lng');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTES_MERGE,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTES_MERGE,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function shareRoute($params)
-    {
-        $allQueryFields = array('route_id', 'response_format');
-        $allBodyFields = array('recipient_email');
+	public function shareRoute($params)
+	{
+		$allQueryFields = array('route_id', 'response_format');
+		$allBodyFields = array('recipient_email');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_SHARE,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_SHARE,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    // Returns random route_id from existing routes between $offset and $offset+$limit
-    public function getRandomRouteId($offset, $limit)
-    {
-        $params = array(
-            'offset' => !is_null($offset) ? $offset : 0,
-            'limit'  => !is_null($limit) ? $limit : 30
-        );
+	// Returns random route_id from existing routes between $offset and $offset+$limit
+	public function getRandomRouteId($offset, $limit)
+	{
+		$params = array(
+			'offset' => !is_null($offset) ? $offset : 0,
+			'limit'  => !is_null($limit) ? $limit : 30
+		);
         
-        $routes = $this->getRoutes($params);
+		$routes = $this->getRoutes($params);
         
-        if (is_null($routes) || sizeof($routes)<1) {
-            echo "<br> There are no routes in the account. Please, create the routes first. <br>";
-            return null;
-        } 
+		if (is_null($routes) || sizeof($routes)<1) {
+			echo "<br> There are no routes in the account. Please, create the routes first. <br>";
+			return null;
+		} 
         
-        $randomIndex = rand(0, sizeof($routes) - 1);
+		$randomIndex = rand(0, sizeof($routes) - 1);
         
-        return $routes[$randomIndex]->route_id;
-    }
+		return $routes[$randomIndex]->route_id;
+	}
 
-    public function update()
-    {
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id'  => isset($this->route_id) ? $this->route_id : null
-            ),
-            'body' => array(
-                'parameters' => $this->parameters,
-                ),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+	public function update()
+	{
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id'  => isset($this->route_id) ? $this->route_id : null
+			),
+			'body' => array(
+				'parameters' => $this->parameters,
+				),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function updateAddress($address = null)
-    {
-        $body = sizeof($this->addresses)<1 ? get_object_vars($this->parameters) 
-            : (isset($this->addresses[0]) ? $this->addresses[0] : get_object_vars($this->parameters));
+	public function updateAddress($address = null)
+	{
+		$body = sizeof($this->addresses)<1 ? get_object_vars($this->parameters) 
+			: (isset($this->addresses[0]) ? $this->addresses[0] : get_object_vars($this->parameters));
 
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id'             => isset($this->route_id) ? $this->route_id : null,
-                'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
-            ),
-            'body'        => $body,
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id'             => isset($this->route_id) ? $this->route_id : null,
+				'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
+			),
+			'body'        => $body,
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function updateRouteAddress()
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id'             => isset($this->route_id) ? $this->route_id : null,
-                'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
-            ),
-            'body'        => array(
-                "parameters" => isset($this->parameters) ? get_object_vars($this->parameters) : null,
-                "addresses"  => isset($this->addresses) ? $this->addresses : null
-            ),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+	public function updateRouteAddress()
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id'             => isset($this->route_id) ? $this->route_id : null,
+				'route_destination_id' => isset($this->route_destination_id) ? $this->route_destination_id : null,
+			),
+			'body'        => array(
+				"parameters" => isset($this->parameters) ? get_object_vars($this->parameters) : null,
+				"addresses"  => isset($this->addresses) ? $this->addresses : null
+			),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function addAddresses($params)
-    {
-        $allQueryFields = array('route_id');
-        $allBodyFields = array('addresses');
+	public function addAddresses($params)
+	{
+		$allQueryFields = array('route_id');
+		$allBodyFields = array('addresses');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function insertAddressOptimalPosition(array $params)
-    {
-        $allQueryFields = array('route_id');
-        $allBodyFields = array('addresses', 'optimal_position');
+	public function insertAddressOptimalPosition(array $params)
+	{
+		$allQueryFields = array('route_id');
+		$allBodyFields = array('addresses', 'optimal_position');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function addNoteFile($params)
-    {
-        $fname = isset($params['strFilename']) ? $params['strFilename'] : null;
-        $rpath = realpath($fname);
+	public function addNoteFile($params)
+	{
+		$fname = isset($params['strFilename']) ? $params['strFilename'] : null;
+		$rpath = realpath($fname);
         
-        $allQueryFields = array('route_id', 'address_id', 'dev_lat', 'dev_lng', 'device_type');
-        $allBodyFields = array('strUpdateType', 'strFilename', 'strNoteContents');
+		$allQueryFields = array('route_id', 'address_id', 'dev_lat', 'dev_lng', 'device_type');
+		$allBodyFields = array('strUpdateType', 'strFilename', 'strNoteContents');
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_NOTES_ADD,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'FILE'   => $rpath,
-            'HTTPHEADER' => array(
-                'Content-Type: application/x-www-form-urlencoded'
-            )
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_NOTES_ADD,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'FILE'   => $rpath,
+			'HTTPHEADER' => array(
+				'Content-Type: application/x-www-form-urlencoded'
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function deleteRoutes($route_id)
-    {
-         $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTES_DELETE,
-            'method' => 'DELETE',
-            'query'  => array(
-                'route_id' => $route_id,
-            )
-        ));
+	public function deleteRoutes($route_id)
+	{
+		 $result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTES_DELETE,
+			'method' => 'DELETE',
+			'query'  => array(
+				'route_id' => $route_id,
+			)
+		));
         
-        return $result;
-    }
+		return $result;
+	}
     
-    public function GetAddressesFromRoute($route_id)
-    {
-        $route1 = Route::getRoutes(array('route_id' => $route_id));
+	public function GetAddressesFromRoute($route_id)
+	{
+		$route1 = Route::getRoutes(array('route_id' => $route_id));
         
-        if (isset($route1)) {
-            return $route1->addresses;
-        } else {
-            return null;
-        }
-    }
+		if (isset($route1)) {
+			return $route1->addresses;
+		} else {
+			return null;
+		}
+	}
     
-    public function GetRandomAddressFromRoute($route_id)
-    {
-        $route1 = Route::getRoutes(array('route_id' => $route_id));
+	public function GetRandomAddressFromRoute($route_id)
+	{
+		$route1 = Route::getRoutes(array('route_id' => $route_id));
         
-        if (isset($route1)) {
-            $addresses = $route1->addresses;
+		if (isset($route1)) {
+			$addresses = $route1->addresses;
             
-            $rnd = rand(0, sizeof($addresses) - 1);
+			$rnd = rand(0, sizeof($addresses) - 1);
             
-            return $addresses[$rnd];
-        } else {
-            return null;
-        }
-    }
+			return $addresses[$rnd];
+		} else {
+			return null;
+		}
+	}
 
-    public function getRouteId()
-    {
-        return $this->route_id;
-    }
+	public function getRouteId()
+	{
+		return $this->route_id;
+	}
 
-    public function getOptimizationId()
-    {
-        return $this->optimization_problem_id;
-    }
+	public function getOptimizationId()
+	{
+		return $this->optimization_problem_id;
+	}
     
-    public function GetLastLocation(array $params)
-    {
-        $allQueryFields = array('route_id', 'device_tracking_history');
+	public function GetLastLocation(array $params)
+	{
+		$allQueryFields = array('route_id', 'device_tracking_history');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return Route::fromArray($route);
-    }
+		return Route::fromArray($route);
+	}
     
-    public function GetTrackingHistoryFromTimeRange(array $params)
-    {
-        $allQueryFields = array('route_id', 'format', 'time_period', 'start_date', 'end_date');
+	public function GetTrackingHistoryFromTimeRange(array $params)
+	{
+		$allQueryFields = array('route_id', 'format', 'time_period', 'start_date', 'end_date');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::GET_DEVICE_LOCATION,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::GET_DEVICE_LOCATION,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $route;
-    }
+		return $route;
+	}
     
-    public function GetAssetTracking(array $params)
-    {
-        $allQueryFields = array('tracking');
+	public function GetAssetTracking(array $params)
+	{
+		$allQueryFields = array('tracking');
         
-        $route = Route4Me::makeRequst(array(
-            'url'    => Endpoint::STATUS_V4,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
+		$route = Route4Me::makeRequst(array(
+			'url'    => Endpoint::STATUS_V4,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
 
-        return $route;
-    }
+		return $route;
+	}
 }

src/Route4Me/Member.php

Indentation +274 added lines, -274 removed lines

@@ -6,320 +6,320 @@
 
 class Member extends Common
 {
-    public $device_id;
-    public $device_type;
-    public $format;
+	public $device_id;
+	public $device_type;
+	public $format;
     
-    public $strEmail;
-    public $strPassword;
-    public $strPassword_1;
-    public $strPassword_2;
-    public $strFirstName;
-    public $strLastName;
-    public $strIndustry;
-    public $chkTerms;
-    public $plan;
+	public $strEmail;
+	public $strPassword;
+	public $strPassword_1;
+	public $strPassword_2;
+	public $strFirstName;
+	public $strLastName;
+	public $strIndustry;
+	public $chkTerms;
+	public $plan;
     
-    public $session_guid;
-    public $member_id;
+	public $session_guid;
+	public $member_id;
     
-    public $email_address;
-    public $first_name;
-    public $last_name;
-    public $phone_number;
-    public $company_name;
-    public $webiinar_date;
+	public $email_address;
+	public $first_name;
+	public $last_name;
+	public $phone_number;
+	public $company_name;
+	public $webiinar_date;
     
-    public $subscription_name;
-    public $token;
-    public $payload;
+	public $subscription_name;
+	public $token;
+	public $payload;
     
-    public $HIDE_ROUTED_ADDRESSES;
-    public $member_phone;
-    public $member_zipcode;
-    public $route_count;
-    public $member_email;
-    public $HIDE_VISITED_ADDRESSES;
-    public $READONLY_USER;
-    public $member_type;
-    public $date_of_birth;
-    public $member_first_name;
-    public $member_password;
-    public $HIDE_NONFUTURE_ROUTES;
-    public $member_last_name;
-    public $SHOW_ALL_VEHICLES;
-    public $SHOW_ALL_DRIVERS;
+	public $HIDE_ROUTED_ADDRESSES;
+	public $member_phone;
+	public $member_zipcode;
+	public $route_count;
+	public $member_email;
+	public $HIDE_VISITED_ADDRESSES;
+	public $READONLY_USER;
+	public $member_type;
+	public $date_of_birth;
+	public $member_first_name;
+	public $member_password;
+	public $HIDE_NONFUTURE_ROUTES;
+	public $member_last_name;
+	public $SHOW_ALL_VEHICLES;
+	public $SHOW_ALL_DRIVERS;
     
-    public $config_key;
-    public $config_value;
+	public $config_key;
+	public $config_value;
     
-    public $preferred_units;
-    public $preferred_language;
-    public $timezone;
-    public $OWNER_MEMBER_ID;
-    public $user_reg_state_id;
-    public $user_reg_country_id;
-    public $member_picture;
-    public $api_key;
-    public $custom_data;
+	public $preferred_units;
+	public $preferred_language;
+	public $timezone;
+	public $OWNER_MEMBER_ID;
+	public $user_reg_state_id;
+	public $user_reg_country_id;
+	public $member_picture;
+	public $api_key;
+	public $custom_data;
     
-    public static function fromArray(array $params) 
-    {
-        $member= new Member();
-        
-        foreach($params as $key => $value) {
-            if (property_exists($member, $key)) {
-                $member->{$key} = $value;
-            }
-        }
-        
-        return $member;
-    }
+	public static function fromArray(array $params) 
+	{
+		$member= new Member();
+        
+		foreach($params as $key => $value) {
+			if (property_exists($member, $key)) {
+				$member->{$key} = $value;
+			}
+		}
+        
+		return $member;
+	}
     
-    public static function getUsers()
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'GET'
-        ));
+	public static function getUsers()
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'GET'
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getUser($params)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'member_id' => isset($params['member_id']) ? $params['member_id'] : null
-            )
-        ));
+	public static function getUser($params)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'member_id' => isset($params['member_id']) ? $params['member_id'] : null
+			)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function getUserLocations($param)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VIEW_USER_LOCATIONS,
-            'method' => 'GET',
-            'query'  => array(
-                'query' => $param
-            )
-        ));
+	public static function getUserLocations($param)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VIEW_USER_LOCATIONS,
+			'method' => 'GET',
+			'query'  => array(
+				'query' => $param
+			)
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function addDeviceRecord($params)
-    {
-        $allQueryFields = array('device_id', 'device_type');
-        $allBodyFields = array('device_id', 'device_type', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VERIFY_DEVICE_LICENSE,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function addDeviceRecord($params)
+	{
+		$allQueryFields = array('device_id', 'device_type');
+		$allBodyFields = array('device_id', 'device_type', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VERIFY_DEVICE_LICENSE,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function createMember($params)
-    {
-        $excludeFields = array('session_guid', 'member_id', 'token', 'payload', 'webiinar_date', 
-        'company_name', 'config_key', 'config_value', 'api_key');
+	public static function createMember($params)
+	{
+		$excludeFields = array('session_guid', 'member_id', 'token', 'payload', 'webiinar_date', 
+		'company_name', 'config_key', 'config_value', 'api_key');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
 
-    public static function getRandomMemberByType($memberType)
-    {
-        $members = self::getUsers();
+	public static function getRandomMemberByType($memberType)
+	{
+		$members = self::getUsers();
         
-        if (is_null($members)) return null;
-        if (!isset($members['results'])) return null;
+		if (is_null($members)) return null;
+		if (!isset($members['results'])) return null;
         
-        $memberIDs = array();
+		$memberIDs = array();
         
-        foreach ($members['results'] as $memb) {
-            if (isset($memb['member_id']) && isset($memb['member_type'])) {
-                if ($memberType==$memb['member_type']) $memberIDs[]=$memb['member_id'];
-            }
-        }
+		foreach ($members['results'] as $memb) {
+			if (isset($memb['member_id']) && isset($memb['member_type'])) {
+				if ($memberType==$memb['member_type']) $memberIDs[]=$memb['member_id'];
+			}
+		}
         
-        if (sizeof($memberIDs)<1) return null;
+		if (sizeof($memberIDs)<1) return null;
         
-        $randomIndex = rand(0, sizeof($memberIDs)-1);
+		$randomIndex = rand(0, sizeof($memberIDs)-1);
         
-        return $memberIDs[$randomIndex];
-    }
+		return $memberIDs[$randomIndex];
+	}
 
 
-    public static function updateMember($body)
-    {
-        $excludeFields = array('session_guid', 'token', 'payload', 'webiinar_date', 
-        'company_name', 'config_key', 'config_value', 'api_key');
+	public static function updateMember($body)
+	{
+		$excludeFields = array('session_guid', 'token', 'payload', 'webiinar_date', 
+		'company_name', 'config_key', 'config_value', 'api_key');
         
-        $allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
+		$allBodyFields = Route4Me::getObjectProperties(new Member(), $excludeFields);
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $body)
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $body)
+		));
         
-        return $response;
-    }
+		return $response;
+	}
 
-    public static function deleteMember($body)
-    {
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_V4,
-            'method' => 'DELETE',
-            'body'   => array(
-                'member_id' =>  isset($body->member_id) ? $body->member_id : null
-            )
+	public static function deleteMember($body)
+	{
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_V4,
+			'method' => 'DELETE',
+			'body'   => array(
+				'member_id' =>  isset($body->member_id) ? $body->member_id : null
+			)
 
-        ));
+		));
         
-        return $response;
-    }
+		return $response;
+	}
     
-    public static function newAccountRegistration($params)
-    {
-        $allQueryFields = array('plan');
-        $allBodyFields = array('strEmail', 'strPassword_1', 'strPassword_2', 'strFirstName', 
-        'strLastName', 'format', 'strIndustry', 'chkTerms', 
-        'device_type', 'strSubAccountType', 'blDisableMarketing', 'blDisableAccountActivationEmail');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::REGISTER_ACTION,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
-        
-        return $response;
-    }
+	public static function newAccountRegistration($params)
+	{
+		$allQueryFields = array('plan');
+		$allBodyFields = array('strEmail', 'strPassword_1', 'strPassword_2', 'strFirstName', 
+		'strLastName', 'format', 'strIndustry', 'chkTerms', 
+		'device_type', 'strSubAccountType', 'blDisableMarketing', 'blDisableAccountActivationEmail');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::REGISTER_ACTION,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
+        
+		return $response;
+	}
     
-    public static function validateSession($params)
-    {
-        $allQueryFields = array('session_guid', 'member_id', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VALIDATE_SESSION,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function validateSession($params)
+	{
+		$allQueryFields = array('session_guid', 'member_id', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::VALIDATE_SESSION,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function memberAuthentication($params)
-    {
-        $allBodyFields = array('strEmail', 'strPassword', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::AUTHENTICATE,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
-        
-        return $response;
-    }
+	public static function memberAuthentication($params)
+	{
+		$allBodyFields = array('strEmail', 'strPassword', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::AUTHENTICATE,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
+        
+		return $response;
+	}
     
-    public static function webinarRegistration($params)
-    {
-        $allBodyFields = array('email_address', 'first_name', 'last_name', 'phone_number', 
-        'company_name', 'member_id', 'webiinar_date');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::WEBINAR_REGISTER,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function webinarRegistration($params)
+	{
+		$allBodyFields = array('email_address', 'first_name', 'last_name', 'phone_number', 
+		'company_name', 'member_id', 'webiinar_date');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::WEBINAR_REGISTER,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function purchaseUserLicense($params)
-    {
-        $allQueryFields = array('device_id');
-        $allBodyFields = array('member_id', 'session_guid', 'device_id', 'device_type', 
-        'subscription_name', 'token', 'payload', 'format');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::USER_LICENSE,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function purchaseUserLicense($params)
+	{
+		$allQueryFields = array('device_id');
+		$allBodyFields = array('member_id', 'session_guid', 'device_id', 'device_type', 
+		'subscription_name', 'token', 'payload', 'format');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::USER_LICENSE,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function newMemberConfigKey($params)
-    {
-        $allBodyFields = array('config_key', 'config_value');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'POST',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function newMemberConfigKey($params)
+	{
+		$allBodyFields = array('config_key', 'config_value');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'POST',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function removeMemberConfigKey($params)
-    {
-        $allBodyFields = array('config_key');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'DELETE',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function removeMemberConfigKey($params)
+	{
+		$allBodyFields = array('config_key');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'DELETE',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public static function getMemberConfigData($params)
-    {
-        $allQueryFields = array('config_key');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function getMemberConfigData($params)
+	{
+		$allQueryFields = array('config_key');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+        
+		return $response;
+	}
 
-    public static function updateMemberConfigKey($params)
-    {
-        $allBodyFields = array('config_key', 'config_value');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::CONFIGURATION_SETTINGS,
-            'method' => 'PUT',
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public static function updateMemberConfigKey($params)
+	{
+		$allBodyFields = array('config_key', 'config_value');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::CONFIGURATION_SETTINGS,
+			'method' => 'PUT',
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
 }

src/Route4Me/AddressBookLocation.php

Indentation +368 added lines, -368 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');
+	public static function getAddressBookLocations($params)
+	{
+		$allQueryFields = array('limit', 'offset');
         
-        $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 getAddressBookLocationsByIDs($ids)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'address_id' => $ids
-            )
-        ));
+	public static function getAddressBookLocationsByIDs($ids)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'address_id' => $ids
+			)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function getRandomAddressBookLocation($params)
-    {
-        $ablocations = self::getAddressBookLocations(array('offset' => 0, 'limit' => 20));
+	public static function getRandomAddressBookLocation($params)
+	{
+		$ablocations = self::getAddressBookLocations(array('offset' => 0, 'limit' => 20));
         
-        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);
+	public static function validateScheduleWeekDays($scheduleWeekDays)
+	{
+		$weekdays = explode(',', $scheduleWeekDays);
         
-        if (sizeof($weekdays)<1) return FALSE;
+		if (sizeof($weekdays)<1) return FALSE;
         
-        $isValid = TRUE;
+		$isValid = TRUE;
         
-        for ($i=0; $i<sizeof($weekdays); $i++) { 
-            if (is_numeric($weekdays[$i])) {
-                $wday = intval($weekdays[$i]);
-                if ($wday<1 || $wday>7) $isValid = FALSE;
-            } else {
-                $isValid = FALSE;
-            }
-        }
+		for ($i=0; $i<sizeof($weekdays); $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);
+	public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
+	{
+		$monthlyDates = explode(',', $scheduleMonthlyDates);
         
-        if (sizeof($monthlyDates) <1) return FALSE;
+		if (sizeof($monthlyDates) <1) return FALSE;
         
-        $isValid = TRUE;
+		$isValid = TRUE;
         
-        for ($i=0; $i < sizeof($monthlyDates); $i++) { 
-            if (is_numeric($monthlyDates[$i])) {
-                $mday = intval($monthlyDates[$i]);
-                if ($mday <1 || $mday > 31) $isValid = FALSE;
-            } else {
-                $isValid = FALSE;
-            }
-        }
+		for ($i=0; $i < sizeof($monthlyDates); $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

src/Route4Me/Address.php

Indentation +235 added lines, -235 removed lines

@@ -8,283 +8,283 @@
 
 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');
-        $allBodyFields = array('strFilename');
+	public function AddNoteFile($params)
+	{
+		$allQueryFields = array('route_id', 'address_id', 'dev_lat', 'dev_lng', 'device_type', 'strUpdateType');
+		$allBodyFields = array('strFilename');
         
-        $result = Route4Me::fileUploadRequest(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::fileUploadRequest(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 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/OptimizationProblem.php

Indentation +208 added lines, -208 removed lines

@@ -11,236 +11,236 @@
 
 class OptimizationProblem extends Common
 {
-    public $optimization_problem_id;
-    public $user_errors = array();
-    public $state;
-    public $optimization_errors = array();
-    public $parameters;
-    public $sent_to_background;
-    public $created_timestamp;
-    public $scheduled_for;
-    public $optimization_completed_timestamp;
-    public $addresses = array();
-    public $routes = array();
-    public $links = array();
-
-    function __construct()
-    {
-        $this->parameters = new RouteParameters;
-    }
-
-    public static function fromArray(array $params)
-    {
-        $problem = new OptimizationProblem;
-        $problem->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
-        $problem->user_errors = Common::getValue($params, 'user_errors', array());
-        $problem->state = Common::getValue($params, 'state', array());
-        $problem->sent_to_background = Common::getValue($params, 'sent_to_background', array());
-        $problem->links = Common::getValue($params, 'links', array());
-
-        if (isset($params['parameters'])) {
-            $problem->parameters = RouteParameters::fromArray($params['parameters']);
-        }
-
-        if (isset($params['addresses'])) {
-            $addresses = array();
+	public $optimization_problem_id;
+	public $user_errors = array();
+	public $state;
+	public $optimization_errors = array();
+	public $parameters;
+	public $sent_to_background;
+	public $created_timestamp;
+	public $scheduled_for;
+	public $optimization_completed_timestamp;
+	public $addresses = array();
+	public $routes = array();
+	public $links = array();
+
+	function __construct()
+	{
+		$this->parameters = new RouteParameters;
+	}
+
+	public static function fromArray(array $params)
+	{
+		$problem = new OptimizationProblem;
+		$problem->optimization_problem_id = Common::getValue($params, 'optimization_problem_id');
+		$problem->user_errors = Common::getValue($params, 'user_errors', array());
+		$problem->state = Common::getValue($params, 'state', array());
+		$problem->sent_to_background = Common::getValue($params, 'sent_to_background', array());
+		$problem->links = Common::getValue($params, 'links', array());
+
+		if (isset($params['parameters'])) {
+			$problem->parameters = RouteParameters::fromArray($params['parameters']);
+		}
+
+		if (isset($params['addresses'])) {
+			$addresses = array();
             
-            foreach ($params['addresses'] as $address) {
-                $addresses[] = Address::fromArray($address);
-            }
+			foreach ($params['addresses'] as $address) {
+				$addresses[] = Address::fromArray($address);
+			}
             
-            $problem->addresses = $addresses;
-        }
+			$problem->addresses = $addresses;
+		}
 
-        if (isset($params['routes'])) {
-            $routes = array();
+		if (isset($params['routes'])) {
+			$routes = array();
             
-            foreach ($params['routes'] as $route) {
-                $routes[] = Route::fromArray($route);
-            }
+			foreach ($params['routes'] as $route) {
+				$routes[] = Route::fromArray($route);
+			}
             
-            $problem->routes = $routes;
-        }
-
-        return $problem;
-    }
-
-    public static function optimize(OptimizationProblemParams $params)
-    {
-        $allQueryFields = array('redirect', 'directions', 'format', 'route_path_output', 'optimized_callback_url');
-        
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => array(
-                'addresses'  => $params->getAddressesArray(),
-                'parameters' => $params->getParametersArray()
-            )
-        ));
-
-        return OptimizationProblem::fromArray($optimize);
-    }
-
-    public static function get($params)
-    {
-        $allQueryFields = array('state', 'limit', 'format', 'offset', 
-        'optimization_problem_id', 'wait_for_final_state');
-        
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-
-        if (isset($optimize['optimizations'])) {
-            $problems = array();
+			$problem->routes = $routes;
+		}
+
+		return $problem;
+	}
+
+	public static function optimize(OptimizationProblemParams $params)
+	{
+		$allQueryFields = array('redirect', 'directions', 'format', 'route_path_output', 'optimized_callback_url');
+        
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => array(
+				'addresses'  => $params->getAddressesArray(),
+				'parameters' => $params->getParametersArray()
+			)
+		));
+
+		return OptimizationProblem::fromArray($optimize);
+	}
+
+	public static function get($params)
+	{
+		$allQueryFields = array('state', 'limit', 'format', 'offset', 
+		'optimization_problem_id', 'wait_for_final_state');
+        
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+
+		if (isset($optimize['optimizations'])) {
+			$problems = array();
             
-            foreach ($optimize['optimizations'] as $problem) {
-                $problems[] = OptimizationProblem::fromArray($problem);
-            }
+			foreach ($optimize['optimizations'] as $problem) {
+				$problems[] = OptimizationProblem::fromArray($problem);
+			}
             
-            return $problems;
-        } else {
-            return OptimizationProblem::fromArray($optimize);
-        }
-    }
-
-    public static function reoptimize($params)
-    {
-        $param = new OptimizationProblemParams;
-        $param->optimization_problem_id = isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null;
-        $param->reoptimize = 1;
-
-        return self::update((array)$param);
-    }
-
-    public static function update($params)
-    {
-        $allQueryFields = array('optimization_problem_id', 'reoptimize');
-        $allBodyFields = array('addresses');
-        
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'PUT',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'  => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $optimize;
-    }
-
-    public function getOptimizationId()
-    {
-        return $this->optimization_problem_id;
-    }
-
-    public function getRoutes()
-    {
-        return $this->routes;
-    }
+			return $problems;
+		} else {
+			return OptimizationProblem::fromArray($optimize);
+		}
+	}
+
+	public static function reoptimize($params)
+	{
+		$param = new OptimizationProblemParams;
+		$param->optimization_problem_id = isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null;
+		$param->reoptimize = 1;
+
+		return self::update((array)$param);
+	}
+
+	public static function update($params)
+	{
+		$allQueryFields = array('optimization_problem_id', 'reoptimize');
+		$allBodyFields = array('addresses');
+        
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'PUT',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'  => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $optimize;
+	}
+
+	public function getOptimizationId()
+	{
+		return $this->optimization_problem_id;
+	}
+
+	public function getRoutes()
+	{
+		return $this->routes;
+	}
     
-    public function getRandomOptimizationId($offset, $limit)
-    {
-        $optimizations = self::get(array('offset' => $offset, 'limit' => $limit));
+	public function getRandomOptimizationId($offset, $limit)
+	{
+		$optimizations = self::get(array('offset' => $offset, 'limit' => $limit));
             
-        $rOptimization = $optimizations[rand(0,sizeof($optimizations)-1)];
-        
-        if(!isset($rOptimization->optimization_problem_id)) {
-            if (sizeof($optimizations)>9) {
-                $this->getRandomOptimizationId($offset, $limit);
-            } else {
-                return null;
-            }
-        }
+		$rOptimization = $optimizations[rand(0,sizeof($optimizations)-1)];
+        
+		if(!isset($rOptimization->optimization_problem_id)) {
+			if (sizeof($optimizations)>9) {
+				$this->getRandomOptimizationId($offset, $limit);
+			} else {
+				return null;
+			}
+		}
                 
-        return $rOptimization->optimization_problem_id;
-    }
+		return $rOptimization->optimization_problem_id;
+	}
     
-    public function getAddresses($opt_id)
-    {
-        if ($opt_id==null) {
-            return null;
-        }
+	public function getAddresses($opt_id)
+	{
+		if ($opt_id==null) {
+			return null;
+		}
         
-        $params = array("optimization_problem_id" => $opt_id );
+		$params = array("optimization_problem_id" => $opt_id );
         
-        $optimization = (array)$this->get($params);
+		$optimization = (array)$this->get($params);
         
-        $addresses = $optimization["addresses"];
+		$addresses = $optimization["addresses"];
         
-        return $addresses;
-    }
+		return $addresses;
+	}
     
-    public function getRandomAddressFromOptimization($opt_id)
-    {
-        $addresses = (array)$this->getAddresses($opt_id);
+	public function getRandomAddressFromOptimization($opt_id)
+	{
+		$addresses = (array)$this->getAddresses($opt_id);
         
-        if ($addresses==null) {
-            echo "There are no addresses in this optimization!.. Try again.";
-            return null;
-        }
+		if ($addresses==null) {
+			echo "There are no addresses in this optimization!.. Try again.";
+			return null;
+		}
         
-        $num = rand(0, sizeof($addresses)-1);
+		$num = rand(0, sizeof($addresses)-1);
         
-        $rAddress = $addresses[$num];
+		$rAddress = $addresses[$num];
         
-        return $rAddress;
-    }
+		return $rAddress;
+	}
     
-    public function removeAddress($params)
-    {
-        $allQueryFields = array('optimization_problem_id', 'route_destination_id');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'DELETE',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-        
-        return $response;
-    }
+	public function removeAddress($params)
+	{
+		$allQueryFields = array('optimization_problem_id', 'route_destination_id');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'DELETE',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public function removeOptimization($params)
-    {
-        $allQueryFields = array('redirect');
-        $allBodyFields = array('optimization_problem_ids');
-        
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::OPTIMIZATION_PROBLEM,
-            'method' => 'DELETE',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $response;
-    }
+	public function removeOptimization($params)
+	{
+		$allQueryFields = array('redirect');
+		$allBodyFields = array('optimization_problem_ids');
+        
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::OPTIMIZATION_PROBLEM,
+			'method' => 'DELETE',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $response;
+	}
     
-    public function getHybridOptimization($params)
-    {
-        $allQueryFields = array('target_date_string', 'timezone_offset_minutes');
-        
-        $optimize = Route4Me::makeRequst(array(
-            'url'    => Endpoint::HYBRID_DATE_OPTIMIZATION,
-            'method' => 'GET',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
-        ));
-
-        return $optimize;
-    }
+	public function getHybridOptimization($params)
+	{
+		$allQueryFields = array('target_date_string', 'timezone_offset_minutes');
+        
+		$optimize = Route4Me::makeRequst(array(
+			'url'    => Endpoint::HYBRID_DATE_OPTIMIZATION,
+			'method' => 'GET',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
+		));
+
+		return $optimize;
+	}
     
-    Public function addDepotsToHybrid($params)
-    {
-        $allQueryFields = array('optimization_problem_id');
-        $allBodyFields = array('optimization_problem_id', 'delete_old_depots', 'new_depots');
-        
-        $depots = Route4Me::makeRequst(array( 
-            'url'    => Endpoint::CHANGE_HYBRID_OPTIMIZATION_DEPOT,
-            'method' => 'POST',
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
-        ));
-        
-        return $depots;
-    }
+	Public function addDepotsToHybrid($params)
+	{
+		$allQueryFields = array('optimization_problem_id');
+		$allBodyFields = array('optimization_problem_id', 'delete_old_depots', 'new_depots');
+        
+		$depots = Route4Me::makeRequst(array( 
+			'url'    => Endpoint::CHANGE_HYBRID_OPTIMIZATION_DEPOT,
+			'method' => 'POST',
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params),
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
+		));
+        
+		return $depots;
+	}
 }