From 3a26b14b71b68069fa3a9854f37f9bf7e5b03b11 Mon Sep 17 00:00:00 2001
From: Godwin <goodgodwin@hotmail.com>
Date: Mon, 24 Jul 2017 09:53:17 -0700
Subject: [PATCH] Fixed map loading (#240)

* Fixed fonts

* Fixed assets

* Fixed logo in emails

* Switched to immediate email delivery

* Fixed prod emails and added deployment tasks

* Fixed deployments

* Updated README

* Added Bike Collectives Core to README

* Fixed issue with map loading

* Fixed issue with map loading
---
 README.md                            | 4 ++++
 app/assets/javascripts/map.js        | 2 +-
 app/views/conferences/list.html.haml | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fd1db9a..773b475 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,10 @@ bundle config local.bikecollectives_core PATH_TO/bikecollectives_core
 
 Here is a list of the gems we have created so far, if you are a collaborator on this project you may need to become a collaborator on these gems as well. Don't hesitate to make a request, it won't be denied:
 
+### Bike Collectives Core ###
+
+[Bike Collectives Core](https://github.com/bikebike/bikecollectives_core) is where models, migrations, and some common controllers and helpers live. This Gem is shared between [Bike Collectives](https://github.com/bikebike/bikecollectives) and [Bike Collectives Workbench](https://github.com/bikebike/bikecollectives_workbench).
+
 ### Lingua Franca ###
 
 [Lingua Franca](https://github.com/lingua-franca/lingua_franca) provides an easy way to include translatable content and provides a user interface for translators to provide translations. See [Translations](#translations) for best practices on the Bike!Bike! website.
diff --git a/app/assets/javascripts/map.js b/app/assets/javascripts/map.js
index b0dd9bb..bf74956 100644
--- a/app/assets/javascripts/map.js
+++ b/app/assets/javascripts/map.js
@@ -33,7 +33,7 @@
       });
     };
 
-    d3.json('/assets/world-110m.json', function(error, world) {
+    d3.json(document.getElementById('map').getAttribute('data-src'), function(error, world) {
       if (error) {
         throw error;
       }
diff --git a/app/views/conferences/list.html.haml b/app/views/conferences/list.html.haml
index 9949e51..58d6390 100644
--- a/app/views/conferences/list.html.haml
+++ b/app/views/conferences/list.html.haml
@@ -5,7 +5,7 @@
 
 - content_for :banner do
   #header-title.map
-    %svg#map.loading{preserveAspectRatio: 'xMinYMin slice', viewBox: "0 0 1880 550"}
+    %svg#map.loading{preserveAspectRatio: 'xMinYMin slice', viewBox: "0 0 1880 550", data: { src: asset_path('world-110m.json') }}
     #tooltip
 
 %article