diff options
| author |   Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-09 15:57:18 +0200 |
|---|---|---|
| committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-11 10:13:48 +0200 |
| commit | ef1b8f5fa4c2e939e9b6f08069ee08d362ee0ee5 (patch) | |
| tree | c24e100f4e377a4eb1f597f0f1a29da599601cd4 /layers.json | |
| parent | 6e444881b679e72388f4bc76d5372f62f7f61145 (diff) | |
layers: fix json to actually include numbers
Actually use numbers where we had number-strings. This simplifies the
json parsing quite a bit.
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'layers.json')
| -rw-r--r-- | layers.json | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/layers.json b/layers.json index 1146911..b5973a0 100644 --- a/layers.json +++ b/layers.json @@ -27,42 +27,42 @@ "mappings": [ { "type": "single", - "surface_id": "1000", + "surface_id": 1000, "name": "HomeScreen", - "layer_id": "1000", + "layer_id": 1000, "area": { "type": "full" }, "comment": "Single layer map for the HomeScreen, XXX: type is redundant, could also check existence of id/first_id+last_id" }, { "type": "range", - "first_surface_id": "2000", - "last_surface_id": "2999", + "first_surface_id": 2000, + "last_surface_id": 2999, "name": "apps", - "layer_id": "1001", - "area": { "type": "rect", "rect": { "x": "0", "y": "100", "width": "-1", "height": "-201" } }, + "layer_id": 1001, + "area": { "type": "rect", "rect": { "x": 0, "y": 100, "width": -1, "height": -201 } }, "comment": "Range of IDs that will always be placed on layer 1001, negative rect values are interpreted as output_size.dimension - $value" }, { "type": "range", - "first_surface_id": "3000", - "last_surface_id": "3999", + "first_surface_id": 3000, + "last_surface_id": 3999, "name": "popups", - "layer_id": "9999", - "area": { "type": "rect", "rect": { "x": "0", "y": "100", "width": "-1", "height": "-201" } }, + "layer_id": 9999, + "area": { "type": "rect", "rect": { "x": 0, "y": 100, "width": -1, "height": -201 } }, "comment": "Range of IDs that will always be placed on the popup layer, that gets a very high 'dummy' id of 9999" } ], "tests": [ - { "surface_id": "1000", "expect_layer_id": "1000" }, - { "surface_id": "1001", "expect_layer_id": "-1", "comment": "check against -1 for not found entries" }, - { "surface_id": "1999", "expect_layer_id": "-1" }, - { "surface_id": "2000", "expect_layer_id": "1001" }, - { "surface_id": "2500", "expect_layer_id": "1001" }, - { "surface_id": "2999", "expect_layer_id": "1001" }, - { "surface_id": "3000", "expect_layer_id": "9999" }, - { "surface_id": "3500", "expect_layer_id": "9999" }, - { "surface_id": "3999", "expect_layer_id": "9999" }, - { "surface_id": "4711", "expect_layer_id": "-1" } + { "surface_id": 1000, "expect_layer_id": 1000 }, + { "surface_id": 1001, "expect_layer_id": -1, "comment": "check against -1 for not found entries" }, + { "surface_id": 1999, "expect_layer_id": -1 }, + { "surface_id": 2000, "expect_layer_id": 1001 }, + { "surface_id": 2500, "expect_layer_id": 1001 }, + { "surface_id": 2999, "expect_layer_id": 1001 }, + { "surface_id": 3000, "expect_layer_id": 9999 }, + { "surface_id": 3500, "expect_layer_id": 9999 }, + { "surface_id": 3999, "expect_layer_id": 9999 }, + { "surface_id": 4711, "expect_layer_id": -1 } ] } |