From e6bc7efb7f5f41de84863c66cdb18750f3a24b74 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 22 Mar 2019 09:20:18 -0400
Subject: [PATCH] Disallow favoriting of unsearchable presets Rename preset
 favorite button class and file

---
 modules/ui/entity_editor.js                                  | 4 ++--
 modules/ui/{preset_favorite.js => preset_favorite_button.js} | 4 ++--
 modules/ui/search_add.js                                     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename modules/ui/{preset_favorite.js => preset_favorite_button.js} (89%)

diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js
index eba317e19..09dee62f5 100644
--- a/modules/ui/entity_editor.js
+++ b/modules/ui/entity_editor.js
@@ -14,7 +14,7 @@ import { tooltip } from '../util/tooltip';
 import { actionChangeTags } from '../actions';
 import { modeBrowse } from '../modes';
 import { svgIcon } from '../svg';
-import { uiPresetFavorite } from './preset_favorite';
+import { uiPresetFavoriteButton } from './preset_favorite_button';
 import { uiPresetIcon } from './preset_icon';
 import { uiQuickLinks } from './quick_links';
 import { uiRawMemberEditor } from './raw_member_editor';
@@ -341,7 +341,7 @@ export function uiEntityEditor(context) {
             _tagReference = uiTagReference(_activePreset.reference(context.geometry(_entityID)), context)
                 .showing(false);
         }
-        _presetFavorite = uiPresetFavorite(_activePreset, context.geometry(_entityID), context);
+        _presetFavorite = uiPresetFavoriteButton(_activePreset, context.geometry(_entityID), context);
         return entityEditor;
     };
 
diff --git a/modules/ui/preset_favorite.js b/modules/ui/preset_favorite_button.js
similarity index 89%
rename from modules/ui/preset_favorite.js
rename to modules/ui/preset_favorite_button.js
index 856d1741e..3fd84898e 100644
--- a/modules/ui/preset_favorite.js
+++ b/modules/ui/preset_favorite_button.js
@@ -6,7 +6,7 @@ import {
 import { t } from '../util/locale';
 import { svgIcon } from '../svg';
 
-export function uiPresetFavorite(preset, geom, context, klass) {
+export function uiPresetFavoriteButton(preset, geom, context, klass) {
 
     geom = context.presets().fallback(geom).id;
 
@@ -17,7 +17,7 @@ export function uiPresetFavorite(preset, geom, context, klass) {
 
     presetFavorite.button = function(selection) {
 
-        var canFavorite = geom !== 'relation';
+        var canFavorite = geom !== 'relation' && preset.searchable !== false;
 
         _button = selection.selectAll('.preset-favorite-button')
             .data(canFavorite ? [0] : []);
diff --git a/modules/ui/search_add.js b/modules/ui/search_add.js
index c806fdbb6..33a3e324c 100644
--- a/modules/ui/search_add.js
+++ b/modules/ui/search_add.js
@@ -19,7 +19,7 @@ import { svgIcon } from '../svg/index';
 import { tooltip } from '../util/tooltip';
 import { uiTagReference } from './tag_reference';
 import { uiTooltipHtml } from './tooltipHtml';
-import { uiPresetFavorite } from './preset_favorite';
+import { uiPresetFavoriteButton } from './preset_favorite_button';
 import { uiPresetIcon } from './preset_icon';
 import { utilKeybinding, utilNoAuto, utilRebind } from '../util';
 
@@ -437,7 +437,7 @@ export function uiSearchAdd(context) {
 
         row.each(function(d) {
             if (d.geometry) {
-                var presetFavorite = uiPresetFavorite(d.preset, d.geometry, context, 'accessory');
+                var presetFavorite = uiPresetFavoriteButton(d.preset, d.geometry, context, 'accessory');
                 d3_select(this).call(presetFavorite.button);
             }
         });