From 973be1e0ef3da4b535c6ae798e23474f13cf6c4d Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Wed, 23 Jun 2010 12:47:16 -0400
Subject: [PATCH] Ignore existing lat/lng when calling ensureMap() as a result
 of a geocode request

---
 kronolith/js/kronolith.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index 40659d8f2..52c1a818a 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -3719,7 +3719,7 @@ KronolithCore = {
         switch (trigger.id) {
         case 'kronolithEventLocation':
             if (kc == Event.KEY_RETURN) {
-                this.ensureMap();
+                this.ensureMap(true);
                 this.geocode($F('kronolithEventLocation'));
                 e.stop();
                 return;
@@ -4259,7 +4259,7 @@ KronolithCore = {
                 break;
 
             case 'kronolithEventGeo':
-                this.ensureMap();
+                this.ensureMap(true);
                 this.geocode($F('kronolithEventLocation'));
                 e.stop();
                 break;
@@ -5506,7 +5506,7 @@ KronolithCore = {
     contextOnClick: Prototype.emptyFunction,
 
     // Map
-    initializeMap: function()
+    initializeMap: function(ignoreLL)
     {
          var layers = [];
          if (Kronolith.conf.maps.providers) {
@@ -5526,7 +5526,7 @@ KronolithCore = {
                  mapClick: this.afterClickMap.bind(this)
              });
 
-         if ($('kronolithEventLocationLat').value) {
+         if ($('kronolithEventLocationLat').value && !ignoreLL) {
              var ll = { lat:$('kronolithEventLocationLat').value, lon: $('kronolithEventLocationLon').value };
              // Note that we need to cast the value of zoom to an integer here,
              // otherwise the map display breaks.
@@ -5658,10 +5658,10 @@ KronolithCore = {
     /**
      * Ensures the map tab is visible and sets UI elements accordingly.
      */
-    ensureMap: function()
+    ensureMap: function(ignoreLL)
     {
         if (!this.mapInitialized) {
-            this.initializeMap();
+            this.initializeMap(ignoreLL);
         }
         var dialog = $('kronolithEventForm');
         dialog.select('.kronolithTabsOption').invoke('hide');
-- 
2.11.0