diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style')
5 files changed, 25 insertions, 162 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/CompositeFunction.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/CompositeFunction.java index 1ed43580c4..1db14afc5f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/CompositeFunction.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/CompositeFunction.java @@ -3,7 +3,10 @@ package com.mapbox.mapboxsdk.style.functions; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.mapbox.mapboxsdk.style.functions.stops.CompositeStops; +import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops; +import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops; +import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops; +import com.mapbox.mapboxsdk.style.functions.stops.Stop; import com.mapbox.mapboxsdk.style.functions.stops.Stops; import java.util.Map; @@ -21,13 +24,23 @@ import java.util.Map; * @param <O> the output type (the property type) * @see Function#composite */ -public class CompositeFunction<Z extends Number, I, O> extends Function<I, O> { +public class CompositeFunction<Z extends Number, I, O> extends Function<Stop.CompositeValue<Z, I>, O> { private final String property; private O defaultValue; CompositeFunction(@NonNull String property, - @NonNull CompositeStops<Z, I, O, ? extends Stops<I, O>> stops) { + @NonNull CategoricalStops<Stop.CompositeValue<Z, I>, O> stops) { + this(null, property, stops); + } + + CompositeFunction(@NonNull String property, + @NonNull ExponentialStops<Stop.CompositeValue<Z, I>, O> stops) { + this(null, property, stops); + } + + CompositeFunction(@NonNull String property, + @NonNull IntervalStops<Stop.CompositeValue<Z, I>, O> stops) { this(null, property, stops); } @@ -36,7 +49,7 @@ public class CompositeFunction<Z extends Number, I, O> extends Function<I, O> { * JNI Constructor */ private CompositeFunction(@Nullable O defaultValue, @NonNull String property, - @NonNull CompositeStops<Z, I, O, ? extends Stops<I, O>> stops) { + @NonNull Stops<Stop.CompositeValue<Z, I>, O> stops) { super(stops); this.defaultValue = defaultValue; this.property = property; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/Function.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/Function.java index 8c5186b994..c45f4b6cae 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/Function.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/Function.java @@ -4,7 +4,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops; -import com.mapbox.mapboxsdk.style.functions.stops.CompositeStops; import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops; import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops; import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops; @@ -193,7 +192,7 @@ public class Function<I, O> { @NonNull String property, @NonNull CategoricalStops<Stop.CompositeValue<Z, I>, O> stops) { - return new CompositeFunction<>(property, new CompositeStops<>(stops)); + return new CompositeFunction<>(property, stops); } /** @@ -219,7 +218,7 @@ public class Function<I, O> { @NonNull String property, @NonNull ExponentialStops<Stop.CompositeValue<Z, I>, O> stops) { - return new CompositeFunction<>(property, new CompositeStops<>(stops)); + return new CompositeFunction<>(property, stops); } /** @@ -245,7 +244,7 @@ public class Function<I, O> { @NonNull String property, @NonNull IntervalStops<Stop.CompositeValue<Z, I>, O> stops) { - return new CompositeFunction<>(property, new CompositeStops<>(stops)); + return new CompositeFunction<>(property, stops); } // Class definition // @@ -257,7 +256,7 @@ public class Function<I, O> { * * @param stops the stops */ - Function(@NonNull Stops stops) { + Function(@NonNull Stops<I, O> stops) { this.stops = stops; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/CompositeStops.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/CompositeStops.java deleted file mode 100644 index 7e2ce94fe1..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/CompositeStops.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.mapbox.mapboxsdk.style.functions.stops; - -import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Size; - -import com.mapbox.mapboxsdk.style.functions.stops.Stop.CompositeValue; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -/** - * The {@link Stops} implementation for composite functions - * - * @param <Z> the zoom type (usually Float) - * @param <I> the input type (the feature property type) - * @param <O> the output type (the property type) - * @param <S> the {@link Stops} implementation (eg CategoricalStops, {@link ExponentialStops} or {@link IntervalStops}) - */ -public class CompositeStops<Z extends Number, I, O, S extends IterableStops<I, O, Stop<I, O>>> - extends IterableStops<CompositeValue<Z, I>, O, Map.Entry<Z, S>> { - - private final Map<Z, S> stops; - - /** - * JNI Constructor - * - * @param stops the stops {@link Map} - */ - @Keep - private CompositeStops(@NonNull @Size(min = 1) Map<Z, S> stops) { - this.stops = stops; - } - - /** - * Create composite stops for {@link ExponentialStops}. Use - * {@link com.mapbox.mapboxsdk.style.functions.Function#composite(String, ExponentialStops)} - * - * @param stops the stops - */ - public CompositeStops(@NonNull ExponentialStops<Stop.CompositeValue<Z, I>, O> stops) { - this.stops = new HashMap<>(); - - for (Map.Entry<Z, List<Stop<I, O>>> entry : collect(stops).entrySet()) { - // noinspection unchecked - this.stops.put(entry.getKey(), - (S) new ExponentialStops<>(stops.getBase(), entry.getValue().toArray(new Stop[0]))); - } - } - - /** - * Create composite stops for {@link IntervalStops}. - * Use {@link com.mapbox.mapboxsdk.style.functions.Function#composite(String, IntervalStops)} - * - * @param stops the stops - */ - public CompositeStops(@NonNull IntervalStops<Stop.CompositeValue<Z, I>, O> stops) { - this.stops = new HashMap<>(); - - for (Map.Entry<Z, List<Stop<I, O>>> entry : collect(stops).entrySet()) { - // noinspection unchecked - this.stops.put(entry.getKey(), (S) new IntervalStops<>(entry.getValue().toArray(new Stop[0]))); - } - } - - /** - * Create composite stops for {@link CategoricalStops}. - * Use {@link com.mapbox.mapboxsdk.style.functions.Function#composite(String, CategoricalStops)} - * - * @param stops the stops - */ - public CompositeStops(@NonNull CategoricalStops<CompositeValue<Z, I>, O> stops) { - this.stops = new HashMap<>(); - - for (Map.Entry<Z, List<Stop<I, O>>> entry : collect(stops).entrySet()) { - // noinspection unchecked - this.stops.put(entry.getKey(), (S) new CategoricalStops<>(entry.getValue().toArray(new Stop[0]))); - } - } - - /** - * {@inheritDoc} - */ - @Override - protected String getTypeName() { - return stops.values().iterator().next().getTypeName(); - } - - /** - * {@inheritDoc} - */ - @Override - public Map<String, Object> toValueObject() { - Map<String, Object> map = super.toValueObject(); - - // Flatten and toValueObjects stops - // noinspection unchecked - map.put("stops", toValueObjects(flatten(this.stops).toArray(new Stop[0]))); - - return map; - } - - @NonNull - private List<Stop<CompositeValue<Z, I>, O>> flatten(Map<Z, S> stops) { - List<Stop<CompositeValue<Z, I>, O>> flattenedStops = new ArrayList<>(); - for (Map.Entry<Z, S> entry : stops.entrySet()) { - for (Stop<I, O> stop : entry.getValue()) { - flattenedStops.add(new Stop<>(new CompositeValue<>(entry.getKey(), stop.in), stop.out)); - } - } - return flattenedStops; - } - - @NonNull - private Map<Z, List<Stop<I, O>>> collect( - @NonNull IterableStops<CompositeValue<Z, I>, O, Stop<CompositeValue<Z, I>, O>> stops) { - Map<Z, List<Stop<I, O>>> converted = new HashMap<>(); - - for (Stop<CompositeValue<Z, I>, O> stop : stops) { - List<Stop<I, O>> stopsForZ = converted.get(stop.in.zoom); - if (stopsForZ == null) { - stopsForZ = new ArrayList<>(); - converted.put(stop.in.zoom, stopsForZ); - } - - stopsForZ.add(new Stop<>(stop.in.value, stop.out)); - } - - return converted; - } - - /** - * {@inheritDoc} - */ - @Override - public Iterator<Map.Entry<Z, S>> iterator() { - return stops.entrySet().iterator(); - } - - /** - * {@inheritDoc} - */ - @Override - public int size() { - return stops.size(); - } - -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stop.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stop.java index 80825ccf6d..72164f4c4b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stop.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stop.java @@ -52,8 +52,8 @@ public class Stop<I, O> { * @param <V> the feature property input type */ public static class CompositeValue<Z extends Number, V> { - Z zoom; - V value; + public final Z zoom; + public final V value; CompositeValue(Z zoom, V value) { this.zoom = zoom; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stops.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stops.java index a9d8055084..af4f53c072 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stops.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stops.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.style.functions.stops; +import android.support.annotation.CallSuper; import android.support.annotation.NonNull; import android.support.annotation.Size; @@ -77,6 +78,7 @@ public abstract class Stops<I, O> { * * @return the value object representation for conversion to core */ + @CallSuper public Map<String, Object> toValueObject() { HashMap<String, Object> map = new HashMap<>(); map.put("type", getTypeName()); |