From 7bf73111c4da5837b92d6258dcf710bc15c8afa9 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 4 Mar 2019 10:28:13 -0500
Subject: [PATCH] Don't use double point icons Remove subsections when
 reloading

---
 modules/ui/preset_icon.js | 32 +++++++++++++++++++-------------
 modules/ui/search_add.js  |  1 +
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js
index 9610be3e8..9bcd404fb 100644
--- a/modules/ui/preset_icon.js
+++ b/modules/ui/preset_icon.js
@@ -23,6 +23,8 @@ export function uiPresetIcon() {
             return 'iD-other-line';
         else if (geom === 'vertex')
             return p.isFallback() ? '' : 'temaki-vertex';
+        else if (isSmall() && geom === 'point')
+            return null;
         else
             return 'maki-marker-stroked';
     }
@@ -148,9 +150,9 @@ export function uiPresetIcon() {
         var p = preset.apply(this, arguments);
         var geom = geometry ? geometry.apply(this, arguments) : null;
         var picon = getIcon(p, geom);
-        var isMaki = /^maki-/.test(picon);
-        var isTemaki = /^temaki-/.test(picon);
-        var isFa = /^fa[srb]-/.test(picon);
+        var isMaki = picon ? /^maki-/.test(picon) : false;
+        var isTemaki = picon ? /^temaki-/.test(picon) : false;
+        var isFa = picon ? /^fa[srb]-/.test(picon) : false;
         var isiDIcon = !(isMaki || isTemaki || isFa);
         var isCategory = !p.setTags;
         var drawLine = geom === 'line' && !isCategory;
@@ -229,18 +231,22 @@ export function uiPresetIcon() {
             .call(svgIcon(''))
             .merge(icon);
 
-        icon
-            .attr('class', 'preset-icon ' + (geom ? geom + '-geom' : ''))
-            .classed('framed', isFramed)
-            .classed('preset-icon-iD', isiDIcon);
+        if (picon) {
 
-        icon.selectAll('svg')
-            .attr('class', function() {
-                return 'icon ' + picon + ' ' + (!isiDIcon && geom !== 'line'  ? '' : tagClasses);
-            });
+            icon
+                .attr('class', 'preset-icon ' + (geom ? geom + '-geom' : ''))
+                .classed('framed', isFramed)
+                .classed('preset-icon-iD', isiDIcon);
+
+            icon.selectAll('svg')
+                .attr('class', function() {
+                    return 'icon ' + picon + ' ' + (!isiDIcon && geom !== 'line'  ? '' : tagClasses);
+                });
+
+            icon.selectAll('use')
+                .attr('href', '#' + picon + (isMaki ? (isSmall() && geom === 'point' ? '-11' : '-15') : ''));
+        }
 
-        icon.selectAll('use')
-            .attr('href', '#' + picon + (isMaki ? (isSmall() && geom === 'point' ? '-11' : '-15') : ''));
     }
 
 
diff --git a/modules/ui/search_add.js b/modules/ui/search_add.js
index 7c3ae2bfc..bf50cfbd1 100644
--- a/modules/ui/search_add.js
+++ b/modules/ui/search_add.js
@@ -119,6 +119,7 @@ export function uiSearchAdd(context) {
                 var value = search.property('value');
                 //list.classed('filtered', value.length);
                 if (value.length) {
+                    popover.selectAll('.subsection').remove();
                     var results = presets.search(value);
                     list.call(drawList, results);
                     popover.selectAll('.list .list-item.focused')