From 8abc39461bfb8d7be2cadc5e56e0f877783e514a Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 10 Oct 2017 20:54:41 -0400
Subject: [PATCH] Fallback Area preset should preserve the `area=yes` tag
 (closes #4424)

---
 modules/presets/preset.js   | 28 +++++++++++++++-------------
 test/spec/presets/preset.js | 12 ++++++++----
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/modules/presets/preset.js b/modules/presets/preset.js
index f65e22e750..f4e4db27de 100644
--- a/modules/presets/preset.js
+++ b/modules/presets/preset.js
@@ -94,7 +94,7 @@ export function presetPreset(id, preset, fields) {
     };
 
 
-    var removeTags = preset.removeTags || preset.tags;
+    var removeTags = preset.removeTags || preset.tags || {};
     preset.removeTags = function(tags, geometry) {
         tags = _omit(tags, _keys(removeTags));
 
@@ -110,7 +110,7 @@ export function presetPreset(id, preset, fields) {
     };
 
 
-    var applyTags = preset.addTags || preset.tags;
+    var applyTags = preset.addTags || preset.tags || {};
     preset.applyTags = function(tags, geometry) {
         var k;
 
@@ -128,19 +128,21 @@ export function presetPreset(id, preset, fields) {
         // This is necessary if the geometry is already an area (e.g. user drew an area) AND any of:
         // 1. chosen preset could be either an area or a line (`barrier=city_wall`)
         // 2. chosen preset doesn't have a key in areaKeys (`railway=station`)
-        delete tags.area;
-        if (geometry === 'area') {
-            var needsAreaTag = true;
-            if (preset.geometry.indexOf('line') === -1) {
-                for (k in applyTags) {
-                    if (k in areaKeys) {
-                        needsAreaTag = false;
-                        break;
+        if (!applyTags.hasOwnProperty('area')) {
+            delete tags.area;
+            if (geometry === 'area') {
+                var needsAreaTag = true;
+                if (preset.geometry.indexOf('line') === -1) {
+                    for (k in applyTags) {
+                        if (k in areaKeys) {
+                            needsAreaTag = false;
+                            break;
+                        }
                     }
                 }
-            }
-            if (needsAreaTag) {
-                tags.area = 'yes';
+                if (needsAreaTag) {
+                    tags.area = 'yes';
+                }
             }
         }
 
diff --git a/test/spec/presets/preset.js b/test/spec/presets/preset.js
index 890f4f196a..1feff1082a 100644
--- a/test/spec/presets/preset.js
+++ b/test/spec/presets/preset.js
@@ -97,7 +97,7 @@ describe('iD.presetPreset', function() {
             expect(preset.applyTags({}, 'point')).to.eql({});
         });
 
-        context('for a preset with no tag in areaKeys', function() {
+        describe('for a preset with no tag in areaKeys', function() {
             var preset = iD.presetPreset('test', {geometry: ['line', 'area'], tags: {name: 'testname', highway: 'pedestrian'}});
 
             it('doesn\'t add area=yes to non-areas', function() {
@@ -109,11 +109,15 @@ describe('iD.presetPreset', function() {
             });
         });
 
-        context('for a preset with a tag in areaKeys', function() {
-            var preset = iD.presetPreset('test', {geometry: ['area'], tags: {name: 'testname', natural: 'water'}});
-            it('doesn\'t add area=yes', function() {
+        describe('for a preset with a tag in areaKeys', function() {
+            it('doesn\'t add area=yes automatically', function() {
+                var preset = iD.presetPreset('test', {geometry: ['area'], tags: {name: 'testname', natural: 'water'}});
                 expect(preset.applyTags({}, 'area')).to.eql({name: 'testname', natural: 'water'});
             });
+            it('does add area=yes if asked to', function() {
+                var preset = iD.presetPreset('test', {geometry: ['area'], tags: {name: 'testname', area: 'yes'}});
+                expect(preset.applyTags({}, 'area')).to.eql({name: 'testname', area: 'yes'});
+            });
         });
     });