From 8f4dc9f51365a46b49b07eecfe4b798cd0ed96ff Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebastian.castro@protonmail.com>
Date: Wed, 5 May 2021 14:31:08 +0200
Subject: [PATCH] osm: resolve webhook if nothing is to send to OSM
---
src/Services/ElementSynchronizationService.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Services/ElementSynchronizationService.php b/src/Services/ElementSynchronizationService.php
index 6290bf758..1c7c43fd9 100755
--- a/src/Services/ElementSynchronizationService.php
+++ b/src/Services/ElementSynchronizationService.php
@@ -70,6 +70,8 @@ class ElementSynchronizationService
if ($osmFeature->getVersion() == intval($gogoFeature['version'])) {
if ($this->editOsmFeatureWithGoGoFeature($osmFeature, $gogoFeature))
$toAdd = $osmFeature;
+ else
+ return $promise->resolve(new Response(200, [], null, '1.1', ''));
}
else {
$message = 'Feature versions mismatch: '.$gogoFeature['version'].' on our side, '.$osmFeature->getVersion().' on OSM';
@@ -115,7 +117,7 @@ class ElementSynchronizationService
return $promise->resolve(new Response(200, [], null, '1.1', 'Success')); // TODO translate ?
}
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));
}
}
--
GitLab