From 236dd79b855933b475b260c9913827b466733f55 Mon Sep 17 00:00:00 2001 From: Helge Fahrnberger Date: Thu, 12 Jan 2017 14:31:26 +0100 Subject: [PATCH 1/4] Reordered and renamed groups Purpose: Match structure and wording with Mapbox GL style spec. --- src/config/layout.json | 95 ++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 50 deletions(-) diff --git a/src/config/layout.json b/src/config/layout.json index 54a205b3..033fb10c 100644 --- a/src/config/layout.json +++ b/src/config/layout.json @@ -2,7 +2,7 @@ "line": { "groups": [ { - "title": "Paint", + "title": "Paint properties”, "type": "properties", "fields": [ "line-opacity", @@ -10,21 +10,21 @@ "line-width", "line-offset", "line-blur", - "line-pattern" + "line-pattern”, + "line-translate", + "line-translate-anchor”, + "line-gap-width" ] }, { - "title": "Secondary", + "title": “Layout properties", "type": "properties", "fields": [ - "line-translate", - "line-translate-anchor", "line-cap", "line-join", "line-miter-limit", "line-round-limit", - "line-dasharray", - "line-gap-width" + "line-dasharray" ] } ] @@ -32,7 +32,7 @@ "background": { "groups": [ { - "title": "Basic", + "title": “Paint properties", "type": "properties", "fields": [ "background-color", @@ -45,7 +45,7 @@ "fill": { "groups": [ { - "title": "Basic", + "title": “Paint properties", "type": "properties", "fields": [ "fill-opacity", @@ -62,7 +62,7 @@ "fill-extrusion": { "groups": [ { - "title": "Basic", + "title": "Paint properties", "type": "properties", "fields": [ "fill-extrusion-opacity", @@ -79,29 +79,17 @@ "circle": { "groups": [ { - "title": "Basic", + "title": “Paint properties", "type": "properties", "fields": [ "circle-color", "circle-opacity", "circle-stroke-color", "circle-stroke-opacity", - "circle-blur" - ] - }, - { - "title": "Scale", - "type": "properties", - "fields": [ + "circle-blur”, "circle-radius", "circle-stroke-width", - "circle-pitch-scale" - ] - }, - { - "title": "Position", - "type": "properties", - "fields": [ + "circle-pitch-scale”, "circle-translate", "circle-translate-anchor" ] @@ -111,37 +99,25 @@ "symbol": { "groups": [ { - "title": "Basic", - "type": "properties", - "fields": [ - "text-field", - "text-font", - "text-color", - "text-size", - "text-line-height", - "text-halo-color", - "text-halo-width", - "text-halo-blur" - ] - }, - { - "title": "Placement", + "title": “General layout properties”, "type": "properties", "fields": [ "symbol-placement", "symbol-spacing", - "text-padding", - "symbol-avoid-edges", - "text-allow-overlap", - "text-ignore-placement", - "text-translate", - "text-translate-anchor" + "symbol-avoid-edges" ] }, { - "title": "Text", + "title": “Text layout properties”, "type": "properties", "fields": [ + "text-field", + "text-font", + "text-size", + "text-line-height", + "text-padding", + "text-allow-overlap", + "text-ignore-placement", "text-pitch-alignment", "text-rotation-alignment", "text-max-width", @@ -157,7 +133,7 @@ ] }, { - "title": "Icon", + "title": “Icon layout properties”, "type": "properties", "fields": [ "icon-allow-overlap", @@ -171,7 +147,26 @@ "icon-rotate", "icon-padding", "icon-keep-upright", - "icon-offset" + "icon-offset" + ] + }, + { + "title": “Text paint properties”, + "type": "properties", + "fields": [ + "text-color", + "text-halo-color", + "text-halo-width", + "text-halo-blur”, + "text-translate", + "text-translate-anchor” + ] + }, + { + "title": “Icon paint properties”, + "type": "properties", + "fields": [ + "" ] } ] @@ -179,7 +174,7 @@ "raster": { "groups": [ { - "title": "Basic", + "title": “Paint properties", "type": "properties", "fields": [ "raster-opacity", From f209d8e9a58e89d23055c7d783c3e7485fc7adb4 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Thu, 12 Jan 2017 17:01:30 +0100 Subject: [PATCH 2/4] Fix layout.json quote tokens --- src/config/layout.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/config/layout.json b/src/config/layout.json index 033fb10c..786c6ba9 100644 --- a/src/config/layout.json +++ b/src/config/layout.json @@ -2,7 +2,7 @@ "line": { "groups": [ { - "title": "Paint properties”, + "title": "Paint properties", "type": "properties", "fields": [ "line-opacity", @@ -10,14 +10,14 @@ "line-width", "line-offset", "line-blur", - "line-pattern”, + "line-pattern", "line-translate", - "line-translate-anchor”, + "line-translate-anchor", "line-gap-width" ] }, { - "title": “Layout properties", + "title": "Layout properties", "type": "properties", "fields": [ "line-cap", @@ -32,7 +32,7 @@ "background": { "groups": [ { - "title": “Paint properties", + "title": "Paint properties", "type": "properties", "fields": [ "background-color", @@ -45,7 +45,7 @@ "fill": { "groups": [ { - "title": “Paint properties", + "title": "Paint properties", "type": "properties", "fields": [ "fill-opacity", @@ -79,17 +79,17 @@ "circle": { "groups": [ { - "title": “Paint properties", + "title": "Paint properties", "type": "properties", "fields": [ "circle-color", "circle-opacity", "circle-stroke-color", "circle-stroke-opacity", - "circle-blur”, + "circle-blur", "circle-radius", "circle-stroke-width", - "circle-pitch-scale”, + "circle-pitch-scale", "circle-translate", "circle-translate-anchor" ] @@ -99,7 +99,7 @@ "symbol": { "groups": [ { - "title": “General layout properties”, + "title": "General layout properties", "type": "properties", "fields": [ "symbol-placement", @@ -108,7 +108,7 @@ ] }, { - "title": “Text layout properties”, + "title": "Text layout properties", "type": "properties", "fields": [ "text-field", @@ -133,7 +133,7 @@ ] }, { - "title": “Icon layout properties”, + "title": "Icon layout properties", "type": "properties", "fields": [ "icon-allow-overlap", @@ -151,19 +151,19 @@ ] }, { - "title": “Text paint properties”, + "title": "Text paint properties", "type": "properties", "fields": [ "text-color", "text-halo-color", "text-halo-width", - "text-halo-blur”, + "text-halo-blur", "text-translate", - "text-translate-anchor” + "text-translate-anchor" ] }, { - "title": “Icon paint properties”, + "title": "Icon paint properties", "type": "properties", "fields": [ "" @@ -174,7 +174,7 @@ "raster": { "groups": [ { - "title": “Paint properties", + "title": "Paint properties", "type": "properties", "fields": [ "raster-opacity", From 5479b240e1977832594e57af0e5edc631fc512eb Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Thu, 12 Jan 2017 17:28:45 +0100 Subject: [PATCH 3/4] Fix empty field causing exceptions --- src/config/layout.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/config/layout.json b/src/config/layout.json index 786c6ba9..5c618ce7 100644 --- a/src/config/layout.json +++ b/src/config/layout.json @@ -166,7 +166,6 @@ "title": "Icon paint properties", "type": "properties", "fields": [ - "" ] } ] From 52e8fd2c29588d6c5ac36854c215247d7afbba3e Mon Sep 17 00:00:00 2001 From: Helge Fahrnberger Date: Thu, 12 Jan 2017 17:44:56 +0100 Subject: [PATCH 4/4] Add missing properties --- src/config/layout.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/config/layout.json b/src/config/layout.json index 5c618ce7..f1e0281c 100644 --- a/src/config/layout.json +++ b/src/config/layout.json @@ -155,6 +155,7 @@ "type": "properties", "fields": [ "text-color", + "text-opacity", "text-halo-color", "text-halo-width", "text-halo-blur", @@ -166,6 +167,13 @@ "title": "Icon paint properties", "type": "properties", "fields": [ + "icon-color", + "icon-opacity", + "icon-halo-color", + "icon-halo-width", + "icon-halo-blur", + "icon-translate", + "icon-translate-anchor" ] } ]