Merge pull request #3746 from PacificCommunity/2.6.3_thumbnail_fix_ba…

…ckported [backport 2.6.x] backport thumbnail fix
GeoNode · Apr 11, 2018 · aa5932d · aa5932d
2 parents 6497609 + 9de6fb8
commit aa5932d
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/geonode/static/geonode/js/utils/thumbnail.js b/geonode/static/geonode/js/utils/thumbnail.js
@@ -5,10 +5,32 @@ var createMapThumbnail = function(obj_id) {
     var map = xmap.clone(); 
     map.find('*').each(function(i) {
         e = $(this);
-        if(e.css('display') === 'none' || (e.attr("class") !== undefined && (e.attr("class").indexOf('olControl') >= 0 || e.attr("class").indexOf('x-') >= 0))) {
-            e.remove(); 
-        } else if (e.attr('src') === '/static/geoexplorer/externals/ext/resources/images/default/s.gif') {
+        if(e.css('display') === 'none' ||
+            // leaflet
+            ($('.leaflet-tile-pane')[0] != undefined && e.attr("class") !== undefined &&
+                ((e.attr("class").indexOf('leaflet-layer') < 0 && e.attr("class").indexOf('leaflet-tile') < 0) ||
+                 e.attr("class").indexOf('x-') >= 0)) ||
+            // OpenLayers
+            ($('.olMapViewport')[0] != undefined && e.attr("class") !== undefined &&
+                (e.attr("class").indexOf('olControl') >= 0 ||
+                 e.attr("class").indexOf('olImageLoadError') >= 0 ||
+                 e.attr("class").indexOf('ol-overlaycontainer') >= 0 ||
+                 e.attr("class").indexOf('x-') >= 0))
+        ) {
             e.remove();
+        } else if (e.attr('src') !== undefined) {
+            if (e.attr('src').indexOf('images/default') > 0 || e.attr('src').indexOf('default/img') > 0) {
+                e.remove();
+            }
+            if (!e.attr('src').startsWith("http")) {
+                var href = e.attr('src');
+                e.attr('src', 'http:' + href);
+            }
+
+            e.css({
+                "visibility":"inherit",
+                "position":"absolute"
+            });
         } else {
             e.removeAttr("id");
         }