stacking imagery better

Author: jywarren

app/models/warpable.rb

@@ -3,8 +3,8 @@
 class Warpable < ActiveRecord::Base
 
   has_attachment :content_type => :image, 
-		 #:storage => :file_system,:path_prefix => 'public/warpables', 
-                 :storage => :s3, 
+		 :storage => :file_system,:path_prefix => 'public/warpables', 
+                 #:storage => :s3, 
                  :max_size => 5.megabytes,
                  # :resize_to => '320x200>',
 		:processor => :image_science,
@@ -91,8 +91,8 @@ def generate_affine_distort(scale,path)
     end
 
     if (self.public_filename[0..3] == 'http')
-      Net::HTTP.start('s3.amazonaws.com') { |http|
-      # Net::HTTP.start('localhost') { |http|
+      #Net::HTTP.start('s3.amazonaws.com') { |http|
+      Net::HTTP.start('localhost') { |http|
         resp = http.get(self.public_filename)
         open(local_location, "wb") { |file|
           file.write(resp.body)

public/cartagen/cartagen.js

@@ -8886,7 +8886,7 @@ document.observe('cartagen:init', Map.init.bindAsEventListener(Map))
 document.observe('glop:predraw', Map.draw.bindAsEventListener(Map))
 var Warper = {
 	initialize: function() {
-		Glop.observe('cartagen:predraw', this.draw.bindAsEventListener(this))
+		Glop.observe('cartagen:postdraw', this.draw.bindAsEventListener(this))
 		Glop.observe('mousedown',this.mousedown.bindAsEventListener(this))
 		Glop.observe('dblclick', this.dblclick.bindAsEventListener(this))
 	},

public/cartagen/src/warper/warper.js

@@ -4,7 +4,7 @@
  */
 var Warper = {
 	initialize: function() {
-		Glop.observe('cartagen:predraw', this.draw.bindAsEventListener(this))
+		Glop.observe('cartagen:postdraw', this.draw.bindAsEventListener(this))
 		Glop.observe('mousedown',this.mousedown.bindAsEventListener(this))
 		Glop.observe('dblclick', this.dblclick.bindAsEventListener(this))
 	},