From d1b4e04ee4fe1f2e9385d47f2e39b165ca78f03b Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 9 Oct 2013 16:35:12 -0700
Subject: [PATCH] Don't add addr:housenumber=yes when applying Address preset
 (#1874)

---
 data/presets/presets.json         | 1 +
 data/presets/presets/address.json | 1 +
 js/id/presets/preset.js           | 2 +-
 test/spec/presets/preset.js       | 5 +++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 1fef18b09..e049b5418 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -9,6 +9,7 @@
         "tags": {
             "addr:housenumber": "*"
         },
+        "addTags": {},
         "matchScore": 0.2,
         "name": "Address"
     },
diff --git a/data/presets/presets/address.json b/data/presets/presets/address.json
index 972504812..b000b5c9a 100644
--- a/data/presets/presets/address.json
+++ b/data/presets/presets/address.json
@@ -8,6 +8,7 @@
     "tags": {
         "addr:housenumber": "*"
     },
+    "addTags": {},
     "matchScore": 0.2,
     "name": "Address"
 }
\ No newline at end of file
diff --git a/js/id/presets/preset.js b/js/id/presets/preset.js
index b9a5581ba..634bdd81a 100644
--- a/js/id/presets/preset.js
+++ b/js/id/presets/preset.js
@@ -73,7 +73,7 @@ iD.presets.Preset = function(id, preset, fields) {
         return tags;
     };
 
-    var applyTags = preset.applyTags || preset.tags;
+    var applyTags = preset.addTags || preset.tags;
     preset.applyTags = function(tags, geometry) {
         tags = _.clone(tags);
 
diff --git a/test/spec/presets/preset.js b/test/spec/presets/preset.js
index fed0bfc52..d68ede870 100644
--- a/test/spec/presets/preset.js
+++ b/test/spec/presets/preset.js
@@ -69,6 +69,11 @@ describe('iD.presets.Preset', function() {
             expect(preset.applyTags({}, 'area')).to.eql({building: 'yes'});
         });
 
+        it("prefers to add tags of addTags property", function() {
+            var preset = iD.presets.Preset('test', {tags: {building: '*'}, addTags: {building: 'ok'}});
+            expect(preset.applyTags({}, 'area')).to.eql({building: 'ok'});
+        });
+
         it("adds default tags of fields with matching geometry", function() {
             var field = iD.presets.Field('field', {key: 'building', geometry: 'area', default: 'yes'}),
                 preset = iD.presets.Preset('test', {fields: ['field']}, {field: field});