use edit.newFeature.wayEditingHistory to determine if conflicting fea…

…ture is a way
developmentseed · Jun 8, 2020 · 372e129 · 372e129
1 parent 3cbaa0e
commit 372e129
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/components/Conflict.js b/app/components/Conflict.js
@@ -228,7 +228,7 @@ export default class Conflict extends React.Component {
     if (updatedFeature.isDeleted) {
       return this.upstreamDeleted()
     }
-    if (updatedFeature.geometry.type === 'LineString' || updatedFeature.geometry.type === 'Polygon') {
+    if (originalEdit.newFeature.wayEditingHistory) {
       return this.featureIsAWay()
     }
     if (originalEdit.type === 'delete') {

diff --git a/app/screens/UserContributions/UserContributionsItemScreen.js b/app/screens/UserContributions/UserContributionsItemScreen.js
@@ -206,7 +206,7 @@ class UserContributionsItemScreen extends React.Component {
   }
 
   getHeaderActions (edit) {
-    if (edit.newFeature.geometry.type === 'LineString' || edit.newFeature.geometry.type === 'Polygon') {
+    if (edit.newFeature.wayEditingHistory) {
       return this.getWayConflictActions()
     }
     if (edit.status === 'success') {