Skip to content

Business intelligence made simple

Moved maps? method [skip ci]

Andrew Kane044ac52ea18a
diff --git a/app/helpers/blazer/base_helper.rb b/app/helpers/blazer/base_helper.rb
index 9ca9ea5a..e5406122 100644
--- a/app/helpers/blazer/base_helper.rb
+++ b/app/helpers/blazer/base_helper.rb
@@ -28,10 +28,6 @@ module Blazer
end
end
- def blazer_maps?
- Blazer.mapbox_access_token.present?
- end
-
def blazer_js_var(name, value)
"var #{name} = #{json_escape(value.to_json(root: false))};".html_safe
end
diff --git a/app/views/blazer/queries/docs.html.erb b/app/views/blazer/queries/docs.html.erb
index ba5ea92b..816b3915 100644
--- a/app/views/blazer/queries/docs.html.erb
+++ b/app/views/blazer/queries/docs.html.erb
@@ -119,7 +119,7 @@
<td>Map</td>
<td>
Named <code>latitude</code> and <code>longitude</code>, or <code>lat</code> and <code>lon</code>, or <code>lat</code> and <code>lng</code>
- <% if !blazer_maps? %>
+ <% if !Blazer.maps? %>
<br />
<strong>Needs configured</strong>
<% end %>
diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erb
index f593afbc..934c173b 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 Blazer.maps? && @markers.any? %>
<% map_id = SecureRandom.hex %>
<%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>
<script>
diff --git a/app/views/layouts/blazer/application.html.erb b/app/views/layouts/blazer/application.html.erb
index fb9c4254..0cb3157e 100644
--- a/app/views/layouts/blazer/application.html.erb
+++ b/app/views/layouts/blazer/application.html.erb
@@ -15,7 +15,7 @@
<script>
<%= blazer_js_var "rootPath", root_path %>
</script>
- <% if blazer_maps? %>
+ <% if Blazer.maps? %>
<%= stylesheet_link_tag "https://api.mapbox.com/mapbox-gl-js/v2.12.0/mapbox-gl.css", integrity: "sha384-JnF4GvwrnLggHxx0ORCeHombtPxfqigY/GeEvbdv0Uy5qrCAuAyN3AulKRA+VAPr", crossorigin: "anonymous" %>
<%= javascript_include_tag "https://api.mapbox.com/mapbox-gl-js/v2.12.0/mapbox-gl.js", integrity: "sha384-vfOzZDaNX5M/OSAH3SyXcnOJbCgq0Y8y4c0WSofB4ePtoj17jb1QEVO/pf7j7+Co", crossorigin: "anonymous" %>
<% end %>
diff --git a/lib/blazer.rb b/lib/blazer.rb
index 629d148d..7cc91c5b 100644
--- a/lib/blazer.rb
+++ b/lib/blazer.rb
@@ -218,6 +218,10 @@ module Blazer
slack_oauth_token.present? || slack_webhook_url.present?
end
+ def self.maps?
+ mapbox_access_token.present?
+ end
+
def self.uploads?
settings.key?("uploads")
end