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

jshinting

Browse Source
This commit is contained in:
Tom MacWright
2013-02-07 15:41:14 -05:00
parent 9a2bafac1b
commit b9d80538b1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/merge.js
+5 -5
View File
@@ -6,8 +6,8 @@ iD.actions.Merge = function(ids) {
var action = function(graph) {
var geometries = groupEntitiesByGeometry(graph),
area = geometries['area'][0],
points = geometries['point'];
area = geometries.area[0],
points = geometries.point;
points.forEach(function (point) {
area = area.mergeTags(point.tags);
@@ -26,9 +26,9 @@ iD.actions.Merge = function(ids) {
action.enabled = function(graph) {
var geometries = groupEntitiesByGeometry(graph);
return geometries['area'].length === 1 &&
geometries['point'].length > 0 &&
(geometries['area'].length + geometries['point'].length) === ids.length;
return geometries.area.length === 1 &&
geometries.point.length > 0 &&
(geometries.area.length + geometries.point.length) === ids.length;
};
return action;