From 548760529cd74eedebfdc3ca695ad2bc1f4afd7b Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 15 Aug 2013 12:08:46 -0700
Subject: [PATCH] Remove area=yes when choosing an area preset (fixes #1684)

---
 data/presets/presets.json      | 4 +++-
 data/presets/presets/area.json | 4 +++-
 js/id/ui/preset_list.js        | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index c8f54750c..fbdfe287a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1157,7 +1157,9 @@
     },
     "area": {
         "name": "Area",
-        "tags": {},
+        "tags": {
+            "area": "yes"
+        },
         "geometry": [
             "area"
         ]
diff --git a/data/presets/presets/area.json b/data/presets/presets/area.json
index 3633bf01b..b6df31e02 100644
--- a/data/presets/presets/area.json
+++ b/data/presets/presets/area.json
@@ -1,5 +1,7 @@
 {
     "name": "Area",
-    "tags": {},
+    "tags": {
+        "area": "yes"
+    },
     "geometry": ["area"]
 }
\ No newline at end of file
diff --git a/js/id/ui/preset_list.js b/js/id/ui/preset_list.js
index 8699d4a8c..5b82f0f45 100644
--- a/js/id/ui/preset_list.js
+++ b/js/id/ui/preset_list.js
@@ -16,7 +16,7 @@ iD.ui.PresetList = function(context) {
         var message = messagewrap.append('h3')
             .text(t('inspector.choose'));
 
-        if (currentPreset) {
+        if (context.entity(id).isUsed(context.graph())) {
             messagewrap.append('button')
                 .attr('class', 'preset-choose')
                 .on('click', function() { event.choose(currentPreset); })
@@ -226,6 +226,7 @@ iD.ui.PresetList = function(context) {
     presetList.entityID = function(_) {
         if (!arguments.length) return id;
         id = _;
+        presetList.preset(context.presets().match(context.entity(id), context.graph()));
         return presetList;
     };