Skip to content
Snippets Groups Projects
Commit 8f4dc9f5 authored by Sebastian Castro's avatar Sebastian Castro
Browse files

osm: resolve webhook if nothing is to send to OSM

parent bcecc476
No related branches found
No related tags found
No related merge requests found
...@@ -70,6 +70,8 @@ class ElementSynchronizationService ...@@ -70,6 +70,8 @@ class ElementSynchronizationService
if ($osmFeature->getVersion() == intval($gogoFeature['version'])) { if ($osmFeature->getVersion() == intval($gogoFeature['version'])) {
if ($this->editOsmFeatureWithGoGoFeature($osmFeature, $gogoFeature)) if ($this->editOsmFeatureWithGoGoFeature($osmFeature, $gogoFeature))
$toAdd = $osmFeature; $toAdd = $osmFeature;
else
return $promise->resolve(new Response(200, [], null, '1.1', ''));
} }
else { else {
$message = 'Feature versions mismatch: '.$gogoFeature['version'].' on our side, '.$osmFeature->getVersion().' on OSM'; $message = 'Feature versions mismatch: '.$gogoFeature['version'].' on our side, '.$osmFeature->getVersion().' on OSM';
...@@ -115,7 +117,7 @@ class ElementSynchronizationService ...@@ -115,7 +117,7 @@ class ElementSynchronizationService
return $promise->resolve(new Response(200, [], null, '1.1', 'Success')); // TODO translate ? return $promise->resolve(new Response(200, [], null, '1.1', 'Success')); // TODO translate ?
} }
catch(\Exception $e) { catch(\Exception $e) {
$message = 'Error when sending changeset'; // TODO translate $message = 'Error when sending changeset';
return $promise->resolve(new Response($e->getCode(), [], null, '1.1', $message)); return $promise->resolve(new Response($e->getCode(), [], null, '1.1', $message));
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment