From 096cfaa073789b10d5f1e96511f2ba04f48ad53f Mon Sep 17 00:00:00 2001
From: efarooqui <efarooqui@pandora.com>
Date: Sun, 8 Aug 2021 17:06:48 -0700
Subject: [PATCH] Minor changes to example config for feature flags

---
 example.config.js                   | 13 +++++++------
 src/components/space/carto/Map.js   |  3 ++-
 src/components/time/atoms/Events.js |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/example.config.js b/example.config.js
index 4730758..b0f2c7d 100644
--- a/example.config.js
+++ b/example.config.js
@@ -2,10 +2,10 @@ module.exports = {
   title: 'example',
   display_title: 'example',
   SERVER_ROOT: 'http://localhost:4040',
-  EVENTS_EXT: '/api/timemap_data/export_events/deeprows',
-  CATEGORIES_EXT: '/api/timemap_data/export_categories/rows',
-  ASSOCIATIONS_EXT: '/api/timemap_data/export_associations/deeprows',
-  SOURCES_EXT: '/api/timemap_data/export_sources/deepids',
+  EVENTS_EXT: '/api/colombia_test/export_events/deeprows',
+  CATEGORIES_EXT: '/api/colombia_test/export_categories/rows',
+  ASSOCIATIONS_EXT: '/api/colombia_test/export_associations/deeprows',
+  SOURCES_EXT: '/api/colombia_test/export_sources/deepids',
   SITES_EXT: '',
   SHAPES_EXT: '',
   DATE_FMT: 'MM/DD/YYYY',
@@ -17,9 +17,10 @@ module.exports = {
       }
     },
     features: {
-      USE_CATEGORIES: false,
+      COLOR_BY_ASSOCIATION: true,
+      USE_CATEGORIES: true,
       USE_ASSOCIATIONS: true,
-      USE_SOURCES: false,
+      USE_SOURCES: true,
       USE_COVER: false,
       GRAPH_NONLOCATED: false,
       HIGHLIGHT_GROUPS: false
diff --git a/src/components/space/carto/Map.js b/src/components/space/carto/Map.js
index 13cd0cb..d776dd8 100644
--- a/src/components/space/carto/Map.js
+++ b/src/components/space/carto/Map.js
@@ -276,7 +276,7 @@ class Map extends React.Component {
       this.superclusterIndex.options.minZoom
     );
     const zoomLevelsToSkip = 2;
-    const zoomToFly = Math.max(
+    const zoomToFly = Math.min(
       expansionZoom + zoomLevelsToSkip,
       this.props.app.cluster.maxZoom
     );
@@ -384,6 +384,7 @@ class Map extends React.Component {
       individualClusters,
       this.props.domain.locations
     );
+
     return (
       <Events
         svg={this.svgRef.current}
diff --git a/src/components/time/atoms/Events.js b/src/components/time/atoms/Events.js
index 7f5a0e0..f0fb7a6 100644
--- a/src/components/time/atoms/Events.js
+++ b/src/components/time/atoms/Events.js
@@ -160,7 +160,7 @@ const TimelineEvents = ({
     const { shape: eventShape } = event;
 
     let renderShape = isDot ? renderDot : renderBar;
-    if (eventShape.shape) {
+    if (eventShape && eventShape.shape) {
       if (eventShape.shape === AVAILABLE_SHAPES.BAR) {
         renderShape = renderBar;
       } else if (eventShape.shape === AVAILABLE_SHAPES.DIAMOND) {