[core] Add DDS support for {text,icon}-size (#8593)

* Update gl-js and generate style code * Factor out packUint8Pair() helper function * Draft implementation of DDS for {text,icon}-size Ports mapbox/mapbox-gl-js#4455 * Fix text-size/composite-function-line-placement test * Refactor to PaintPropertyBinders-like strategy * Dedupe gl::Program construction * Use exponential function base for interpolation * Dedupe coveringZoomStops method * Fixup tests * Fix CI errors (hidden within #if block)
mapbox · Apr 6, 2017 · 693c9f3 · 693c9f3
1 parent f9cc044
commit 693c9f3
Show file tree

Hide file tree

Showing 37 changed files with 1,008 additions and 218 deletions.
diff --git a/include/mbgl/style/conversion/make_property_setters.hpp b/include/mbgl/style/conversion/make_property_setters.hpp
@@ -37,7 +37,7 @@ auto makeLayoutPropertySetters() {
     result["icon-ignore-placement"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconIgnorePlacement>;
     result["icon-optional"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconOptional>;
     result["icon-rotation-alignment"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setIconRotationAlignment>;
-    result["icon-size"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setIconSize>;
+    result["icon-size"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconSize>;
     result["icon-text-fit"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<IconTextFitType>, &SymbolLayer::setIconTextFit>;
     result["icon-text-fit-padding"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<std::array<float, 4>>, &SymbolLayer::setIconTextFitPadding>;
     result["icon-image"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<std::string>, &SymbolLayer::setIconImage>;
@@ -49,7 +49,7 @@ auto makeLayoutPropertySetters() {
     result["text-rotation-alignment"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setTextRotationAlignment>;
     result["text-field"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<std::string>, &SymbolLayer::setTextField>;
     result["text-font"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<std::vector<std::string>>, &SymbolLayer::setTextFont>;
-    result["text-size"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextSize>;
+    result["text-size"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextSize>;
     result["text-max-width"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextMaxWidth>;
     result["text-line-height"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextLineHeight>;
     result["text-letter-spacing"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextLetterSpacing>;

diff --git a/include/mbgl/style/data_driven_property_value.hpp b/include/mbgl/style/data_driven_property_value.hpp
@@ -45,6 +45,15 @@ class DataDrivenPropertyValue {
     bool isDataDriven() const {
         return value.template is<SourceFunction<T>>() || value.template is<CompositeFunction<T>>();
     }
+
+    bool isZoomConstant() const {
+        return !value.template is<CameraFunction<T>>() && !value.template is<CompositeFunction<T>>();
+    }
+
+    template <class... Ts>
+    auto match(Ts&&... ts) const {
+        return value.match(std::forward<Ts>(ts)...);
+    }
 
     template <typename Evaluator>
     auto evaluate(const Evaluator& evaluator) const {

diff --git a/include/mbgl/style/function/camera_function.hpp b/include/mbgl/style/function/camera_function.hpp
@@ -28,7 +28,7 @@ class CameraFunction {
             return s.evaluate(Value(double(zoom))).value_or(T());
         });
     }
-
+    
     friend bool operator==(const CameraFunction& lhs,
                            const CameraFunction& rhs) {
         return lhs.stops == rhs.stops;

diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
@@ -59,9 +59,9 @@ class SymbolLayer : public Layer {
     PropertyValue<AlignmentType> getIconRotationAlignment() const;
     void setIconRotationAlignment(PropertyValue<AlignmentType>);
 
-    static PropertyValue<float> getDefaultIconSize();
-    PropertyValue<float> getIconSize() const;
-    void setIconSize(PropertyValue<float>);
+    static DataDrivenPropertyValue<float> getDefaultIconSize();
+    DataDrivenPropertyValue<float> getIconSize() const;
+    void setIconSize(DataDrivenPropertyValue<float>);
 
     static PropertyValue<IconTextFitType> getDefaultIconTextFit();
     PropertyValue<IconTextFitType> getIconTextFit() const;
@@ -107,9 +107,9 @@ class SymbolLayer : public Layer {
     PropertyValue<std::vector<std::string>> getTextFont() const;
     void setTextFont(PropertyValue<std::vector<std::string>>);
 
-    static PropertyValue<float> getDefaultTextSize();
-    PropertyValue<float> getTextSize() const;
-    void setTextSize(PropertyValue<float>);
+    static DataDrivenPropertyValue<float> getDefaultTextSize();
+    DataDrivenPropertyValue<float> getTextSize() const;
+    void setTextSize(DataDrivenPropertyValue<float>);
 
     static PropertyValue<float> getDefaultTextMaxWidth();
     PropertyValue<float> getTextMaxWidth() const;

diff --git a/mapbox-gl-js b/mapbox-gl-js
diff --git a/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
@@ -1526,11 +1526,11 @@ public static PropertyValue<Float> iconSize(Float value) {
   /**
    * Scale factor for icon. 1 is original size, 3 triples the size.
    *
-   * @param <Z> the zoom parameter type
-   * @param function a wrapper {@link CameraFunction} for Float
+   * @param <T> the function input type
+   * @param function a wrapper function for Float
    * @return property wrapper around a Float function
    */
-  public static <Z extends Number> PropertyValue<CameraFunction<Z, Float>> iconSize(CameraFunction<Z, Float> function) {
+  public static <T> PropertyValue<Function<T, Float>> iconSize(Function<T, Float> function) {
     return new LayoutPropertyValue<>("icon-size", function);
   }
 
@@ -1802,11 +1802,11 @@ public static PropertyValue<Float> textSize(Float value) {
   /**
    * Font size.
    *
-   * @param <Z> the zoom parameter type
-   * @param function a wrapper {@link CameraFunction} for Float
+   * @param <T> the function input type
+   * @param function a wrapper function for Float
    * @return property wrapper around a Float function
    */
-  public static <Z extends Number> PropertyValue<CameraFunction<Z, Float>> textSize(CameraFunction<Z, Float> function) {
+  public static <T> PropertyValue<Function<T, Float>> textSize(Function<T, Float> function) {
     return new LayoutPropertyValue<>("text-size", function);
   }
 

diff --git a/...idSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/...idSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
@@ -382,6 +382,114 @@ public void testIconSizeAsCameraFunction() {
   }
 
 
+  @Test
+  public void testIconSizeAsIdentitySourceFunction() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("icon-size");
+    assertNotNull(layer);
+
+    // Set
+    layer.setProperties(
+      iconSize(property("FeaturePropertyA", Stops.<Float>identity()))
+    );
+
+    // Verify
+    assertNotNull(layer.getIconSize());
+    assertNotNull(layer.getIconSize().getFunction());
+    assertEquals(SourceFunction.class, layer.getIconSize().getFunction().getClass());
+    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconSize().getFunction()).getProperty());
+    assertEquals(IdentityStops.class, layer.getIconSize().getFunction().getStops().getClass());
+  }
+
+  @Test
+  public void testIconSizeAsExponentialSourceFunction() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("icon-size");
+    assertNotNull(layer);
+
+    // Set
+    layer.setProperties(
+      iconSize(
+        property(
+          "FeaturePropertyA",
+          exponential(
+            stop(0.3f, iconSize(0.3f))
+          ).withBase(0.5f)
+        )
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getIconSize());
+    assertNotNull(layer.getIconSize().getFunction());
+    assertEquals(SourceFunction.class, layer.getIconSize().getFunction().getClass());
+    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconSize().getFunction()).getProperty());
+    assertEquals(ExponentialStops.class, layer.getIconSize().getFunction().getStops().getClass());
+  }
+
+  @Test
+  public void testIconSizeAsCategoricalSourceFunction() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("icon-size");
+    assertNotNull(layer);
+
+    // Set
+    layer.setProperties(
+      iconSize(
+        property(
+          "FeaturePropertyA",
+          categorical(
+            stop(1.0f, iconSize(0.3f))
+          )
+        ).withDefaultValue(iconSize(0.3f))
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getIconSize());
+    assertNotNull(layer.getIconSize().getFunction());
+    assertEquals(SourceFunction.class, layer.getIconSize().getFunction().getClass());
+    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconSize().getFunction()).getProperty());
+    assertEquals(CategoricalStops.class, layer.getIconSize().getFunction().getStops().getClass());
+    assertNotNull(((SourceFunction) layer.getIconSize().getFunction()).getDefaultValue());
+    assertNotNull(((SourceFunction) layer.getIconSize().getFunction()).getDefaultValue().getValue());
+    assertEquals(0.3f, ((SourceFunction) layer.getIconSize().getFunction()).getDefaultValue().getValue());
+  }
+
+  @Test
+  public void testIconSizeAsCompositeFunction() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("icon-size");
+    assertNotNull(layer);
+
+    // Set
+    layer.setProperties(
+      iconSize(
+        composite(
+          "FeaturePropertyA",
+          exponential(
+            stop(0, 0.3f, iconSize(0.9f))
+          ).withBase(0.5f)
+        ).withDefaultValue(iconSize(0.3f))
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getIconSize());
+    assertNotNull(layer.getIconSize().getFunction());
+    assertEquals(CompositeFunction.class, layer.getIconSize().getFunction().getClass());
+    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconSize().getFunction()).getProperty());
+    assertEquals(ExponentialStops.class, layer.getIconSize().getFunction().getStops().getClass());
+    assertEquals(1, ((ExponentialStops) layer.getIconSize().getFunction().getStops()).size());
+
+    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconSize().getFunction().getStops();
+    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+    assertEquals(0f, stop.in.zoom, 0.001);
+    assertEquals(0.3f, stop.in.value, 0.001f);
+    assertEquals(0.9f, stop.out, 0.001f);
+  }
+
   @Test
   public void testIconTextFitAsConstant() {
     checkViewIsDisplayed(R.id.mapView);
@@ -1074,6 +1182,114 @@ public void testTextSizeAsCameraFunction() {
   }
 
 
+  @Test
+  public void testTextSizeAsIdentitySourceFunction() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("text-size");
+    assertNotNull(layer);
+
+    // Set
+    layer.setProperties(
+      textSize(property("FeaturePropertyA", Stops.<Float>identity()))
+    );
+
+    // Verify
+    assertNotNull(layer.getTextSize());
+    assertNotNull(layer.getTextSize().getFunction());
+    assertEquals(SourceFunction.class, layer.getTextSize().getFunction().getClass());
+    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextSize().getFunction()).getProperty());
+    assertEquals(IdentityStops.class, layer.getTextSize().getFunction().getStops().getClass());
+  }
+
+  @Test
+  public void testTextSizeAsExponentialSourceFunction() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("text-size");
+    assertNotNull(layer);
+
+    // Set
+    layer.setProperties(
+      textSize(
+        property(
+          "FeaturePropertyA",
+          exponential(
+            stop(0.3f, textSize(0.3f))
+          ).withBase(0.5f)
+        )
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getTextSize());
+    assertNotNull(layer.getTextSize().getFunction());
+    assertEquals(SourceFunction.class, layer.getTextSize().getFunction().getClass());
+    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextSize().getFunction()).getProperty());
+    assertEquals(ExponentialStops.class, layer.getTextSize().getFunction().getStops().getClass());
+  }
+
+  @Test
+  public void testTextSizeAsCategoricalSourceFunction() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("text-size");
+    assertNotNull(layer);
+
+    // Set
+    layer.setProperties(
+      textSize(
+        property(
+          "FeaturePropertyA",
+          categorical(
+            stop(1.0f, textSize(0.3f))
+          )
+        ).withDefaultValue(textSize(0.3f))
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getTextSize());
+    assertNotNull(layer.getTextSize().getFunction());
+    assertEquals(SourceFunction.class, layer.getTextSize().getFunction().getClass());
+    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextSize().getFunction()).getProperty());
+    assertEquals(CategoricalStops.class, layer.getTextSize().getFunction().getStops().getClass());
+    assertNotNull(((SourceFunction) layer.getTextSize().getFunction()).getDefaultValue());
+    assertNotNull(((SourceFunction) layer.getTextSize().getFunction()).getDefaultValue().getValue());
+    assertEquals(0.3f, ((SourceFunction) layer.getTextSize().getFunction()).getDefaultValue().getValue());
+  }
+
+  @Test
+  public void testTextSizeAsCompositeFunction() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("text-size");
+    assertNotNull(layer);
+
+    // Set
+    layer.setProperties(
+      textSize(
+        composite(
+          "FeaturePropertyA",
+          exponential(
+            stop(0, 0.3f, textSize(0.9f))
+          ).withBase(0.5f)
+        ).withDefaultValue(textSize(0.3f))
+      )
+    );
+
+    // Verify
+    assertNotNull(layer.getTextSize());
+    assertNotNull(layer.getTextSize().getFunction());
+    assertEquals(CompositeFunction.class, layer.getTextSize().getFunction().getClass());
+    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextSize().getFunction()).getProperty());
+    assertEquals(ExponentialStops.class, layer.getTextSize().getFunction().getStops().getClass());
+    assertEquals(1, ((ExponentialStops) layer.getTextSize().getFunction().getStops()).size());
+
+    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextSize().getFunction().getStops();
+    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+    assertEquals(0f, stop.in.zoom, 0.001);
+    assertEquals(0.3f, stop.in.value, 0.001f);
+    assertEquals(0.9f, stop.out, 0.001f);
+  }
+
   @Test
   public void testTextMaxWidthAsConstant() {
     checkViewIsDisplayed(R.id.mapView);

diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h
@@ -537,6 +537,15 @@ MGL_EXPORT
  * `MGLCameraStyleFunction` with an interpolation mode of:
    * `MGLInterpolationModeExponential`
    * `MGLInterpolationModeInterval`
+ * `MGLSourceStyleFunction` with an interpolation mode of:
+   * `MGLInterpolationModeExponential`
+   * `MGLInterpolationModeInterval`
+   * `MGLInterpolationModeCategorical`
+   * `MGLInterpolationModeIdentity`
+ * `MGLCompositeStyleFunction` with an interpolation mode of:
+   * `MGLInterpolationModeExponential`
+   * `MGLInterpolationModeInterval`
+   * `MGLInterpolationModeCategorical`
  */
 @property (nonatomic, null_resettable) MGLStyleValue<NSNumber *> *iconScale;
 
@@ -919,6 +928,15 @@ MGL_EXPORT
  * `MGLCameraStyleFunction` with an interpolation mode of:
    * `MGLInterpolationModeExponential`
    * `MGLInterpolationModeInterval`
+ * `MGLSourceStyleFunction` with an interpolation mode of:
+   * `MGLInterpolationModeExponential`
+   * `MGLInterpolationModeInterval`
+   * `MGLInterpolationModeCategorical`
+   * `MGLInterpolationModeIdentity`
+ * `MGLCompositeStyleFunction` with an interpolation mode of:
+   * `MGLInterpolationModeExponential`
+   * `MGLInterpolationModeInterval`
+   * `MGLInterpolationModeCategorical`
  */
 @property (nonatomic, null_resettable) MGLStyleValue<NSNumber *> *textFontSize;