Merge pull request #47 from CartoDB/shield_placement_type

adds shield-placement-type to torque-reference

lib/carto/torque-reference.js

@@ -838,6 +838,18 @@ var _mapnik_reference_latest = {
                 "default-value": "point",
                 "doc": "How this shield 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."
             },
+            "placement-type": {
+                "css": "shield-placement-type",
+                "doc": "Re-position and/or re-size shield to avoid overlaps. \"simple\" for basic algorithm (using shield-placements string,) \"dummy\" to turn this feature off.",
+                "type": [
+                    "dummy",
+                    "simple",
+                    "list"
+                ],
+                "expression":true,
+                "default-meaning": "Alternative placements will not be enabled.",
+                "default-value": "dummy"
+            },
             "avoid-edges": {
                 "css": "shield-avoid-edges",
                 "doc": "Tell positioning algorithm to avoid labeling near intersection edges.",