Business intelligence made simple
Improved map logic
Andrew Kane96d8d1c83c81
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex c0ff4dc1..315b57df 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -252,6 +252,27 @@ module Blazer@linked_columns = @data_source.linked_columns@markers = []+ @geojson = []+ set_map_data if Blazer.maps?++ render_cohort_analysis if @cohort_analysis && !@error++ respond_to do |format|+ format.html do+ render layout: false+ end+ format.csv do+ # not ideal, but useful for testing+ raise Error, @error if @error && Rails.env.test?++ data = csv_data(@columns, @rows, @data_source)+ filename = "#{@query.try(:name).try(:parameterize).presence || 'query'}.csv"+ send_data data, type: "text/csv; charset=utf-8", disposition: "attachment", filename: filename+ end+ end+ end++ def set_map_data[["latitude", "longitude"], ["lat", "lon"], ["lat", "lng"]].each do |keys|lat_index = @columns.index(keys.first)lon_index = @columns.index(keys.last)@@ -266,10 +287,11 @@ module Blazerlongitude: r[lon_index]}end++ return if @markers.any?endend- @geojson = []geo_index = @columns.index("geojson")if geo_index@geojson =@@ -282,22 +304,6 @@ module Blazerendendend-- render_cohort_analysis if @cohort_analysis && !@error-- respond_to do |format|- format.html do- render layout: false- end- format.csv do- # not ideal, but useful for testing- raise Error, @error if @error && Rails.env.test?-- data = csv_data(@columns, @rows, @data_source)- filename = "#{@query.try(:name).try(:parameterize).presence || 'query'}.csv"- send_data data, type: "text/csv; charset=utf-8", disposition: "attachment", filename: filename- end- endenddef set_queries(limit = nil)diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erbindex 33cba2b7..b709a609 100644--- a/app/views/blazer/queries/run.html.erb+++ b/app/views/blazer/queries/run.html.erb@@ -72,7 +72,7 @@<% color = "#54a3ee" %><% series_library[1] = {borderDash: [8], borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color} %><% end %>- <% if Blazer.maps? && @markers.any? %>+ <% if @markers.any? %><% map_id = SecureRandom.hex %><%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %><script>@@ -81,7 +81,7 @@<%= blazer_js_var "mapId", map_id %>new Mapkick.Map(mapId, markers, {accessToken: mapboxAccessToken, tooltips: {hover: false, html: true}});</script>- <% elsif Blazer.maps? && @geojson.any? %>+ <% elsif @geojson.any? %><% map_id = SecureRandom.hex %><%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %><script>