From 9349dd91dbb15a32362a80efe659b55f7606f81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Wed, 2 Jul 2014 12:11:57 +0200 Subject: [PATCH 1/2] promote glyphs to a top level element, rather than specifying them per-source --- reference/v3.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/reference/v3.json b/reference/v3.json index 7ab5ca3..9c178bc 100644 --- a/reference/v3.json +++ b/reference/v3.json @@ -27,7 +27,11 @@ "sprite": { "type": "sprite", "doc": "Sprite definition." - } + }, + "glyphs": { + "type": "string", + "doc": "A URL template for loading signed-distance-field glyph sets in PBF format. Valid tokens are {{fontstack}} and {{range}}." + }, }, "sprite": [{ "type": "string", @@ -61,9 +65,6 @@ "type": "string", "doc": "A URL, or URL template to retrive the source data." }, - "glyphs": { - "type": "string" - }, "tileSize": { "type": "number", "default": 512 From 091ac87f1ab5a4a9ed6fa30f4e313706b49f17c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Wed, 2 Jul 2014 12:16:12 +0200 Subject: [PATCH 2/2] fix json error --- reference/v3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/v3.json b/reference/v3.json index 9c178bc..3ac2d6d 100644 --- a/reference/v3.json +++ b/reference/v3.json @@ -31,7 +31,7 @@ "glyphs": { "type": "string", "doc": "A URL template for loading signed-distance-field glyph sets in PBF format. Valid tokens are {{fontstack}} and {{range}}." - }, + } }, "sprite": [{ "type": "string",