From b087e78528e9e10775be01679d5c961dc1b541d6 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Mon, 27 Apr 2015 11:46:11 -0400
Subject: [PATCH] Allow zoomToEntity to be called w/o Extent

In case user clicks on Entity description - line 102
---
 js/id/ui/conflicts.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/id/ui/conflicts.js b/js/id/ui/conflicts.js
index 01ef1e76c..8bf1011fa 100644
--- a/js/id/ui/conflicts.js
+++ b/js/id/ui/conflicts.js
@@ -218,7 +218,11 @@ iD.ui.Conflicts = function(context) {
 
         var entity = context.graph().hasEntity(id);
         if (entity) {
-            context.map().trimmedExtent(extent);
+            if (extent) {
+                context.map().trimmedExtent(extent);
+            } else {
+                context.map().zoomTo(entity);
+            }
             context.surface().selectAll(
                 iD.util.entityOrMemberSelector([entity.id], context.graph()))
                 .classed('hover', true);