Add Option+W shortcut to toggle the OSM data layer (close #6104)

This commit is contained in:
Quincy Morgan
2019-04-19 14:51:53 -07:00
parent c2b13357bb
commit b566ef05b5
4 changed files with 29 additions and 6 deletions
+1
View File
@@ -1696,6 +1696,7 @@ en:
fullscreen: "Enter full screen mode"
sidebar: "Toggle sidebar"
wireframe: "Toggle wireframe mode"
osm_data: "Toggle OpenStreetMap data"
minimap: "Toggle minimap"
selecting:
title: "Selecting features"
+5
View File
@@ -74,6 +74,11 @@
"shortcuts": ["area_fill.wireframe.key"],
"text": "shortcuts.browsing.display_options.wireframe"
},
{
"modifiers": ["⌥"],
"shortcuts": ["area_fill.wireframe.key"],
"text": "shortcuts.browsing.display_options.osm_data"
},
{
"shortcuts": ["background.minimap.key"],
"text": "shortcuts.browsing.display_options.minimap"
+1
View File
@@ -2055,6 +2055,7 @@
"fullscreen": "Enter full screen mode",
"sidebar": "Toggle sidebar",
"wireframe": "Toggle wireframe mode",
"osm_data": "Toggle OpenStreetMap data",
"minimap": "Toggle minimap"
},
"selecting": {
+22 -6
View File
@@ -11,10 +11,12 @@ import { modeBrowse } from '../modes';
import { uiDisclosure } from './disclosure';
import { uiSettingsCustomData } from './settings/custom_data';
import { uiTooltipHtml } from './tooltipHtml';
import { uiCmd } from './cmd';
export function uiMapData(context) {
var key = t('map_data.key');
var osmDataToggleKey = uiCmd('⌥' + t('area_fill.wireframe.key'));
var features = context.features().keys();
var layers = context.layers();
var fills = ['wireframe', 'partial', 'full'];
@@ -277,11 +279,20 @@ export function uiMapData(context) {
var labelEnter = liEnter
.append('label')
.each(function(d) {
d3_select(this)
.call(tooltip()
.title(t('map_data.layers.' + d.id + '.tooltip'))
.placement('bottom')
);
if (d.id === 'osm') {
d3_select(this)
.call(tooltip()
.html(true)
.title(uiTooltipHtml(t('map_data.layers.' + d.id + '.tooltip'), osmDataToggleKey))
.placement('bottom')
);
} else {
d3_select(this)
.call(tooltip()
.title(t('map_data.layers.' + d.id + '.tooltip'))
.placement('bottom')
);
}
});
labelEnter
@@ -820,7 +831,12 @@ export function uiMapData(context) {
context.keybinding()
.on(key, uiMapData.togglePane)
.on(t('area_fill.wireframe.key'), toggleWireframe);
.on(t('area_fill.wireframe.key'), toggleWireframe)
.on(osmDataToggleKey, function() {
d3_event.preventDefault();
d3_event.stopPropagation();
toggleLayer('osm');
});
};
return uiMapData;