From 113bd089875c96eda3455ca71a38659e79842855 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 10 Apr 2012 12:49:38 +0200 Subject: Fix gpx upload for route --- chimere/static/chimere/js/edit_route_map.js | 6 +++++- chimere/templates/chimere/upload_file.html | 8 +------- chimere/views.py | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/chimere/static/chimere/js/edit_route_map.js b/chimere/static/chimere/js/edit_route_map.js index d3ab611..1650983 100644 --- a/chimere/static/chimere/js/edit_route_map.js +++ b/chimere/static/chimere/js/edit_route_map.js @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2011 Étienne Loks +/* Copyright (C) 2008-2012 Étienne Loks This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -41,6 +41,10 @@ function toggleDrawOff() { jQuery("#map_edit").chimere("deactivateCurrentControl"); } +function initFeatureFromWkt(wkt) { + jQuery("#map_edit").chimere('initFeatureFromWkt', wkt); +} + function checkFields(){ if (!jQuery("#id_name").val() || !jQuery("#id_categories").val()){ diff --git a/chimere/templates/chimere/upload_file.html b/chimere/templates/chimere/upload_file.html index 7e17563..b0fbafc 100644 --- a/chimere/templates/chimere/upload_file.html +++ b/chimere/templates/chimere/upload_file.html @@ -3,11 +3,6 @@ {% block title %}Chimère{% endblock %} - {% head_jquery %} @@ -27,8 +22,7 @@
{% if gpx_id %}