CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-06 19:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:openstreetmap/iD

Browse Source
This commit is contained in:
Bryan Housel
2014-05-28 13:21:26 -04:00
parent 941ee1d88c c0db8b8e67
commit 26d7206bc9
7 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
css/app.css
View File

@@ -1542,6 +1542,11 @@ input[type=number] {
height: 300px;
}
.form-field-restrictions svg {
width: 100%;
height: 100%;
}
.form-field-restrictions .restriction-help {
z-index: 1;
position: absolute;

4
js/id/core/entity.js
View File

@@ -112,6 +112,10 @@ iD.Entity.prototype = {
});
},
isHighwayIntersection: function() {
return false;
},
deprecatedTags: function() {
var tags = _.pairs(this.tags);
var deprecated = {};

8
js/id/core/node.js
View File

@@ -37,6 +37,14 @@ _.extend(iD.Node.prototype, {
});
},
isHighwayIntersection: function(resolver) {
return resolver.transient(this, 'isHighwayIntersection', function() {
return resolver.parentWays(this).filter(function(parent) {
return parent.tags.highway && parent.geometry(resolver) === 'line';
}).length > 1;
});
},
asJXON: function(changeset_id) {
var r = {
node: {

2
js/id/ui/inspector.js
View File

@@ -35,7 +35,7 @@ iD.ui.Inspector = function(context) {
entity = context.entity(entityID),
showEditor = state === 'hover' ||
entity.isUsed(graph) ||
(entity.type === 'node' && entity.isIntersection(graph));
entity.isHighwayIntersection(graph);
if (showEditor) {
$wrap.style('right', '0%');

2
js/id/ui/preset.js
View File

@@ -72,7 +72,7 @@ iD.ui.preset = function(context) {
}
});
if (geometry === 'vertex' && entity.isIntersection(context.graph())) {
if (entity.isHighwayIntersection(context.graph())) {
fields.push(UIField(context.presets().field('restrictions'), entity, true));
}

4
js/id/ui/preset/restrictions.js
View File

@@ -119,7 +119,9 @@ iD.ui.preset.restrictions = function(field, context) {
}
function render() {
restrictions(selection);
if (context.hasEntity(vertexID)) {
restrictions(selection);
}
}
}

26
test/spec/core/node.js
View File

@@ -52,12 +52,30 @@ describe('iD.Node', function () {
expect(node.isIntersection(graph)).to.equal(true);
});
it("returns true for a node shared by more two non-highways", function () {
it("returns true for a node shared by more than one waterway", function () {
var node = iD.Node(),
w1 = iD.Way({nodes: [node.id]}),
w2 = iD.Way({nodes: [node.id]}),
w1 = iD.Way({nodes: [node.id], tags: {waterway: 'river'}}),
w2 = iD.Way({nodes: [node.id], tags: {waterway: 'river'}}),
graph = iD.Graph([node, w1, w2]);
expect(node.isIntersection(graph)).to.equal(false);
expect(node.isIntersection(graph)).to.equal(true);
});
});
describe("#isHighwayIntersection", function () {
it("returns true for a node shared by more than one highway", function () {
var node = iD.Node(),
w1 = iD.Way({nodes: [node.id], tags: {highway: 'residential'}}),
w2 = iD.Way({nodes: [node.id], tags: {highway: 'residential'}}),
graph = iD.Graph([node, w1, w2]);
expect(node.isHighwayIntersection(graph)).to.equal(true);
});
it("returns false for a node shared by more than one waterway", function () {
var node = iD.Node(),
w1 = iD.Way({nodes: [node.id], tags: {waterway: 'river'}}),
w2 = iD.Way({nodes: [node.id], tags: {waterway: 'river'}}),
graph = iD.Graph([node, w1, w2]);
expect(node.isHighwayIntersection(graph)).to.equal(false);
});
});