Main map: add a waiting image while loading markers/routes on the map

2 files changed, 24 insertions, 0 deletions

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index f8ed3fe..336f6e2 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -596,6 +596,26 @@ table.inline-table td input[type=file]{
 }
 
 
+#waiting{ /* Fixed position to provide the vertical offset */
+    position:fixed;
+    top:40%;
+    width:100%;
+    z-index:40002;
+    display:none;
+}
+
+#waiting-content {
+    width:33px;
+    position:relative;
+    margin:0 auto;
+    background-color:white;
+    padding:10px;
+    border:1px solid black;
+}
+
+
+
+
 /* openlayer customisation */
 .olControlPermalink {
     display: block;
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 9ec51e6..7ad3a9b 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -229,6 +229,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         * Load markers and route from DB
         */
         loadGeoObjects: function () {
+            if($('#waiting').length){$('#waiting').show();}
             helpers.retrieve_checked_categories();
             var ids = settings.checked_categories.join('_');
             if (!ids) ids = '0';
@@ -251,6 +252,9 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
                     error: function (data) {
                         settings.layerMarkers.clearMarkers();
                         settings.layerVectors.removeAllFeatures();
+                    },
+                    complete: function () {
+                        if($('#waiting').length){$('#waiting').hide();}
                     }
                 });
         },