From b4c7b2126b384a61bb69b046d0620ac53dd063ec Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 17:55:10 -0400
Subject: split off info/settings

---
 .../javascripts/ui/blueprint/BlueprintSettings.js  | 139 +++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintSettings.js

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
new file mode 100644
index 0000000..1ff3d6e
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -0,0 +1,139 @@
+
+var BlueprintSettings = FormView.extend({
+	el: "#blueprintSettings",
+	
+	createAction: "/api/layout/new",
+	updateAction: "/api/layout/edit",
+	destroyAction: "/api/layout/destroy",
+
+	events: {
+	  "mousedown": "stopPropagation",
+		"keydown": 'stopPropagation',
+		"keydown [name=name]": 'enterSubmit',
+		"click [data-role='save-layout']": 'clickSave',
+		"click [data-role='clone-layout']": 'clone',
+		"click [data-role='clear-layout']": 'clear',
+		"click [data-role='destroy-layout']": 'destroy',
+	},
+	
+	initialize: function(opt){
+		this.parent = opt.parent
+		this.__super__.initialize.call(this)
+		
+		this.$id = this.$("[name=_id]")
+		this.$csrf = this.$("[name=_csrf]")
+		this.$name = this.$("[name=name]")
+		this.$privacy = this.$("[name=privacy]")
+	},
+	
+	load: function(data){
+		this.$id.val(data._id)
+		this.$name.val(data.name)
+
+		this.parent.colorControl.loadDefaults()
+
+		data.rooms && Rooms.deserialize(data.rooms)
+		data.startPosition && scene.camera.move(data.startPosition)
+		data.privacy && this.$privacy.find("[value=" + data.privacy + "]").prop('checked', "checked")
+
+		this.action = data.isNew ? this.createAction : this.updateAction
+	},
+	
+	clone: function(){
+		var names = this.$name.val().split(" ")
+		if ( ! isNaN(Number( names[names.length-1] )) ) {
+			names[names.length-1] = Number( names[names.length-1] ) + 1
+		}
+		else {
+			names.push("2")
+		}
+
+		this.$id.val('new')
+		this.$name.val( names.join(" ") )
+		this.action = this.createAction
+		
+		window.history.pushState(null, document.title, "/builder/new")
+	},
+	
+	clear: function(){
+		Rooms.removeAll()
+	},
+	
+	destroy: function(){
+		var msg = "Are you sure you want to delete the blueprint " + sanitize(this.$name.val()) + "?"
+		ConfirmModal.confirm(msg, function(){
+			$.ajax({
+				url: this.destroyAction,
+				type: "delete",
+				data: { _id: this.$id.val(), _csrf: this.$csrf.val() },
+				success: function(data){
+					window.location.href = "/layout"
+				}
+			})
+		}.bind(this))
+	},
+
+	toggle: function(state){
+		this.$el.toggleClass("active", state)
+	},
+
+	enterSubmit: function (e) {
+		e.stopPropagation()
+		var base = this
+		if (e.keyCode == 13) {
+			setTimeout(function(){ base.save(e) }, 100)
+		}
+	},
+
+	validate: function(){
+		var errors = []
+		var name = this.$name.val()
+		if (! name || ! name.length) {
+			errors.push("Layout needs a name.")
+		}
+		if (Rooms.count() == 0) {
+			errors.push("Please add some rooms by drawing boxes.")
+		}
+		return errors
+	},
+	
+	showErrors: function(errors){
+		var $errors = $("<span>")
+		errors.forEach(function(err){
+			var $row = $("<div>")
+			$row.html(err)
+			$errors.append( $row )
+		})
+		ErrorModal.alert($errors)
+	},
+	
+	serialize: function(){
+		var thumbnail = map.draw.render()
+		var fd = new FormData()
+		fd.append( "_csrf", this.$csrf.val() )
+		fd.append( "_id", this.$id.val() )
+		fd.append( "name", this.$name.val() )
+		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
+		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
+		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
+		fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
+		return fd
+	},
+
+	clickSave: function(){
+    this.toggle(false)
+    this.save()
+	},
+	
+	success: function(data){
+		this.$id.val(data._id)
+		this.$name.val(data.name)
+		this.action = this.updateAction
+		
+		Minotaur.unwatch(this)
+		Minotaur.hide()
+
+		window.history.pushState(null, document.title, "/layout/" + data.slug)
+	},
+
+})
-- 
cgit v1.2.3-70-g09d2


From bbd62d9c7f3838d07e42e46c244c317a5dbdb5ae Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 20:01:58 -0400
Subject: clear shapes

---
 .../rectangles/engine/shapes/shapelist.js          |  6 ++++
 .../javascripts/ui/blueprint/BlueprintSettings.js  | 38 +++-------------------
 .../javascripts/ui/blueprint/BlueprintView.js      |  5 ++-
 views/controls/blueprint/settings.ejs              | 18 ++--------
 views/controls/blueprint/toolbar.ejs               |  2 +-
 5 files changed, 16 insertions(+), 53 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 932ce36..e86c5d6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -13,6 +13,12 @@ var ShapeList = Fiber.extend(function(base){
       this.shapes.splice(index, 1)
     }
   }
