@@ -85,10 +85,10 @@ |
||
85 | 85 | if (isset($params['l'])) { |
86 | 86 | |
87 | 87 | $coords = $params['l']->getCoordinates()->getCoordinates(); |
88 | - $queryBuilder->field('locations.coordinates')->geoWithinCenter((float) $coords[0], (float) $coords[1], (float) $this->value['d']/100); |
|
88 | + $queryBuilder->field('locations.coordinates')->geoWithinCenter((float) $coords[0], (float) $coords[1], (float) $this->value['d'] / 100); |
|
89 | 89 | } |
90 | 90 | |
91 | - if (isset($params['channel']) && !empty($params['channel']) && $params['channel']!="default" ){ |
|
91 | + if (isset($params['channel']) && !empty($params['channel']) && $params['channel'] != "default") { |
|
92 | 92 | $queryBuilder->field('portals')->equals($params['channel']); |
93 | 93 | } |
94 | 94 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | ? [ |
70 | 70 | 'type' => $coords->getType(), |
71 | 71 | 'coordinates' => $coords->getCoordinates(), |
72 | - ] |
|
72 | + ] |
|
73 | 73 | : null |
74 | 74 | |
75 | 75 | ]; |
@@ -90,14 +90,14 @@ discard block |
||
90 | 90 | |
91 | 91 | $str = ''; |
92 | 92 | if ($street) { $str .= $street; if (!$number) { $str .= ', '; } } |
93 | - if ($number) { $str .= ' ' . $number . ', '; } |
|
94 | - if ($postalCode) { $str .= $postalCode . ' '; } |
|
93 | + if ($number) { $str .= ' '.$number.', '; } |
|
94 | + if ($postalCode) { $str .= $postalCode.' '; } |
|
95 | 95 | if ($city) { $str .= $city; } |
96 | - if ($region) { $str .= ', ' . $region; } |
|
97 | - if ($country) { $str .= ', ' . $country; } |
|
96 | + if ($region) { $str .= ', '.$region; } |
|
97 | + if ($country) { $str .= ', '.$country; } |
|
98 | 98 | if ($coords) { |
99 | 99 | $coords = $coords->getCoordinates(); |
100 | - $str .= ' ( ' . join(', ', $coords) . ' )'; |
|
100 | + $str .= ' ( '.join(', ', $coords).' )'; |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | return $str; |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | if (!$value) { continue; } |
139 | 139 | |
140 | 140 | if ('coordinates' == $key) { |
141 | - $class = '\\Geo\\Entity\\Geometry\\' . $value['type']; |
|
141 | + $class = '\\Geo\\Entity\\Geometry\\'.$value['type']; |
|
142 | 142 | $value = new $class($value['coordinates']); |
143 | 143 | } |
144 | 144 |
@@ -40,7 +40,7 @@ |
||
40 | 40 | { |
41 | 41 | $result = json_decode($result, JSON_OBJECT_AS_ARRAY); |
42 | 42 | |
43 | - $r=[]; |
|
43 | + $r = []; |
|
44 | 44 | foreach ($result["result"] as $val) { |
45 | 45 | $coords = $this->queryCoords($val); |
46 | 46 | if (false !== strpos($val, ',')) { |
@@ -63,16 +63,16 @@ |
||
63 | 63 | |
64 | 64 | foreach ($result as $key => $val) { |
65 | 65 | $row=[ |
66 | - 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | - 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | - 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | - 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
66 | + 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | + 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | + 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | + 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
71 | 71 | |
72 | - 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | - 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | - //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | - //'data' => json_encode($val), |
|
72 | + 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | + 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | + //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | + //'data' => json_encode($val), |
|
76 | 76 | ]; |
77 | 77 | if ($val->geometry) { |
78 | 78 | $row['coordinates'] = [ |
@@ -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 | } |
@@ -72,10 +72,10 @@ |
||
72 | 72 | if (0 === strpos($value, '{')) { |
73 | 73 | return $value; |
74 | 74 | } |
75 | - if ($value){ |
|
75 | + if ($value) { |
|
76 | 76 | $data = $this->geoClient->queryOne($value); |
77 | 77 | return $data['id']; |
78 | - }else{ |
|
78 | + } else { |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | } |
@@ -75,7 +75,7 @@ |
||
75 | 75 | if ($value){ |
76 | 76 | $data = $this->geoClient->queryOne($value); |
77 | 77 | return $data['id']; |
78 | - }else{ |
|
78 | + } else{ |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | } |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | |
44 | 44 | public function __construct(RepositoryService $repositoryService, AuthenticationService $auth, Acl $acl) |
45 | 45 | { |
46 | - $this->repositoryService=$repositoryService; |
|
47 | - $this->auth=$auth; |
|
48 | - $this->acl=$acl; |
|
46 | + $this->repositoryService = $repositoryService; |
|
47 | + $this->auth = $auth; |
|
48 | + $this->acl = $acl; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | public function __invoke() |
@@ -64,12 +64,12 @@ discard block |
||
64 | 64 | public function get(Params $params, $allowDraft = false, $getSnapshot = false) |
65 | 65 | { |
66 | 66 | /* @var \Jobs\Repository\Job $jobRepository */ |
67 | - $jobRepository = $this->repositoryService->get('Jobs/Job'); |
|
67 | + $jobRepository = $this->repositoryService->get('Jobs/Job'); |
|
68 | 68 | $idFromRoute = $params('id', 0); |
69 | 69 | $idFromQuery = $params->fromQuery('id', 0); |
70 | 70 | $idFromSubForm = $params->fromPost('job', 0); |
71 | 71 | |
72 | - $id = empty($idFromRoute)? (empty($idFromQuery)?$idFromSubForm:$idFromQuery) : $idFromRoute; |
|
72 | + $id = empty($idFromRoute) ? (empty($idFromQuery) ? $idFromSubForm : $idFromQuery) : $idFromRoute; |
|
73 | 73 | $snapshotId = $params->fromPost('snapshot') ?: ($params->fromQuery('snapshot') ?: null); |
74 | 74 | |
75 | 75 | if (empty($id) && empty($snapshotId) && $allowDraft) { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | /** |
94 | 94 | * Switch to another user. |
95 | 95 | * |
96 | - * @param string|UserInterface $id user id of the user to switch to. |
|
96 | + * @param string $id user id of the user to switch to. |
|
97 | 97 | * @param array $params Additional parameters to store in the session container. |
98 | 98 | * |
99 | 99 | * @return bool |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | * @param string $key |
168 | 168 | * @param mixed $default Value to return if param $key is not set. |
169 | 169 | * |
170 | - * @return null |
|
170 | + * @return string |
|
171 | 171 | */ |
172 | 172 | public function getSessionParam($key, $default = null) |
173 | 173 | { |
@@ -65,6 +65,6 @@ |
||
65 | 65 | 'admin' => 1, |
66 | 66 | ]], |
67 | 67 | true |
68 | - ) . '&return=' . $this->returnUrl; |
|
68 | + ).'&return='.$this->returnUrl; |
|
69 | 69 | } |
70 | 70 | } |
71 | 71 | \ No newline at end of file |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | if (0 === strpos($value, '{')) { |
63 | 63 | return $value; |
64 | 64 | } |
65 | - if ($value){ |
|
65 | + if ($value) { |
|
66 | 66 | foreach ($this->getValueOptions() as $optValue => $opt) { |
67 | 67 | if (false !== strpos($value, $opt)) { |
68 | 68 | return $optValue; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | }, |
76 | 76 | |
77 | 77 | /* hydrate */ |
78 | - function ($value) { |
|
78 | + function($value) { |
|
79 | 79 | if (empty($value) || 0 !== strpos($value, '{')) { |
80 | 80 | return null; |
81 | 81 | } |