Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the initial inspector of the sidebar upon feature selection #5632

Merged
merged 1 commit into from
Dec 19, 2018
Merged

Change the initial inspector of the sidebar upon feature selection #5632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions modules/osm/entity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,13 @@ osmEntity.prototype = {
},


isUsed: function(resolver) {
return _without(Object.keys(this.tags), 'area').length > 0 ||
resolver.parentRelations(this).length > 0;
hasNonGeometryTags: function() {
return _without(Object.keys(this.tags), 'area').length > 0;
},

hasParentRelations: function(resolver) {
return resolver.parentRelations(this).length > 0;
},

hasInterestingTags: function() {
return _keys(this.tags).some(osmIsInterestingTag);
Expand Down
17 changes: 8 additions & 9 deletions modules/ui/inspector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function uiInspector(context) {
var _newFeature = false;


function inspector(selection) {
function inspector(selection, newFeature) {
presetList
.entityID(_entityID)
.autofocus(_newFeature)
Expand Down Expand Up @@ -44,19 +44,18 @@ export function uiInspector(context) {
var presetPane = wrap.selectAll('.preset-list-pane');
var editorPane = wrap.selectAll('.entity-editor-pane');

var graph = context.graph();
var entity = context.entity(_entityID);

var showEditor = _state === 'hover' ||
entity.isUsed(graph) ||
entity.isHighwayIntersection(graph);
var isTaglessVertex = entity.geometry(context.graph()) === 'vertex' && !entity.hasNonGeometryTags();
// start with the preset list if the feature is new or is a vertex with no tags
var showPresetList = newFeature || isTaglessVertex;

if (showEditor) {
wrap.style('right', '0%');
editorPane.call(entityEditor);
} else {
if (showPresetList) {
wrap.style('right', '-100%');
presetPane.call(presetList);
} else {
wrap.style('right', '0%');
editorPane.call(entityEditor);
}

var footer = selection.selectAll('.footer')
Expand Down
21 changes: 5 additions & 16 deletions modules/ui/preset_list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
import { t, textDirection } from '../util/locale';
import { actionChangePreset } from '../actions/index';
import { operationDelete } from '../operations/index';
import { modeBrowse } from '../modes/index';
import { svgIcon } from '../svg/index';
import { uiPresetIcon } from './preset_icon';
import { uiTagReference } from './tag_reference';
Expand Down Expand Up @@ -43,21 +42,11 @@ export function uiPresetList(context) {
.append('h3')
.text(t('inspector.choose'));

if (context.entity(_entityID).isUsed(context.graph())) {
messagewrap
.append('button')
.attr('class', 'preset-choose')
.on('click', function() { dispatch.call('choose', this, _currentPreset); })
.call(svgIcon((textDirection === 'rtl') ? '#iD-icon-backward' : '#iD-icon-forward'));
} else {
messagewrap
.append('button')
.attr('class', 'close')
.on('click', function() {
context.enter(modeBrowse(context));
})
.call(svgIcon('#iD-icon-close'));
}
messagewrap
.append('button')
.attr('class', 'preset-choose')
.on('click', function() { dispatch.call('choose', this, _currentPreset); })
.call(svgIcon((textDirection === 'rtl') ? '#iD-icon-backward' : '#iD-icon-forward'));

function initialKeydown() {
// hack to let delete shortcut work when search is autofocused
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export function uiSidebar(context) {
.newFeature(newFeature);

inspectorWrap
.call(inspector);
.call(inspector, newFeature);
}

} else {
Expand Down
27 changes: 16 additions & 11 deletions test/spec/osm/entity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,30 +189,35 @@ describe('iD.osmEntity', function () {
});
});

describe('#isUsed', function () {
describe('#hasNonGeometryTags', function () {
it('returns false for an entity without tags', function () {
var node = iD.Node(),
graph = iD.Graph([node]);
expect(node.isUsed(graph)).to.equal(false);
var node = iD.Node();
expect(node.hasNonGeometryTags()).to.equal(false);
});

it('returns true for an entity with tags', function () {
var node = iD.Node({tags: {foo: 'bar'}}),
graph = iD.Graph([node]);
expect(node.isUsed(graph)).to.equal(true);
var node = iD.Node({tags: {foo: 'bar'}});
expect(node.hasNonGeometryTags()).to.equal(true);
});

it('returns false for an entity with only an area=yes tag', function () {
var node = iD.Node({tags: {area: 'yes'}}),
graph = iD.Graph([node]);
expect(node.isUsed(graph)).to.equal(false);
var node = iD.Node({tags: {area: 'yes'}});
expect(node.hasNonGeometryTags()).to.equal(false);
});
});

describe('#hasParentRelations', function () {
it('returns true for an entity that is a relation member', function () {
var node = iD.Node(),
relation = iD.Relation({members: [{id: node.id}]}),
graph = iD.Graph([node, relation]);
expect(node.isUsed(graph)).to.equal(true);
expect(node.hasParentRelations(graph)).to.equal(true);
});

it('returns false for an entity that is not a relation member', function () {
var node = iD.Node(),
graph = iD.Graph([node]);
expect(node.hasParentRelations(graph)).to.equal(false);
});
});

Expand Down