Recovering from bad merge

openlayers · Mar 12, 2013 · bb8755e · bb8755e
1 parent 15375df
commit bb8755e
Showing 1 changed file with 33 additions and 0 deletions.
diff --git a/src/objectliterals.exports b/src/objectliterals.exports
@@ -155,6 +155,39 @@
 @exportObjectLiteralProperty ol.source.TiledWMSOptions.url string|undefined
 @exportObjectLiteralProperty ol.source.TiledWMSOptions.urls Array.<string>|undefined
 
+@exportObjectLiteral ol.style.IconOptions
+@exportObjectLiteralProperty ol.style.IconOptions.url string|ol.Expression
+@exportObjectLiteralProperty ol.style.IconOptions.width number|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.IconOptions.height number|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.IconOptions.opacity number|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.IconOptions.rotation number|ol.Expression|undefined
+
+@exportObjectLiteral ol.style.LineOptions
+@exportObjectLiteralProperty ol.style.LineOptions.strokeColor string|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.LineOptions.strokeWidth number|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.LineOptions.opacity number|ol.Expression|undefined
+
+@exportObjectLiteral ol.style.PolygonOptions
+@exportObjectLiteralProperty ol.style.PolygonOptions.fillColor string|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.PolygonOptions.strokeColor string|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.PolygonOptions.strokeWidth number|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.PolygonOptions.opacity number|ol.Expression|undefined
+
+@exportObjectLiteral ol.style.RuleOptions
+@exportObjectLiteralProperty ol.style.RuleOptions.filter ol.filter.Filter|undefined
+@exportObjectLiteralProperty ol.style.RuleOptions.symbolizers Array.<ol.style.Symbolizer>|undefined
+
+@exportObjectLiteral ol.style.ShapeOptions
+@exportObjectLiteralProperty ol.style.ShapeOptions.type ol.style.ShapeType|undefined
+@exportObjectLiteralProperty ol.style.ShapeOptions.size number|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.ShapeOptions.fillColor string|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.ShapeOptions.strokeColor string|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.ShapeOptions.strokeWidth number|ol.Expression|undefined
+@exportObjectLiteralProperty ol.style.ShapeOptions.opacity number|ol.Expression|undefined
+
+@exportObjectLiteral ol.style.StyleOptions
+@exportObjectLiteralProperty ol.style.StyleOptions.rules Array.<ol.style.Rule>
+
 @exportObjectLiteral ol.source.WMTSOptions
 @exportObjectLiteralProperty ol.source.WMTSOptions.attributions Array.<ol.Attribution>|undefined
 @exportObjectLiteralProperty ol.source.WMTSOptions.crossOrigin string|null|undefined