layer of indirection for rooms

1 files changed, 22 insertions, 14 deletions

diff --git a/assets/javascripts/rectangles/sort.js b/assets/javascripts/rectangles/sort.js
index 0d79af8..8ece95f 100644
--- a/assets/javascripts/rectangles/sort.js
+++ b/assets/javascripts/rectangles/sort.js
@@ -1,21 +1,29 @@
-function sort_rects_by_position(list){
+function sort_rooms_by_position(list){
 	return list.sort(function(a,b){
-		if (a.x.a < b.x.a) {
-			return -1
-		}
-		if (a.x.a > b.x.a) {
-			return 1
-		}
-		if (a.y.a < b.y.a) {
-			return -1
-		}
-		if (a.y.a > b.y.a) {
-			return 1
-		}
-		return 0
+		return compare_rect_position(a.rect, b.rect)
 	})
 }
 
+function sort_rects_by_position(list){
+	return list.sort(compare_rect_position)
+}
+
+function compare_rect_position(a,b){
+	if (a.x.a < b.x.a) {
+		return -1
+	}
+	if (a.x.a > b.x.a) {
+		return 1
+	}
+	if (a.y.a < b.y.a) {
+		return -1
+	}
+	if (a.y.a > b.y.a) {
+		return 1
+	}
+	return 0
+}
+
 function sort_rects_by_area(list){
 	return list.map(function(r){ return [r.area(), r] }).sort(function(a,b){
 		if (a[0] < b[0]) {