From 726b5b0c7d058cb4bad742c8e3f48d76d68e86a2 Mon Sep 17 00:00:00 2001
From: Franc Camps-Febrer <francamps@gmail.com>
Date: Fri, 21 Dec 2018 12:37:17 +0100
Subject: [PATCH 1/2] Do not flyTo if eventPoint is null

---
 src/components/Map.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Map.jsx b/src/components/Map.jsx
index a97c5f9..eba270c 100644
--- a/src/components/Map.jsx
+++ b/src/components/Map.jsx
@@ -39,7 +39,7 @@ class Map extends React.Component {
       // Fly to first  of events selected
       const eventPoint = (nextProps.app.selected.length > 0) ? nextProps.app.selected[0] : null;
 
-      if (eventPoint.latitude && eventPoint.longitude) {
+      if (eventPoint !== null && eventPoint.latitude && eventPoint.longitude) {
         this.map.flyTo([eventPoint.latitude, eventPoint.longitude]);
       }
     }

From fbf1f4d03dea65eb8f5922b588dbea8d58e07048 Mon Sep 17 00:00:00 2001
From: Franc Camps-Febrer <francamps@gmail.com>
Date: Fri, 21 Dec 2018 12:49:41 +0100
Subject: [PATCH 2/2] Swap flyto for setView

---
 src/components/Map.jsx               | 2 +-
 src/components/MapEvents.jsx         | 1 -
 src/components/MapSelectedEvents.jsx | 1 -
 src/scss/map.scss                    | 4 ----
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/Map.jsx b/src/components/Map.jsx
index eba270c..6f93158 100644
--- a/src/components/Map.jsx
+++ b/src/components/Map.jsx
@@ -40,7 +40,7 @@ class Map extends React.Component {
       const eventPoint = (nextProps.app.selected.length > 0) ? nextProps.app.selected[0] : null;
 
       if (eventPoint !== null && eventPoint.latitude && eventPoint.longitude) {
-        this.map.flyTo([eventPoint.latitude, eventPoint.longitude]);
+        this.map.setView([eventPoint.latitude, eventPoint.longitude]);
       }
     }
   }  
diff --git a/src/components/MapEvents.jsx b/src/components/MapEvents.jsx
index 479736b..84cf6c4 100644
--- a/src/components/MapEvents.jsx
+++ b/src/components/MapEvents.jsx
@@ -46,7 +46,6 @@ class MapEvents extends React.Component {
       <g
         className="location"
         transform={`translate(${x}, ${y})`}
-        style={{ transition: 'transform 0.1s' }}
       >
         {Object.keys(eventsByCategory).map(cat => {
           return this.renderCategory(eventsByCategory[cat], cat)
diff --git a/src/components/MapSelectedEvents.jsx b/src/components/MapSelectedEvents.jsx
index 97f298f..8c48bc8 100644
--- a/src/components/MapSelectedEvents.jsx
+++ b/src/components/MapSelectedEvents.jsx
@@ -13,7 +13,6 @@ class MapSelectedEvents extends React.Component {
 
   renderMarker (event) {
     const { x, y } = this.projectPoint([event.latitude, event.longitude]);
-    console.log(x, y)
     return (
       <g
         className="location-marker"
diff --git a/src/scss/map.scss b/src/scss/map.scss
index 7067756..a49b34c 100644
--- a/src/scss/map.scss
+++ b/src/scss/map.scss
@@ -59,7 +59,6 @@
     font-family: 'Lato', Helvetica, sans-serif;
     border: rgba($black,0.6);
     letter-spacing: 0.05em;
-    transition: transform 0.1s;
 
     &::before {
       border-top-color: rgba($black,0.6);
@@ -169,12 +168,9 @@
 .location-event-marker {
   fill: $event_default;
   stroke-width: 0;
-  transition: 0.2s ease;
-  /*fill-opacity: 0.8;*/
   cursor: pointer;
 
   &:hover {
-    transition: 0.2s ease;
     fill-opacity: 1;
   }
 }