Merge pull request #3037 from GeoNode/ISSUE_3035_26x

- Fix for Issue #3035: Upload Layer: the check on default style is weak

geonode/geoserver/helpers.py

@@ -183,16 +183,34 @@ def _style_name(resource):
     return _punc.sub("_", resource.store.workspace.name + ":" + resource.name)
 
 
-def get_sld_for(layer):
-    # FIXME: GeoServer sometimes fails to associate a style with the data, so
+def get_sld_for(gs_catalog, layer):
+    # GeoServer sometimes fails to associate a style with the data, so
     # for now we default to using a point style.(it works for lines and
     # polygons, hope this doesn't happen for rasters  though)
-    name = layer.default_style.name if layer.default_style is not None else "point"
+    if layer.default_style is None:
+        gs_catalog._cache.clear()
+        layer = gs_catalog.get_layer(layer.name)
+    name = layer.default_style.name if layer.default_style is not None else "raster"
+
+    # Detect geometry type if it is a FeatureType
+    if layer.resource.resource_type == 'featureType':
+        res = layer.resource
+        res.fetch()
+        ft = res.store.get_resources(res.name)
+        ft.fetch()
+        for attr in ft.dom.find("attributes").getchildren():
+            attr_binding = attr.find("binding")
+            if "jts.geom" in attr_binding.text:
+                if "Polygon" in attr_binding.text:
+                    name = "polygon"
+                elif "Line" in attr_binding.text:
+                    name = "line"
+                else:
+                    name = "point"
 
     # FIXME: When gsconfig.py exposes the default geometry type for vector
     # layers we should use that rather than guessing based on the auto-detected
     # style.
-
     if name in _style_templates:
         fg, bg, mark = _style_contexts.next()
         return _style_templates[name] % dict(
@@ -213,7 +231,7 @@ def fixup_style(cat, resource, style):
             logger.info("%s uses a default style, generating a new one", lyr)
             name = _style_name(resource)
             if style is None:
-                sld = get_sld_for(lyr)
+                sld = get_sld_for(cat, lyr)
             else:
                 sld = style.read()
             logger.info("Creating style [%s]", name)
@@ -746,7 +764,15 @@ def set_attributes_from_geoserver(layer, overwrite=False):
 def set_styles(layer, gs_catalog):
     style_set = []
     gs_layer = gs_catalog.get_layer(layer.name)
-    default_style = gs_layer.default_style
+    if gs_layer.default_style:
+        default_style = gs_layer.default_style
+    else:
+        default_style = gs_catalog.get_style(layer.name)
+        try:
+            gs_layer.default_style = default_style
+            gs_catalog.save(gs_layer)
+        except:
+            logger.exception("GeoServer Layer Default Style issues!")
     layer.default_style = save_style(default_style)
     # FIXME: This should remove styles that are no longer valid
     style_set.append(layer.default_style)
@@ -1168,27 +1194,34 @@ def geoserver_upload(
         sld = f.read()
         f.close()
     else:
-        sld = get_sld_for(publishing)
+        sld = get_sld_for(cat, publishing)
 
     style = None
     if sld is not None:
         try:
             cat.create_style(name, sld)
-            style = cat.get_style(name)
         except geoserver.catalog.ConflictingDataError as e:
             msg = ('There was already a style named %s in GeoServer, '
                    'try to use: "%s"' % (name + "_layer", str(e)))
             logger.warn(msg)
             e.args = (msg,)
-            try:
-                cat.create_style(name + '_layer', sld)
+
+            style = cat.get_style(name)
+            if style is None:
+                try:
+                    cat.create_style(name + '_layer', sld)
+                except geoserver.catalog.ConflictingDataError as e:
+                    msg = ('There was already a style named %s in GeoServer, '
+                           'cannot overwrite: "%s"' % (name, str(e)))
+                    logger.warn(msg)
+                    e.args = (msg,)
+
                 style = cat.get_style(name + "_layer")
-            except geoserver.catalog.ConflictingDataError as e:
-                style = cat.get_style('point')
-                msg = ('There was already a style named %s in GeoServer, '
-                       'cannot overwrite: "%s"' % (name, str(e)))
-                logger.error(msg)
-                e.args = (msg,)
+                if style is None:
+                    style = cat.get_style('point')
+                    msg = ('Could not find any suitable style in GeoServer '
+                           'for Layer: "%s"' % (name))
+                    logger.error(msg)
 
         # FIXME: Should we use the fully qualified typename?
         publishing.default_style = style

geonode/upload/upload.py

@@ -606,14 +606,12 @@ def final_step(upload_session, user):
         sld = f.read()
         f.close()
     else:
-        sld = get_sld_for(publishing)
+        sld = get_sld_for(cat, publishing)
 
     style = None
-    print " **************************************** "
     if sld is not None:
         try:
             cat.create_style(name, sld)
-            style = cat.get_style(name)
         except geoserver.catalog.ConflictingDataError as e:
             msg = 'There was already a style named %s in GeoServer, try using another name: "%s"' % (
                 name, str(e))
@@ -625,19 +623,25 @@ def final_step(upload_session, user):
                 logger.error(msg)
                 e.args = (msg,)
 
-            # what are we doing with this var?
-            msg = 'No style could be created for the layer, falling back to POINT default one'
+        if style is None:
             try:
-                style = cat.get_style(name + '_layer')
+                style = cat.get_style(name)
             except:
-                style = cat.get_style('point')
-                logger.warn(msg)
-                e.args = (msg,)
-
-        # FIXME: Should we use the fully qualified typename?
-        publishing.default_style = style
-        _log('default style set to %s', name)
-        cat.save(publishing)
+                logger.warn('Could not retreive the Layer default Style name')
+                # what are we doing with this var?
+                msg = 'No style could be created for the layer, falling back to POINT default one'
+                try:
+                    style = cat.get_style(name + '_layer')
+                except:
+                    style = cat.get_style('point')
+                    logger.warn(msg)
+                    e.args = (msg,)
+
+        if style:
+            # FIXME: Should we use the fully qualified typename?
+            publishing.default_style = style
+            _log('default style set to %s', name)
+            cat.save(publishing)
 
     _log('Creating Django record for [%s]', name)
     target = task.target

pavement.py

@@ -576,9 +576,9 @@ def deb(options):
 
         sh(('git-dch --spawn-editor=snapshot --git-author --new-version=%s'
             ' --id-length=6 --ignore-branch --release' % (simple_version)))
-        #In case you publish from Ubuntu Xenial (git-dch is removed from upstream)
-        # use the following line instead:
-        #sh(('gbp dch --spawn-editor=snapshot --git-author --new-version=%s'
+        # In case you publish from Ubuntu Xenial (git-dch is removed from upstream)
+        #  use the following line instead:
+        # sh(('gbp dch --spawn-editor=snapshot --git-author --new-version=%s'
         #    ' --id-length=6 --ignore-branch --release' % (simple_version)))
 
         deb_changelog = path('debian') / 'changelog'