Admin import: xapi specific interface (refs #449, refs #458)

2 files changed, 67 insertions, 15 deletions

diff --git a/chimere/static/chimere/css/forms.css b/chimere/static/chimere/css/forms.css
index 46acdb9..b75f947 100644
--- a/chimere/static/chimere/css/forms.css
+++ b/chimere/static/chimere/css/forms.css
@@ -39,7 +39,7 @@ div.bottomform{
     margin:0;
     border: 1px solid black;
     width:100%;
-    height:500px;
+    height:350px;
 }
 
 
@@ -129,3 +129,17 @@ div.bottomform{
     overflow:hidden;
     height:16px;
 }
+
+.form-row.field-filtr.field-map{
+    float:right;
+    width:50%;
+}
+
+#id_filtr{
+    width:400px;
+}
+
+.aligned .input-osm label{
+    display:inline;
+    float:none;
+}
diff --git a/chimere/static/chimere/js/importer_interface.js b/chimere/static/chimere/js/importer_interface.js
index 4eaacb7..fc52b4c 100644
--- a/chimere/static/chimere/js/importer_interface.js
+++ b/chimere/static/chimere/js/importer_interface.js
@@ -1,8 +1,9 @@
 django.jQuery(function($) {
     var importer_form_filter = {
-        OSM:new Array('field-source', 'field-default_name', 'field-categories'),
+        OSM:new Array('field-filtr', 'field-default_name', 'field-categories',
+                      'field-source'),
         KML:new Array('field-source', 'field-source_file', 'field-default_name',
-                      'filed-filtr', 'field-zipped', 'field-origin',
+                      'field-filtr', 'field-zipped', 'field-origin',
                       'field-license', 'field-categories'),
         SHP:new Array('field-source', 'field-source_file', 'field-default_name',
                       'field-zipped', 'field-origin', 'field-srid',
@@ -13,26 +14,63 @@ django.jQuery(function($) {
                       'field-origin', 'field-srid', 'field-license',
                       'field-categories')
     }
-/*
-    field-source
-    field-source_file
-    field-filtr
-    field-default_name
-    field-srid
-    field-zipped
-    field-origin
-    field-license
-    field-categories
-*/
+    var map_initialized;
     function refresh_importer_form(){
         $('.form-row').not('.field-importer_type').hide();
-        var importer_val = $('.field-importer_type select').val()
+        var importer_val = $('.field-importer_type select').val();
         if (!importer_val) return;
         var form_filters = importer_form_filter[importer_val];
         for (k=0; k<form_filters.length;k++){
             $('.form-row.'+form_filters[k]).show();
         }
+        if (importer_val == 'OSM'){
+            $('.form-row.field-filtr').addClass('field-map');
+            $('#map_edit').show();
+            if(!$('#id_source').val()){
+                $('#id_source').val(default_xapi);
+            }
+            $('#id_filtr').attr('readonly', true);
+            $('.help-osm').show();
+            $('.input-osm').show();
+            if (!map_initialized){
+                init_map_form();
+                map_initialized = true;
+            }
+        } else {
+            $('.form-row.field-filtr').removeClass('field-map');
+            $('#id_filtr').attr('readonly', false);
+            $('#map_edit').hide();
+            $('.help-osm').hide();
+            $('.input-osm').hide();
+            if($('#id_source').val() == default_xapi) $('#id_source').val('');
+        }
     }
     refresh_importer_form();
     $('.field-importer_type select').change(refresh_importer_form);
+    function refresh_filtr_form(){
+        if (!$('#upper_left_lat').val() ||
+           !parseFloat($('#upper_left_lat').val())){
+            alert(msg_missing_area);
+            return false;
+        }
+        if (!$('input[name=id_filtr_type]:checked').val()){
+            alert(msg_missing_type);
+            return false;
+        }
+        if (!$('#id_filtr_tag').val()){
+            alert(msg_missing_filtr);
+            return false;
+        }
+        value = $('input[name=id_filtr_type]:checked').val();
+        value += '[' + $("#id_filtr_tag").val() + ']';
+        value += '[bbox=';
+        value += $('#upper_left_lon').val() + ',';
+        value += $('#upper_left_lat').val() + ',';
+        value += $('#lower_right_lon').val() + ',';
+        value += $('#lower_right_lat').val();
+        value += ']';
+        $('#id_filtr').val(value);
+        return false;
+    }
+    $('#id_refresh_filtr').click(refresh_filtr_form);
 });