dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- New map option for inline system region names, closed #947

Browse Source
This commit is contained in:
Mark Friedrich
2020-04-24 22:10:42 +02:00
parent 7cc66f1591
commit f628ed69b4
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/app/map/map.js
View File

@@ -83,7 +83,7 @@ define([
description: 'Compact system layout',
class: 'systemCompactClass'
},
mapSignatureOverlays : {
connectionSignatureOverlays : {
buttonId: Util.config.menuButtonEndpointId,
description: 'Endpoint overlay',
onEnable: MapOverlay.showInfoSignatureOverlays,
@@ -1436,7 +1436,7 @@ define([
*/
let showInfoSignatureOverlays = payload => new Promise(resolve => {
Util.getLocalStore('map').getItem(payload.data.mapConfig.config.id).then(dataStore => {
if(dataStore && dataStore.mapSignatureOverlays){
if(dataStore && dataStore.connectionSignatureOverlays){
MapOverlay.showInfoSignatureOverlays($(payload.data.mapConfig.map.getContainer()));
}
resolve(payload);

16
js/app/map/overlay/overlay.js
View File

@@ -288,7 +288,7 @@ define([
let connectionsData = Util.getObjVal(mapData, 'data.connections');
if(connectionsData){
let overlayIcon = getOverlayIcon(mapElement, options.mapSignatureOverlays.class);
let overlayIcon = getOverlayIcon(mapElement, options.connectionSignatureOverlays.class);
showLoading(overlayIcon);
updateInfoSignatureOverlays(map, connectionsData);
hideLoading(overlayIcon);
@@ -352,7 +352,7 @@ define([
let mapElement = MapOverlayUtil.getMapElementFromOverlay(this);
let map = getMapObjectFromOverlayIcon(this);
MapUtil.storeLocalData('map', mapElement.data('id'), 'filterScopes', []);
Util.getLocalStore('map').setItem(`${mapElement.data('id')}.filterScopes`, []);
MapUtil.filterMapByScopes(map, []);
}
},
@@ -380,6 +380,12 @@ define([
class: 'pf-map-overlay-compact',
iconClass: ['fas', 'fa-fw', 'fa-compress']
},
connectionSignatureOverlays: {
title: 'signature overlays',
trigger: 'active',
class: 'pf-map-overlay-endpoint',
iconClass: ['fas', 'fa-fw', 'fa-link']
},
systemPopover: {
title: 'sovereignty',
trigger: 'hover',
@@ -416,12 +422,6 @@ define([
}
}
},
mapSignatureOverlays: {
title: 'signature overlays',
trigger: 'active',
class: 'pf-map-overlay-endpoint',
iconClass: ['fas', 'fa-fw', 'fa-link']
},
connection: {
title: 'WH data',
trigger: 'hover',

2
js/app/map/util.js
View File

@@ -1472,7 +1472,7 @@ define([
// init endpoint overlay --------------------------------------------------------------------------
Util.triggerMenuAction(mapElement, 'MapOption', {
option: 'mapSignatureOverlays',
option: 'connectionSignatureOverlays',
toggle: false,
skipOnEnable: true, // skip callback -> Otherwise it would run 2 times on map create
skipOnDisable: true // skip callback -> Otherwise it would run 2 times on map create

2
js/app/page.js
View File

@@ -406,7 +406,7 @@ define([
group: 'mapOptions',
action: 'MapOption',
target: 'map',
data: {option: 'mapSignatureOverlays', toggle: true}
data: {option: 'connectionSignatureOverlays', toggle: true}
},{
type: 'heading',
label: 'Help'

4
public/js/v2.0.1/app/map/map.js
View File

@@ -83,7 +83,7 @@ define([
description: 'Compact system layout',
class: 'systemCompactClass'
},
mapSignatureOverlays : {
connectionSignatureOverlays : {
buttonId: Util.config.menuButtonEndpointId,
description: 'Endpoint overlay',
onEnable: MapOverlay.showInfoSignatureOverlays,
@@ -1436,7 +1436,7 @@ define([
*/
let showInfoSignatureOverlays = payload => new Promise(resolve => {
Util.getLocalStore('map').getItem(payload.data.mapConfig.config.id).then(dataStore => {
if(dataStore && dataStore.mapSignatureOverlays){
if(dataStore && dataStore.connectionSignatureOverlays){
MapOverlay.showInfoSignatureOverlays($(payload.data.mapConfig.map.getContainer()));
}
resolve(payload);

16
public/js/v2.0.1/app/map/overlay/overlay.js
View File

@@ -288,7 +288,7 @@ define([
let connectionsData = Util.getObjVal(mapData, 'data.connections');
if(connectionsData){
let overlayIcon = getOverlayIcon(mapElement, options.mapSignatureOverlays.class);
let overlayIcon = getOverlayIcon(mapElement, options.connectionSignatureOverlays.class);
showLoading(overlayIcon);
updateInfoSignatureOverlays(map, connectionsData);
hideLoading(overlayIcon);
@@ -352,7 +352,7 @@ define([
let mapElement = MapOverlayUtil.getMapElementFromOverlay(this);
let map = getMapObjectFromOverlayIcon(this);
MapUtil.storeLocalData('map', mapElement.data('id'), 'filterScopes', []);
Util.getLocalStore('map').setItem(`${mapElement.data('id')}.filterScopes`, []);
MapUtil.filterMapByScopes(map, []);
}
},
@@ -380,6 +380,12 @@ define([
class: 'pf-map-overlay-compact',
iconClass: ['fas', 'fa-fw', 'fa-compress']
},
connectionSignatureOverlays: {
title: 'signature overlays',
trigger: 'active',
class: 'pf-map-overlay-endpoint',
iconClass: ['fas', 'fa-fw', 'fa-link']
},
systemPopover: {
title: 'sovereignty',
trigger: 'hover',
@@ -416,12 +422,6 @@ define([
}
}
},
mapSignatureOverlays: {
title: 'signature overlays',
trigger: 'active',
class: 'pf-map-overlay-endpoint',
iconClass: ['fas', 'fa-fw', 'fa-link']
},
connection: {
title: 'WH data',
trigger: 'hover',

2
public/js/v2.0.1/app/map/util.js
View File

@@ -1472,7 +1472,7 @@ define([
// init endpoint overlay --------------------------------------------------------------------------
Util.triggerMenuAction(mapElement, 'MapOption', {
option: 'mapSignatureOverlays',
option: 'connectionSignatureOverlays',
toggle: false,
skipOnEnable: true, // skip callback -> Otherwise it would run 2 times on map create
skipOnDisable: true // skip callback -> Otherwise it would run 2 times on map create

2
public/js/v2.0.1/app/page.js
View File

@@ -406,7 +406,7 @@ define([
group: 'mapOptions',
action: 'MapOption',
target: 'map',
data: {option: 'mapSignatureOverlays', toggle: true}
data: {option: 'connectionSignatureOverlays', toggle: true}
},{
type: 'heading',
label: 'Help'