Update search results on map move

alno · May 23, 2012 · b412c32 · b412c32
1 parent 250e24f
commit b412c32
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/app/assets/javascripts/app.js.coffee b/app/assets/javascripts/app.js.coffee
@@ -94,11 +94,7 @@ class @App
     unless parseFloat(params.lat) == @map.getCenter().lat and parseFloat(params.lon) == @map.getCenter().lng and parseInt(params.zoom) == @map.getZoom()
       @map.setView(new L.LatLng(params.lat, params.lon,1), params.zoom)
 
-    if params.mode == 'search' and params.query != @currentQuery
-      @currentQuery = params.query
-
-      $.get "/search.json", {lat: params.lat, lng: params.lon, q: params.query}, (data) =>
-        @updateSearchResults(data)
+    @modes[params.mode].route(params) if @modes[params.mode].route
 
   selectStyle: (style) ->
     @styleLayerCache = {} unless @styleLayerCache
@@ -184,7 +180,6 @@ class @App
         cat.find('a').attr('href', null)
 
     @sidebar.find('#sidebar_results_tab').tab('show')
-    @showSidebar()
 
   buildPaginator: (container, current, count, handler) ->
     appendLink = (page) ->

diff --git a/app/assets/javascripts/modes/search.js.coffee b/app/assets/javascripts/modes/search.js.coffee
@@ -5,3 +5,16 @@ class @App.Search
   enter: ->
 
   exit: ->
+
+  route: (params) ->
+    queryHash = "#{params.lat}/#{params.lon}/#{params.query}"
+
+    if queryHash != @lastQueryHash
+      reopenResults = params.query != @lastQuery
+
+      @lastQueryHash = queryHash
+      @lastQuery = params.query
+
+      $.get "/search.json", {lat: params.lat, lng: params.lon, q: params.query}, (data) =>
+        @app.updateSearchResults(data)
+        @app.showSidebar() if reopenResults