diff options
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 329d6ba..2cbfced 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -782,6 +782,21 @@ function transform(obj) { methods.activateMarkerEdit(); } } + + /* register reload on move once the map is loaded */ + settings._map_loaded = false; + settings._cache_boundingbox = false; + settings.map.once("postcompose", function(){ + if (settings.reload_on_move){ + methods.register_reload_on_move(); + } + settings._map_loaded = true; + if (settings._load_geoobjects_requested){ + methods.loadGeoObjects(); + } + }); + + return; if (settings.routing_start_lon && settings.routing_start_lat){ /// OL3-TODO @@ -1043,16 +1058,18 @@ function transform(obj) { */ loadGeoObjects: function () { if($('#waiting').length){$('#waiting').show();} + if (!settings._map_loaded){ + settings._load_geoobjects_requested = true; + return; + } + settings._load_geoobjects_requested = false; + helpers.retrieve_checked_categories(); var ids = settings.checked_categories.join('_'); if (!ids) ids = '0'; var uri = extra_url + "getGeoObjects/" + ids; if (settings.display_submited) uri += "/A_S"; - if (settings.reload_on_move && !settings._cache_boundingbox){ - methods.register_reload_on_move(); - } - var data = {}; if (settings._cache_boundingbox){ data = { |