Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Layout and Format nodes in text and shield symbolizers #62

Closed
wants to merge 2 commits into from
Closed

Support Layout and Format nodes in text and shield symbolizers #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5dddc5
Add reference data for child elements that can exist inside of text a…
hollinger Jun 17, 2014
51f0cdc
Update tests to support the child-elements array and test the element…
hollinger Jun 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 164 additions & 0 deletions latest/reference.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,10 @@
}
},
"shield": {
"child-elements": [
"format",
"layout"
],
"name": {
"css": "shield-name",
"type": "expression",
Expand Down Expand Up @@ -1634,6 +1638,10 @@
}
},
"text": {
"child-elements": [
"format",
"layout"
],
"name": {
"css": "text-name",
"type": "expression",
Expand Down Expand Up @@ -1947,6 +1955,162 @@
}

},
"elements": {
"format": {
"child-elements": [
"format",
"layout"
],
"pseudo": {
"before": {
"behavior": "prepend",
"indexed": true
},
"after": {
"behavior": "append",
"indexed": true
}
},
"content": {
"css": "content",
"type": "expression",
"default-value": "",
"serialization": "content",
"doc": "Value to use for a text label. Data columns are specified using brackets like [column_name]"
},
"face-name": {
"css": "face-name",
"type": "string",
"validate": "font",
"doc": "Font name and style to render a label in"
},
"size": {
"css": "size",
"type": "float",
"doc": "Text size in pixels"
},
"fill": {
"css": "fill",
"doc": "Specifies the color for the text",
"type": "color"
},
"halo-fill": {
"css": "halo-fill",
"type": "color",
"doc": "Specifies the color of the halo around the text."
},
"halo-radius": {
"css": "halo-radius",
"doc": "Specify the radius of the halo in pixels",
"type": "float"
},
"character-spacing": {
"css": "character-spacing",
"type": "float",
"doc": "Horizontal spacing adjustment between characters in pixels"
},
"line-spacing": {
"css": "line-spacing",
"type": "unsigned",
"doc": "Vertical spacing adjustment between lines in pixels"
},
"wrap-character": {
"css": "wrap-character",
"type": "string",
"doc": "Use this character instead of a space to wrap long text."
},
"text-transform": {
"css": "transform",
"type": [
"none",
"uppercase",
"lowercase",
"capitalize"
],
"doc": "Transform the case of the characters"
}
},
"layout": {
"child-elements": [
"format",
"layout"
],
"pseudo": {
"layout": {
"indexed": true,
"behavior": "append"
}
},
"content": {
"css": "content",
"type": "expression",
"default-value": "",
"serialization": "content",
"doc": "Value to use for a text label. Data columns are specified using brackets like [column_name]"
},
"dx": {
"css": "dx",
"type": "float",
"doc": "Displace text by fixed amount, in pixels, +/- along the X axis. With \"dummy\" placement-type, a positive value displaces to the right. With \"simple\" placement-type, it is either left, right or unchanged, depending on the placement selected. Any non-zero value implies \"horizontal-alignment\" changes to \"left\" by default. Has no effect with 'line' text-placement-type."
},
"dy": {
"css": "dy",
"type": "float",
"doc": "Displace text by fixed amount, in pixels, +/- along the Y axis. With \"dummy\" placement-type, a positive value displaces downwards. With \"simple\" placement-type, it is either up, down or unchanged, depending on the placement selected. With \"line\" placement-type, a positive value displaces below the path."
},
"vertical-alignment": {
"css": "vertical-alignment",
"type": [
"top",
"middle",
"bottom",
"auto"
],
"doc": "Position of label relative to point position."
},
"horizontal-alignment": {
"css": "horizontal-alignment",
"type": [
"left",
"middle",
"right",
"auto"
],
"doc": "The text's horizontal alignment from its centerpoint"
},
"justify-alignment": {
"css": "align",
"type": [
"left",
"right",
"center",
"auto"
],
"doc": "Define how text is justified"
},
"text-ratio": {
"css": "text-ratio",
"doc": "Define the amount of text (of the total) present on successive lines when wrapping occurs",
"type": "unsigned"
},
"wrap-width": {
"css": "wrap-width",
"doc": "Length of a chunk of text in characters before wrapping text",
"default-value": 0,
"type": "unsigned"
},
"wrap-before": {
"css": "wrap-before",
"type": "boolean",
"doc": "Wrap text before wrap-width is reached. If false, wrapped lines will be a bit longer than wrap-width."
},
"orientation": {
"css": "orientation",
"type": "expression",
"doc": "Rotate the text."
}
}
},
"colors": {
"aliceblue": [240, 248, 255],
"antiquewhite": [250, 235, 215],
Expand Down
2 changes: 2 additions & 0 deletions test/lint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var lint_ref = function(ver) {
for (var symbolizer in symbolizers) {
if (symbolizer === 'colors') continue;
for (var prop in symbolizers[symbolizer]) {
if (prop === 'child-elements') continue;
if (!symbolizers[symbolizer][prop].doc) {
if (symbolizer !== cursim) {
cursim = symbolizer;
Expand All @@ -35,6 +36,7 @@ var lint_ref = function(ver) {
for (var symbolizer in symbolizers) {
if (symbolizer === 'colors') continue;
for (var prop in symbolizers[symbolizer]) {
if (prop === 'child-elements') continue;
if (symbolizers[symbolizer][prop]['default-value'] === undefined) {
if (symbolizer !== cursim) {
cursim = symbolizer;
Expand Down
43 changes: 34 additions & 9 deletions test/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@
# >= python 2.6
import json

def testAttribute(parent, attr):
assert 'type' in attr[1].keys(), '%s: type not in %s' % (parent[0], attr[0])
#assert 'doc' in attr[1].keys(), '%s: doc string not in %s' % (parent[0], attr[0])
assert 'css' in attr[1].keys(), '%s: css not in %s' % (parent[0], attr[0])

def testPsuedo(parent, attr):
for i in attr[1].items():
assert 'behavior' in i[1].keys(), '%s: behavior not in %s' % (parent[0], i[0])
assert 'indexed' in i[1].keys(), '%s: indexed not in %s' % (parent[0], i[0])

def testChildElements(parent, attr, reference):
for child in attr[1]:
assert child in reference['elements'].keys(), '%s: %s is not a valid element' % (parent[0], child)

versions = ['2.0.0','2.0.1', '2.0.2', '2.1.0', '2.1.1', '2.3.0', 'latest']

for v in versions:
Expand All @@ -17,12 +31,23 @@
for sym in reference['symbolizers'].items():
assert sym[1]
for i in sym[1].items():
if sym[0] not in ['map','*']:
group_name = sym[0]
if group_name == 'markers':
group_name = 'marker'
css_name = i[1]['css']
assert group_name in css_name, "'%s' not properly prefixed by '%s'" % (css_name,group_name)
assert 'type' in i[1].keys(), '%s: type not in %s' % (sym[0], i[0])
assert 'doc' in i[1].keys(), '%s: doc string not in %s' % (sym[0], i[0])
assert 'css' in i[1].keys(), '%s: css not in %s' % (sym[0], i[0])
if i[0] == 'child-elements':
testChildElements(sym, i, reference)
else:
testAttribute(sym, i)
if sym[0] not in ['map','*']:
group_name = sym[0]
if group_name == 'markers':
group_name = 'marker'
css_name = i[1]['css']
assert group_name in css_name, "'%s' not properly prefixed by '%s'" % (css_name,group_name)
if 'elements' in reference.keys():
for elem in reference['elements'].items():
assert elem[1]
for i in elem[1].items():
if i[0] == 'child-elements':
testChildElements(elem, i, reference)
elif i[0] == 'pseudo':
testPsuedo(elem, i)
else:
testAttribute(elem, i)