Merge branch 'v2.1' into v2.2

Conflicts:
	chimere/admin.py
	chimere/models.py

2 files changed, 36 insertions, 13 deletions

diff --git a/chimere/static/chimere/js/importer_interface.js b/chimere/static/chimere/js/importer_interface.js
index 65bcf8c..5c77a8d 100644
--- a/chimere/static/chimere/js/importer_interface.js
+++ b/chimere/static/chimere/js/importer_interface.js
@@ -2,35 +2,37 @@ django.jQuery(function($) {
     var importer_form_filter = {
         OSM:new Array('field-filtr', 'field-default_name', 'field-categories',
                       'field-source', 'field-overwrite',
-                      'field-automatic_update'),
+                      'field-automatic_update', 'field-default_status'),
         KML:new Array('field-source', 'field-source_file', 'field-default_name',
                       'field-filtr', 'field-zipped', 'field-origin',
                       'field-license', 'field-categories', 'field-overwrite',
-                      'field-get_description', 'field-automatic_update'),
+                      'field-get_description', 'field-automatic_update',
+                      'field-default_status'),
         SHP:new Array('field-source', 'field-source_file', 'field-default_name',
                       'field-zipped', 'field-origin', 'field-srid',
                       'field-license', 'field-categories', 'field-overwrite',
-                      'field-automatic_update'),
+                      'field-automatic_update', 'field-default_status'),
         RSS:new Array('field-source', 'field-default_name', 'field-origin',
                       'field-srid', 'field-license', 'field-categories',
                       'field-overwrite', 'field-get_description',
-                      'field-automatic_update'),
+                      'field-automatic_update', 'field-default_status'),
         CSV:new Array('field-source', 'field-source_file', 'field-default_name',
                       'field-origin', 'field-srid', 'field-license',
                       'field-categories', 'field-overwrite',
-                      'field-get_description', 'field-automatic_update'),
+                      'field-get_description', 'field-automatic_update',
+                      'field-default_status'),
         XSLT:new Array('field-source', 'field-source_file',
                       'field-source_file_alt', 'field-default_name',
                       'field-origin', 'field-srid', 'field-license',
                       'field-categories', 'field-overwrite',
                       'field-get_description', 'field-default_localisation',
-                      'field-automatic_update'),
+                      'field-automatic_update', 'field-default_status'),
         XXLT:new Array('field-source', 'field-source_file',
                       'field-source_file_alt', 'field-default_name',
                       'field-origin', 'field-srid', 'field-license',
                       'field-categories', 'field-overwrite',
                       'field-get_description', 'field-default_localisation',
-                      'field-automatic_update')
+                      'field-automatic_update', 'field-default_status')
     }
     var osm_map_initialized;
     var edit_map_initialized;
@@ -118,10 +120,10 @@ django.jQuery(function($) {
         value = $('input[name=id_filtr_type]:checked').val();
         value += '[' + $("#id_filtr_tag").val() + ']';
         value += '[bbox=';
-        value += $('#upper_left_lon').val() + ',';
-        value += $('#lower_right_lat').val() + ',';
-        value += $('#lower_right_lon').val() + ',';
-        value += $('#upper_left_lat').val();
+        value += Number($('#upper_left_lon').val()).toFixed(6) + ',';
+        value += Number($('#lower_right_lat').val()).toFixed(6) + ',';
+        value += Number($('#lower_right_lon').val()).toFixed(6) + ',';
+        value += Number($('#upper_left_lat').val()).toFixed(6);
         value += ']';
         $('#id_filtr').val(value);
         return false;
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 78cb3dc..f7e0785 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -43,7 +43,6 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         else
             return v; };
 })( jQuery );
-
 (function ($) {
     /*
     * Chimere jQuery plugin
@@ -756,7 +755,6 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                     } else {
                         par.removeClass('selected');
                     }
-                    methods.hidePopup(e);
                     methods.loadGeoObjects();
                     _toggle_categories($(this));
                     settings.permalink.updateLink();
@@ -764,6 +762,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                         $('#layer_cat_'+c_name).prop("checked",
                                                      this.checked);
                     }
+                    methods.hidePopup(e);
                 });
                 $('#display_submited_check').bind("click", function () {
                     methods.loadGeoObjects();
@@ -1028,6 +1027,28 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         cleanRoute: function(){
             settings.layerVectors.removeAllFeatures();
         },
+        // add json layer
+        addJSON: function(json_url){
+            var jsonStyle = new OpenLayers.Style({
+                'strokeWidth':1,
+                'fillColor':'#BBBBBB',
+                'strokeColor':'#AAAAAA'
+            });
+
+            var jsonStyleMap = new OpenLayers.StyleMap({'default': jsonStyle});
+            settings.layerJson = new OpenLayers.Layer.Vector("GeoJSON", {
+                    projection: EPSG_DISPLAY_PROJECTION,
+                    strategies: [new OpenLayers.Strategy.Fixed()],
+                    protocol: new OpenLayers.Protocol.HTTP({
+                        url: json_url,
+                        format: new OpenLayers.Format.GeoJSON()
+                    }),
+                    styleMap: jsonStyleMap
+                });
+            settings.map.addLayer(settings.layerJson);
+            settings.map.setLayerIndex(settings.layerJson, 0);
+            settings.layerJson.setOpacity(0.4);
+        },
         // Put a route on the map
         addRoute: function(route) {
             var polyline = route.geometry;