blueprint integration into project editor

12 files changed, 112 insertions, 30 deletions

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 46c1d7f..d4281ad 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -37,6 +37,7 @@
 	
 		base.list = {}
 		base.regions = []
+		base.shapesMode = false
 
 		base.uid = new UidGenerator(base.list)
 
@@ -95,6 +96,7 @@
 		}
 		
 		base.rebuild = function(walls_data){
+		  if (base.shapesMode) return
       walls_data = walls_data || Walls.serialize()
       Rooms.clipper.update()
       Rooms.builder.rebuild()
@@ -124,6 +126,36 @@
 			})
       Rooms.rebuild(walls_data)
 		}
+
+		base.deserializeFromShapes = function(shapes_data, walls_data) {
+		  base.shapesMode = true
+      window.viewHeight = data.viewHeight || app.defaults.viewHeight
+      window.wallHeight = data.wallHeight || app.defaults.wallHeight
+      $(".units").val( data.units )
+
+      shapes.deserialize( data.shapes )
+      shapes.build()
+
+      regions.forEach(function(region){
+        var room = new Room({
+          rect: region,
+          regions: [region],
+          height: wallHeight,
+        })
+        room.sides = region.sides
+        region.id = Rooms.uid("room_")
+        Rooms.list[ region.id ] = room
+        Rooms.builder.build(region)
+        room.mx_floor = Rooms.builder.make_floor(room, region)
+        room.mx_ceiling = Rooms.builder.make_ceiling(room, region)
+      })
+
+      Rooms.grouper.build()
+
+      Walls.paint()
+      Walls.deserialize(walls_data)
+      app.tube("rooms-built")
+		}
 		
 		base.report = function(){
 		  var data = []
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index e5e46e5..61b1d1b 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -18,35 +18,36 @@ var SiteRouter = Router.extend({
 	},
 	
 	routes: {
-		"/":                    'home',
-		"/home":                'home',
-		"/login":               'signin',
-		"/signin":              'signin',
-		"/signup":              'signup',
+		"/":                             'home',
+		"/home":                         'home',
+		"/login":                        'signin',
+		"/signin":                       'signin',
+		"/signup":                       'signup',
 
-		"/auth/usernameTaken":  'usernameTaken',
-		"/auth/password":       'passwordReset',
-		"/auth/forgotPassword": 'passwordForgot',
+		"/auth/usernameTaken":           'usernameTaken',
+		"/auth/password":                'passwordReset',
+		"/auth/forgotPassword":          'passwordForgot',
 
-		"/profile":             'profile',
-		"/profile/edit":        'editProfile',
-		"/profile/billing":     'editSubscription',
-		"/profile/:name":       'profile',
-		"/about/:name/edit":    'editDocument',
-		"/about/new":           'newDocument',
+		"/profile":                      'profile',
+		"/profile/edit":                 'editProfile',
+		"/profile/billing":              'editSubscription',
+		"/profile/:name":                'profile',
+		"/about/:name/edit":             'editDocument',
+		"/about/new":                    'newDocument',
 
-		"/layout":              'layoutPicker',
-		"/layout/:name":        'layoutEditor',
+		"/layout":                       'layoutPicker',
+		"/layout/:name":                 'layoutEditor',
 
-		"/blueprint":           'blueprintEditor',
-		"/blueprint/:name":     'blueprintEditor',
+		"/blueprint":                    'blueprintEditor',
+		"/blueprint/:name":              'blueprintEditor',
 
-		"/project":             'projectPicker',
-		"/project/new":         'newProject',
-		"/project/new/:layout": 'projectNewWithLayout',
-		"/project/:name":       'projectViewer',
-		"/project/:name/edit":  'projectEditor',
-		"/project/:name/view":  'projectViewer',
+		"/project":                      'projectPicker',
+		"/project/new":                  'newProject',
+		"/project/blueprint/:blueprint": 'projectNewWithBlueprint',
+		"/project/new/:layout":          'projectNewWithLayout',
+		"/project/:name":                'projectViewer',
+		"/project/:name/edit":           'projectEditor',
+		"/project/:name/view":           'projectViewer',
 
 		"/test/blueprint":      'blueprintEditor',
 	},
@@ -123,6 +124,22 @@ var SiteRouter = Router.extend({
 		window.history.pushState(null, document.title, "/project/new")
 		this.newProjectModal.load()
 	},
+	
+	projectNewWithBlueprint: function(e, blueprint){
+		e && e.preventDefault()
+		
+		Rooms.shapesMode = true
+
+		app.mode.editor = true
+		app.launch()
+		if (app.unsupported) return
+
+		blueprint = slugify(blueprint)
+		
+		window.history.pushState(null, document.title, "/project/blueprint/" + blueprint)
+		this.editorView = app.controller = new EditorView()
+		this.editorView.loadBlueprint(blueprint)
+	},
 
 	projectNewWithLayout: function(e, layout){
 		e && e.preventDefault()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 9c8808a..0870a11 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -95,6 +95,9 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
+    fd.append( "wallHeight", this.parent.info.$height.unitVal() )
+    fd.append( "units", this.parent.info.$units.val() )
+
 		return fd
 	},
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index e1d360f..3095cfe 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -48,8 +48,8 @@ var BlueprintView = View.extend({
 	},
 	
 	ready: function(data){
-		this.settings.load(data)
 		this.info.load(data)
+		this.settings.load(data)
 	  this.editor.loadFloorplan(data)
 	},
 	
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 9a7dbf9..aa58d6e 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -40,8 +40,8 @@ var BuilderInfo = View.extend({
 	
 	load: function(data){
 		this.$viewHeight.unitVal( window.viewHeight = data.viewHeight || app.defaults.viewHeight )
-		this.$units.val( "ft" )
-		this.$unitName.html( "ft" )
+		this.$units.val( data.units || "ft" )
+		this.$unitName.html( data.units || "ft" )
 
     if (Rooms.regions.length == 0) {
       this.changeHeightGlobal(true)
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 460863e..000852e 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -41,7 +41,12 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		data.rooms && Rooms.deserialize(data.rooms, data.walls)
+		if (data.rooms) {
+		  Rooms.deserialize(data.rooms, data.walls)
+		}
+		else if (data.shapes) {
+		  Rooms.deserializeFromShapes(data.shapes, data.walls)
+		}
 		if (data.startPosition) {
 		  scene.camera.move(data.startPosition)
 		  this.startPosition = data.startPosition
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index a2d84a6..879c963 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -2,6 +2,7 @@
 var EditorView = View.extend({
 	el: "#editorView",
 	
+	blueprintAction: "/api/blueprint/",
 	projectAction: "/api/project/",
 	layoutAction: "/api/layout/",
 
@@ -41,6 +42,10 @@ var EditorView = View.extend({
 		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},
 	
+	loadBlueprint: function(blueprint){
+		$.get(this.blueprintAction + blueprint, this.readyLayout.bind(this))
+	},
+	
 	ready: function(data){
 		$("#map").hide()
 
diff --git a/server/lib/api/blueprint.js b/server/lib/api/blueprint.js
index e581d8f..222b466 100644
--- a/server/lib/api/blueprint.js
+++ b/server/lib/api/blueprint.js
@@ -92,6 +92,9 @@ var blueprint = {
       
       doc.name = util.sanitize(data.name)
       doc.slug = util.slugify(data.name)
+      doc.units = util.sanitize(data.units)
+      doc.viewHeight = util.sanitizeNumber(data.viewHeight)
+      doc.wallHeight = util.sanitizeNumber(data.wallHeight)
       doc.shapes = JSON.parse(data.shapes)
       doc.startPosition = JSON.parse(data.startPosition)
 
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index 3810168..50d3b49 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -37,7 +37,12 @@ var projects = {
 		data.slug = util.slugify(data.name) + "-" + (+new Date)
 		data.description = util.sanitize(data.description)
 		data.viewHeight = Number(data.viewHeight || 0)
-		data.rooms = JSON.parse(data.rooms)
+		if (data.shapes) {
+      data.shapes = JSON.parse(data.shapes)
+		}
+		else {
+      data.rooms = JSON.parse(data.rooms)
+		}
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
 		data.sculpture = JSON.parse(data.sculpture)
@@ -102,7 +107,12 @@ var projects = {
 
 				_.extend(doc, data)
 
-				doc.rooms = JSON.parse(data.rooms)
+        if (data.shapes) {
+          doc.shapes = JSON.parse(data.shapes)
+        }
+        else {
+          doc.rooms = JSON.parse(data.rooms)
+        }
 				doc.walls = JSON.parse(data.walls)
 				doc.colors = JSON.parse(data.colors)
 				doc.media = JSON.parse(data.media)
diff --git a/server/lib/schemas/Blueprint.js b/server/lib/schemas/Blueprint.js
index 76d0a09..3c3b0cc 100644
--- a/server/lib/schemas/Blueprint.js
+++ b/server/lib/schemas/Blueprint.js
@@ -51,6 +51,7 @@ var BlueprintSchema = new mongoose.Schema({
 	
 	widthDimension: { type: Number },
 	heightDimension: { type: Number },
+	wallHeight: { type: Number },
 	units: { type: String },
 	line: { type: String },
 
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index 855d95a..687555d 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -28,6 +28,7 @@ var ProjectSchema = new mongoose.Schema({
 		type: String,
 	},
 	rooms: [mongoose.Schema.Types.Mixed],
+	shapes: [mongoose.Schema.Types.Mixed],
 	walls: [mongoose.Schema.Types.Mixed],
 	media: [mongoose.Schema.Types.Mixed],
 	sculpture: [mongoose.Schema.Types.Mixed],
@@ -35,6 +36,7 @@ var ProjectSchema = new mongoose.Schema({
 	startPosition: mongoose.Schema.Types.Mixed,
 	lastPosition: mongoose.Schema.Types.Mixed,
 	viewHeight: { type: Number },
+	units: { type: String, default: "ft" },
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },
 	updated_at: { type: Date },
diff --git a/server/lib/util.js b/server/lib/util.js
index e3fd1ed..86fbdcc 100644
--- a/server/lib/util.js
+++ b/server/lib/util.js
@@ -5,6 +5,7 @@ var whitespace = new RegExp('\\s', 'g')
 var whitespaceHead = /^\s+/
 var whitespaceTail = /\s+$/
 var nonAlphanumerics = new RegExp('[^-_a-zA-Z0-9]', 'g')
+var nonNumerics = new RegExp('[^0-9]', 'g')
 var consecutiveDashes = new RegExp("-+", 'g')
 var entities = new RegExp("[<>&]", 'g')
 
@@ -19,6 +20,9 @@ util.slugify = function (s){
 util.sanitize = function (s){
 	return (s || "").replace(entities, "")
 }
+util.sanitizeNumber = function (s){
+	return (s || "").replace(nonNumerics, "")
+}
 util.escape = function (s){
 	return (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
 }