Fix the serialization of paint classes

fixes #2107
mapbox · Feb 11, 2016 · c33f075 · c33f075
1 parent 5ee71a4
commit c33f075
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/js/style/style_layer.js b/js/style/style_layer.js
@@ -225,7 +225,7 @@ StyleLayer.prototype = {
         };
 
         for (var klass in this._paintDeclarations) {
-            var key = klass === '' ? 'paint' : 'paint.' + key;
+            var key = klass === '' ? 'paint' : 'paint.' + klass;
             output[key] = util.mapObject(this._paintDeclarations[klass], getDeclarationValue);
         }
 

diff --git a/test/js/style/style_layer.test.js b/test/js/style/style_layer.test.js
@@ -240,9 +240,25 @@ test('StyleLayer#serialize', function(t) {
         t.end();
     });
 
+    t.test('serializes layers with paint classes', function(t) {
+        var layer = createSymbolLayer({
+            'paint.night': {
+                'text-color': 'orange'
+            }
+        });
+        t.deepEqual(
+            StyleLayer.create(layer).serialize(),
+            layer
+        );
+        t.end();
+    });
+
     t.test('serializes refed layers', function(t) {
         t.deepEqual(
-            StyleLayer.create(createRefedSymbolLayer(), createSymbolLayer()).serialize(),
+            StyleLayer.create(
+                createRefedSymbolLayer(),
+                StyleLayer.create(createSymbolLayer())
+            ).serialize(),
             createRefedSymbolLayer()
         );
         t.end();