Merge pull request #395 from mapbox/require-layer-ids

require ids on layers, closes #394
mapbox · Dec 18, 2015 · d023533 · d023533
2 parents a1f0723 + ea9b3ef
commit d023533
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 29 deletions.
diff --git a/reference/v8.json b/reference/v8.json
@@ -229,7 +229,8 @@
   "layer": {
     "id": {
       "type": "string",
-      "doc": "Unique layer name."
+      "doc": "Unique layer name.",
+      "required": true
     },
     "type": {
       "type": "enum",

diff --git a/test/fixture/layers.input.json b/test/fixture/layers.input.json
@@ -1,5 +1,5 @@
 {
-  "version": 7,
+  "version": 8,
   "sources": {
     "vector": {
       "type": "vector",
@@ -16,6 +16,11 @@
       "source": "vector",
       "source-layer": "layer"
     },
+    {
+      "type": "line",
+      "source": "vector",
+      "source-layer": "source-layer"
+    },
     {
       "id": "ref",
       "type": "line",

diff --git a/test/fixture/layers.output.json b/test/fixture/layers.output.json
@@ -4,59 +4,63 @@
     "line": 14
   },
   {
-    "message": "layers[2]: \"type\" is prohibited for ref layers",
-    "line": 28
+    "message": "layers[1]: missing required property \"id\"",
+    "line": 19
   },
   {
-    "message": "layers[2]: \"source\" is prohibited for ref layers",
-    "line": 29
+    "message": "layers[3]: \"type\" is prohibited for ref layers",
+    "line": 33
   },
   {
-    "message": "layers[2]: \"source-layer\" is prohibited for ref layers",
-    "line": 30
+    "message": "layers[3]: \"source\" is prohibited for ref layers",
+    "line": 34
   },
   {
-    "message": "layers[2]: \"filter\" is prohibited for ref layers",
-    "line": 31
+    "message": "layers[3]: \"source-layer\" is prohibited for ref layers",
+    "line": 35
   },
   {
-    "message": "layers[2]: \"layout\" is prohibited for ref layers",
-    "line": 32
+    "message": "layers[3]: \"filter\" is prohibited for ref layers",
+    "line": 36
   },
   {
-    "message": "layers[3]: ref layer \"not-found\" not found",
-    "line": 36
+    "message": "layers[3]: \"layout\" is prohibited for ref layers",
+    "line": 37
   },
   {
-    "message": "layers[4]: ref cannot reference another ref layer",
-    "line": 40
+    "message": "layers[4]: ref layer \"not-found\" not found",
+    "line": 41
   },
   {
-    "message": "layers[5]: missing required property \"source\"",
-    "line": 42
+    "message": "layers[5]: ref cannot reference another ref layer",
+    "line": 45
   },
   {
-    "message": "layers[6]: source \"not-found\" not found",
-    "line": 49
+    "message": "layers[6]: missing required property \"source\"",
+    "line": 47
   },
   {
-    "message": "layers[7]: layer \"vector-raster-mismatch\" requires a vector source",
+    "message": "layers[7]: source \"not-found\" not found",
     "line": 54
   },
   {
-    "message": "layers[8]: layer \"raster-vector-mismatch\" requires a raster source",
+    "message": "layers[8]: layer \"vector-raster-mismatch\" requires a vector source",
     "line": 59
   },
   {
-    "message": "layers[10]: duplicate layer id \"duplicate\", previously used at line 63",
-    "line": 69
+    "message": "layers[9]: layer \"raster-vector-mismatch\" requires a raster source",
+    "line": 64
+  },
+  {
+    "message": "layers[11]: duplicate layer id \"duplicate\", previously used at line 68",
+    "line": 74
   },
   {
-    "message": "layers[11].type: expected one of [fill, line, symbol, raster, background], invalid found",
-    "line": 76
+    "message": "layers[12].type: expected one of [fill, line, symbol, circle, raster, background], invalid found",
+    "line": 81
   },
   {
-    "message": "layers[12]: layer \"missing-source-layer\" must specify a \"source-layer\"",
-    "line": 82
+    "message": "layers[13]: layer \"missing-source-layer\" must specify a \"source-layer\"",
+    "line": 87
   }
 ]
diff --git a/test/fixture/pitch.output.json b/test/fixture/pitch.output.json
@@ -3,4 +3,4 @@
     "message": "pitch: number expected, string found",
     "line": 3
   }
-]
+]
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
         "message": "pitch: number expected, string found",
         "line": 3
       }
-    ]
+    ]