@@ -65,7 +65,7 @@ |
||
| 65 | 65 | * |
| 66 | 66 | * @param MvcEvent $event |
| 67 | 67 | * |
| 68 | - * @return null|\Zend\Http\PhpEnvironment\Response |
|
| 68 | + * @return null|\Zend\Stdlib\ResponseInterface |
|
| 69 | 69 | * @throws \UnexpectedValueException |
| 70 | 70 | */ |
| 71 | 71 | public function onRoute(MvcEvent $event) |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | * @var array |
| 48 | 48 | */ |
| 49 | 49 | private $events = [ |
| 50 | - [ MvcEvent::EVENT_ROUTE, 'onRoute', 100 ], |
|
| 50 | + [MvcEvent::EVENT_ROUTE, 'onRoute', 100], |
|
| 51 | 51 | ]; |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -28,11 +28,11 @@ discard block |
||
| 28 | 28 | $client->setMethod('GET'); |
| 29 | 29 | |
| 30 | 30 | $osmTags = [ |
| 31 | - 'tourism','aeroway','railway', 'amenity', 'historic', 'tunnel', 'mountain_pass', |
|
| 31 | + 'tourism', 'aeroway', 'railway', 'amenity', 'historic', 'tunnel', 'mountain_pass', |
|
| 32 | 32 | 'leisure', 'natural', 'bridge', 'waterway' |
| 33 | 33 | ]; |
| 34 | 34 | |
| 35 | - $osmTags = array_map(function($i) { return urlencode('!' . $i); }, $osmTags); |
|
| 35 | + $osmTags = array_map(function($i) { return urlencode('!'.$i); }, $osmTags); |
|
| 36 | 36 | |
| 37 | 37 | $uri = sprintf( |
| 38 | 38 | '%s?osm_tag=%s', |
@@ -59,12 +59,12 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | $result = json_decode($result); |
| 61 | 61 | $result = $result->features; |
| 62 | - $r=[]; |
|
| 62 | + $r = []; |
|
| 63 | 63 | |
| 64 | 64 | foreach ($result as $key => $val) { |
| 65 | - $row=[ |
|
| 66 | - 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
| 67 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
| 65 | + $row = [ |
|
| 66 | + 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode : ''), |
|
| 67 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city : ''), |
|
| 68 | 68 | 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
| 69 | 69 | 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
| 70 | 70 | 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | ]; |
| 82 | 82 | } |
| 83 | 83 | //$row['id'] = json_encode($row); |
| 84 | - $r[]=$row; |
|
| 84 | + $r[] = $row; |
|
| 85 | 85 | } |
| 86 | 86 | return $r; |
| 87 | 87 | } |