sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

remove Ox.Break

Browse source
This commit is contained in:
rolux 2012-07-05 10:58:08 +02:00
commit bda90f6b6b
44 changed files with 152 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

11
source/Ox/js/Geo.js
View file

@ -252,8 +252,7 @@
// If an area crosses the dateline,
// we split it into two parts,
// west and east of the dateline
var areas = [areaA, areaB].map(splitArea),
ret;
var areas = [areaA, areaB].map(splitArea), ret;
function contains(areaA, areaB) {
return areaA.sw.lat <= areaB.sw.lat
&& areaA.sw.lng <= areaB.sw.lng
@ -266,10 +265,10 @@
Ox.forEach(areas[0], function(area0) {
ret = contains(area0, area1);
// Break if the outer part contains the inner part
ret && Ox.Break();
return !ret;
});
// Break if no outer part contains the inner part
!ret && Ox.Break();
return ret;
});
return ret;
};
@ -327,7 +326,7 @@
: Ox.joinAreas(intersections);
}
if (ret === null) {
Ox.Break();
return false; // break
} else {
ret = splitArea(ret);
}
@ -378,7 +377,7 @@
Ox.forEach(gaps, function(gap, i) {
if (Ox.containsArea(gap, area)) {
ret = i;
Ox.Break();
return false; // break
}
});
return ret;