Merge pull request #17 from mapbox/layer-type

Promote render `type` property to parent layer
cutting-room-floor · Jul 8, 2014 · edb12c5 · edb12c5
2 parents 73ca80f + 8b85a6c
commit edb12c5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/migrations/v4.js b/migrations/v4.js
@@ -29,12 +29,15 @@ function convertLayer(layer) {
 
     if (!render) return;
 
+    layer.type = render.type;
+    delete render.type;
+
     if (layer.filter && layer.filter.$type) {
         layer.filter.$type = newTypes[layer.filter.$type];
     }
 
-    if (render.type === 'text' || render.type === 'icon') {
-        render.type = 'symbol';
+    if (layer.type === 'text' || layer.type === 'icon') {
+        layer.type = 'symbol';
 
         rename(render, 'icon-spacing', 'symbol-min-distance');
         rename(render, 'text-min-distance', 'symbol-min-distance');