Fix DE-DK arrow. Update tooltip

electricitymaps · Nov 20, 2016 · 915c717 · 915c717
1 parent 3df5540
commit 915c717
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/exchangeconfig.js b/app/exchangeconfig.js
@@ -84,7 +84,7 @@ function addExchangesConfiguration(exchanges) {
     // DE
     exchanges['DE->DK'] = {
         lonlat: [9.3, 54.9],
-        rotation: 180
+        rotation: 0
     };
     exchanges['DE->FR'] = {
         lonlat: [8.048297, 48.931337],

diff --git a/app/main.js b/app/main.js
@@ -341,8 +341,10 @@ function dataLoaded(err, state, solar, wind) {
             tooltip
                 .style('left', (d3.event.pageX - w - 5) + 'px')
                 .style('top', (d3.event.pageY - h - 5) + 'px');
-            tooltip.select('i.country-flag')
-                .attr('class', function(d) { return 'flag-icon flag-icon-' + d.countryCode.toLowerCase(); })
+            tooltip.select('i#country-flag')
+                .attr('class', 'flag-icon flag-icon-' + d.countryCode.toLowerCase())
+            tooltip.select('#country-code')
+                .text(d.countryCode);
             tooltip.select('.country-emission-rect')
                 .style('background-color', d.co2intensity ? co2color(d.co2intensity) : 'gray');
             tooltip.select('.country-emission-intensity')

diff --git a/index.html b/index.html
@@ -160,7 +160,7 @@ <h1>
                     <div class="country-picker-container small-screen-visible" style="margin-left: 20px">
                         <p></p>
                     </div>
-                    Like the map? <a href="https://docs.google.com/forms/d/e/1FAIpQLSc-_sRr3mmhe0bifigGxfAzgh97-pJFcwpwWZGLFc6vvu8laA/viewform?c=0&w=1" target="_blank">We would love to hear your feedback</a>!<br />
+                    Like the visualization? <a href="https://docs.google.com/forms/d/e/1FAIpQLSc-_sRr3mmhe0bifigGxfAzgh97-pJFcwpwWZGLFc6vvu8laA/viewform?c=0&w=1" target="_blank">We would love to hear your feedback</a>!<br />
                     Found bugs or have ideas? Report them <a href="https://github.com/corradio/electricitymap/issues/new" target="_blank">here</a>.<br />
                     <br />
                     <!-- Facebook share -->
@@ -189,6 +189,7 @@ <h1>
         <div class="loading overlay"></div>
         <div id="country-tooltip" class="tooltip panel">
             Carbon intensity:<br />
+            <i id="country-flag"></i> <span id="country-code"></span>: 
             <div class="country-emission-rect"></div> <span class="country-emission-intensity"></span> gCO2eq/kWh
         </div>
         <div id="exchange-tooltip" class="tooltip panel">