Business intelligence made simple
Added support for maps from GeoJSON - closes #417
Andrew Kaneafabb2fa9b7a
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 59890ea5..429e6df0 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -2,6 +2,7 @@- Switched to Mapbox GL for maps (this affects Mapbox billing)- Support for AnomalyDetection.rb is no longer experimental+- Added support for maps from GeoJSON- Fixed `async` option- Fixed run now button for cached queries- Dropped support for Ruby < 2.7 and Rails < 6diff --git a/README.md b/README.mdindex aaa02a76..ac9d9209 100644--- a/README.md+++ b/README.md@@ -360,6 +360,12 @@ Columns named `latitude` and `longitude` or `lat` and `lon` or `lat` and `lng` -SELECT name, latitude, longitude FROM cities```+or a column named `geojson` [unreleased]++```sql+SELECT name, geojson FROM counties+```+To enable, get an access token from [Mapbox](https://www.mapbox.com/) and set `ENV["MAPBOX_ACCESS_TOKEN"]`.### Targetsdiff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex efb180c2..8d072601 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -269,6 +269,20 @@ module Blazerendend+ @geojson = []+ geo_index = @columns.index("geojson")+ if geo_index+ @geojson =+ @rows.filter_map do |r|+ if r[geo_index] && (geometry = JSON.parse(r[geo_index]))+ {+ tooltip: r.each_with_index.map { |v, i| i == geo_index ? nil : "<strong>#{ERB::Util.html_escape(@columns[i])}:</strong> #{ERB::Util.html_escape(v)}" }.compact.join("<br>").truncate(140, separator: " "),+ geometry: geometry+ }+ end+ end+ end+render_cohort_analysis if @cohort_analysis && !@errorrespond_to do |format|diff --git a/app/views/blazer/queries/docs.html.erb b/app/views/blazer/queries/docs.html.erbindex 816b3915..e744fd56 100644--- a/app/views/blazer/queries/docs.html.erb+++ b/app/views/blazer/queries/docs.html.erb@@ -125,6 +125,16 @@<% end %></td></tr>+ <tr>+ <td>Area Map</td>+ <td>+ Named <code>geojson</code>+ <% if !Blazer.maps? %>+ <br />+ <strong>Needs configured</strong>+ <% end %>+ </td>+ </tr></tbody></table>diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erbindex 633f5a9b..33cba2b7 100644--- a/app/views/blazer/queries/run.html.erb+++ b/app/views/blazer/queries/run.html.erb@@ -81,6 +81,15 @@<%= blazer_js_var "mapId", map_id %>new Mapkick.Map(mapId, markers, {accessToken: mapboxAccessToken, tooltips: {hover: false, html: true}});</script>+ <% elsif Blazer.maps? && @geojson.any? %>+ <% map_id = SecureRandom.hex %>+ <%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>+ <script>+ <%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %>+ <%= blazer_js_var "geojson", @geojson %>+ <%= blazer_js_var "mapId", map_id %>+ new Mapkick.AreaMap(mapId, geojson, {accessToken: mapboxAccessToken, tooltips: {hover: false, html: true}});+ </script><% elsif chart_type == "line" %><% chart_data = @columns[1..-1].each_with_index.map{ |k, i| {name: blazer_series_name(k), data: @rows.map{ |r| [r[0], r[i + 1]] }, library: series_library[i]} } %><%= line_chart chart_data, **chart_options %>