Merge pull request #75 from KaiVolland/fix-keys

Fix keys
geostyler · Apr 26, 2019 · b75a259 · b75a259
2 parents 7250691 + 5ef0bfc
commit b75a259
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 39 deletions.
diff --git a/data/qmls/line_simple.qml b/data/qmls/line_simple.qml
@@ -1,8 +1,8 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
   <renderer-v2 type="RuleRenderer">
-    <rules key="0">
-      <rule key="0" symbol="0" label="QGIS Simple Symbol"/>
+    <rules key="renderer_rules">
+      <rule key="renderer_rule_0" symbol="0" label="QGIS Simple Symbol"/>
     </rules>
     <symbols>
       <symbol type="line" name="0">
@@ -19,4 +19,4 @@
       </symbol>
     </symbols>
   </renderer-v2>
-</qgis>
+</qgis>
diff --git a/data/qmls/no_symbolizer.qml b/data/qmls/no_symbolizer.qml
@@ -1,7 +1,7 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
   <renderer-v2 type="RuleRenderer">
-    <rules key="0"/>
+    <rules key="renderer_rules"/>
     <symbols/>
   </renderer-v2>
-</qgis>
+</qgis>
diff --git a/data/qmls/point_external_graphic.qml b/data/qmls/point_external_graphic.qml
@@ -1,8 +1,8 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
   <renderer-v2 type="RuleRenderer">
-    <rules key="0">
-      <rule key="0" symbol="0" label="QGIS Simple Symbol"/>
+    <rules key="renderer_rules">
+      <rule key="renderer_rule_0" symbol="0" label="QGIS Simple Symbol"/>
     </rules>
     <symbols>
       <symbol type="marker" name="0">
@@ -17,4 +17,4 @@
       </symbol>
     </symbols>
   </renderer-v2>
-</qgis>
+</qgis>
diff --git a/data/qmls/point_label.qml b/data/qmls/point_label.qml
@@ -1,17 +1,17 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
   <renderer-v2 type="RuleRenderer">
-    <rules key="0"/>
+    <rules key="renderer_rules"/>
     <symbols/>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="0">
-      <rule key="0" filter="value > 0.1">
+    <rules key="labeling_rules">
+      <rule key="labeling_rule_0" filter="value > 0.1">
         <settings>
           <text-style fontSize="10" fontLetterSpacing="0" multilineHeight="1" textColor="0,0,0,255" fontFamily="Sans Serif" fieldName="locality_name"/>
           <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="13" yOffset="37" rotationAngle="0"/>
         </settings>
       </rule>
     </rules>
   </labeling>
-</qgis>
+</qgis>
diff --git a/data/qmls/point_multiple_symbols.qml b/data/qmls/point_multiple_symbols.qml
@@ -1,8 +1,8 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
   <renderer-v2 type="RuleRenderer">
-    <rules key="0">
-      <rule key="0" symbol="0" label="QGIS Simple Symbol"/>
+    <rules key="renderer_rules">
+      <rule key="renderer_rule_0" symbol="0" label="QGIS Simple Symbol"/>
     </rules>
     <symbols>
       <symbol type="marker" name="0">
@@ -35,4 +35,4 @@
       </symbol>
     </symbols>
   </renderer-v2>
-</qgis>
+</qgis>
diff --git a/data/qmls/point_rules.qml b/data/qmls/point_rules.qml
@@ -1,10 +1,10 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
   <renderer-v2 type="RuleRenderer">
-    <rules key="0">
-      <rule key="0" symbol="0" label="Bildpositi = 1" scalemindenom="100" scalemaxdenom="2000" filter="Bildpositi = 1"/>
-      <rule key="1" symbol="1" label="Bildpositi > 1 AND Bildpositi &lt; 3" scalemindenom="100" scalemaxdenom="2000" filter="Bildpositi > 1 AND Bildpositi &lt; 3"/>
-      <rule key="2" symbol="2" label="Bildpositi = 3" scalemindenom="100" scalemaxdenom="2000" filter="Bildpositi = 3"/>
+    <rules key="renderer_rules">
+      <rule key="renderer_rule_0" symbol="0" label="Bildpositi = 1" scalemindenom="100" scalemaxdenom="2000" filter="Bildpositi = 1"/>
+      <rule key="renderer_rule_1" symbol="1" label="Bildpositi > 1 AND Bildpositi &lt; 3" scalemindenom="100" scalemaxdenom="2000" filter="Bildpositi > 1 AND Bildpositi &lt; 3"/>
+      <rule key="renderer_rule_2" symbol="2" label="Bildpositi = 3" scalemindenom="100" scalemaxdenom="2000" filter="Bildpositi = 3"/>
     </rules>
     <symbols>
       <symbol type="marker" name="0">
@@ -54,4 +54,4 @@
       </symbol>
     </symbols>
   </renderer-v2>
-</qgis>
+</qgis>
diff --git a/data/qmls/point_simple.qml b/data/qmls/point_simple.qml
@@ -1,8 +1,8 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
   <renderer-v2 type="RuleRenderer">
-    <rules key="0">
-      <rule key="0" symbol="0" label="QGIS Simple Symbol"/>
+    <rules key="renderer_rules">
+      <rule key="renderer_rule_0" symbol="0" label="QGIS Simple Symbol"/>
     </rules>
     <symbols>
       <symbol type="marker" name="0">

