summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-30 23:02:07 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-30 23:02:07 +0200
commitedb53be0c3d28ca7af064b7e86d657ca9084854c (patch)
treea577d9275910780ee05cc4156707c0a6ac415a80
parentee4bffdeb2c10750a51ea76f32de2acca9929d01 (diff)
downloadChimère-edb53be0c3d28ca7af064b7e86d657ca9084854c.tar.bz2
Chimère-edb53be0c3d28ca7af064b7e86d657ca9084854c.zip
JS: fix bad parameter of route edition
-rw-r--r--chimere/static/chimere/js/jquery.chimere.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 0e7def5..0bda01e 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -269,6 +269,15 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
}, // end of init
activateContextMenu: function(){
+ settings.edition_type_is_route = false;
+ settings.map.events.unregister('click', settings.map,
+ methods.setMarker);
+ settings.map.events.register('click', settings.map,
+ methods.displayMapMenu);
+ },
+
+ activateRouteEdit: function(){
+ settings.edition_type_is_route = true;
settings.map.events.unregister('click', settings.map,
methods.setMarker);
settings.map.events.register('click', settings.map,
@@ -276,6 +285,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
},
activateMarkerEdit: function(){
+ settings.edition_type_is_route = false;
if ($('#chimere_map_menu').length){
$('#chimere_map_menu').hide();
}
@@ -883,7 +893,6 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
return;
},
updateMarkerInput: function(){
- settings.edition_type_is_route = false;
if (!settings.current_edit_feature) {
return;
}
@@ -898,7 +907,6 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
},
updateRoutingInput: function(){
- settings.edition_type_is_route = true;
if (!settings.current_route_feature) {
return;
}