diff options
| author | Michel Etienne | 2014-08-19 15:20:40 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-08-19 15:20:40 +0200 |
| commit | 1800c071b0ef185077d14fc0355ae2a53b904008 (patch) | |
| tree | 9c955472bd4a9e704ffe869184fe19ee6be538d7 /app/maps | |
| parent | fe6da8dbd4dcffa0152b03dadb6f91af51915358 (diff) | |
| download | chouette-core-1800c071b0ef185077d14fc0355ae2a53b904008.tar.bz2 | |
edit latitude and longitude on one combined field, Mantis 26827
Diffstat (limited to 'app/maps')
| -rw-r--r-- | app/maps/access_point_map.rb | 10 | ||||
| -rw-r--r-- | app/maps/stop_area_map.rb | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/app/maps/access_point_map.rb b/app/maps/access_point_map.rb index f31dcf5a3..0103d9edb 100644 --- a/app/maps/access_point_map.rb +++ b/app/maps/access_point_map.rb @@ -10,10 +10,10 @@ class AccessPointMap < ApplicationMap end def customize_map(map, page) - page.assign "parent_layer", kml_layer(access_point.stop_area, :style_map => Design::StopAreasStyleMap.new(helpers).style_map) - page << map.add_layer(:parent_layer) page.assign "edit_access_point_layer", kml_layer(access_point, { :default => editable? }, :style_map => Design::EditAccessPointStyleMap.new(helpers).style_map) page << map.add_layer(:edit_access_point_layer) + page.assign "parent_layer", kml_layer(access_point.stop_area, :style_map => Design::StopAreasStyleMap.new(helpers).style_map) + page << map.add_layer(:parent_layer) if editable? @@ -23,14 +23,12 @@ class AccessPointMap < ApplicationMap edit_access_point_layer.events.on({ 'afterfeaturemodified': function(event) { geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326")); - $('#access_point_longitude').val(geometry.x); - $('#access_point_latitude').val(geometry.y); + $('#access_point_coordinates').val(geometry.y.toString()+ ","+ geometry.x.toString()); if(referential_projection != undefined) { projection_geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), referential_projection ); - $('#access_point_projection_x').val(projection_geometry.x); - $('#access_point_projection_y').val(projection_geometry.y); } + $('#access_point_projection_xy').val(projection_geometry.x.toString()+ ","+ projection_geometry.y.toString()); } } }); EOF diff --git a/app/maps/stop_area_map.rb b/app/maps/stop_area_map.rb index 6c3dd5feb..3fff4a110 100644 --- a/app/maps/stop_area_map.rb +++ b/app/maps/stop_area_map.rb @@ -34,14 +34,12 @@ class StopAreaMap < ApplicationMap edit_stop_area_layer.events.on({ 'afterfeaturemodified': function(event) { geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326")); - $('#stop_area_longitude').val(geometry.x); - $('#stop_area_latitude').val(geometry.y); + $('#stop_area_coordinates').val(geometry.y.toString()+ ","+ geometry.x.toString()); if(referential_projection != undefined) { projection_geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), referential_projection ); - $('#stop_area_projection_x').val(projection_geometry.x); - $('#stop_area_projection_y').val(projection_geometry.y); } + $('#stop_area_projection_xy').val(projection_geometry.x.toString()+ ","+ projection_geometry.y.toString()); } } }); EOF |