L.VectorGrid labels, exclude OL-Plugin layers, fix OL WFS

#566, #582
qgis2web · Nov 28, 2017 · d0bea23 · d0bea23
1 parent 5984075
commit d0bea23
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 10 deletions.
diff --git a/js/Leaflet.VectorGrid.js b/js/Leaflet.VectorGrid.js
diff --git a/maindialog.py b/maindialog.py
@@ -353,7 +353,8 @@ def populate_layers_and_groups(self, dlg):
 
         for tree_layer in tree_layers:
             layer = tree_layer.layer()
-            if layer.type() != QgsMapLayer.PluginLayer:
+            if (layer.type() != QgsMapLayer.PluginLayer and
+                layer.customProperty("ol_layer_type") is None):
                 try:
                     if layer.type() == QgsMapLayer.VectorLayer:
                         testDump = layer.rendererV2().dump()

diff --git a/olLayerScripts.py b/olLayerScripts.py
@@ -374,6 +374,7 @@ def getWFS(layer, layerName, layerAttr, cluster, minResolution, maxResolution):
     jsonSource_%(n)s.addFeatures(features_%(n)s);
 }''' % {"name": layer.name(), "n": layerName,
         "min": minResolution, "max": maxResolution}
+    return layerCode
 
 
 def getJSON(layerName, crsConvert, layerAttr, cluster, pointLayerType,