floating point values for priority style param (#2011)

* floating point values for priority style param - floating point values for priority will be used soon once tilezen/vector-datasource#988 lands in tilzen tiles * Add dummy floats for priority to test - TODO: replace with collision data function when tilezen tiles support this
tangrams · Jan 23, 2019 · 5b2f67c · 5b2f67c
1 parent e4ebb42
commit 5b2f67c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/core/src/scene/styleContext.cpp b/core/src/scene/styleContext.cpp
@@ -313,6 +313,8 @@ bool StyleContext::evalStyle(FunctionID _id, StyleParamKey _key, StyleParam::Val
                 break;
             }
             case StyleParamKey::angle:
+            case StyleParamKey::priority:
+            case StyleParamKey::text_priority:
             case StyleParamKey::text_font_stroke_width:
             case StyleParamKey::placement_min_length_ratio: {
                 _val = static_cast<float>(number);
@@ -326,7 +328,6 @@ bool StyleContext::evalStyle(FunctionID _id, StyleParamKey _key, StyleParam::Val
             }
             case StyleParamKey::order:
             case StyleParamKey::outline_order:
-            case StyleParamKey::priority:
             case StyleParamKey::color:
             case StyleParamKey::outline_color:
             case StyleParamKey::text_font_fill:

diff --git a/core/src/scene/styleParam.cpp b/core/src/scene/styleParam.cpp
@@ -285,9 +285,7 @@ StyleParam::Value StyleParam::parseNode(StyleParamKey key, const YAML::Node& nod
         break;
     case StyleParamKey::order:
     case StyleParamKey::outline_order:
-    case StyleParamKey::priority:
-    case StyleParamKey::text_max_lines:
-    case StyleParamKey::text_priority: {
+    case StyleParamKey::text_max_lines: {
         int result = -1;
         if (YamlUtil::getInt(node, result)) {
             return static_cast<uint32_t>(result);
@@ -350,6 +348,8 @@ StyleParam::Value StyleParam::parseNode(StyleParamKey key, const YAML::Node& nod
         LOGW("Invalid angle value: %s", Dump(node).c_str());
         break;
     }
+    case StyleParamKey::priority:
+    case StyleParamKey::text_priority:
     case StyleParamKey::miter_limit:
     case StyleParamKey::outline_miter_limit:
     case StyleParamKey::placement_min_length_ratio:
@@ -477,9 +477,7 @@ std::string StyleParam::toString() const {
     case StyleParamKey::order:
     case StyleParamKey::text_order:
     case StyleParamKey::outline_order:
-    case StyleParamKey::priority:
     case StyleParamKey::text_max_lines:
-    case StyleParamKey::text_priority:
     case StyleParamKey::color:
     case StyleParamKey::outline_color:
     case StyleParamKey::outline_style:
@@ -493,6 +491,8 @@ std::string StyleParam::toString() const {
     case StyleParamKey::outline_join:
         if (!value.is<uint32_t>()) break;
         return k + std::to_string(value.get<uint32_t>());
+    case StyleParamKey::priority:
+    case StyleParamKey::text_priority:
     case StyleParamKey::miter_limit:
     case StyleParamKey::angle:
     case StyleParamKey::outline_miter_limit:

diff --git a/core/src/style/pointStyleBuilder.cpp b/core/src/style/pointStyleBuilder.cpp
@@ -131,12 +131,12 @@ auto PointStyleBuilder::applyRule(const DrawRule& _rule) const -> Parameters {
     _rule.get(StyleParamKey::offset, p.labelOptions.offset);
     _rule.get(StyleParamKey::buffer, p.labelOptions.buffer);
 
-    uint32_t priority = 0;
+    float priority = 0;
     std::string repeatGroup;
     StyleParam::Width repeatDistance;
 
     if (_rule.get(StyleParamKey::priority, priority)) {
-        p.labelOptions.priority = (float)priority;
+        p.labelOptions.priority = priority;
     }
 
     _rule.get(StyleParamKey::sprite_default, p.spriteDefault);

diff --git a/core/src/style/textStyleBuilder.cpp b/core/src/style/textStyleBuilder.cpp
@@ -618,15 +618,15 @@ TextStyle::Parameters TextStyleBuilder::applyRule(const DrawRule& _rule,
 
     _rule.get(StyleParamKey::text_max_lines, p.maxLines);
 
-    uint32_t priority = 0;
+    float priority = 0;
     size_t repeatGroupHash = 0;
     std::string repeatGroup;
     StyleParam::Width repeatDistance;
     glm::vec2 defaultBuffer = glm::vec2(p.fontSize * 0.25f);
 
     if (_iconText) {
         if (_rule.get(StyleParamKey::text_priority, priority)) {
-            p.labelOptions.priority = (float)priority;
+            p.labelOptions.priority = priority;
         }
         _rule.get(StyleParamKey::text_collide, p.labelOptions.collide);
         if (!_rule.get(StyleParamKey::text_interactive, p.interactive)) {
@@ -668,7 +668,7 @@ TextStyle::Parameters TextStyleBuilder::applyRule(const DrawRule& _rule,
         }
     } else {
         if (_rule.get(StyleParamKey::priority, priority)) {
-            p.labelOptions.priority = (float)priority;
+            p.labelOptions.priority = priority;
         }
         _rule.get(StyleParamKey::collide, p.labelOptions.collide);
         _rule.get(StyleParamKey::interactive, p.interactive);

diff --git a/scenes/scene.yaml b/scenes/scene.yaml
@@ -328,7 +328,7 @@ layers:
                     texture: pois
                     sprite: shield
                     # sprite: function() { return feature.network }
-                    priority: 2
+                    priority: 2.5
                     color: white
                     size: 24px
                     placement: midpoint
@@ -368,7 +368,7 @@ layers:
                     text:
                         repeat_distance: 200px
                         repeat_group: road_labels
-                        priority: 2
+                        priority: 2.5
                         font:
                             stroke: { color: white, width: 4 }
                             transform: capitalize
@@ -480,7 +480,7 @@ layers:
             draw:
                 points:
                     sprite: tree
-                    priority: 2
+                    priority: 2.5
                     size: 16px
                     text:
                         font:
@@ -499,7 +499,7 @@ layers:
                 points:
                     visible: false
                 text:
-                    priority: 2
+                    priority: 2.5
                     font:
                         size: 9pt
                         style: italic
@@ -555,7 +555,7 @@ layers:
                     draw: { points: { sprite: museum } }
                 station:
                     filter: { kind: [station] }
-                    draw: { points: { sprite: train, priority: 2 } }
+                    draw: { points: { sprite: train, priority: 2.5 } }
                 hospital:
                     filter: { kind: [hospital, pharmacy] }
                     draw: { points: { sprite: hospital } }