@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | $vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/'; |
5 | 5 | |
6 | - require $vdir.'/../vendor/autoload.php'; |
|
6 | + require $vdir.'/../vendor/autoload.php'; |
|
7 | 7 | |
8 | 8 | use Route4Me\Route4Me; |
9 | 9 | use Route4Me\Member; |
@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | $vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/'; |
5 | 5 | |
6 | - require $vdir.'/../vendor/autoload.php'; |
|
6 | + require $vdir.'/../vendor/autoload.php'; |
|
7 | 7 | |
8 | 8 | use Route4Me\Route4Me; |
9 | 9 | use Route4Me\Member; |
@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | $vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/'; |
5 | 5 | |
6 | - require $vdir.'/../vendor/autoload.php'; |
|
6 | + require $vdir.'/../vendor/autoload.php'; |
|
7 | 7 | |
8 | 8 | use Route4Me\Route4Me; |
9 | 9 | use Route4Me\Member; |
@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | $vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/'; |
5 | 5 | |
6 | - require $vdir.'/../vendor/autoload.php'; |
|
6 | + require $vdir.'/../vendor/autoload.php'; |
|
7 | 7 | |
8 | 8 | use Route4Me\Route4Me; |
9 | 9 | use Route4Me\Member; |
@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | $vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/'; |
5 | 5 | |
6 | - require $vdir.'/../vendor/autoload.php'; |
|
6 | + require $vdir.'/../vendor/autoload.php'; |
|
7 | 7 | |
8 | 8 | use Route4Me\Route4Me; |
9 | 9 | use Route4Me\Member; |
@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | $vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/'; |
5 | 5 | |
6 | - require $vdir.'/../vendor/autoload.php'; |
|
6 | + require $vdir.'/../vendor/autoload.php'; |
|
7 | 7 | |
8 | 8 | use Route4Me\Route4Me; |
9 | 9 | use Route4Me\Member; |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | $vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/'; |
3 | - require $vdir.'/../vendor/autoload.php'; |
|
3 | + require $vdir.'/../vendor/autoload.php'; |
|
4 | 4 | |
5 | 5 | use Route4Me\MyQ; |
6 | 6 |
@@ -68,60 +68,60 @@ discard block |
||
68 | 68 | |
69 | 69 | public static function fromArray(array $params) { |
70 | 70 | $member= new Member(); |
71 | - foreach($params as $key => $value) { |
|
72 | - if (property_exists($member, $key)) { |
|
73 | - $member->{$key} = $value; |
|
74 | - } |
|
71 | + foreach($params as $key => $value) { |
|
72 | + if (property_exists($member, $key)) { |
|
73 | + $member->{$key} = $value; |
|
74 | + } |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | return $member; |
78 | 78 | } |
79 | 79 | |
80 | 80 | public static function getUsers() |
81 | - { |
|
82 | - $response = Route4Me::makeRequst(array( |
|
83 | - 'url' => self::$apiUrl, |
|
84 | - 'method' => 'GET' |
|
85 | - )); |
|
81 | + { |
|
82 | + $response = Route4Me::makeRequst(array( |
|
83 | + 'url' => self::$apiUrl, |
|
84 | + 'method' => 'GET' |
|
85 | + )); |
|
86 | 86 | //var_dump($response); die(""); |
87 | 87 | return $response; |
88 | 88 | } |
89 | 89 | |
90 | 90 | public static function getUser($params) |
91 | - { |
|
92 | - $response = Route4Me::makeRequst(array( |
|
93 | - 'url' => self::$apiUrl, |
|
94 | - 'method' => 'GET', |
|
95 | - 'query' => array( |
|
96 | - 'member_id' => isset($params['member_id']) ? $params['member_id'] : null |
|
91 | + { |
|
92 | + $response = Route4Me::makeRequst(array( |
|
93 | + 'url' => self::$apiUrl, |
|
94 | + 'method' => 'GET', |
|
95 | + 'query' => array( |
|
96 | + 'member_id' => isset($params['member_id']) ? $params['member_id'] : null |
|
97 | 97 | ) |
98 | - )); |
|
98 | + )); |
|
99 | 99 | //var_dump($response); die(""); |
100 | 100 | return $response; |
101 | 101 | } |
102 | 102 | |
103 | 103 | public static function getUserLocations($param) |
104 | - { |
|
105 | - $response = Route4Me::makeRequst(array( |
|
106 | - 'url' => self::$apiUserLocations, |
|
107 | - 'method' => 'GET', |
|
108 | - 'query' => array( |
|
109 | - 'query' => $param |
|
104 | + { |
|
105 | + $response = Route4Me::makeRequst(array( |
|
106 | + 'url' => self::$apiUserLocations, |
|
107 | + 'method' => 'GET', |
|
108 | + 'query' => array( |
|
109 | + 'query' => $param |
|
110 | 110 | ) |
111 | - )); |
|
111 | + )); |
|
112 | 112 | //var_dump($response); die(""); |
113 | 113 | return $response; |
114 | 114 | } |
115 | 115 | |
116 | 116 | public static function addDeviceRecord($body) |
117 | - { |
|
118 | - $response = Route4Me::makeRequst(array( |
|
119 | - 'url' => self::$apiUrlDevice, |
|
120 | - 'method' => 'POST', |
|
121 | - 'body' => array( |
|
117 | + { |
|
118 | + $response = Route4Me::makeRequst(array( |
|
119 | + 'url' => self::$apiUrlDevice, |
|
120 | + 'method' => 'POST', |
|
121 | + 'body' => array( |
|
122 | 122 | 'device_id' => isset($body->device_id) ? $body->device_id: null, |
123 | - 'device_type' => isset($body->device_type) ? $body->device_type : null, |
|
124 | - 'format' => isset($body->format) ? $body->format : null |
|
123 | + 'device_type' => isset($body->device_type) ? $body->device_type : null, |
|
124 | + 'format' => isset($body->format) ? $body->format : null |
|
125 | 125 | ) |
126 | 126 | |
127 | 127 | )); |
@@ -129,25 +129,25 @@ discard block |
||
129 | 129 | } |
130 | 130 | |
131 | 131 | public static function createMember($body) |
132 | - { |
|
133 | - $response = Route4Me::makeRequst(array( |
|
134 | - 'url' => self::$apiUrl, |
|
135 | - 'method' => 'POST', |
|
136 | - 'body' => array( |
|
132 | + { |
|
133 | + $response = Route4Me::makeRequst(array( |
|
134 | + 'url' => self::$apiUrl, |
|
135 | + 'method' => 'POST', |
|
136 | + 'body' => array( |
|
137 | 137 | 'HIDE_ROUTED_ADDRESSES' => isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null, |
138 | - 'member_phone' => isset($body->member_phone) ? $body->member_phone : null, |
|
139 | - 'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null, |
|
140 | - 'route_count' => isset($body->route_count) ? $body->route_count : null, |
|
141 | - 'member_email' => isset($body->member_email) ? $body->member_email : null, |
|
142 | - 'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null, |
|
143 | - 'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null, |
|
144 | - 'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null, |
|
145 | - 'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null, |
|
146 | - 'member_password' => isset($body->member_password) ? $body->member_password : null, |
|
147 | - 'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null, |
|
148 | - 'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null, |
|
149 | - 'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null, |
|
150 | - 'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null |
|
138 | + 'member_phone' => isset($body->member_phone) ? $body->member_phone : null, |
|
139 | + 'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null, |
|
140 | + 'route_count' => isset($body->route_count) ? $body->route_count : null, |
|
141 | + 'member_email' => isset($body->member_email) ? $body->member_email : null, |
|
142 | + 'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null, |
|
143 | + 'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null, |
|
144 | + 'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null, |
|
145 | + 'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null, |
|
146 | + 'member_password' => isset($body->member_password) ? $body->member_password : null, |
|
147 | + 'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null, |
|
148 | + 'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null, |
|
149 | + 'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null, |
|
150 | + 'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null |
|
151 | 151 | ) |
152 | 152 | |
153 | 153 | )); |
@@ -155,26 +155,26 @@ discard block |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | public static function updateMember($body) |
158 | - { |
|
159 | - $response = Route4Me::makeRequst(array( |
|
160 | - 'url' => self::$apiUrl, |
|
161 | - 'method' => 'PUT', |
|
162 | - 'body' => array( |
|
158 | + { |
|
159 | + $response = Route4Me::makeRequst(array( |
|
160 | + 'url' => self::$apiUrl, |
|
161 | + 'method' => 'PUT', |
|
162 | + 'body' => array( |
|
163 | 163 | 'member_id' => isset($body->member_id) ? $body->member_id: null, |
164 | - 'member_phone' => isset($body->member_phone) ? $body->member_phone : null, |
|
165 | - 'HIDE_ROUTED_ADDRESSES' => isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null, |
|
166 | - 'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null, |
|
167 | - 'route_count' => isset($body->route_count) ? $body->route_count : null, |
|
168 | - 'member_email' => isset($body->member_email) ? $body->member_email : null, |
|
169 | - 'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null, |
|
170 | - 'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null, |
|
171 | - 'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null, |
|
172 | - 'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null, |
|
173 | - 'member_password' => isset($body->member_password) ? $body->member_password : null, |
|
174 | - 'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null, |
|
175 | - 'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null, |
|
176 | - 'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null, |
|
177 | - 'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null |
|
164 | + 'member_phone' => isset($body->member_phone) ? $body->member_phone : null, |
|
165 | + 'HIDE_ROUTED_ADDRESSES' => isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null, |
|
166 | + 'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null, |
|
167 | + 'route_count' => isset($body->route_count) ? $body->route_count : null, |
|
168 | + 'member_email' => isset($body->member_email) ? $body->member_email : null, |
|
169 | + 'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null, |
|
170 | + 'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null, |
|
171 | + 'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null, |
|
172 | + 'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null, |
|
173 | + 'member_password' => isset($body->member_password) ? $body->member_password : null, |
|
174 | + 'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null, |
|
175 | + 'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null, |
|
176 | + 'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null, |
|
177 | + 'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null |
|
178 | 178 | ) |
179 | 179 | |
180 | 180 | )); |
@@ -182,11 +182,11 @@ discard block |
||
182 | 182 | } |
183 | 183 | |
184 | 184 | public static function deleteMember($body) |
185 | - { |
|
186 | - $response = Route4Me::makeRequst(array( |
|
187 | - 'url' => self::$apiUrl, |
|
188 | - 'method' => 'DELETE', |
|
189 | - 'body' => array( |
|
185 | + { |
|
186 | + $response = Route4Me::makeRequst(array( |
|
187 | + 'url' => self::$apiUrl, |
|
188 | + 'method' => 'DELETE', |
|
189 | + 'body' => array( |
|
190 | 190 | 'member_id' => isset($body->member_id) ? $body->member_id: null |
191 | 191 | ) |
192 | 192 | |
@@ -195,50 +195,50 @@ discard block |
||
195 | 195 | } |
196 | 196 | |
197 | 197 | public static function newAccountRegistration($body) |
198 | - { |
|
199 | - $response = Route4Me::makeRequst(array( |
|
200 | - 'url' => self::$apiUrlRegistr, |
|
201 | - 'method' => 'POST', |
|
202 | - 'body' => array( |
|
198 | + { |
|
199 | + $response = Route4Me::makeRequst(array( |
|
200 | + 'url' => self::$apiUrlRegistr, |
|
201 | + 'method' => 'POST', |
|
202 | + 'body' => array( |
|
203 | 203 | 'strEmail' => isset($body->strEmail) ? $body->strEmail: null, |
204 | - 'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null, |
|
205 | - 'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null, |
|
206 | - 'strFirstName' => isset($body->strFirstName) ? $body->strFirstName: null, |
|
207 | - 'strLastName' => isset($body->strLastName) ? $body->strLastName: null, |
|
208 | - 'strIndustry' => isset($body->strIndustry) ? $body->strIndustry: null, |
|
209 | - 'chkTerms' => isset($body->chkTerms) ? $body->chkTerms: null, |
|
210 | - 'plan' => isset($body->plan) ? $body->plan: null, |
|
211 | - 'strSubAccountType' => isset($body->strSubAccountType) ? $body->strSubAccountType: null, |
|
212 | - 'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false, |
|
213 | - 'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false |
|
204 | + 'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null, |
|
205 | + 'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null, |
|
206 | + 'strFirstName' => isset($body->strFirstName) ? $body->strFirstName: null, |
|
207 | + 'strLastName' => isset($body->strLastName) ? $body->strLastName: null, |
|
208 | + 'strIndustry' => isset($body->strIndustry) ? $body->strIndustry: null, |
|
209 | + 'chkTerms' => isset($body->chkTerms) ? $body->chkTerms: null, |
|
210 | + 'plan' => isset($body->plan) ? $body->plan: null, |
|
211 | + 'strSubAccountType' => isset($body->strSubAccountType) ? $body->strSubAccountType: null, |
|
212 | + 'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false, |
|
213 | + 'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false |
|
214 | 214 | ) |
215 | 215 | )); |
216 | 216 | return $response; |
217 | 217 | } |
218 | 218 | |
219 | 219 | public static function validateSession($params) |
220 | - { |
|
221 | - $response = Route4Me::makeRequst(array( |
|
222 | - 'url' => self::$apiUrlSessValid, |
|
223 | - 'method' => 'GET', |
|
224 | - 'query' => array( |
|
220 | + { |
|
221 | + $response = Route4Me::makeRequst(array( |
|
222 | + 'url' => self::$apiUrlSessValid, |
|
223 | + 'method' => 'GET', |
|
224 | + 'query' => array( |
|
225 | 225 | 'session_guid' => isset($params->session_guid) ? $params->session_guid: null, |
226 | - 'member_id' => isset($params->member_id) ? $params->member_id : null, |
|
227 | - 'format' => isset($params->format) ? $params->format : null |
|
226 | + 'member_id' => isset($params->member_id) ? $params->member_id : null, |
|
227 | + 'format' => isset($params->format) ? $params->format : null |
|
228 | 228 | ) |
229 | 229 | )); |
230 | 230 | return $response; |
231 | 231 | } |
232 | 232 | |
233 | 233 | public static function memberAuthentication($body) |
234 | - { |
|
235 | - $response = Route4Me::makeRequst(array( |
|
236 | - 'url' => self::$apiUrlAuthen, |
|
237 | - 'method' => 'POST', |
|
238 | - 'body' => array( |
|
234 | + { |
|
235 | + $response = Route4Me::makeRequst(array( |
|
236 | + 'url' => self::$apiUrlAuthen, |
|
237 | + 'method' => 'POST', |
|
238 | + 'body' => array( |
|
239 | 239 | 'strEmail' => isset($body->strEmail) ? $body->strEmail: null, |
240 | - 'strPassword' => isset($body->strPassword) ? $body->strPassword : null, |
|
241 | - 'format' => isset($body->format) ? $body->format : null |
|
240 | + 'strPassword' => isset($body->strPassword) ? $body->strPassword : null, |
|
241 | + 'format' => isset($body->format) ? $body->format : null |
|
242 | 242 | ) |
243 | 243 | |
244 | 244 | )); |
@@ -246,18 +246,18 @@ discard block |
||
246 | 246 | } |
247 | 247 | |
248 | 248 | public static function webinarRegistration($body) |
249 | - { |
|
250 | - $response = Route4Me::makeRequst(array( |
|
251 | - 'url' => self::$apiUrlWebinar, |
|
252 | - 'method' => 'POST', |
|
253 | - 'body' => array( |
|
249 | + { |
|
250 | + $response = Route4Me::makeRequst(array( |
|
251 | + 'url' => self::$apiUrlWebinar, |
|
252 | + 'method' => 'POST', |
|
253 | + 'body' => array( |
|
254 | 254 | 'email_address' => isset($body->email_address) ? $body->email_address: null, |
255 | - 'first_name' => isset($body->first_name) ? $body->first_name : null, |
|
256 | - 'last_name' => isset($body->last_name) ? $body->last_name : null, |
|
257 | - 'phone_number' => isset($body->phone_number) ? $body->phone_number : null, |
|
258 | - 'phone_number' => isset($body->phone_number) ? $body->phone_number : null, |
|
259 | - 'member_id' => isset($body->member_id) ? $body->member_id : null, |
|
260 | - 'webiinar_date' => isset($body->webiinar_date) ? $body->webiinar_date : null, |
|
255 | + 'first_name' => isset($body->first_name) ? $body->first_name : null, |
|
256 | + 'last_name' => isset($body->last_name) ? $body->last_name : null, |
|
257 | + 'phone_number' => isset($body->phone_number) ? $body->phone_number : null, |
|
258 | + 'phone_number' => isset($body->phone_number) ? $body->phone_number : null, |
|
259 | + 'member_id' => isset($body->member_id) ? $body->member_id : null, |
|
260 | + 'webiinar_date' => isset($body->webiinar_date) ? $body->webiinar_date : null, |
|
261 | 261 | ) |
262 | 262 | |
263 | 263 | )); |
@@ -265,19 +265,19 @@ discard block |
||
265 | 265 | } |
266 | 266 | |
267 | 267 | public static function purchaseUserLicense($body) |
268 | - { |
|
269 | - $response = Route4Me::makeRequst(array( |
|
270 | - 'url' => self::$apiUrlLicense, |
|
271 | - 'method' => 'POST', |
|
272 | - 'body' => array( |
|
268 | + { |
|
269 | + $response = Route4Me::makeRequst(array( |
|
270 | + 'url' => self::$apiUrlLicense, |
|
271 | + 'method' => 'POST', |
|
272 | + 'body' => array( |
|
273 | 273 | 'member_id' => isset($body->member_id) ? $body->member_id: null, |
274 | - 'session_guid' => isset($body->session_guid) ? $body->session_guid : null, |
|
275 | - 'device_id' => isset($body->device_id) ? $body->device_id : null, |
|
276 | - 'device_type' => isset($body->device_type) ? $body->device_type : null, |
|
277 | - 'subscription_name' => isset($body->subscription_name) ? $body->subscription_name : null, |
|
278 | - 'token' => isset($body->token) ? $body->token : null, |
|
279 | - 'payload' => isset($body->payload) ? $body->payload : null, |
|
280 | - 'format' => isset($body->format) ? $body->format : null, |
|
274 | + 'session_guid' => isset($body->session_guid) ? $body->session_guid : null, |
|
275 | + 'device_id' => isset($body->device_id) ? $body->device_id : null, |
|
276 | + 'device_type' => isset($body->device_type) ? $body->device_type : null, |
|
277 | + 'subscription_name' => isset($body->subscription_name) ? $body->subscription_name : null, |
|
278 | + 'token' => isset($body->token) ? $body->token : null, |
|
279 | + 'payload' => isset($body->payload) ? $body->payload : null, |
|
280 | + 'format' => isset($body->format) ? $body->format : null, |
|
281 | 281 | ) |
282 | 282 | |
283 | 283 | )); |
@@ -285,24 +285,24 @@ discard block |
||
285 | 285 | } |
286 | 286 | |
287 | 287 | public static function newMemberConfigKey($body) |
288 | - { |
|
289 | - $response = Route4Me::makeRequst(array( |
|
290 | - 'url' => self::$apiMemberConfig, |
|
291 | - 'method' => 'POST', |
|
292 | - 'body' => array( |
|
288 | + { |
|
289 | + $response = Route4Me::makeRequst(array( |
|
290 | + 'url' => self::$apiMemberConfig, |
|
291 | + 'method' => 'POST', |
|
292 | + 'body' => array( |
|
293 | 293 | 'config_key' => isset($body->config_key) ? $body->config_key: null, |
294 | - 'config_value' => isset($body->config_value) ? $body->config_value : null |
|
294 | + 'config_value' => isset($body->config_value) ? $body->config_value : null |
|
295 | 295 | ) |
296 | 296 | )); |
297 | 297 | return $response; |
298 | 298 | } |
299 | 299 | |
300 | 300 | public static function removeMemberConfigKey($body) |
301 | - { |
|
302 | - $response = Route4Me::makeRequst(array( |
|
303 | - 'url' => self::$apiMemberConfig, |
|
304 | - 'method' => 'DELETE', |
|
305 | - 'body' => array( |
|
301 | + { |
|
302 | + $response = Route4Me::makeRequst(array( |
|
303 | + 'url' => self::$apiMemberConfig, |
|
304 | + 'method' => 'DELETE', |
|
305 | + 'body' => array( |
|
306 | 306 | 'config_key' => isset($body->config_key) ? $body->config_key: null |
307 | 307 | ) |
308 | 308 | )); |
@@ -310,11 +310,11 @@ discard block |
||
310 | 310 | } |
311 | 311 | |
312 | 312 | public static function getMemberConfigData($body) |
313 | - { |
|
314 | - $response = Route4Me::makeRequst(array( |
|
315 | - 'url' => self::$apiMemberConfig, |
|
316 | - 'method' => 'GET', |
|
317 | - 'query' => array( |
|
313 | + { |
|
314 | + $response = Route4Me::makeRequst(array( |
|
315 | + 'url' => self::$apiMemberConfig, |
|
316 | + 'method' => 'GET', |
|
317 | + 'query' => array( |
|
318 | 318 | 'config_key' => isset($body->config_key) ? $body->config_key: null |
319 | 319 | ) |
320 | 320 | )); |
@@ -322,13 +322,13 @@ discard block |
||
322 | 322 | } |
323 | 323 | |
324 | 324 | public static function updateMemberConfigKey($body) |
325 | - { |
|
326 | - $response = Route4Me::makeRequst(array( |
|
327 | - 'url' => self::$apiMemberConfig, |
|
328 | - 'method' => 'PUT', |
|
329 | - 'body' => array( |
|
325 | + { |
|
326 | + $response = Route4Me::makeRequst(array( |
|
327 | + 'url' => self::$apiMemberConfig, |
|
328 | + 'method' => 'PUT', |
|
329 | + 'body' => array( |
|
330 | 330 | 'config_key' => isset($body->config_key) ? $body->config_key: null, |
331 | - 'config_value' => isset($body->config_value) ? $body->config_value : null |
|
331 | + 'config_value' => isset($body->config_value) ? $body->config_value : null |
|
332 | 332 | ) |
333 | 333 | )); |
334 | 334 | return $response; |
@@ -12,156 +12,156 @@ discard block |
||
12 | 12 | |
13 | 13 | class OptimizationProblem extends Common |
14 | 14 | { |
15 | - static public $apiUrl = '/api.v4/optimization_problem.php'; |
|
15 | + static public $apiUrl = '/api.v4/optimization_problem.php'; |
|
16 | 16 | static public $apiUrl_addr = '/api.v4/address.php'; |
17 | - static public $apiHybridUrl = '/api.v4/hybrid_date_optimization.php'; |
|
18 | - static public $apiHybridDepotUrl = '/api/change_hybrid_optimization_depot.php'; |
|
17 | + static public $apiHybridUrl = '/api.v4/hybrid_date_optimization.php'; |
|
18 | + static public $apiHybridDepotUrl = '/api/change_hybrid_optimization_depot.php'; |
|
19 | 19 | |
20 | - public $optimization_problem_id; |
|
21 | - public $user_errors = array(); |
|
22 | - public $state; |
|
23 | - public $parameters; |
|
24 | - public $sent_to_background; |
|
25 | - public $addresses = array(); |
|
26 | - public $routes = array(); |
|
27 | - public $links = array(); |
|
20 | + public $optimization_problem_id; |
|
21 | + public $user_errors = array(); |
|
22 | + public $state; |
|
23 | + public $parameters; |
|
24 | + public $sent_to_background; |
|
25 | + public $addresses = array(); |
|
26 | + public $routes = array(); |
|
27 | + public $links = array(); |
|
28 | 28 | |
29 | - function __construct() |
|
30 | - { |
|
31 | - $this->parameters = new RouteParameters; |
|
32 | - } |
|
29 | + function __construct() |
|
30 | + { |
|
31 | + $this->parameters = new RouteParameters; |
|
32 | + } |
|
33 | 33 | |
34 | - public static function fromArray(array $params) |
|
35 | - { |
|
36 | - $problem = new OptimizationProblem; |
|
37 | - $problem->optimization_problem_id = Common::getValue($params, 'optimization_problem_id'); |
|
38 | - $problem->user_errors = Common::getValue($params, 'user_errors', array()); |
|
39 | - $problem->state = Common::getValue($params, 'state', array()); |
|
40 | - $problem->sent_to_background = Common::getValue($params, 'sent_to_background', array()); |
|
41 | - $problem->links = Common::getValue($params, 'links', array()); |
|
34 | + public static function fromArray(array $params) |
|
35 | + { |
|
36 | + $problem = new OptimizationProblem; |
|
37 | + $problem->optimization_problem_id = Common::getValue($params, 'optimization_problem_id'); |
|
38 | + $problem->user_errors = Common::getValue($params, 'user_errors', array()); |
|
39 | + $problem->state = Common::getValue($params, 'state', array()); |
|
40 | + $problem->sent_to_background = Common::getValue($params, 'sent_to_background', array()); |
|
41 | + $problem->links = Common::getValue($params, 'links', array()); |
|
42 | 42 | |
43 | - if (isset($params['parameters'])) { |
|
44 | - $problem->parameters = RouteParameters::fromArray($params['parameters']); |
|
45 | - } |
|
43 | + if (isset($params['parameters'])) { |
|
44 | + $problem->parameters = RouteParameters::fromArray($params['parameters']); |
|
45 | + } |
|
46 | 46 | |
47 | - if (isset($params['addresses'])) { |
|
48 | - $addresses = array(); |
|
49 | - foreach ($params['addresses'] as $address) { |
|
50 | - $addresses[] = Address::fromArray($address); |
|
51 | - } |
|
52 | - $problem->addresses = $addresses; |
|
53 | - } |
|
47 | + if (isset($params['addresses'])) { |
|
48 | + $addresses = array(); |
|
49 | + foreach ($params['addresses'] as $address) { |
|
50 | + $addresses[] = Address::fromArray($address); |
|
51 | + } |
|
52 | + $problem->addresses = $addresses; |
|
53 | + } |
|
54 | 54 | |
55 | - if (isset($params['routes'])) { |
|
56 | - $routes = array(); |
|
57 | - foreach ($params['routes'] as $route) { |
|
58 | - $routes[] = Route::fromArray($address); |
|
59 | - } |
|
60 | - $problem->routes = $routes; |
|
61 | - } |
|
55 | + if (isset($params['routes'])) { |
|
56 | + $routes = array(); |
|
57 | + foreach ($params['routes'] as $route) { |
|
58 | + $routes[] = Route::fromArray($address); |
|
59 | + } |
|
60 | + $problem->routes = $routes; |
|
61 | + } |
|
62 | 62 | |
63 | - return $problem; |
|
64 | - } |
|
63 | + return $problem; |
|
64 | + } |
|
65 | 65 | |
66 | - public static function optimize(OptimizationProblemParams $params) |
|
67 | - { |
|
68 | - $optimize = Route4Me::makeRequst(array( |
|
69 | - 'url' => self::$apiUrl, |
|
70 | - 'method' => 'POST', |
|
71 | - 'query' => array( |
|
72 | - 'directions' => isset($params->directions) ? $params->directions: null, |
|
73 | - 'format' => isset($params->format) ? $params->format: null, |
|
74 | - 'route_path_output' => isset($params->route_path_output) ? $params->route_path_output: null, |
|
75 | - 'optimized_callback_url' => isset($params->optimized_callback_url) ? $params->optimized_callback_url: null |
|
76 | - ), |
|
77 | - 'body' => array( |
|
78 | - 'addresses' => $params->getAddressesArray(), |
|
79 | - 'parameters' => $params->getParametersArray() |
|
80 | - ) |
|
81 | - )); |
|
66 | + public static function optimize(OptimizationProblemParams $params) |
|
67 | + { |
|
68 | + $optimize = Route4Me::makeRequst(array( |
|
69 | + 'url' => self::$apiUrl, |
|
70 | + 'method' => 'POST', |
|
71 | + 'query' => array( |
|
72 | + 'directions' => isset($params->directions) ? $params->directions: null, |
|
73 | + 'format' => isset($params->format) ? $params->format: null, |
|
74 | + 'route_path_output' => isset($params->route_path_output) ? $params->route_path_output: null, |
|
75 | + 'optimized_callback_url' => isset($params->optimized_callback_url) ? $params->optimized_callback_url: null |
|
76 | + ), |
|
77 | + 'body' => array( |
|
78 | + 'addresses' => $params->getAddressesArray(), |
|
79 | + 'parameters' => $params->getParametersArray() |
|
80 | + ) |
|
81 | + )); |
|
82 | 82 | |
83 | - return OptimizationProblem::fromArray($optimize); |
|
84 | - } |
|
83 | + return OptimizationProblem::fromArray($optimize); |
|
84 | + } |
|
85 | 85 | |
86 | - public static function get($params) |
|
87 | - { |
|
88 | - $optimize = Route4Me::makeRequst(array( |
|
89 | - 'url' => self::$apiUrl, |
|
90 | - 'method' => 'GET', |
|
91 | - 'query' => array( |
|
92 | - 'state' => isset($params['state']) ? $params['state'] : null, |
|
93 | - 'limit' => isset($params['limit']) ? $params['limit'] : null, |
|
94 | - 'offset' => isset($params['offset']) ? $params['offset'] : null, |
|
95 | - 'optimization_problem_id' => isset($params['optimization_problem_id']) |
|
96 | - ? $params['optimization_problem_id'] : null, |
|
97 | - 'wait_for_final_state' => isset($params['wait_for_final_state']) |
|
98 | - ? $params['wait_for_final_state'] : null, |
|
99 | - ) |
|
100 | - )); |
|
86 | + public static function get($params) |
|
87 | + { |
|
88 | + $optimize = Route4Me::makeRequst(array( |
|
89 | + 'url' => self::$apiUrl, |
|
90 | + 'method' => 'GET', |
|
91 | + 'query' => array( |
|
92 | + 'state' => isset($params['state']) ? $params['state'] : null, |
|
93 | + 'limit' => isset($params['limit']) ? $params['limit'] : null, |
|
94 | + 'offset' => isset($params['offset']) ? $params['offset'] : null, |
|
95 | + 'optimization_problem_id' => isset($params['optimization_problem_id']) |
|
96 | + ? $params['optimization_problem_id'] : null, |
|
97 | + 'wait_for_final_state' => isset($params['wait_for_final_state']) |
|
98 | + ? $params['wait_for_final_state'] : null, |
|
99 | + ) |
|
100 | + )); |
|
101 | 101 | |
102 | - if (isset($optimize['optimizations'])) { |
|
103 | - $problems = array(); |
|
104 | - foreach($optimize['optimizations'] as $problem) { |
|
105 | - $problems[] = OptimizationProblem::fromArray($problem); |
|
106 | - } |
|
107 | - return $problems; |
|
108 | - } else { |
|
109 | - return OptimizationProblem::fromArray($optimize); |
|
110 | - } |
|
111 | - } |
|
102 | + if (isset($optimize['optimizations'])) { |
|
103 | + $problems = array(); |
|
104 | + foreach($optimize['optimizations'] as $problem) { |
|
105 | + $problems[] = OptimizationProblem::fromArray($problem); |
|
106 | + } |
|
107 | + return $problems; |
|
108 | + } else { |
|
109 | + return OptimizationProblem::fromArray($optimize); |
|
110 | + } |
|
111 | + } |
|
112 | 112 | |
113 | - public static function reoptimize($params) |
|
114 | - { |
|
115 | - $param = new OptimizationProblemParams; |
|
116 | - $param->optimization_problem_id = isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null; |
|
117 | - $param->reoptimize = 1; |
|
113 | + public static function reoptimize($params) |
|
114 | + { |
|
115 | + $param = new OptimizationProblemParams; |
|
116 | + $param->optimization_problem_id = isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null; |
|
117 | + $param->reoptimize = 1; |
|
118 | 118 | |
119 | - return self::update((array)$param); |
|
120 | - } |
|
119 | + return self::update((array)$param); |
|
120 | + } |
|
121 | 121 | |
122 | - public static function update($params) |
|
123 | - { |
|
122 | + public static function update($params) |
|
123 | + { |
|
124 | 124 | $optimize = Route4Me::makeRequst(array( |
125 | - 'url' => self::$apiUrl, |
|
126 | - 'method' => 'PUT', |
|
127 | - 'query' => array( |
|
128 | - 'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null, |
|
129 | - 'addresses' => isset($params['addresses']) ? $params['addresses'] : null, |
|
130 | - 'reoptimize' => isset($params['reoptimize']) ? $params['reoptimize'] : null, |
|
131 | - ) |
|
132 | - )); |
|
125 | + 'url' => self::$apiUrl, |
|
126 | + 'method' => 'PUT', |
|
127 | + 'query' => array( |
|
128 | + 'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null, |
|
129 | + 'addresses' => isset($params['addresses']) ? $params['addresses'] : null, |
|
130 | + 'reoptimize' => isset($params['reoptimize']) ? $params['reoptimize'] : null, |
|
131 | + ) |
|
132 | + )); |
|
133 | 133 | |
134 | 134 | return $optimize; |
135 | - } |
|
135 | + } |
|
136 | 136 | |
137 | - public function getOptimizationId() |
|
138 | - { |
|
139 | - return $this->optimization_problem_id; |
|
140 | - } |
|
137 | + public function getOptimizationId() |
|
138 | + { |
|
139 | + return $this->optimization_problem_id; |
|
140 | + } |
|
141 | 141 | |
142 | - public function getRoutes() |
|
143 | - { |
|
144 | - return $this->routes; |
|
145 | - } |
|
142 | + public function getRoutes() |
|
143 | + { |
|
144 | + return $this->routes; |
|
145 | + } |
|
146 | 146 | |
147 | 147 | public function getRandomOptimizationId($offset,$limit) |
148 | 148 | { |
149 | 149 | $query['limit'] = isset($params['limit']) ? $params['limit'] : 30; |
150 | - $query['offset'] = isset($params['offset']) ? $params['offset'] : 0; |
|
150 | + $query['offset'] = isset($params['offset']) ? $params['offset'] : 0; |
|
151 | 151 | |
152 | 152 | $json = Route4Me::makeRequst(array( |
153 | - 'url' => self::$apiUrl, |
|
154 | - 'method' => 'GET', |
|
155 | - 'query' => $query |
|
156 | - )); |
|
153 | + 'url' => self::$apiUrl, |
|
154 | + 'method' => 'GET', |
|
155 | + 'query' => $query |
|
156 | + )); |
|
157 | 157 | |
158 | 158 | $optimizations = array(); |
159 | - foreach($json as $optimization) { |
|
159 | + foreach($json as $optimization) { |
|
160 | 160 | if (gettype($optimization)!="array") continue; |
161 | 161 | foreach ($optimization as $otp1) { |
162 | 162 | $optimizations[] = $otp1; |
163 | 163 | } |
164 | - } |
|
164 | + } |
|
165 | 165 | |
166 | 166 | $num=rand(0,sizeof($optimizations)-1); |
167 | 167 | //echo "num=$num.<br>".sizeof($optimizations)."<br>"; |
@@ -201,13 +201,13 @@ discard block |
||
201 | 201 | public function removeAddress($params) |
202 | 202 | { |
203 | 203 | $response = Route4Me::makeRequst(array( |
204 | - 'url' => self::$apiUrl_addr, |
|
205 | - 'method' => 'DELETE', |
|
206 | - 'query' => array( |
|
207 | - 'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null, |
|
208 | - 'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null, |
|
209 | - ) |
|
210 | - )); |
|
204 | + 'url' => self::$apiUrl_addr, |
|
205 | + 'method' => 'DELETE', |
|
206 | + 'query' => array( |
|
207 | + 'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null, |
|
208 | + 'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null, |
|
209 | + ) |
|
210 | + )); |
|
211 | 211 | |
212 | 212 | return $response; |
213 | 213 | } |
@@ -215,48 +215,48 @@ discard block |
||
215 | 215 | public function removeOptimization($params) |
216 | 216 | { |
217 | 217 | $response = Route4Me::makeRequst(array( |
218 | - 'url' => self::$apiUrl, |
|
219 | - 'method' => 'DELETE', |
|
220 | - 'query' => array( |
|
221 | - 'redirect' => isset($params['redirect']) ? $params['redirect'] : null, |
|
222 | - ), |
|
223 | - 'body' => array( |
|
218 | + 'url' => self::$apiUrl, |
|
219 | + 'method' => 'DELETE', |
|
220 | + 'query' => array( |
|
221 | + 'redirect' => isset($params['redirect']) ? $params['redirect'] : null, |
|
222 | + ), |
|
223 | + 'body' => array( |
|
224 | 224 | 'optimization_problem_ids' => isset($params['optimization_problem_ids']) ? $params['optimization_problem_ids'] : null, |
225 | 225 | ) |
226 | - )); |
|
226 | + )); |
|
227 | 227 | |
228 | 228 | return $response; |
229 | 229 | } |
230 | 230 | |
231 | - public function getHybridOptimization($params) |
|
232 | - { |
|
233 | - $optimize = Route4Me::makeRequst(array( |
|
234 | - 'url' => self::$apiHybridUrl, |
|
235 | - 'method' => 'GET', |
|
236 | - 'query' => array( |
|
237 | - 'target_date_string' => isset($params['target_date_string']) ? $params['target_date_string'] : null, |
|
238 | - 'timezone_offset_minutes' => isset($params['timezone_offset_minutes']) ? $params['timezone_offset_minutes'] : null |
|
239 | - ) |
|
240 | - )); |
|
231 | + public function getHybridOptimization($params) |
|
232 | + { |
|
233 | + $optimize = Route4Me::makeRequst(array( |
|
234 | + 'url' => self::$apiHybridUrl, |
|
235 | + 'method' => 'GET', |
|
236 | + 'query' => array( |
|
237 | + 'target_date_string' => isset($params['target_date_string']) ? $params['target_date_string'] : null, |
|
238 | + 'timezone_offset_minutes' => isset($params['timezone_offset_minutes']) ? $params['timezone_offset_minutes'] : null |
|
239 | + ) |
|
240 | + )); |
|
241 | 241 | |
242 | - return $optimize; |
|
243 | - } |
|
242 | + return $optimize; |
|
243 | + } |
|
244 | 244 | |
245 | - Public function addDepotsToHybrid($params) |
|
246 | - { |
|
247 | - $depots = Route4Me::makeRequst(array( |
|
248 | - 'url' => self::$apiHybridDepotUrl, |
|
249 | - 'method' => 'POST', |
|
250 | - 'query' => array( |
|
251 | - 'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null, |
|
252 | - ), |
|
253 | - 'body' => array( |
|
254 | - 'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null, |
|
255 | - 'delete_old_depots' => isset($params['delete_old_depots']) ? $params['delete_old_depots'] : null, |
|
256 | - 'new_depots' => isset($params['new_depots']) ? $params['new_depots'] : null, |
|
257 | - ) |
|
258 | - )); |
|
245 | + Public function addDepotsToHybrid($params) |
|
246 | + { |
|
247 | + $depots = Route4Me::makeRequst(array( |
|
248 | + 'url' => self::$apiHybridDepotUrl, |
|
249 | + 'method' => 'POST', |
|
250 | + 'query' => array( |
|
251 | + 'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null, |
|
252 | + ), |
|
253 | + 'body' => array( |
|
254 | + 'optimization_problem_id' => isset($params['optimization_problem_id']) ? $params['optimization_problem_id'] : null, |
|
255 | + 'delete_old_depots' => isset($params['delete_old_depots']) ? $params['delete_old_depots'] : null, |
|
256 | + 'new_depots' => isset($params['new_depots']) ? $params['new_depots'] : null, |
|
257 | + ) |
|
258 | + )); |
|
259 | 259 | |
260 | - return $depots; |
|
261 | - } |
|
260 | + return $depots; |
|
261 | + } |
|
262 | 262 | } |