10 files changed, 33 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 86507b03e..69d083fe7 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,4 +9,5 @@
 //= require jquery-ui
 //= require modernizr
 //= require cocoon
-//= require_tree .
+//= require_directory ./public
+//= require_directory .
diff --git a/app/assets/javascripts/OpenLayers.js b/app/assets/javascripts/public/OpenLayers.js
index 9523007df..9523007df 100644
--- a/app/assets/javascripts/OpenLayers.js
+++ b/app/assets/javascripts/public/OpenLayers.js
diff --git a/app/assets/javascripts/formtastic.qtip2.min.js b/app/assets/javascripts/public/formtastic.qtip2.min.js
index 2f81a7a54..2f81a7a54 100644
--- a/app/assets/javascripts/formtastic.qtip2.min.js
+++ b/app/assets/javascripts/public/formtastic.qtip2.min.js
diff --git a/app/assets/javascripts/jquery.qtip.min.js b/app/assets/javascripts/public/jquery.qtip.min.js
index 891523841..891523841 100644
--- a/app/assets/javascripts/jquery.qtip.min.js
+++ b/app/assets/javascripts/public/jquery.qtip.min.js
diff --git a/app/assets/javascripts/jquery.tokeninput.js b/app/assets/javascripts/public/jquery.tokeninput.js
index 87641a57a..87641a57a 100644
--- a/app/assets/javascripts/jquery.tokeninput.js
+++ b/app/assets/javascripts/public/jquery.tokeninput.js
diff --git a/app/assets/javascripts/jquery.ui.datepicker-i18n.js b/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js
index 3d0d55b46..3d0d55b46 100644
--- a/app/assets/javascripts/jquery.ui.datepicker-i18n.js
+++ b/app/assets/javascripts/public/jquery.ui.datepicker-i18n.js
diff --git a/app/assets/javascripts/proj4js-compressed.js b/app/assets/javascripts/public/proj4js-compressed.js
index 3da44ad15..3da44ad15 100644
--- a/app/assets/javascripts/proj4js-compressed.js
+++ b/app/assets/javascripts/public/proj4js-compressed.js
diff --git a/app/assets/javascripts/public/proj4js-defs.js b/app/assets/javascripts/public/proj4js-defs.js
new file mode 100644
index 000000000..fe77a033c
--- /dev/null
+++ b/app/assets/javascripts/public/proj4js-defs.js
@@ -0,0 +1,9 @@
+Proj4js.defs["EPSG:27561"] = "+proj=lcc +lat_1=49.50000000000001 +lat_0=49.50000000000001 +lon_0=0 +k_0=0.999877341 +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs"
+Proj4js.defs["EPSG:27562"] = "+proj=lcc +lat_1=46.8 +lat_0=46.8 +lon_0=0 +k_0=0.99987742 +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs"
+Proj4js.defs["EPSG:27563"] = "+proj=lcc +lat_1=44.10000000000001 +lat_0=44.10000000000001 +lon_0=0 +k_0=0.999877499 +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs"
+Proj4js.defs["EPSG:27564"] = "+proj=lcc +lat_1=42.16500000000001 +lat_0=42.16500000000001 +lon_0=0 +k_0=0.99994471 +x_0=234.358 +y_0=185861.369 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs"
+Proj4js.defs["EPSG:27571"] = "+proj=lcc +lat_1=49.50000000000001 +lat_0=49.50000000000001 +lon_0=0 +k_0=0.999877341 +x_0=600000 +y_0=1200000 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs"
+Proj4js.defs["EPSG:27572"] = "+proj=lcc +lat_1=46.8 +lat_0=46.8 +lon_0=0 +k_0=0.99987742 +x_0=600000 +y_0=2200000 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs"
+Proj4js.defs["EPSG:27573"] = "+proj=lcc +lat_1=44.10000000000001 +lat_0=44.10000000000001 +lon_0=0 +k_0=0.999877499 +x_0=600000 +y_0=3200000 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs"
+Proj4js.defs["EPSG:27574"] = "+proj=lcc +lat_1=42.16500000000001 +lat_0=42.16500000000001 +lon_0=0 +k_0=0.99994471 +x_0=234.358 +y_0=4185861.369 +a=6378249.2 +b=6356515 +towgs84=-168,-60,320,0,0,0,0 +pm=paris +units=m +no_defs"
+Proj4js.defs["EPSG:2154"] = "+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"
diff --git a/app/assets/javascripts/stop_areas.js.coffee b/app/assets/javascripts/stop_areas.js.coffee
new file mode 100644
index 000000000..a03124169
--- /dev/null
+++ b/app/assets/javascripts/stop_areas.js.coffee
@@ -0,0 +1,21 @@
+jQuery ->
+  x_y_change = (event) -> 
+    if referential_projection != undefined
+      projection_geometry = new OpenLayers.Geometry.Point($('input#stop_area_longitude').val(), $('input#stop_area_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), referential_projection )
+      $('input#stop_area_x').val(projection_geometry.x)
+      $('input#stop_area_y').val(projection_geometry.y)
+      
+      #var stop_area = map.getLayersByName("stop_area")[0].getFeatureByFid(645).set
+      
+
+  $('input#stop_area_longitude').change(x_y_change)
+  $('input#stop_area_latitude').change(x_y_change)
+   
+  lon_lat_change = (event) -> 
+    if referential_projection != undefined
+      projection_geometry = new OpenLayers.Geometry.Point($('input#stop_area_x').val(), $('input#stop_area_y').val()).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))
+      $('input#stop_area_longitude').val(projection_geometry.x)
+      $('input#stop_area_latitude').val(projection_geometry.y)
+
+  $('input#stop_area_x').change(lon_lat_change)
+  $('input#stop_area_y').change(lon_lat_change)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index f4936039b..06b340db2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -26,7 +26,7 @@ ChouetteIhm::Application.configure do
   config.assets.compress = false
 
   # Expands the lines which load the assets
-  config.assets.debug = false
+  config.assets.debug = true
 
   config.active_record.mass_assignment_sanitizer = :strict