CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 17:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom MacWright
2012-12-06 15:21:59 -05:00
parent f9455270f1 bdbcc5c331
commit a94eb35ddd
9 changed files with 152 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
js/id/graph/entity.js
View File

@@ -1,13 +1,23 @@
iD.Entity = function(a, b, c) {
if (!(this instanceof iD.Entity)) return new iD.Entity(a, b, c);
_.extend(this, {tags: {}}, a, b, c);
this.tags = {};
this.transients = {};
var sources = [a, b, c], source;
for (var i = 0; i < sources.length; ++i) {
source = sources[i];
for (var prop in source) {
if (prop !== 'transients' && Object.prototype.hasOwnProperty.call(source, prop)) {
this[prop] = source[prop];
}
}
}
if (!this.id) {
this.id = iD.util.id(this.type);
this._updated = true;
}
delete this._extent;
if (iD.debug) {
Object.freeze(this);
@@ -31,6 +41,35 @@ iD.Entity.prototype = {
return this._updated && +this.id.slice(1) > 0;
},
intersects: function(extent, resolver) {
if (this.type === 'node') {
return this.loc[0] > extent[0][0] &&
this.loc[0] < extent[1][0] &&
this.loc[1] < extent[0][1] &&
this.loc[1] > extent[1][1];
} else if (this.type === 'way') {
var _extent = this.transients.extent;
if (!_extent) {
_extent = this.transients.extent = [[-Infinity, Infinity], [Infinity, -Infinity]];
for (var i = 0, l = this.nodes.length; i < l; i++) {
var node = resolver.entity(this.nodes[i]);
if (node.loc[0] > _extent[0][0]) _extent[0][0] = node.loc[0];
if (node.loc[0] < _extent[1][0]) _extent[1][0] = node.loc[0];
if (node.loc[1] < _extent[0][1]) _extent[0][1] = node.loc[1];
if (node.loc[1] > _extent[1][1]) _extent[1][1] = node.loc[1];
}
}
return _extent[0][0] > extent[0][0] &&
_extent[1][0] < extent[1][0] &&
_extent[0][1] < extent[0][1] &&
_extent[1][1] > extent[1][1];
} else {
return false;
}
},
hasInterestingTags: function() {
return _.keys(this.tags).some(function (key) {
return key != "attribution" &&

37
js/id/graph/graph.js
View File

@@ -55,46 +55,13 @@ iD.Graph.prototype = {
return iD.Graph(entities, annotation);
},
nodeIntersect: function(entity, extent) {
return entity.loc[0] > extent[0][0] &&
entity.loc[0] < extent[1][0] &&
entity.loc[1] < extent[0][1] &&
entity.loc[1] > extent[1][1];
},
wayIntersect: function(entity, extent) {
return entity._extent[0][0] > extent[0][0] &&
entity._extent[1][0] < extent[1][0] &&
entity._extent[0][1] < extent[0][1] &&
entity._extent[1][1] > extent[1][1];
},
indexWay: function(way) {
if (way.type === 'way' && !way._extent) {
// top left, bottom right
var extent = [[-Infinity, Infinity], [Infinity, -Infinity]];
var w = way;
for (var j = 0, l = w.nodes.length; j < l; j++) {
if (w.nodes[j].loc[0] > extent[0][0]) extent[0][0] = w.nodes[j].loc[0];
if (w.nodes[j].loc[0] < extent[1][0]) extent[1][0] = w.nodes[j].loc[0];
if (w.nodes[j].loc[1] < extent[0][1]) extent[0][1] = w.nodes[j].loc[1];
if (w.nodes[j].loc[1] > extent[1][1]) extent[1][1] = w.nodes[j].loc[1];
}
way._extent = extent;
}
return true;
},
// get all objects that intersect an extent.
intersects: function(extent) {
var items = [];
for (var i in this.entities) {
var entity = this.entities[i];
if (entity.type === 'node' && this.nodeIntersect(entity, extent)) {
items.push(entity);
} else if (entity.type === 'way') {
var w = this.fetch(entity.id);
if (this.indexWay(w) && this.wayIntersect(w, extent)) items.push(w);
if (entity.intersects(extent, this)) {
items.push(this.fetch(entity.id));
}
}
return items;

20
js/id/modes/draw_area.js
View File

@@ -13,6 +13,13 @@ iD.modes.DrawArea = function(way_id) {
firstnode_id = _.first(way.nodes),
node = iD.Node({loc: mode.map.mouseCoordinates()});
function finish(next) {
way = mode.history.graph().entity(way.id);
way.tags = _.omit(way.tags, 'elastic');
mode.history.perform(iD.actions.ChangeEntityTags(way, way.tags));
return mode.controller.enter(next);
}
mode.history.perform(iD.actions.AddWayNode(way, node));
mode.map.surface.on('mousemove.drawarea', function() {
@@ -29,12 +36,8 @@ iD.modes.DrawArea = function(way_id) {
mode.history.replace(iD.actions.DeleteNode(node));
mode.history.replace(iD.actions.AddWayNode(way,
mode.history.graph().entity(way.nodes[0])));
way = mode.history.graph().entity(way.id);
way.tags = _.omit(way.tags, 'elastic');
mode.history.perform(iD.actions.ChangeEntityTags(way, way.tags));
// End by clicking on own tail
return mode.controller.enter(iD.modes.Select(way));
return finish(iD.modes.Select(way));
} else {
// connect a way to an existing way
mode.history.replace(iD.actions.AddWayNode(way, datum));
@@ -48,9 +51,10 @@ iD.modes.DrawArea = function(way_id) {
});
mode.map.keybinding().on('⎋.drawarea', function() {
mode.controller.exit();
})
.on('⌫.drawarea', function() {
finish(iD.modes.Browse());
});
mode.map.keybinding().on('⌫.drawarea', function() {
d3.event.preventDefault();
var lastNode = _.last(way.nodes);
mode.history.replace(iD.actions.removeWayNode(way,

15
js/id/modes/draw_road.js
View File

@@ -16,6 +16,12 @@ iD.modes.DrawRoad = function(way_id, direction) {
firstNode = way.nodes[0],
lastNode = _.last(way.nodes);
function finish(next) {
way.tags = _.omit(way.tags, 'elastic');
mode.history.perform(iD.actions.ChangeEntityTags(way, way.tags));
return mode.controller.enter(next);
}
mode.history.perform(iD.actions.AddWayNode(way, node, index));
mode.map.surface.on('mousemove.drawroad', function() {
@@ -40,12 +46,7 @@ iD.modes.DrawRoad = function(way_id, direction) {
mode.history.graph().entity(lastNode), index));
}
way.tags = _.omit(way.tags, 'elastic');
mode.history.perform(iD.actions.ChangeEntityTags(
way, way.tags));
// End by clicking on own tail
return mode.controller.enter(iD.modes.Select(way));
return finish(iD.modes.Select(way));
} else {
// connect a way to an existing way
mode.history.replace(iD.actions.AddWayNode(way, datum, index));
@@ -70,7 +71,7 @@ iD.modes.DrawRoad = function(way_id, direction) {
});
mode.map.keybinding().on('⎋.drawroad', function() {
mode.controller.exit();
finish(iD.modes.Browse());
});
mode.map.keybinding().on('⌫.drawroad', function() {

24
js/id/renderer/map.js
View File

@@ -135,7 +135,7 @@ iD.Map = function() {
else ways.push(a);
} else if (a._poi) {
points.push(a);
} else if (!a._poi && a.type === 'node' && iD.util.geo.nodeIntersect(a, extent)) {
} else if (!a._poi && a.type === 'node' && a.intersects(extent)) {
waynodes.push(a);
}
}
@@ -208,11 +208,13 @@ iD.Map = function() {
.data(data, key);
lines.exit().remove();
lines.enter().append('path')
.classed('hover', classHover)
.classed('active', classActive);
lines
.order()
.attr('d', getline)
.attr('class', class_gen)
.classed('hover', classHover)
.classed('active', classActive);
return lines;
}
@@ -281,17 +283,21 @@ iD.Map = function() {
}
function hoverIn() {
var entity = d3.select(d3.event.target).datum();
hover = entity.id;
drawVector(iD.util.trueObj([hover]));
d3.select('.messages').text(entity.tags.name || '#' + entity.id);
var datum = d3.select(d3.event.target).datum();
if (datum instanceof iD.Entity) {
hover = datum.id;
drawVector(iD.util.trueObj([hover]));
d3.select('.messages').text(datum.tags.name || '#' + datum.id);
}
}
function hoverOut() {
var oldHover = hover;
hover = null;
drawVector(iD.util.trueObj([oldHover]));
d3.select('.messages').text('');
if (hover) {
var oldHover = hover;
hover = null;
drawVector(iD.util.trueObj([oldHover]));
d3.select('.messages').text('');
}
}
function zoomPan() {

7
js/id/util.js
View File

@@ -90,13 +90,6 @@ iD.util.geo.dist = function(a, b) {
Math.pow(a[1] - b[1], 2));
};
iD.util.geo.nodeIntersect = function(entity, extent) {
return entity.loc[0] > extent[0][0] &&
entity.loc[0] < extent[1][0] &&
entity.loc[1] < extent[0][1] &&
entity.loc[1] > extent[1][1];
};
iD.util.geo.chooseIndex = function(way, point, map) {
var dist = iD.util.geo.dist;
var projNodes = way.nodes.map(function(n) {

64
test/spec/graph/entity.js
View File

@@ -1,4 +1,18 @@
describe('Entity', function () {
if (iD.debug) {
it("is frozen", function () {
expect(Object.isFrozen(iD.Entity())).to.be.true;
});
it("freezes tags", function () {
expect(Object.isFrozen(iD.Entity().tags)).to.be.true;
});
it("does not freeze transients", function () {
expect(Object.isFrozen(iD.Entity().transients)).to.be.false;
});
}
describe("#update", function () {
it("returns a new Entity", function () {
var a = iD.Entity(),
@@ -23,7 +37,17 @@ describe('Entity', function () {
var attrs = {tags: {foo: 'bar'}},
e = iD.Entity().update(attrs);
expect(attrs).to.eql({tags: {foo: 'bar'}});
})
});
it("doesn't copy transients", function () {
var entity = iD.Entity();
entity.transients['foo'] = 'bar';
expect(entity.update({}).transients).not.to.have.property('foo');
});
it("doesn't copy prototype properties", function () {
expect(iD.Entity().update({})).not.to.have.ownProperty('update');
});
});
describe("#created", function () {
@@ -102,9 +126,25 @@ describe('Node', function () {
it("sets tags as specified", function () {
expect(iD.Node({tags: {foo: 'bar'}}).tags).to.eql({foo: 'bar'});
});
describe("#intersects", function () {
it("returns true for a node within the given extent", function () {
expect(iD.Node({loc: [0, 0]}).intersects([[-180, 90], [180, -90]])).to.equal(true);
});
it("returns false for a node outside the given extend", function () {
expect(iD.Node({loc: [0, 0]}).intersects([[100, 90], [180, -90]])).to.equal(false);
});
});
});
describe('Way', function () {
if (iD.debug) {
it("freezes nodes", function () {
expect(Object.isFrozen(iD.Way().nodes)).to.be.true;
});
}
it("returns a way", function () {
expect(iD.Way().type).to.equal("way");
});
@@ -133,9 +173,31 @@ describe('Way', function () {
it("sets tags as specified", function () {
expect(iD.Way({tags: {foo: 'bar'}}).tags).to.eql({foo: 'bar'});
});
describe("#intersects", function () {
it("returns true for a way with a node within the given extent", function () {
var node = iD.Node({loc: [0, 0]}),
way = iD.Way({nodes: [node.id]}),
graph = iD.Graph([node, way]);
expect(way.intersects([[-180, 90], [180, -90]], graph)).to.equal(true);
});
it("returns false for way with no nodes within the given extent", function () {
var node = iD.Node({loc: [0, 0]}),
way = iD.Way({nodes: [node.id]}),
graph = iD.Graph([node, way]);
expect(way.intersects([[100, 90], [180, -90]], graph)).to.equal(false);
});
});
});
describe('Relation', function () {
if (iD.debug) {
it("freezes nodes", function () {
expect(Object.isFrozen(iD.Relation().members)).to.be.true;
});
}
it("returns a relation", function () {
expect(iD.Relation().type).to.equal("relation");
});

10
test/spec/graph/graph.js
View File

@@ -16,6 +16,16 @@ describe('iD.Graph', function() {
expect(graph.annotation).to.equal('first graph');
});
if (iD.debug) {
it("is frozen", function () {
expect(Object.isFrozen(iD.Graph())).to.be.true;
});
it("freezes entities", function () {
expect(Object.isFrozen(iD.Graph().entities)).to.be.true;
});
}
describe('operations', function() {
it('#remove', function() {
var entities = { 'n-1': {

15
test/spec/util.js
View File

@@ -35,20 +35,7 @@ describe('Util', function() {
expect(iD.util.geo.interp(a, b, 0)).to.eql([0, 0]);
});
});
describe('#nodeIntersect', function() {
it('correctly says that a node is in an extent', function() {
expect(iD.util.geo.nodeIntersect({
loc: [0, 0]
}, [[-180, 90],
[180, -90]])).to.be.true;
});
it('correctly says that a node is outside of an extent', function() {
expect(iD.util.geo.nodeIntersect({
loc: [0, 0]
}, [[100, 90],
[180, -90]])).to.be.false;
});
});
describe('#dist', function() {
it('distance between two same points is zero', function() {
var a = [0, 0],