From 527faa7b4222415e2798bbd85fd5f92d3c54f1ad Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 1 Apr 2020 11:25:45 -0700
Subject: [PATCH] Remove need for coreContext in presetIndex

---
 modules/core/context.js   | 2 +-
 modules/presets/index.js  | 7 +++----
 modules/ui/preset_list.js | 9 +++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/core/context.js b/modules/core/context.js
index de6987552..416607f39 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -452,7 +452,7 @@ export function coreContext() {
       _map = rendererMap(context);
       _photos = rendererPhotos(context);
 
-      _presets = presetIndex(context);
+      _presets = presetIndex();
 
       _ui = uiInit(context);
 
diff --git a/modules/presets/index.js b/modules/presets/index.js
index 4bae2013c..e72516643 100644
--- a/modules/presets/index.js
+++ b/modules/presets/index.js
@@ -19,7 +19,7 @@ export { presetPreset };
 // `presetIndex` wraps a `presetCollection`
 // with methods for loading new data and returning defaults
 //
-export function presetIndex(context) {
+export function presetIndex() {
   const dispatch = d3_dispatch('recentsChange');
   const MAXRECENTS = 30;
 
@@ -310,9 +310,9 @@ export function presetIndex(context) {
   _this.universal = () => _universal;
 
 
-  _this.defaults = (geometry, n) => {
+  _this.defaults = (geometry, n, startWithRecents) => {
     let rec = [];
-    if (!context.inIntro()) {
+    if (startWithRecents) {
       rec = _this.recent().matchGeometry(geometry).collection.slice(0, 4);
     }
     const def = utilArrayUniq(rec.concat(_defaults[geometry].collection)).slice(0, n - 1);
@@ -441,7 +441,6 @@ export function presetIndex(context) {
 
 
   _this.setMostRecent = (preset, geometry) => {
-    if (context.inIntro()) return;
     if (preset.searchable === false) return;
 
     geometry = _this.fallback(geometry).id;
diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index 1da6dba59..7c8fde7e2 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -105,7 +105,7 @@ export function uiPresetList(context) {
                     search: value
                 });
             } else {
-                results = context.presets().defaults(entityGeometries()[0], 36);
+                results = context.presets().defaults(entityGeometries()[0], 36, !context.inIntro());
                 messageText = t('inspector.choose');
             }
             list.call(drawList, results);
@@ -140,7 +140,7 @@ export function uiPresetList(context) {
         var list = listWrap
             .append('div')
             .attr('class', 'preset-list')
-            .call(drawList, context.presets().defaults(entityGeometries()[0], 36));
+            .call(drawList, context.presets().defaults(entityGeometries()[0], 36, !context.inIntro()));
 
         context.features().on('change.preset-list', updateForFeatureHiddenState);
     }
@@ -399,8 +399,9 @@ export function uiPresetList(context) {
 
         item.choose = function() {
             if (d3_select(this).classed('disabled')) return;
-
-            context.presets().setMostRecent(preset, entityGeometries()[0]);
+            if (!context.inIntro()) {
+                context.presets().setMostRecent(preset, entityGeometries()[0]);
+            }
             context.perform(
                 function(graph) {
                     for (var i in _entityIDs) {