From dead97e32103506062c42fa952c0fb5301dfc731 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Tue, 26 Feb 2019 15:17:04 -0500
Subject: [PATCH] Reduce parameters for add modes Tweak CSS classes

---
 css/55_cursors.css         |  3 +--
 modules/modes/add_area.js  |  4 ++--
 modules/modes/add_line.js  |  4 ++--
 modules/modes/add_point.js |  4 ++--
 modules/ui/modes.js        | 13 +++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/css/55_cursors.css b/css/55_cursors.css
index 70edc9c55..b9039d91d 100644
--- a/css/55_cursors.css
+++ b/css/55_cursors.css
@@ -54,7 +54,7 @@
     cursor: url(img/cursor-select-remove.png), pointer; /* FF */
 }
 
-[class*=" mode-add-preset-"] #map,
+.mode-add-favorite #map,
 .mode-draw-line #map,
 .mode-draw-area #map,
 .mode-add-line  #map,
@@ -105,4 +105,3 @@
 .turn circle {
     cursor: pointer;
 }
-
diff --git a/modules/modes/add_area.js b/modules/modes/add_area.js
index 9c8f465f0..55b344943 100644
--- a/modules/modes/add_area.js
+++ b/modules/modes/add_area.js
@@ -10,7 +10,7 @@ import { modeDrawArea } from './index';
 import { osmNode, osmWay } from '../osm';
 
 
-export function modeAddArea(context, customMode, preset) {
+export function modeAddArea(context, customMode) {
     var mode = customMode || {
         id: 'add-area',
         button: 'area',
@@ -26,7 +26,7 @@ export function modeAddArea(context, customMode, preset) {
         .on('startFromNode', startFromNode);
 
     var defaultTags = { area: 'yes' };
-    if (preset) defaultTags = preset.setTags(defaultTags, 'area');
+    if (mode.preset) defaultTags = mode.preset.setTags(defaultTags, 'area');
 
 
     function actionClose(wayId) {
diff --git a/modules/modes/add_line.js b/modules/modes/add_line.js
index c524f502c..b56549682 100644
--- a/modules/modes/add_line.js
+++ b/modules/modes/add_line.js
@@ -10,7 +10,7 @@ import { modeDrawLine } from './index';
 import { osmNode, osmWay } from '../osm';
 
 
-export function modeAddLine(context, customMode, preset) {
+export function modeAddLine(context, customMode) {
     var mode = customMode || {
         id: 'add-line',
         button: 'line',
@@ -26,7 +26,7 @@ export function modeAddLine(context, customMode, preset) {
         .on('startFromNode', startFromNode);
 
     var defaultTags = {};
-    if (preset) defaultTags = preset.setTags(defaultTags, 'line');
+    if (mode.preset) defaultTags = mode.preset.setTags(defaultTags, 'line');
 
 
     function start(loc) {
diff --git a/modules/modes/add_point.js b/modules/modes/add_point.js
index d9024d95d..e5c77d0cf 100644
--- a/modules/modes/add_point.js
+++ b/modules/modes/add_point.js
@@ -6,7 +6,7 @@ import { osmNode } from '../osm';
 import { actionAddMidpoint } from '../actions';
 
 
-export function modeAddPoint(context, customMode, preset) {
+export function modeAddPoint(context, customMode) {
     var mode = customMode || {
         id: 'add-point',
         button: 'point',
@@ -24,7 +24,7 @@ export function modeAddPoint(context, customMode, preset) {
         .on('finish', cancel);
 
     var defaultTags = {};
-    if (preset) defaultTags = preset.setTags(defaultTags, 'point');
+    if (mode.preset) defaultTags = mode.preset.setTags(defaultTags, 'point');
 
 
     function add(loc) {
diff --git a/modules/ui/modes.js b/modules/ui/modes.js
index b1f1a48f4..c73628054 100644
--- a/modules/ui/modes.js
+++ b/modules/ui/modes.js
@@ -99,7 +99,7 @@ export function uiModes(context) {
                 var preset = context.presets().item(d.id);
                 var isMaki = /^maki-/.test(preset.icon);
                 var icon = '#' + preset.icon + (isMaki ? '-11' : '');
-                var markerClass = 'add-preset-' + preset.name()
+                var markerClass = 'add-favorite add-preset-' + preset.name()
                     .replace(/\s+/g, '_')
                     + '-' + d.geom; //replace spaces with underscores to avoid css interpretation
 
@@ -107,18 +107,19 @@ export function uiModes(context) {
                     id: markerClass,
                     button: markerClass,
                     title: t('presets.presets.' + preset.id + '.name'),
-                    description: [t('operations.add.title'), t('presets.presets.' + preset.id + '.name').toLowerCase(), t('geometry.' + d.geom)].join(' '),
+                    description: [t('operations.add.title'), t('presets.presets.' + preset.id + '.name'), t('geometry.' + d.geom)].join(' '),
                     key: '',
-                    icon: icon
+                    icon: icon,
+                    preset: preset
                 };
                 switch (d.geom) {
                     case 'point':
                     case 'vertex':
-                        return modeAddPoint(context, favoriteMode, preset);
+                        return modeAddPoint(context, favoriteMode);
                     case 'line':
-                        return modeAddLine(context, favoriteMode, preset);
+                        return modeAddLine(context, favoriteMode);
                     case 'area':
-                        return modeAddArea(context, favoriteMode, preset);
+                        return modeAddArea(context, favoriteMode);
                 }
             });