diff options
author | vng <viktor.govako@gmail.com> | 2011-11-23 04:02:35 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:28:35 +0300 |
commit | 9e713f19dfcbd8e48de23bf117741ae8586c92be (patch) | |
tree | 13a4c761db86ac52e32ce05f0e9020601596e9c3 /indexer/drules_struct.proto | |
parent | f2dff53a49c8ddec3bb05916959eb731929c6c04 (diff) |
New caption styles with 'primary' and 'secondary'.
Diffstat (limited to 'indexer/drules_struct.proto')
-rw-r--r-- | indexer/drules_struct.proto | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/indexer/drules_struct.proto b/indexer/drules_struct.proto index 065447b5b7..53b22096b1 100644 --- a/indexer/drules_struct.proto +++ b/indexer/drules_struct.proto @@ -11,13 +11,20 @@ message LineRuleProto required double width = 1; required uint32 color = 2; optional DashDotProto dashdot = 3; - optional int32 priority = 4; // optional, because it can be used as part of AreaRule + required int32 priority = 4; +} + +message LineDefProto +{ + required double width = 1; + required uint32 color = 2; + optional DashDotProto dashdot = 3; } message AreaRuleProto { required uint32 color = 1; - optional LineRuleProto border = 2; + optional LineDefProto border = 2; required int32 priority = 3; } @@ -28,28 +35,33 @@ message SymbolRuleProto required int32 priority = 3; } -message CaptionRuleProto +message CaptionDefProto { required int32 height = 1; required uint32 color = 2; optional uint32 stroke_color = 3; - required int32 priority = 4; +} + +message CaptionRuleProto +{ + required CaptionDefProto primary = 1; + optional CaptionDefProto secondary = 2; + required int32 priority = 3; } message CircleRuleProto { required double radius = 1; required uint32 color = 2; - optional LineRuleProto border = 3; + optional LineDefProto border = 3; required int32 priority = 4; } message PathTextRuleProto { - required int32 height = 1; - required uint32 color = 2; - optional uint32 stroke_color = 3; - required int32 priority = 4; + required CaptionDefProto primary = 1; + optional CaptionDefProto secondary = 2; + required int32 priority = 3; } // WayMarkerRule not used yet |