Refine qml output for labels with no symbolizer rules

geostyler · May 18, 2021 · 057d1c2 · 057d1c2
1 parent 2872293
commit 057d1c2
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 28 deletions.
diff --git a/data/qmls/no_symbolizer.qml b/data/qmls/no_symbolizer.qml
@@ -1,7 +1,4 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
-  <renderer-v2 type="RuleRenderer">
-    <rules key="renderer_rules"/>
-    <symbols/>
-  </renderer-v2>
+  <renderer-v2 type="nullSymbol"/>
 </qgis>
diff --git a/data/qmls/point_label.qml b/data/qmls/point_label.qml
@@ -1,9 +1,6 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
-  <renderer-v2 type="RuleRenderer">
-    <rules key="renderer_rules"/>
-    <symbols/>
-  </renderer-v2>
+  <renderer-v2 type="nullSymbol"/>
   <labeling type="rule-based">
     <rules key="labeling_rules">
       <rule key="labeling_rule_0" filter="value > 0.1">

diff --git a/data/qmls/text_text_buffer.qml b/data/qmls/text_text_buffer.qml
@@ -1,9 +1,6 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
-  <renderer-v2 type="RuleRenderer">
-    <rules key="renderer_rules"/>
-    <symbols/>
-  </renderer-v2>
+  <renderer-v2 type="nullSymbol"/>
   <labeling type="rule-based">
     <rules key="labeling_rules">
       <rule key="labeling_rule_0">

diff --git a/src/QGISStyleParser.ts b/src/QGISStyleParser.ts
@@ -902,25 +902,38 @@ export class QGISStyleParser implements StyleParser {
     const type: string = 'RuleRenderer';
     const rules: any[] = [];
     const symbols: any[] = this.getQmlSymbolsFromStyle(geoStylerStyle, rules);
-    return {
-      qgis: {
-        $: {},
-        'renderer-v2': [{
-          $: {
-            type
-          },
-          rules: [{
+    if (rules.length > 0 && symbols.length > 0) {
+      return {
+        qgis: {
+          $: {},
+          'renderer-v2': [{
             $: {
-              key: 'renderer_rules'
+              type
             },
-            rule: rules
-          }],
-          symbols: [{
-            symbol: symbols
+            rules: [{
+              $: {
+                key: 'renderer_rules'
+              },
+              rule: rules
+            }],
+            symbols: [{
+              symbol: symbols
+            }]
           }]
-        }]
-      }
-    };
+        }
+      };
+    } else {
+      return {
+        qgis: {
+          $: {},
+          'renderer-v2': [{
+            $: {
+              type: 'nullSymbol'
+            }
+          }]
+        }
+      };
+    }
   }
 
   convertTextSymbolizerRule(qmlRuleList: any[], rule: Rule) {