aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorLuc Donnet2013-07-01 08:53:34 +0200
committerLuc Donnet2013-07-01 08:53:34 +0200
commite8f8d98b66d3dc912a8ccc253f46b705d77f7db7 (patch)
tree38271d32f5743328e94587fd6e5ceb4a2ddc23da /app/assets/javascripts
parent8f8c8b07b587b0f5f2300f8635b68aeb0415024d (diff)
parent3529f9d5f2851b65fcf94b5a4ec3b722b9f6c64c (diff)
downloadchouette-core-e8f8d98b66d3dc912a8ccc253f46b705d77f7db7.tar.bz2
Merge branch 'master' of github.com:dryade/chouette2
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/access_points.js.coffee10
-rw-r--r--app/assets/javascripts/stop_areas.js.coffee10
2 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/javascripts/access_points.js.coffee b/app/assets/javascripts/access_points.js.coffee
index 74c5e926f..5cff80b7c 100644
--- a/app/assets/javascripts/access_points.js.coffee
+++ b/app/assets/javascripts/access_points.js.coffee
@@ -3,8 +3,8 @@ jQuery ->
if referential_projection != undefined
referential_point = new OpenLayers.Geometry.Point($('input#access_point_longitude').val(), $('input#access_point_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), referential_projection )
- $('input#access_point_x').val(referential_point.x)
- $('input#access_point_y').val(referential_point.y)
+ $('input#access_point_projection_x').val(referential_point.x)
+ $('input#access_point_projection_y').val(referential_point.y)
feature = map.getLayersByName("access_point")[0].getFeatureByFid($('input#access_point_id').val())
google_point = new OpenLayers.LonLat($('input#access_point_longitude').val(), $('input#access_point_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
@@ -16,7 +16,7 @@ jQuery ->
lon_lat_change = (event) ->
if referential_projection != undefined
- wgs84_point = new OpenLayers.Geometry.Point($('input#access_point_x').val(), $('input#access_point_y').val()).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))
+ wgs84_point = new OpenLayers.Geometry.Point($('input#access_point_projection_x').val(), $('input#access_point_projection_y').val()).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))
$('input#access_point_longitude').val( wgs84_point.x)
$('input#access_point_latitude').val( wgs84_point.y)
@@ -26,8 +26,8 @@ jQuery ->
feature.move(google_point)
map.setCenter(google_point, 16, false, true)
- $('input#access_point_x').change(lon_lat_change)
- $('input#access_point_y').change(lon_lat_change)
+ $('input#access_point_projection_x').change(lon_lat_change)
+ $('input#access_point_projection_y').change(lon_lat_change)
# switch visibility of access_links
diff --git a/app/assets/javascripts/stop_areas.js.coffee b/app/assets/javascripts/stop_areas.js.coffee
index aae8d4885..255c4c707 100644
--- a/app/assets/javascripts/stop_areas.js.coffee
+++ b/app/assets/javascripts/stop_areas.js.coffee
@@ -3,8 +3,8 @@ jQuery ->
if referential_projection != undefined
referential_point = 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(referential_point.x)
- $('input#stop_area_y').val(referential_point.y)
+ $('input#stop_area_projection_x').val(referential_point.x)
+ $('input#stop_area_projection_y').val(referential_point.y)
feature = map.getLayersByName("stop_area")[0].getFeatureByFid($('input#stop_area_id').val())
google_point = new OpenLayers.LonLat($('input#stop_area_longitude').val(), $('input#stop_area_latitude').val()).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())
@@ -16,7 +16,7 @@ jQuery ->
lon_lat_change = (event) ->
if referential_projection != undefined
- wgs84_point = new OpenLayers.Geometry.Point($('input#stop_area_x').val(), $('input#stop_area_y').val()).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))
+ wgs84_point = new OpenLayers.Geometry.Point($('input#stop_area_projection_x').val(), $('input#stop_area_projection_y').val()).transform(referential_projection, new OpenLayers.Projection("EPSG:4326"))
$('input#stop_area_longitude').val( wgs84_point.x)
$('input#stop_area_latitude').val( wgs84_point.y)
@@ -26,8 +26,8 @@ jQuery ->
feature.move(google_point)
map.setCenter(google_point, 16, false, true)
- $('input#stop_area_x').change(lon_lat_change)
- $('input#stop_area_y').change(lon_lat_change)
+ $('input#stop_area_projection_x').change(lon_lat_change)
+ $('input#stop_area_projection_y').change(lon_lat_change)
# switch visibility of access_links
switch_generics = (event) ->