diff --git a/data/qmls/polygon_simple.qml b/data/qmls/polygon_simple.qml
@@ -1,8 +1,8 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis>
   <renderer-v2 type="RuleRenderer">
-    <rules key="0">
-      <rule key="0" symbol="0" label="QGIS Simple Symbol"/>
+    <rules key="renderer_rules">
+      <rule key="renderer_rule_0" symbol="0" label="QGIS Simple Symbol"/>
     </rules>
     <symbols>
       <symbol type="fill" name="0">
@@ -20,4 +20,4 @@
       </symbol>
     </symbols>
   </renderer-v2>
-</qgis>
+</qgis>
diff --git a/package.json b/package.json
@@ -57,10 +57,10 @@
     "coveralls": "3.0.3",
     "jest": "23.6.0",
     "np": "5.0.0",
+    "terser-webpack-plugin": "1.2.3",
     "ts-jest": "24.0.1",
     "tslint": "5.12.1",
     "typescript": "3.2.4",
-    "uglifyjs-webpack-plugin": "2.1.2",
     "webpack": "4.30.0",
     "webpack-cli": "3.3.1"
   },

diff --git a/src/QGISStyleParser.spec.ts b/src/QGISStyleParser.spec.ts
@@ -140,7 +140,7 @@ describe('QMLStyleParser implements StyleParser', () => {
         return styleParser.writeStyle(point_external_graphic)
           .then((qgisStyle: string) => {
             expect(qgisStyle).toBeDefined();
-            expect(qgisStyle).toEqual(qml);
+            expect(qgisStyle).toEqual(qml.trim());
           });
       });
       it('can write a QML PointSymbolizer with multiple symbols', async () => {
@@ -149,7 +149,7 @@ describe('QMLStyleParser implements StyleParser', () => {
         return styleParser.writeStyle(point_multiple_symbols)
           .then((qgisStyle: string) => {
             expect(qgisStyle).toBeDefined();
-            expect(qgisStyle).toEqual(qml);
+            expect(qgisStyle).toEqual(qml.trim());
           });
       });
     });
@@ -160,7 +160,7 @@ describe('QMLStyleParser implements StyleParser', () => {
         return styleParser.writeStyle(point_label)
           .then((qgisStyle: string) => {
             expect(qgisStyle).toBeDefined();
-            expect(qgisStyle).toEqual(qml);
+            expect(qgisStyle).toEqual(qml.trim());
           });
       });
     });
@@ -171,7 +171,7 @@ describe('QMLStyleParser implements StyleParser', () => {
         return styleParser.writeStyle(line_simple)
           .then((qgisStyle: string) => {
             expect(qgisStyle).toBeDefined();
-            expect(qgisStyle).toEqual(qml);
+            expect(qgisStyle).toEqual(qml.trim());
           });
       });
     });
@@ -182,7 +182,7 @@ describe('QMLStyleParser implements StyleParser', () => {
         return styleParser.writeStyle(polygon_simple)
           .then((qgisStyle: string) => {
             expect(qgisStyle).toBeDefined();
-            expect(qgisStyle).toEqual(qml);
+            expect(qgisStyle).toEqual(qml.trim());
           });
       });
     });
@@ -193,7 +193,7 @@ describe('QMLStyleParser implements StyleParser', () => {
         return styleParser.writeStyle(point_rules)
           .then((qgisStyle: string) => {
             expect(qgisStyle).toBeDefined();
-            expect(qgisStyle).toEqual(qml);
+            expect(qgisStyle).toEqual(qml.trim());
           });
       });
       it('can write QML with no symbolizers', async () => {
@@ -202,7 +202,7 @@ describe('QMLStyleParser implements StyleParser', () => {
         return styleParser.writeStyle(no_symbolizer)
           .then((qgisStyle: string) => {
             expect(qgisStyle).toBeDefined();
-            expect(qgisStyle).toEqual(qml);
+            expect(qgisStyle).toEqual(qml.trim());
           });
       });
     });

diff --git a/src/QGISStyleParser.ts b/src/QGISStyleParser.ts
@@ -694,7 +694,7 @@ export class QGISStyleParser implements StyleParser {
     const filter = rule.filter;
     const qmlRule: any = {
       $: {
-        key: `${index}`,
+        key: `renderer_rule_${index}`,
         symbol: `${index}`,
         label: rule.name
       }
@@ -912,7 +912,7 @@ export class QGISStyleParser implements StyleParser {
           },
           rules: [{
             $: {
-              key: '0'
+              key: 'renderer_rules'
             },
             rule: rules
           }],
@@ -943,7 +943,7 @@ export class QGISStyleParser implements StyleParser {
         }
         const textRule: any = {
           $: {
-            key: `${qmlRuleList.length}`
+            key: `labeling_rule_${qmlRuleList.length}`
           },
           settings: [{
             'text-style': [{
@@ -995,7 +995,7 @@ export class QGISStyleParser implements StyleParser {
         },
         rules: [{
           $: {
-            key: '0'
+            key: 'labeling_rules'
           },
           rule: []
         }]

diff --git a/webpack.browser.config.js b/webpack.browser.config.js
@@ -1,12 +1,12 @@
 const baseConfig = require('./webpack.config');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 require("@babel/polyfill");
 
 module.exports = {
   ...baseConfig,
   mode: 'production',
   entry: ["@babel/polyfill", "./src/QGISStyleParser.ts"],
   plugins: [
-    new UglifyJsPlugin()
+    new TerserPlugin()
   ]
 };