Edit convert functions to output linear interpolation (#9107)

* Edit convert functions to output linear interpolation * Edit unit tests to reflect linear interpolation * Refactor code to make it succint * minor whitespace updates
mapbox · Dec 16, 2019 · dc3cfa2 · dc3cfa2 · DanielSeehausen · Dec 17, 2019
1 parent a5b76c8
commit dc3cfa2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/style-spec/function/convert.js b/src/style-spec/function/convert.js
@@ -153,7 +153,12 @@ function convertPropertyFunction(parameters, propertySpec, stops) {
         ];
     } else if (type === 'exponential') {
         const base = parameters.base !== undefined ? parameters.base : 1;
-        const expression = [getInterpolateOperator(parameters), ['exponential', base], ['number', get]];
+        const expression = [
+            getInterpolateOperator(parameters),
+            base === 1 ? ["linear"] : ["exponential", base],
+            ["number", get]
+        ];
+
         for (const stop of stops) {
             appendStopPair(expression, stop[0], stop[1], false);
         }
@@ -177,7 +182,8 @@ function convertZoomFunction(parameters, propertySpec, stops, input = ['zoom'])
         isStep = true;
     } else if (type === 'exponential') {
         const base = parameters.base !== undefined ? parameters.base : 1;
-        expression = [getInterpolateOperator(parameters), ['exponential', base], input];
+        expression = [getInterpolateOperator(parameters), base === 1 ? ["linear"] : ["exponential", base], input];
+
     } else {
         throw new Error(`Unknown zoom function type "${type}"`);
     }

diff --git a/test/unit/style-spec/migrate.test.js b/test/unit/style-spec/migrate.test.js
@@ -69,7 +69,7 @@ test('converts stop functions to expressions', (t) => {
     }, spec.latest.$version);
     t.deepEqual(migrated.layers[0].paint['background-opacity'], [
         'interpolate',
-        ['exponential', 1],
+        ['linear'],
         ['zoom'],
         0,
         1,
@@ -78,7 +78,7 @@ test('converts stop functions to expressions', (t) => {
     ]);
     t.deepEqual(migrated.layers[1].paint['background-opacity'], [
         'interpolate',
-        ['exponential', 1],
+        ['linear'],
         ['zoom'],
         0,
         ['literal', [1, 2]],