From f05ae2facf9739123bde5e95bebdb4e4acc8cf50 Mon Sep 17 00:00:00 2001 From: Jordan Hollinger Date: Thu, 8 May 2014 17:39:40 -0400 Subject: [PATCH 1/3] Add reference for group symbolizer attributes. --- latest/reference.json | 117 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/latest/reference.json b/latest/reference.json index e3fed5e..55a94cc 100644 --- a/latest/reference.json +++ b/latest/reference.json @@ -1933,6 +1933,123 @@ "default-value": "0" } }, + "group": { + "start-column": { + "css": "group-start-column", + "doc": "Starting index for indexed column names.", + "type": "unsigned", + "default-value": 1 + }, + "num-columns": { + "css": "group-num-columns", + "doc": "Range of indexed columns. Index values will range from group-start-column to group-start-column + group-num-columns.", + "type": "unsigned", + "default-value": 0, + "default-meaning": "Zero means that no indexed columns will be used." + }, + "repeat-key": { + "css": "group-repeat-key", + "doc": "Pattern to create unique key from data columns to indicate identical labels. This is used with minimum-distance to avoid excessive repetition of identical labels across features.", + "type": "unsigned", + "default-value": 1 + }, + "placement": { + "css": "group-placement", + "type": [ + "point", + "line", + "vertex", + "interior" + ], + "default-value": "point", + "doc": "How this group should be placed. Point placement attempts to place it on top of points, line places along lines multiple times per feature, vertex places on the vertexes of polygons, and interior attempts to place inside of polygons." + }, + "avoid-edges": { + "css": "group-avoid-edges", + "doc": "Avoid placing groups that intersect with tile boundaries.", + "type": "boolean", + "default-value": false + }, + "allow-overlap": { + "css": "group-allow-overlap", + "type": "boolean", + "default-value": false, + "doc": "Control whether overlapping groups are shown or hidden.", + "default-meaning": "Do not allow groups to overlap with other map elements already placed." + }, + "minimum-distance": { + "css": "group-min-distance", + "type": "float", + "default-value": 0, + "doc": "Minimum distance to the next group, not necessarily the same group." + }, + "spacing": { + "css": "group-spacing", + "type": "float", + "default-value": 0, + "doc": "The spacing between repeated occurrences of the same group on a line" + }, + "minimum-padding": { + "css": "group-min-padding", + "default-value": 0, + "doc": "Minimum distance a group will be placed from the edge of a metatile. This option is similiar to group-avoid-edges:true except that the extra margin is used to discard cases where the group+margin are not fully inside the metatile", + "type": "float" + }, + "opacity": { + "css": "group-opacity", + "type": "float", + "doc": "The opacity of the image used for the group", + "default-value": 1 + }, + "clip": { + "css": "group-clip", + "type": "boolean", + "default-value": true, + "default-meaning": "geometry will be clipped to map bounds before rendering", + "doc": "geometries are clipped to map bounds by default for best rendering performance. In some cases users may wish to disable this to avoid rendering artifacts." + }, + "comp-op": { + "css": "group-comp-op", + "default-value": "src-over", + "default-meaning": "add the current symbolizer on top of other symbolizer", + "doc": "Composite operation. This defines how this symbolizer should behave relative to symbolizers atop or below it.", + "type": ["clear", + "src", + "dst", + "src-over", + "dst-over", + "src-in", + "dst-in", + "src-out", + "dst-out", + "src-atop", + "dst-atop", + "xor", + "plus", + "minus", + "multiply", + "screen", + "overlay", + "darken", + "lighten", + "color-dodge", + "color-burn", + "hard-light", + "soft-light", + "difference", + "exclusion", + "contrast", + "invert", + "invert-rgb", + "grain-merge", + "grain-extract", + "hue", + "saturation", + "color", + "value" + ] + } + }, "debug": { "mode": { "css": "debug-mode", From ec525d6a5e69bfdfa5c6797796d29f6aaaca845b Mon Sep 17 00:00:00 2001 From: Jordan Hollinger Date: Fri, 16 May 2014 17:52:59 -0400 Subject: [PATCH 2/3] Add name and class for matching group rules within group symbolizer. --- latest/reference.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/latest/reference.json b/latest/reference.json index 55a94cc..fbc5f14 100644 --- a/latest/reference.json +++ b/latest/reference.json @@ -1934,6 +1934,24 @@ } }, "group": { + "style-name": { + "css": "group-name", + "type": "string", + "required": false, + "default-value": "", + "serialization": "rules", + "tag-name": "GroupRule", + "doc": "Name to be used for matching style definitions to the group symbolizer." + }, + "style-class": { + "css": "group-class", + "type": "string", + "required": false, + "default-value": "", + "serialization": "rules", + "tag-name": "GroupRule", + "doc": "Class names, seperated by spaces, to be used for matching style definitions to the group symbolizer." + }, "start-column": { "css": "group-start-column", "doc": "Starting index for indexed column names.", From c6eda612fe47c556b40b3893315809d966dbbc80 Mon Sep 17 00:00:00 2001 From: Jordan Hollinger Date: Wed, 28 May 2014 08:21:17 -0400 Subject: [PATCH 3/3] Add group layout in group symbolizer. --- latest/reference.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/latest/reference.json b/latest/reference.json index fbc5f14..2106b89 100644 --- a/latest/reference.json +++ b/latest/reference.json @@ -1952,6 +1952,13 @@ "tag-name": "GroupRule", "doc": "Class names, seperated by spaces, to be used for matching style definitions to the group symbolizer." }, + "layout": { + "css": "group-layout", + "required": true, + "type": "tags", + "serialization": "tag", + "doc": "Layout definition for the group." + }, "start-column": { "css": "group-start-column", "doc": "Starting index for indexed column names.",