From 2f8d0b428f86b5ebd992090548b9e58e9dc3f0bb Mon Sep 17 00:00:00 2001
From: Molly Lloyd <molly@mapbox.com>
Date: Tue, 14 Aug 2018 16:44:55 -0700
Subject: [PATCH] rebase fix

---
 src/data/program_configuration.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/data/program_configuration.js b/src/data/program_configuration.js
index acda3d727ff..adc6afe5c3c 100644
--- a/src/data/program_configuration.js
+++ b/src/data/program_configuration.js
@@ -130,13 +130,13 @@ class ConstantBinder<T> implements Binder<T> {
     }
 
     static serialize(binder: ConstantBinder<T>) {
-        const {value, name, type} = binder;
-        return {value: serialize(value), name, type};
+        const {value, names, type} = binder;
+        return {value: serialize(value), names, type};
     }
 
-    static deserialize(serialized: {value: T, name: string, type: string}) {
-        const {value, name, type} = serialized;
-        return new ConstantBinder(deserialize(value), name, type);
+    static deserialize(serialized: {value: T, names: string, type: string}) {
+        const {value, names, type} = serialized;
+        return new ConstantBinder(deserialize(value), names, type);
     }
 }
 
@@ -146,14 +146,14 @@ class CrossFadedConstantBinder<T> implements Binder<T> {
     uniformNames: Array<string>;
     patternPositions: {[string]: ?Array<number>};
     type: string;
-    statistics: { max: number };
+    maxValue: number;
 
     constructor(value: T, names: Array<string>, type: string) {
         this.value = value;
         this.names = names;
         this.uniformNames = this.names.map(name =>`u_${name}`);
         this.type = type;
-        this.statistics = { max: -Infinity };
+        this.maxValue = -Infinity;
         this.patternPositions = {patternTo: null, patternFrom: null};
     }
 
@@ -199,7 +199,7 @@ class SourceExpressionBinder<T> implements Binder<T> {
         this.names = names;
         this.type = type;
         this.uniformNames = this.names.map(name =>`a_${name}`);
-        this.maxValue -Infinity;
+        this.maxValue = -Infinity;
         this.paintVertexAttributes = names.map((name) =>
             ({
                 name: `a_${name}`,
@@ -421,7 +421,7 @@ class CrossFadedCompositeBinder<T> implements Binder<T> {
         this.uniformNames = this.names.map(name =>`a_${name}_t`);
         this.useIntegerZoom = useIntegerZoom;
         this.zoom = zoom;
-        this.statistics = { max: -Infinity };
+        this.maxValue = -Infinity;
 
         this.paintVertexAttributes = names.map((name) =>
             ({