+  exports.destroy = function(){
+    this.shapes.forEach(function(shape){
+      shape.destroy()
+    })
+    this.shapes = []
+  }
   exports.removeSegment = function (segment){
     var shape = segment.shape
     var head = shape.getHeadAtIndex(segment.head)
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 1ff3d6e..d460a9d 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -2,16 +2,14 @@
 var BlueprintSettings = FormView.extend({
 	el: "#blueprintSettings",
 	
-	createAction: "/api/layout/new",
-	updateAction: "/api/layout/edit",
-	destroyAction: "/api/layout/destroy",
+	action: "/api/blueprint/edit",
+	destroyAction: "/api/blueprint/destroy",
 
 	events: {
 	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='save-layout']": 'clickSave',
-		"click [data-role='clone-layout']": 'clone',
 		"click [data-role='clear-layout']": 'clear',
 		"click [data-role='destroy-layout']": 'destroy',
 	},
@@ -23,40 +21,15 @@ var BlueprintSettings = FormView.extend({
 		this.$id = this.$("[name=_id]")
 		this.$csrf = this.$("[name=_csrf]")
 		this.$name = this.$("[name=name]")
-		this.$privacy = this.$("[name=privacy]")
 	},
 	
 	load: function(data){
 		this.$id.val(data._id)
 		this.$name.val(data.name)
-
-		this.parent.colorControl.loadDefaults()
-
-		data.rooms && Rooms.deserialize(data.rooms)
-		data.startPosition && scene.camera.move(data.startPosition)
-		data.privacy && this.$privacy.find("[value=" + data.privacy + "]").prop('checked', "checked")
-
-		this.action = data.isNew ? this.createAction : this.updateAction
-	},
-	
-	clone: function(){
-		var names = this.$name.val().split(" ")
-		if ( ! isNaN(Number( names[names.length-1] )) ) {
-			names[names.length-1] = Number( names[names.length-1] ) + 1
-		}
-		else {
-			names.push("2")
-		}
-
-		this.$id.val('new')
-		this.$name.val( names.join(" ") )
-		this.action = this.createAction
-		
-		window.history.pushState(null, document.title, "/builder/new")
 	},
 	
 	clear: function(){
-		Rooms.removeAll()
+		shapes.destroy()
 	},
 	
 	destroy: function(){
@@ -89,10 +62,10 @@ var BlueprintSettings = FormView.extend({
 		var errors = []
 		var name = this.$name.val()
 		if (! name || ! name.length) {
-			errors.push("Layout needs a name.")
+			errors.push("Blueprint needs a name.")
 		}
 		if (Rooms.count() == 0) {
-			errors.push("Please add some rooms by drawing boxes.")
+			errors.push("Please add some walls.")
 		}
 		return errors
 	},
@@ -113,7 +86,6 @@ var BlueprintSettings = FormView.extend({
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
-		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
 		fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index f919cc7..8330154 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -8,7 +8,6 @@ var BlueprintView = View.extend({
 	},
 	
 	initialize: function(){
-// 		this.settings = new BuilderSettings ({ parent: this })
 // 		this.colorControl = new ColorControl ({ parent: this })
 // 		this.cursor = new HelpCursor({ parent: this })
     this.map = this.buildMap()
@@ -17,11 +16,11 @@ var BlueprintView = View.extend({
     this.uploader = new BlueprintUploader ({ parent: this })
     this.scaler = new BlueprintScaler ({ parent: this })
 		this.info = new BlueprintInfo ({ parent: this })
+		this.settings = new BlueprintSettings ({ parent: this })
 	},
 
 	load: function(name){
 		if (! name || name == "new") {
-// 			this.ready({ isNew: true, _id: "new", name: "" })
       this.uploader.load()
 			return
 		}
@@ -53,7 +52,7 @@ var BlueprintView = View.extend({
 	},
 	
 	ready: function(data){
-// 		this.settings.load(data)
+		this.settings.load(data)
 		this.info.load(data)
 	  this.editor.loadFloorplan(data)
 	},
diff --git a/views/controls/blueprint/settings.ejs b/views/controls/blueprint/settings.ejs
index a7ce2f0..1347f5b 100644
--- a/views/controls/blueprint/settings.ejs
+++ b/views/controls/blueprint/settings.ejs
@@ -10,29 +10,15 @@
 	</div>
 
 	<div class="setting">
-		<input type="text" name="name" placeholder="layout name">
+		<input type="text" name="name" placeholder="Blueprint name">
 	</div>
-	
-	<div class="setting">
-		<div class="radio-group">
-			<input id="privacy_private" class="radio-group__option" type="radio" name="privacy" value="public" checked>
-			<label class="radio-group__label" for="privacy_private">
-				Everyone
-			</label>
-			<input id="privacy_public" class="radio-group__option" type="radio" name="privacy" value="private">
-			<label class="radio-group__label" for="privacy_public">
-				Just for me
-			</label>
-		</div>
-	</div>
-	
+
 	<div class="setting">
 		<button data-role="save-layout">Save</button>
 	</div>
 	
 	<div class="setting subButtons">
 		<a href="#" data-role="clear-layout">Clear</a>
-		<a href="#" data-role="clone-layout">Clone</a>
 		<a href="#" data-role="destroy-layout">Delete</a>
 	</div>
 
diff --git a/views/controls/blueprint/toolbar.ejs b/views/controls/blueprint/toolbar.ejs
index 82cbcba..9c55a4a 100644
--- a/views/controls/blueprint/toolbar.ejs
+++ b/views/controls/blueprint/toolbar.ejs
@@ -32,7 +32,7 @@
 
 	<span
 		data-role='toggle-layout-settings'
-		data-info="save layout"
+		data-info="save blueprint"
 		class="ion-ios-compose-outline"></span>
 </div>
 <!-- 
-- 
cgit v1.2.3-70-g09d2


From 62a8127787c1ed2f0ae420722be9327e421633bd Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 20:08:44 -0400
Subject: serialize/deserialize

---
 public/assets/javascripts/rectangles/engine/shapes/shapelist.js | 3 +++
 public/assets/javascripts/ui/blueprint/BlueprintSettings.js     | 8 ++++----
 server/lib/schemas/Blueprint.js                                 | 7 +++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index c3b5758..d8a03b2 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -19,6 +19,9 @@ var ShapeList = Fiber.extend(function(base){
     })
     this.shapes = []
   }
+  exports.count = function(){
+    return this.shapes.length
+  }
   exports.removeSegment = function (segment){
     var shape = segment.shape
     var head = shape.getHeadAtIndex(segment.head)
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index d460a9d..f9c9e78 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -26,6 +26,7 @@ var BlueprintSettings = FormView.extend({
 	load: function(data){
 		this.$id.val(data._id)
 		this.$name.val(data.name)
+		this.data = data
 	},
 	
 	clear: function(){
@@ -64,7 +65,7 @@ var BlueprintSettings = FormView.extend({
 		if (! name || ! name.length) {
 			errors.push("Blueprint needs a name.")
 		}
-		if (Rooms.count() == 0) {
+		if (shapes.count() == 0) {
 			errors.push("Please add some walls.")
 		}
 		return errors
@@ -81,14 +82,13 @@ var BlueprintSettings = FormView.extend({
 	},
 	
 	serialize: function(){
-		var thumbnail = map.draw.render()
 		var fd = new FormData()
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
-		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
+		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
-		fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
+		fd.append( "thumbnail", this.data.url )
 		return fd
 	},
 
diff --git a/server/lib/schemas/Blueprint.js b/server/lib/schemas/Blueprint.js
index 40e67d8..78a388f 100644
--- a/server/lib/schemas/Blueprint.js
+++ b/server/lib/schemas/Blueprint.js
@@ -29,7 +29,7 @@ var BlueprintSchema = new mongoose.Schema({
 		type: Number,
 		default: 0
 	},
-	title: {
+	name: {
 		type: String,
 		default: ""
 	},
@@ -44,7 +44,10 @@ var BlueprintSchema = new mongoose.Schema({
 	heightDimension: { type: Number },
 	units: { type: String },
 	line: { type: String },
-	
+
+	rooms: [mongoose.Schema.Types.Mixed],
+	startPosition: mongoose.Schema.Types.Mixed,
+
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },
 });
-- 
cgit v1.2.3-70-g09d2


From d9ecfddd7ba63d3cf94b29053476d1d11118d38e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 21:25:28 -0400
Subject: saving blueprints

---
 .../javascripts/rectangles/engine/shapes/polyline.js | 12 ++++++------
 .../rectangles/engine/shapes/shapelist.js            |  7 ++++---
 .../javascripts/ui/blueprint/BlueprintSettings.js    |  7 +++++--
 .../javascripts/ui/blueprint/BlueprintToolbar.js     |  5 +++++
 .../javascripts/ui/blueprint/BlueprintUploader.js    | 16 ++++++++++++++--
 .../assets/javascripts/ui/blueprint/BlueprintView.js | 14 +++++---------
 server/index.js                                      |  1 +
 server/lib/api/blueprint.js                          | 20 ++++++++++++++++++++
 server/lib/schemas/Blueprint.js                      | 11 ++++++++++-
 9 files changed, 70 insertions(+), 23 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index e853592..3c4e9c3 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -1,12 +1,9 @@
 var Polyline = Fiber.extend(function(base){
 	var exports = {}
-	exports.init = function(points){
-    this.points = points
+	exports.init = function(){
+    this.points = []
     this.mx_points = []
     this.closed = false
-    if (points) {
-      this.build()
-    }
 	}
 	exports.add = function(p){
     this.points.push( p )
@@ -138,7 +135,10 @@ var Polyline = Fiber.extend(function(base){
     this.mx.rebuild()
   }
   exports.serialize = function(){
-    return this.points
+    return this.points.map(function(point){ return [point.a, point.b] })
+  }
+  exports.deserialize = function(points){
+    this.points = points.map(function(point){ return new vec2(point[0], point[1]) })
   }
   exports.reset = function(){
     this.mx_points.forEach(function(mx){ scene.remove(mx) })
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index d8a03b2..1b8acfd 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -73,9 +73,10 @@ var ShapeList = Fiber.extend(function(base){
     })
   }
   exports.deserialize = function(data){
-    data.forEach(function(points){
-      var line = new Polyline(points)
-      this.add(line)
+    data && data.forEach(function(points){
+      var line = new Polyline()
+      line.deserialize(points)
+      line.build()
     }.bind(this))
   }
   return exports
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index f9c9e78..acd8dcc 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -26,6 +26,10 @@ var BlueprintSettings = FormView.extend({
 	load: function(data){
 		this.$id.val(data._id)
 		this.$name.val(data.name)
+		if (data.shapes) {
+      shapes.destroy()
+      shapes.deserialize( data.shapes )
+		}
 		this.data = data
 	},
 	
@@ -88,7 +92,6 @@ var BlueprintSettings = FormView.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( "thumbnail", this.data.url )
 		return fd
 	},
 
@@ -105,7 +108,7 @@ var BlueprintSettings = FormView.extend({
 		Minotaur.unwatch(this)
 		Minotaur.hide()
 
-		window.history.pushState(null, document.title, "/layout/" + data.slug)
+		window.history.pushState(null, document.title, "/blueprint/" + data.slug)
 	},
 
 })
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index 5f313fd..e22535e 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -9,6 +9,7 @@ var BlueprintToolbar = View.extend({
     "click [data-role=polyline-mode]": 'polylineMode',
     "click [data-role=ortho-polyline-mode]": 'orthoPolylineMode',
     "click [data-role=eraser-mode]": 'eraserMode',
+    "click [data-role=toggle-layout-settings]": 'toggleSettings',
   },
 
   initialize: function(opt){
@@ -49,6 +50,10 @@ var BlueprintToolbar = View.extend({
     }
   },
   
+  toggleSettings: function(){
+    this.parent.settings.toggle()
+  },
+  
   setActiveMode: function( $el ) {
     this.$modes.removeClass('active')
     $el.addClass('active')
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index 6d13817..c7138e9 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -26,7 +26,9 @@ var BlueprintUploader = UploadView.extend({
 	},
 	
   loaded: false,
-	load: function(){
+  nameToShow: null,
+	load: function(name){
+	  this.nameToShow = name || ""
 		$.get(this.listAction, { tag: this.mediaTag }, this.populate.bind(this))
 	},
 
@@ -36,7 +38,17 @@ var BlueprintUploader = UploadView.extend({
 		  this.$blueprints.show()
       data.forEach(this.append.bind(this))
       this.hide()
-      this.parent.scaler.pick(data[0])
+      if (this.nameToShow) {
+        data.some(function(el){
+          if (el.slug == this.nameToShow) {
+            this.parent.scaler.pick(el)
+            return true
+          }
+        }.bind(this))
+      }
+      else {
+        this.parent.scaler.pick(data[0])
+      }
 		}
 		else {
 		  this.parent.scaler.hideClose()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 8330154..e1d360f 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -2,7 +2,7 @@
 var BlueprintView = View.extend({
 	el: "#blueprintView",
 
-	action: "/api/blueprint/",
+	action: "/api/blueprint/show/",
 
 	events: {
 	},
@@ -20,14 +20,10 @@ var BlueprintView = View.extend({
 	},
 
 	load: function(name){
-		if (! name || name == "new") {
-      this.uploader.load()
-			return
-		}
-		
-		name = sanitize(name)
-		
-		$.get(this.action + name, this.ready.bind(this))
+		name = sanitize(name) || "new"
+    this.uploader.load(name)
+// 		name = sanitize(name)
+// 		$.get(this.action + name, this.ready.bind(this))
 	},
 
   orbiting: true,
diff --git a/server/index.js b/server/index.js
index 421a6a7..7143da2 100644
--- a/server/index.js
+++ b/server/index.js
@@ -165,6 +165,7 @@ site.route = function () {
 	app.post('/api/blueprint/upload', middleware.ensureAuthenticated, api.blueprint.upload)
 	app.get('/api/blueprint/user', middleware.ensureAuthenticated, api.blueprint.user)
 	app.post('/api/blueprint/scale',  middleware.ensureAuthenticated, api.blueprint.scale)
+	app.post('/api/blueprint/edit', middleware.ensureAuthenticated, api.blueprint.update)
 	app.delete('/api/blueprint/destroy', middleware.ensureAuthenticated, api.blueprint.destroy)
 
 	app.get('/api/subscription', middleware.ensureAuthenticated, api.subscription.middleware.ensurePlans, api.subscription.middleware.ensureSubscription, api.subscription.show)
diff --git a/server/lib/api/blueprint.js b/server/lib/api/blueprint.js
index 7319055..e581d8f 100644
--- a/server/lib/api/blueprint.js
+++ b/server/lib/api/blueprint.js
@@ -81,6 +81,26 @@ var blueprint = {
 			})
 		})
 	},
+
+	update: function(req, res){
+	  var _id = req.body._id
+		var data = util.cleanQuery(req.body)
+    if (! _id) { return res.json({ error: 404 }) }
+	  Blueprint.findOne({ _id: _id }, function(err, doc){
+			if (! doc) { return res.json({ error: 404 }) }
+			if (String(doc.user_id) !== String(req.user._id)) { return res.json({ error: 404 }) }
+      
+      doc.name = util.sanitize(data.name)
+      doc.slug = util.slugify(data.name)
+      doc.shapes = JSON.parse(data.shapes)
+      doc.startPosition = JSON.parse(data.startPosition)
+
+			doc.save(function(err, rec){
+				if (err || ! rec) { return res.json({ error: err }) }
+				res.json(rec)
+			})
+		})
+	},
 	
 	destroy: function(req, res){
 		var _id = util.sanitize(req.body._id)
diff --git a/server/lib/schemas/Blueprint.js b/server/lib/schemas/Blueprint.js
index 78a388f..666f0cf 100644
--- a/server/lib/schemas/Blueprint.js
+++ b/server/lib/schemas/Blueprint.js
@@ -33,6 +33,15 @@ var BlueprintSchema = new mongoose.Schema({
 		type: String,
 		default: ""
 	},
+	slug: {
+		type: String,
+		required: true,
+		validate: [function (val){
+			val = util.sanitize(val || this.displayName || "")
+			if (! val.length) return false
+			return true
+		},"{PATH} name is required"]
+	},
 	description: {
 		type: String,
 		default: ""
@@ -45,7 +54,7 @@ var BlueprintSchema = new mongoose.Schema({
 	units: { type: String },
 	line: { type: String },
 
-	rooms: [mongoose.Schema.Types.Mixed],
+	shapes: [mongoose.Schema.Types.Mixed],
 	startPosition: mongoose.Schema.Types.Mixed,
 
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
-- 
cgit v1.2.3-70-g09d2


From 272474767b6ed1f419843c7a205c16f934eeb84f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 20 Aug 2015 23:33:36 -0400
Subject: turn segments into rects

---
 .../rectangles/engine/shapes/regionlist.js         | 54 ++++++++--------------
 .../assets/javascripts/rectangles/models/rect.js   |  6 +++
 .../assets/javascripts/rectangles/models/vec2.js   |  3 ++
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  2 +-
 .../javascripts/ui/blueprint/BlueprintSettings.js  | 16 ++++---
 public/assets/javascripts/ui/lib/ToggleableView.js | 19 ++++++++
 views/controls/blueprint/info.ejs                  |  4 +-
 views/controls/builder/info.ejs                    |  4 +-
 views/controls/editor/media-editor.ejs             |  4 +-
 views/partials/scripts.ejs                         |  1 +
 10 files changed, 65 insertions(+), 48 deletions(-)
 create mode 100644 public/assets/javascripts/ui/lib/ToggleableView.js

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 94b902a..42519cf 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -12,7 +12,7 @@ var RegionList = (function(){
     var rooms = []
     var open_segments = []
     
-    var segment, open_segment, vertical, other_side
+    var segment, open_segment, y_segments
 
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
@@ -21,12 +21,20 @@ var RegionList = (function(){
       }
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
-        if (overlaps(segment, open_segment)) {
+        if (segment.y.overlaps(open_segment.y)) {
           // if we have overlap, it means we have made a full room
-          other_side = clone_segment(open_segment)
-          other_side[0].a = segment[0].a
-          other_side[1].a = segment[1].a
-          rooms.push([open_segment, other_side])
+          
+          y_segments = open_segment.y.split(segment.y)
+          
+          if (y_segments.length == 1) {
+            open_segment.x.b = segment.x.b
+            rooms.push(open_segment)
+          }
+          
+//           other_side = clone_segment(open_segment)
+//           other_side[0].a = segment[0].a
+//           other_side[1].a = segment[1].a
+//           rooms.push([open_segment, other_side])
           open_segments.splice(j, 1)
           j--
         }
@@ -43,8 +51,8 @@ var RegionList = (function(){
     // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
 
-    // re-orientate them so they're either facing up or right
-    segments.forEach(function(segment){
+    // re-orient them so they're either facing up or right and make them into rects
+    segments = segments.map(function(segment){
       // vertical
       if (segment[0].a == segment[1].a) {
         if (segment[0].b > segment[1].b) {
@@ -57,36 +65,12 @@ var RegionList = (function(){
           segment.push(segment.shift())
         }
       }
+      return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
     })
     
-    // sort them from top to bottom, left to right
-    segments = segments.sort(function(a,b){
-      if (a[0].a < b[0].a) {
-        return -1
-      }
-      else if (a[0].a == b[0].a) {
-        if (a[0].b < b[0].b) {
-          return -1
-        }
-        else if (a[0].b == b[0].b) {
-          return 0
-        }
-        else {
-          return 1
-        }
-      }
-      else {
-        return 1
-      }
-    })
-    
-    return segments
+    return sort.rects_by_position(segments)
   }
-  
-  function isVertical (segment) { return segment[0].a == segment[1].a }
-  function isHorizontal (segment) { return segment[0].b == segment[1].b }
-  function overlaps (a,b) { return (a[0].b > b[0].b || a[1].b < b[1].b) }
-  function clone_segment(a){ return [a[0].clone(), a[1].clone()] }
+
   return RegionList
   
 })()
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index 92c8c9e..a4756ed 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -62,6 +62,12 @@
 	Rect.prototype.maxDimension = function(){
 		return abs(this.width) > abs(this.height) ? this.width : this.height
 	}
+	Rect.prototype.isVertical = function(){
+	  return this.x.isPoint()
+	}
+	Rect.prototype.isHorizontal = function(){
+	  return this.y.isPoint()
+	}
 
 	Rect.prototype.mul = function(n){
 		this.x.mul(n)
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 290e45e..90a56c6 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -43,6 +43,9 @@
 	vec2.prototype.eq = function(v){
 		return this.a == v.a && this.b == v.b
 	}
+	vec2.prototype.isPoint = function(){
+		return this.a == this.b
+	}
 	vec2.prototype.add = function(n){
 		this.a += n
 		this.b += n
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 8fe66ca..18ecf5f 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -93,7 +93,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.ctx.save()
     map.draw.translate()
 
-   // this.floorplan.draw(map.draw.ctx, true)
+   this.floorplan.draw(map.draw.ctx, true)
 
     map.draw.coords()
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index acd8dcc..252e3f1 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -1,5 +1,5 @@
 
-var BlueprintSettings = FormView.extend({
+var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 	el: "#blueprintSettings",
 	
 	action: "/api/blueprint/edit",
@@ -25,7 +25,13 @@ var BlueprintSettings = FormView.extend({
 	
 	load: function(data){
 		this.$id.val(data._id)
-		this.$name.val(data.name)
+		if (data.name) {
+		  this.$name.val(data.name)
+      this.hide()
+		}
+		else {
+		  this.$name.val("")
+		}
 		if (data.shapes) {
       shapes.destroy()
       shapes.deserialize( data.shapes )
@@ -51,10 +57,6 @@ var BlueprintSettings = FormView.extend({
 		}.bind(this))
 	},
 
-	toggle: function(state){
-		this.$el.toggleClass("active", state)
-	},
-
 	enterSubmit: function (e) {
 		e.stopPropagation()
 		var base = this
@@ -105,6 +107,8 @@ var BlueprintSettings = FormView.extend({
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
+		this.hide()
+		
 		Minotaur.unwatch(this)
 		Minotaur.hide()
 
diff --git a/public/assets/javascripts/ui/lib/ToggleableView.js b/public/assets/javascripts/ui/lib/ToggleableView.js
new file mode 100644
index 0000000..371629f
--- /dev/null
+++ b/public/assets/javascripts/ui/lib/ToggleableView.js
@@ -0,0 +1,19 @@
+var ToggleableView = View.extend({
+
+	toggle: function(state){
+		this.$el.toggleClass("active", state)
+	},
+	
+	show: function(){
+	  this.toggle(true)
+	},
+
+	hide: function(){
+	  this.toggle(false)
+	},
+	
+	visible: function(){
+	  return this.$el.hasClass("active")
+	}
+
+})
\ No newline at end of file
diff --git a/views/controls/blueprint/info.ejs b/views/controls/blueprint/info.ejs
index 9f7d708..4e2316f 100644
--- a/views/controls/blueprint/info.ejs
+++ b/views/controls/blueprint/info.ejs
@@ -15,8 +15,8 @@
 		<label for="builder-units">units</label>
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 8a0e0d5..11e995a 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -34,8 +34,8 @@
 		<label for="builder-units">units</label>
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 2a3d4f3..225bdc8 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -49,8 +49,8 @@
 	<div class="setting number">
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 	-->
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index bc8dacb..865c0f1 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -108,6 +108,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/lib/FormView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/UploadView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/AnimatedView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/ToggleableView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ErrorModal.js"></script>
-- 
cgit v1.2.3-70-g09d2


From a9bf197a6e8f91cc91d772238168d9be1beb3c4d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 25 Aug 2015 12:15:14 -0400
Subject: makin sure tests work

---
 .../javascripts/rectangles/engine/map/tools/line.js      | 16 +++++++++++++++-
 .../javascripts/rectangles/engine/map/tools/ortho.js     |  2 ++
 .../javascripts/rectangles/engine/map/tools/polyline.js  |  2 ++
 .../javascripts/rectangles/engine/shapes/polyline.js     |  1 -
 .../javascripts/rectangles/engine/shapes/regionlist.js   |  2 +-
 .../javascripts/rectangles/engine/shapes/shapelist.js    |  7 ++++++-
 .../assets/javascripts/ui/blueprint/BlueprintEditor.js   |  8 ++++----
 .../assets/javascripts/ui/blueprint/BlueprintSettings.js |  1 +
 public/assets/test/ortho2.html                           |  9 ++++++++-
 9 files changed, 39 insertions(+), 9 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/line.js b/public/assets/javascripts/rectangles/engine/map/tools/line.js
index 8f409a8..8fe4fff 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/line.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/line.js
@@ -1,3 +1,6 @@
+// This tool lets you define a very simple line between two points.
+// It is used by the BlueprintScaler to specify a sample distance to scale.
+
 var LineTool = MapTool.extend(function(base){
 	var exports = {}
 	
@@ -8,6 +11,17 @@ var LineTool = MapTool.extend(function(base){
 	var can_drag, dragging
 	
 	exports.down = function(e, cursor){
+
+    // rightclick?
+    if (e.ctrlKey || e.which === 3) {
+      cursor.quantize(1/map.zoom)
+      app.router.blueprintView.map.center.a = cursor.x.a
+      app.router.blueprintView.map.center.b = -cursor.y.a
+      cursor.x.b = cursor.x.a
+      cursor.y.b = cursor.y.a
+      return
+    }
+    
 	  this.cursor = cursor
 	  switch (line.length) {
 	    case 0:
@@ -44,6 +58,6 @@ var LineTool = MapTool.extend(function(base){
 	exports.up = function(e, cursor){
 	  can_drag = dragging = false
 	}
-	
+
 	return exports
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
index ef41096..918ac0d 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
@@ -14,6 +14,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
         map.ui.placing = false
         if (shapes.workline.points.length > 2) {
           shapes.workline.build()
+          shapes.add(shapes.workline)
         }
         else {
           shapes.workline.reset()
@@ -35,6 +36,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
       else if (shapes.workline.canCloseWith(p)) {
         shapes.workline.close()
         shapes.workline.build()
+        shapes.add(shapes.workline)
         map.ui.placing = false
       }
       else {
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
index 1ab86f6..6716180 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
@@ -11,6 +11,7 @@ var PolylineTool = MapTool.extend(function (base) {
         map.ui.placing = false
         if (shapes.workline.points.length > 2) {
           shapes.workline.build()
+          shapes.add(shapes.workline)
         }
         else {
           shapes.workline.reset()
@@ -27,6 +28,7 @@ var PolylineTool = MapTool.extend(function (base) {
       if (shapes.workline.canCloseWith(p)) {
         shapes.workline.close()
         shapes.workline.build()
+        shapes.add(shapes.workline)
         map.ui.placing = false
       }
       else {
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 609a2c8..54e11c6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -133,7 +133,6 @@ var Polyline = Fiber.extend(function(base){
   exports.build = function(){
     this.mx_points && this.mx_points.forEach(function(mx){ scene.remove(mx) })
     this.mx = new MX.Polyline(this)
-    shapes.add(this)
   }
   exports.rebuild = function(){
     this.mx.rebuild()
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 663f3fd..86269a6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -169,7 +169,7 @@ var RegionList = (function(){
       }
     }
 
-    return { rooms: rooms }
+    return rooms
   }
   
   
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 90714c2..9cbf165 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -85,8 +85,13 @@ var ShapeList = Fiber.extend(function(base){
     data && data.forEach(function(points){
       var line = new Polyline()
       line.deserialize(points)
-      line.build()
+      shapes.add(line)
     }.bind(this))
   }
+  exports.build = function(){
+    this.shapes.forEach(function(shape){
+      shape.build()
+    })
+  }
   return exports
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index a341a24..547cdca 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -5,7 +5,7 @@ var last_point = new vec2 (0,0)
 
 var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 
-  rooms: [],
+  regions: [],
 
   initialize: function(opt){
     this.parent = opt.parent
@@ -82,7 +82,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       scale: media.scale,
     })
     this.startAnimating()
-    this.rooms = RegionList.build()
+    this.regions = RegionList.build()
   },
   
   animate: function(t, dt){
@@ -118,9 +118,9 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 //    var colors = ["rgba(0,0,0,0.1)"]
 //     var colors = ["rgba(255,255,255,1)"]
 // 
-    map.draw.regions(this.rooms.rooms, colors, "#000")
+    map.draw.regions(this.regions, colors, "#000")
 
-//     this.rooms.rooms.forEach(function(room,i){
+//     this.regions.forEach(function(room,i){
 //       map.draw.ctx.fillStyle = colors[i % colors.length]
 //       map.draw.ctx.fillRect( room.x.a, room.y.a, room.width(), room.height() )
 //     })
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 252e3f1..9c8808a 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -35,6 +35,7 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		if (data.shapes) {
       shapes.destroy()
       shapes.deserialize( data.shapes )
+      shapes.build()
 		}
 		this.data = data
 	},
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
index 448f029..ef77256 100644
--- a/public/assets/test/ortho2.html
+++ b/public/assets/test/ortho2.html
@@ -58,7 +58,9 @@ body {
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
-<script src="/assets/javascripts/rectangles/engine/map/ui_ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/ui/ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/_base.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/arrow.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
 
 <script>
@@ -73,6 +75,7 @@ var MapTool = Fiber.extend(function(base){
 	  move: function(e, cursor){},
 	  drag: function(e, cursor){},
 	  up: function(e, cursor, new_cursor){},
+	  cancel: function(){},
   }
   return exports
 })
@@ -150,6 +153,7 @@ var PolylineTool = MapTool.extend(function (base) {
 })
 
 var scene, map, controls
+var last_point = new vec2(0,0)
 
 map = new Map ({
 	type: "ortho",
@@ -161,6 +165,7 @@ map = new Map ({
 map.ui.add_tool("arrow", new ArrowTool)
 map.ui.add_tool("polyline", new PolylineTool)
 map.ui.add_tool("position", new PositionTool)
+map.ui.set_tool("arrow")
 
 $(window).resize(function(){
   scene.width = window.innerWidth/2
@@ -174,6 +179,8 @@ var shapes = []
 var ctx = map.draw.ctx
 var last_point
 
+shapes.findClosestPoint = function(){}
+
 function polyline (points, finished) {
   if (! points) return
   if (points.length == 1) {
-- 
cgit v1.2.3-70-g09d2


From 630c08b712a2ace833217428f1ef20bddc0b975d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 25 Aug 2015 18:32:14 -0400
Subject: blueprint integration into project editor

---
 .../javascripts/rectangles/engine/rooms/_rooms.js  | 32 +++++++++
 public/assets/javascripts/ui/_router.js            | 75 +++++++++++++---------
 .../javascripts/ui/blueprint/BlueprintSettings.js  |  3 +
 .../javascripts/ui/blueprint/BlueprintView.js      |  2 +-
 .../assets/javascripts/ui/builder/BuilderInfo.js   |  4 +-
 .../assets/javascripts/ui/editor/EditorSettings.js |  7 +-
 public/assets/javascripts/ui/editor/EditorView.js  |  5 ++
 server/lib/api/blueprint.js                        |  3 +
 server/lib/api/projects.js                         | 14 +++-
 server/lib/schemas/Blueprint.js                    |  1 +
 server/lib/schemas/Project.js                      |  2 +
 server/lib/util.js                                 |  4 ++
 12 files changed, 117 insertions(+), 35 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

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',
-
-		"/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',
-
-		"/layout":              'layoutPicker',
-		"/layout/:name":        'layoutEditor',
-
-		"/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',
+		"/":                             'home',
+		"/home":                         'home',
+		"/login":                        'signin',
+		"/signin":                       'signin',
+		"/signup":                       'signup',
+
+		"/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',
+
+		"/layout":                       'layoutPicker',
+		"/layout/:name":                 'layoutEditor',
+
+		"/blueprint":                    'blueprintEditor',
+		"/blueprint/:name":              'blueprintEditor',
+
+		"/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;")
 }
-- 
cgit v1.2.3-70-g09d2


From 0e03cb3c4065e002be50d37e80ddfab1407c8e6b Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 16:10:42 -0400
Subject: popup notice to start a project

---
 public/assets/javascripts/rectangles/models/wall.js  |  2 +-
 .../javascripts/ui/blueprint/BlueprintNotice.js      | 20 ++++++++++++++++++++
 .../javascripts/ui/blueprint/BlueprintSettings.js    |  4 +++-
 .../javascripts/ui/blueprint/BlueprintToolbar.js     |  8 ++++++++
 .../assets/javascripts/ui/blueprint/BlueprintView.js |  5 +++++
 public/assets/stylesheets/app.css                    |  6 ++++++
 views/blueprint.ejs                                  |  6 +-----
 views/controls/blueprint/notice.ejs                  |  3 +++
 views/partials/scripts.ejs                           |  1 +
 9 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintNotice.js
 create mode 100644 views/controls/blueprint/notice.ejs

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 9d4650b..5aa8359 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -198,7 +198,7 @@
 	}
 	
 	Wall.prototype.serialize = function(){
-	  return {
+	  return { 
 	    id: this.id,
 	    background: this.background,
 	  }
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintNotice.js b/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
new file mode 100644
index 0000000..bced4e1
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
@@ -0,0 +1,20 @@
+var BlueprintNotice = View.extend(ToggleableView.prototype).extend({
+  
+  el: "#blueprintNotice",
+  
+  initialize: function(opt){
+    this.parent = opt.parent
+    this.$notice = this.$(".notice")
+  },
+  
+  notice: function(msg){
+    this.$notice.html(msg)
+  },
+  
+  showCreateProjectNotice: function(){
+    this.notice("<a href='/project/blueprint/" + this.parent.data.slug +
+                "'>Start a new project</a> with this blueprint.")
+    this.show()
+  },
+
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 0870a11..e41962e 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -37,7 +37,6 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
       shapes.deserialize( data.shapes )
       shapes.build()
 		}
-		this.data = data
 	},
 	
 	clear: function(){
@@ -107,11 +106,14 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 	},
 	
 	success: function(data){
+	  this.parent.data = data
+	  
 		this.$id.val(data._id)
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
 		this.hide()
+		this.parent.notice.showCreateProjectNotice()
 		
 		Minotaur.unwatch(this)
 		Minotaur.hide()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index e22535e..88f1d0a 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -9,6 +9,7 @@ var BlueprintToolbar = View.extend({
     "click [data-role=polyline-mode]": 'polylineMode',
     "click [data-role=ortho-polyline-mode]": 'orthoPolylineMode',
     "click [data-role=eraser-mode]": 'eraserMode',
+    "click [data-role=start-position-mode]": 'startPositionMode',
     "click [data-role=toggle-layout-settings]": 'toggleSettings',
   },
 
@@ -21,6 +22,7 @@ var BlueprintToolbar = View.extend({
     this.$polylineMode = this.$('[data-role=polyline-mode]')
     this.$orthoPolylineMode = this.$('[data-role=ortho-polyline-mode]')
     this.$eraserMode = this.$('[data-role=eraser-mode]')
+    this.$startPositionMode = this.$('[data-role=start-position-mode]')
     
     this.orthoPolylineMode()
   },
@@ -52,6 +54,7 @@ var BlueprintToolbar = View.extend({
   
   toggleSettings: function(){
     this.parent.settings.toggle()
+    this.parent.notice.toggle( ! this.parent.data.isNew && ! this.parent.settings.visible() )
   },
   
   setActiveMode: function( $el ) {
@@ -79,4 +82,9 @@ var BlueprintToolbar = View.extend({
     this.parent.map.ui.set_tool("eraser")
   },
 
+  startPositionMode: function(){
+    this.setActiveMode( this.$startPositionMode )
+    this.parent.map.ui.set_tool("start-position")
+  },
+  
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 3095cfe..6f1d2f5 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -17,6 +17,7 @@ var BlueprintView = View.extend({
     this.scaler = new BlueprintScaler ({ parent: this })
 		this.info = new BlueprintInfo ({ parent: this })
 		this.settings = new BlueprintSettings ({ parent: this })
+		this.notice = new BlueprintNotice ({ parent: this })
 	},
 
 	load: function(name){
@@ -48,9 +49,13 @@ var BlueprintView = View.extend({
 	},
 	
 	ready: function(data){
+	  this.data = data
 		this.info.load(data)
 		this.settings.load(data)
 	  this.editor.loadFloorplan(data)
+	  if (! data.isNew) {
+	    this.notice.showCreateProjectNotice()
+	  }
 	},
 	
 	hideExtras: function(){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 2fef578..3caa063 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2352,6 +2352,12 @@ input[type="range"]::-webkit-slider-thumb {
   transition: -webkit-transform 0.2s ease-in-out;
 	width: 210px;
 }
+#blueprintNotice.settings {
+  width: 230px;
+}
+#blueprintNotice a {
+  border-bottom: 1px solid;
+}
 #textEditor.settings {
   width: 320px;
 }
diff --git a/views/blueprint.ejs b/views/blueprint.ejs
index e7f7c48..13e8182 100644
--- a/views/blueprint.ejs
+++ b/views/blueprint.ejs
@@ -17,11 +17,7 @@
 			[[ include controls/blueprint/settings ]]
       [[ include controls/blueprint/editor ]]
       [[ include controls/blueprint/scaler ]]
-		</div>
-
-		<div id="hud">
-			<div id="map" style="display: block">
-			</div>
+      [[ include controls/blueprint/notice ]]
 		</div>
 	</div>
 
diff --git a/views/controls/blueprint/notice.ejs b/views/controls/blueprint/notice.ejs
new file mode 100644
index 0000000..1be3f6f
--- /dev/null
+++ b/views/controls/blueprint/notice.ejs
@@ -0,0 +1,3 @@
+<div class="vvbox settings" id="blueprintNotice">
+	<div class="notice"></div>
+</div>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 865c0f1..ac08216 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -142,6 +142,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintScaler.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintToolbar.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUploader.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintNotice.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 8ce3e6347b75a653ed3b7e4e3b2be5f23c841e97 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 16:24:31 -0400
Subject: show start position

---
 public/assets/javascripts/rectangles/engine/map/draw.js     | 8 +++++++-
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js   | 2 +-
 public/assets/javascripts/ui/blueprint/BlueprintSettings.js | 2 +-
 public/assets/javascripts/ui/blueprint/BlueprintToolbar.js  | 2 ++
 public/assets/javascripts/ui/blueprint/BlueprintView.js     | 7 ++++++-
 5 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 8498a46..fd05f86 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -252,7 +252,13 @@ Map.Draw = function(map, opt){
 
 	draw.x_at = function x_at (x, z, length){
 		ctx.save()
-		ctx.translate(x,z)
+	  if (x && 'x' in x) {
+	    length = z
+      ctx.translate(x.x,x.z)
+	  }
+	  else {
+      ctx.translate(x,z)
+	  }
 
 		var len = (length/2 || 4) / map.zoom
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 0f35ac5..bf55aae 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -109,7 +109,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     shapes.draw(map.draw.ctx, "rgba(255,255,0,0.1)", "#f80")
 
     map.draw.ctx.strokeStyle = "#f00";
-    map.draw.x_at(0,0)
+    map.draw.x_at( this.parent.startPosition )
     map.draw.mouse(map.ui.mouse.cursor)
     map.draw.camera(scene.camera)
     
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index e41962e..94672f6 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -93,7 +93,7 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
-		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
+		fd.append( "startPosition", JSON.stringify( this.parent.getStartPosition() ) )
     fd.append( "wallHeight", this.parent.info.$height.unitVal() )
     fd.append( "units", this.parent.info.$units.val() )
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index 88f1d0a..bd42374 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -85,6 +85,8 @@ var BlueprintToolbar = View.extend({
   startPositionMode: function(){
     this.setActiveMode( this.$startPositionMode )
     this.parent.map.ui.set_tool("start-position")
+    this.parent.settings.hide()
+    this.parent.notice.showStartPositionNotice()
   },
   
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 6f1d2f5..7819abd 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -28,6 +28,7 @@ var BlueprintView = View.extend({
 	},
 
   orbiting: true,
+	startPosition: {},
 	buildMap: function(){
 	  // i forget if this has to be global
     map = new Map ({
@@ -53,7 +54,11 @@ var BlueprintView = View.extend({
 		this.info.load(data)
 		this.settings.load(data)
 	  this.editor.loadFloorplan(data)
-	  if (! data.isNew) {
+	  if (data.isNew) {
+	    this.startPosition = { x: 0, y: 0, z: 0, rotationX: 0, rotationY: Math.PI/2 }
+	  }
+	  else {
+	    this.startPosition = data.startPosition
 	    this.notice.showCreateProjectNotice()
 	  }
 	},
-- 
cgit v1.2.3-70-g09d2


From a54c08b70c6072f6c2da48bc209a8b915c993a97 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 17:17:50 -0400
Subject: set default start position on blueprint

---
 .../rectangles/engine/map/tools/line.js            |  2 +-
 .../rectangles/engine/map/tools/start.js           | 29 +++++++++++++++
 .../javascripts/ui/blueprint/BlueprintNotice.js    | 42 ++++++++++++++++++++++
 .../javascripts/ui/blueprint/BlueprintSettings.js  |  2 +-
 .../javascripts/ui/blueprint/BlueprintToolbar.js   |  8 ++---
 .../javascripts/ui/blueprint/BlueprintView.js      |  1 +
 public/assets/stylesheets/app.css                  |  8 +++++
 views/controls/blueprint/notice.ejs                |  1 +
 views/controls/blueprint/settings.ejs              |  7 ----
 views/controls/blueprint/toolbar.ejs               |  5 +++
 views/partials/scripts.ejs                         |  1 +
 11 files changed, 93 insertions(+), 13 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/map/tools/start.js

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/line.js b/public/assets/javascripts/rectangles/engine/map/tools/line.js
index 8fe4fff..a8e2473 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/line.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/line.js
@@ -1,4 +1,4 @@
-// This tool lets you define a very simple line between two points.
+// This tool is used to define a very simple line between two points.
 // It is used by the BlueprintScaler to specify a sample distance to scale.
 
 var LineTool = MapTool.extend(function(base){
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/start.js b/public/assets/javascripts/rectangles/engine/map/tools/start.js
new file mode 100644
index 0000000..cca387c
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/tools/start.js
@@ -0,0 +1,29 @@
+// This tool is used to set the start position on the map.
+
+var StartPositionTool = MapTool.extend(function(base){
+	var exports = {}
+	
+	var selected_point = null
+	
+	var line = exports.line = []
+	
+	var can_drag, dragging
+	
+	exports.down = function(e, cursor){
+    // rightclick?
+    if (e.ctrlKey || e.which === 3) {
+      cursor.quantize(1/map.zoom)
+      app.router.blueprintView.map.center.a = cursor.x.a
+      app.router.blueprintView.map.center.b = -cursor.y.a
+      cursor.x.b = cursor.x.a
+      cursor.y.b = cursor.y.a
+      return
+    }
+    
+    cam.x = app.controller.startPosition.x = cursor.x.a
+    cam.z = app.controller.startPosition.z = cursor.y.a
+	}
+	
+	return exports
+	
+})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintNotice.js b/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
index bced4e1..4b799a6 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
@@ -2,9 +2,14 @@ var BlueprintNotice = View.extend(ToggleableView.prototype).extend({
   
   el: "#blueprintNotice",
   
+  events: {
+    "click .next": "next",
+  },
+  
   initialize: function(opt){
     this.parent = opt.parent
     this.$notice = this.$(".notice")
+    this.$next = this.$(".next")
   },
   
   notice: function(msg){
@@ -14,7 +19,44 @@ var BlueprintNotice = View.extend(ToggleableView.prototype).extend({
   showCreateProjectNotice: function(){
     this.notice("<a href='/project/blueprint/" + this.parent.data.slug +
                 "'>Start a new project</a> with this blueprint.")
+    this.$next.hide()
+    this.nextFn = null
+    this.show()
+  },
+  
+  showStartPositionNotice: function(){
+    this.parent.settings.hide()
+    this.notice("First, click the map to set the starting location.")
+    this.$next.show().html("Next")
+    this.show()
+    this.nextFn = this.showStartAngleNotice.bind(this)
+  },
+  
+  showStartAngleNotice: function(){
+    this.parent.settings.hide()
+    this.notice("Next, rotate the camera to the desired orientation.")
+    this.$next.show().html("Done")
     this.show()
+    this.nextFn = this.doneSettingPosition.bind(this)
+    this.parent.toolbar.toggleOrbitMode(false)
+  },
+  
+  doneSettingPosition: function(){
+    this.nextFn = null
+    this.$next.hide()
+    this.hide()
+    this.parent.settings.show()
+    this.parent.startPosition.rotationX = cam.rotationX
+    this.parent.startPosition.rotationY = cam.rotationY
+    this.parent.toolbar.toggleOrbitMode(true)
+    this.parent.toolbar.orthoPolylineMode()
+  },
+  
+  nextFn: null,
+  next: function(){
+    if (this.nextFn) {
+      this.nextFn()
+    }
   },
 
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 94672f6..80c9355 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -93,7 +93,7 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
-		fd.append( "startPosition", JSON.stringify( this.parent.getStartPosition() ) )
+		fd.append( "startPosition", JSON.stringify( this.parent.startPosition ) )
     fd.append( "wallHeight", this.parent.info.$height.unitVal() )
     fd.append( "units", this.parent.info.$units.val() )
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index bd42374..7721298 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -32,8 +32,8 @@ var BlueprintToolbar = View.extend({
     this.parent.uploader.show()
   },
   
-  toggleOrbitMode: function(){
-    this.parent.orbiting = ! this.parent.orbiting
+  toggleOrbitMode: function(state){
+    this.parent.orbiting = typeof state == "boolean" ? state : ! this.parent.orbiting
     this.$toggleOrbitMode.toggleClass("inuse", ! this.parent.orbiting)
     this.parent.editor.resize()
     if (this.parent.orbiting) {
@@ -46,9 +46,9 @@ var BlueprintToolbar = View.extend({
       movements.gravity(true)
       cam.rotationX = 0
       cam.rotationY = -cam.rotationY
-      cam.x = 0
+      cam.x = this.parent.startPosition.x
       cam.y = viewHeight
-      cam.z = 0
+      cam.z = this.parent.startPosition.z
     }
   },
   
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 7819abd..7d839aa 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -45,6 +45,7 @@ var BlueprintView = View.extend({
     map.ui.add_tool("ortho-polyline", new OrthoPolylineTool)
     map.ui.add_tool("eraser", new EraserTool)
     map.ui.add_tool("position", new PositionTool)
+    map.ui.add_tool("start-position", new StartPositionTool)
     map.ui.placing = false
     return map
 	},
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 3caa063..5ef8c18 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2358,6 +2358,14 @@ input[type="range"]::-webkit-slider-thumb {
 #blueprintNotice a {
   border-bottom: 1px solid;
 }
+#blueprintNotice .next {
+  display: inline-block;
+  background: black; color: white;
+  padding: 4px;
+  margin: 4px 0 0 0;
+  float: right;
+  cursor: pointer;
+}
 #textEditor.settings {
   width: 320px;
 }
diff --git a/views/controls/blueprint/notice.ejs b/views/controls/blueprint/notice.ejs
index 1be3f6f..bf1a310 100644
--- a/views/controls/blueprint/notice.ejs
+++ b/views/controls/blueprint/notice.ejs
@@ -1,3 +1,4 @@
 <div class="vvbox settings" id="blueprintNotice">
 	<div class="notice"></div>
+	<span class="next">Next</span>
 </div>
diff --git a/views/controls/blueprint/settings.ejs b/views/controls/blueprint/settings.ejs
index 1347f5b..9c615ea 100644
--- a/views/controls/blueprint/settings.ejs
+++ b/views/controls/blueprint/settings.ejs
@@ -2,13 +2,6 @@
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
-	<div class="setting">
-		<a href="#" id="startpoint">
-			<span class="ion-ios-navigate-outline"></span>
-			<span id="startText">Select Startpoint</span>
-			<span id="moveText">Move to Desired Point</span></a>
-	</div>
-
 	<div class="setting">
 		<input type="text" name="name" placeholder="Blueprint name">
 	</div>
diff --git a/views/controls/blueprint/toolbar.ejs b/views/controls/blueprint/toolbar.ejs
index ee9594e..ba795e3 100644
--- a/views/controls/blueprint/toolbar.ejs
+++ b/views/controls/blueprint/toolbar.ejs
@@ -30,6 +30,11 @@
 		data-info="remove walls"
     class="ion-scissors mode"></span>
 
+  <span
+    data-role="start-position-mode"
+		data-info="set starting position"
+    class="ion-ios-home-outline mode"></span>
+
 	<span
 		data-role='toggle-layout-settings'
 		data-info="save blueprint"
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index ac08216..af7fe96 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -101,6 +101,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/ortho.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/polyline.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/position.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/start.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/lib/View.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 685d5fd7b32ac868a0b2d8ac8a2a1b4120f274cf Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 27 Aug 2015 11:57:51 -0400
Subject: fork orthopolyline

---
 .../rectangles/engine/map/tools/ortho.js           |  2 +-
 .../javascripts/rectangles/engine/shapes/ortho.js  | 41 ++++++++++++++++++++++
 .../rectangles/engine/shapes/polyline.js           | 21 +++++++----
 .../rectangles/engine/shapes/shapelist.js          | 14 ++++++--
 .../javascripts/ui/blueprint/BlueprintSettings.js  |  3 +-
 .../javascripts/ui/blueprint/BlueprintUploader.js  |  2 +-
 .../javascripts/ui/blueprint/BlueprintView.js      | 22 ++++++++++++
 public/assets/stylesheets/app.css                  |  4 +--
 views/partials/header.ejs                          |  2 ++
 views/partials/scripts.ejs                         |  1 +
 views/profile.ejs                                  |  2 ++
 11 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/shapes/ortho.js

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintSettings.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
index 6ced728..374c822 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
@@ -48,7 +48,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
     }
     else {
       map.ui.placing = true
-      shapes.workline = new Polyline ()
+      shapes.workline = new OrthoPolyline ()
       shapes.workline.add(p)
       first_point = prev_point = p
       horizontal = false
diff --git a/public/assets/javascripts/rectangles/engine/shapes/ortho.js b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
new file mode 100644
index 0000000..8a8f928
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
@@ -0,0 +1,41 @@
+// An OrthoPolyline is a Polyline where all angles are 90 degrees.
+
+var OrthoPolyline = Polyline.extend(function(base){
+	var exports = {}
+	exports.type = function(){
+	  return "ortho"
+	}
+	exports.instantiate = function(){
+	  return new OrthoPolyline
+	}
+	exports.canCloseWith = function(p){
+    return (this.points.length > 2 && this.points[0].distanceTo( p ) < 10/map.zoom)
+	}
+  exports.draw = function(ctx, fillStyle, strokeStyle){
+    var points = this.points
+    if (! points.length) return
+    if (points.length == 1) {
+      ctx.fillStyle = "#f80"
+      map.draw.dot_at(this.points[0].a, points[0].b, 5)
+    }
+    if (points.length > 1) {
+      ctx.fillStyle = fillStyle
+      ctx.strokeStyle = strokeStyle
+      ctx.lineWidth = 2 / map.zoom
+      ctx.beginPath()
+      ctx.moveTo(points[0].a, points[0].b)
+      points.forEach(function(point, i){
+        i && ctx.lineTo(point.a, point.b)
+      })
+      strokeStyle && ctx.stroke()
+      if (! map.ui.placing || this.closed) {
+        fillStyle && ctx.fill()
+      }
+    }
+  }
+  exports.close = function(){
+    this.points[this.points.length] = this.points[0]
+    this.closed = true
+  }
+  return exports
+})
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index fc6cad7..65e22ad 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -9,6 +9,12 @@ var Polyline = Fiber.extend(function(base){
     this.mx_points = []
     this.closed = false
 	}
+	exports.type = function(){
+	  return "polyline"
+	}
+	exports.instantiate = function(){
+	  return new Polyline
+	}
 	exports.add = function(p){
     this.points.push( p )
     this.mx_points.push( new MX.Point(p) )
@@ -25,19 +31,19 @@ var Polyline = Fiber.extend(function(base){
 	exports.getHeadAtIndex = function(index){
 	  if (index == 0) { return null }
 	  if (index == this.points.length-1) { return this.clone() }
-	  var head = new Polyline()
+	  var head = this.instantiate()
 	  head.points = this.points.slice(0, index+1)
 	  return head
 	}
 	exports.getTailAtIndex = function(index){
 	  if (index == this.points.length-1) { return null }
 	  if (index == 0) { return this.clone() }
-	  var tail = new Polyline()
+	  var tail = this.instantiate()
 	  tail.points = this.points.slice(index, this.points.length)
 	  return tail
 	}
 	exports.clone = function(){
-	  var clone = new Polyline()
+	  var clone = this.instantiate()
 	  clone.points = this.points.concat()
 	}
 	exports.hasPointNear = function(p){
@@ -148,10 +154,13 @@ var Polyline = Fiber.extend(function(base){
     return segments
   }
   exports.serialize = function(){
-    return this.points.map(function(point){ return [point.a, point.b] })
+    return {
+      type: this.type(),
+      points: this.points.map(function(point){ return [point.a, point.b] }),
+    }
   }
-  exports.deserialize = function(points){
-    this.points = points.map(function(point){ return new vec2(point[0], point[1]) })
+  exports.deserialize = function(data){
+    this.points = (data.points || data).map(function(point){ return new vec2(point[0], point[1]) })
   }
   exports.reset = function(){
     this.mx_points.forEach(function(mx){ scene.remove(mx) })
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 75ecae6..e5a70fb 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -87,9 +87,17 @@ var ShapeList = Fiber.extend(function(base){
     })
   }
   exports.deserialize = function(data){
-    data && data.forEach(function(points){
-      var line = new Polyline()
-      line.deserialize(points)
+    data && data.forEach(function(shape_data){
+      var line
+      switch (shape_data.type) {
+        case 'ortho':
+          line = new OrthoPolyline()
+          break
+        default:
+          line = new Polyline()
+          break
+      }
+      line.deserialize(shape_data)
       shapes.add(line)
     }.bind(this))
   }
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 80c9355..8addb9c 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -93,10 +93,9 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
-		fd.append( "startPosition", JSON.stringify( this.parent.startPosition ) )
+		fd.append( "startPosition", JSON.stringify( this.parent.quantizeStartPosition() ) )
     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/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index fe1073a..dc3c281 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -65,7 +65,7 @@ var BlueprintUploader = UploadView.extend({
 	  var $el = $(e.currentTarget)
 	  var media = $el.data("media")
 	  this.hide()
-	  this.parent.scaler.pick(media, true)
+	  this.parent.scaler.pick(media)
 	},
   
 	destroy: function(e){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index ecbb536..19b9e84 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -29,6 +29,28 @@ var BlueprintView = View.extend({
 
   orbiting: true,
 	startPosition: {},
+	quantizeStartPosition: function(){
+	  //
+	  var regions = RegionList.build()
+	  var pos = this.startPosition
+	  var startPositionIsInARoom = regions.some(function(region){
+	    return region.contains(pos.x, pos.z)
+	  })
+	  if (startPositionIsInARoom) {
+	    return this.startPosition
+	  }
+	  else {
+	    var center = regions[0].center()
+	    return {
+	      x: center.a,
+	      y: viewHeight,
+	      z: center.b,
+        rotationX: 0,
+        rotationY: Math.PI/2,
+	    }
+	  }
+	},
+	
 	buildMap: function(){
 	  // i forget if this has to be global
     map = new Map ({
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 634ea60..e4f1b27 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1156,6 +1156,7 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
 	width: 100%;
 	height: 100%;
 	padding: 20px 0 40px 0;
+	text-align: center;
 }
 .templates-list,
 .userTemplatesList,
@@ -1186,8 +1187,7 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
 }
 
 .templates span {
-	display: block;
-	float: left;
+	display: inline-block;
 	margin: 1vw 0;
 	width:20%;
 	padding: 2vw;
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index bb8fc6e..ce9ffae 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -64,7 +64,9 @@
 
 	[[ if (profile && String(user._id) == String(profile._id)) { ]]
 	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a>
+<!-- 
 	<a href="/profile" data-role="edit-subscription-modal" class="topLink editSubscription">Subscription</a>
+ -->
 	[[ } else if (! profile) { ]]
 	<a href="/profile" class="topLink profileLink">Profile</a>
 	[[ } ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index bac4120..da3f0ba 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -86,6 +86,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/ortho.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/regionlist.js"></script>
 
diff --git a/views/profile.ejs b/views/profile.ejs
index 63a07f5..d3ae10e 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -78,7 +78,9 @@
 	[[ } ]]
 
 	</div>
+<!-- 
 	[[ include partials/edit-subscription ]]
+ -->
 	[[ include partials/edit-profile ]]
 	[[ include projects/layouts-modal ]]	
 	[[ include projects/edit-project ]]
-- 
cgit v1.2.3-70-g09d2