get rooms api working with shapes

2 files changed, 7 insertions, 2 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 83bc8b7..d8cfca6 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -41,7 +41,7 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		if (data.shapes) {
+		if (data.shapes.length) {
 		  Rooms.deserializeFromShapes(data, data.walls)
 		}
 		else if (data.rooms) {
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 1ba97cf..43e81d8 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -76,7 +76,12 @@ var ReaderView = View.extend({
   },
   
   build: function(data){
-		data.rooms && Rooms.deserialize(data.rooms)
+		if (data.shapes.length) {
+		  Rooms.deserializeFromShapes(data)
+		}
+		else {
+		  Rooms.deserialize(data.rooms)
+		}
 		data.walls && Walls.deserialize(data.walls)
 		data.media && Scenery.deserialize(data.media)
     data.sculpture && Sculpture.deserialize(data.sculpture)