Merge branch 'master' of github.com:developmentseed/mess.js

This commit is contained in:
Tom MacWright 2011-01-17 12:08:27 -05:00
commit b7591915d4

View File

@ -158,7 +158,7 @@ tree.Reference = {
"css": "marker-file",
"type": "uri"
},
"allow-overlap": {
"allow_overlap": {
"css": "marker-allow-overlap",
"type": "boolean",
"default-value": "false",
@ -169,7 +169,7 @@ tree.Reference = {
"docs": "Space between repeated labels",
"type": "float"
},
"max-error": {
"max_error": {
"css": "marker-max-error",
"type": "float"
},
@ -209,7 +209,7 @@ tree.Reference = {
"css": "shield-fill",
"type": "color"
},
"min-distance": {
"min_distance": {
"css": "shield-min-distance",
"type": "float",
"default-value": 0,
@ -221,13 +221,13 @@ tree.Reference = {
"default-value": 0,
"doc": "The spacing between repeated occurrences of the same shield"
},
"character-spacing": {
"character_spacing": {
"css": "shield-spacing",
"type": "float",
"default-value": 0,
"doc": "Horizontal spacing between characters (in pixels). Currently works for point placement only, not line placement."
},
"line-spacing": {
"line_spacing": {
"css": "shield-line-spacing",
"doc": "Vertical spacing between lines of multiline labels (in pixels)",
"type": "float"
@ -370,7 +370,7 @@ tree.Reference = {
"css": "point-type",
"type": "none"
},
"allow-overlap": {
"allow_overlap": {
"css": "point-allow-overlap",
"type": "boolean",
"default-value": "false",
@ -411,7 +411,7 @@ tree.Reference = {
"type": "float",
"type": "none"
},
"wrap-width": {
"wrap_width": {
"css": "text-wrap-width",
"doc": "Length of a chunk of text in characters before wrapping text",
"type": "float"
@ -420,21 +420,21 @@ tree.Reference = {
"css": "text-spacing",
"type": "float"
},
"character-spacing": {
"character_spacing": {
"css": "text-character-spacing",
"type": "float",
"default-value": 0
},
"line-spacing": {
"line_spacing": {
"css": "text-line-spacing",
"default-value": 0,
"type": "float"
},
"label-position-tolerance": {
"label_position_tolerance": {
"css": "text-label-position-tolerance",
"type": "float"
},
"max-char-angle-delta": {
"max_char_angle_delta": {
"css": "text-max-char-angle-delta",
"type": "float",
"default-value": "none",
@ -472,16 +472,16 @@ tree.Reference = {
"doc": "Displace text by fixed amount, in pixels, +/- along the Y axis. A positive value will shift the text down",
"default-value": 10
},
"avoid-edges": {
"avoid_edges": {
"css": "text-avoid-edges",
"doc": "Tell positioning algorithm to avoid labeling near intersection edges.",
"type": "boolean"
},
"min-distance": {
"min_distance": {
"css": "text-min-distance",
"type": "float"
},
"allow-overlap": {
"allow_overlap": {
"css": "text-allow-overlap",
"type": "boolean",
"default-value": "false",
@ -514,7 +514,7 @@ tree.Reference = {
"css": "text-meta-writer",
"type": "string",
"default-value": ""
}
}
},
"inline": {
"color": {