Merge pull request #4868 from capooti/issue-4827-updated

[Fixes #4827] Line layer uploaded to GeoNode is rendered as point layer
GeoNode · Sep 11, 2019 · 357387f · 357387f
2 parents 5c5a304 + 94574f4
commit 357387f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/geonode/geoserver/helpers.py b/geonode/geoserver/helpers.py
@@ -248,10 +248,14 @@ def get_sld_for(gs_catalog, layer):
         traceback.print_exc()
         pass
 
-    if _default_style is None:
+    try:
         gs_catalog._cache.clear()
+        gs_layer = gs_catalog.get_layer(layer.name)
+    except BaseException:
+        traceback.print_exc()
+
+    if _default_style is None:
         try:
-            gs_layer = gs_catalog.get_layer(layer.name)
             name = gs_layer.default_style.name if gs_layer.default_style is not None else "raster"
         except BaseException:
             traceback.print_exc()

diff --git a/geonode/tests/integration.py b/geonode/tests/integration.py
@@ -220,7 +220,7 @@ def test_layer_upload(self):
             set_layer_style(saved_layer, saved_layer.alternate, sld)
 
             fixup_style(gs_catalog, saved_layer.alternate, None)
-            self.assertIsNone(get_sld_for(gs_catalog, saved_layer))
+            self.assertIsNotNone(get_sld_for(gs_catalog, saved_layer))
             _log("3. ------------ %s " % get_sld_for(gs_catalog, saved_layer))
 
             create_gs_thumbnail(saved_layer, overwrite=True)