Use .indexOf instead of .includes for IE compat; lint fix

mapbox · Jul 29, 2019 · 20b8146 · 20b8146
1 parent 51ba9bb
commit 20b8146
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/data/bucket/symbol_bucket.js b/src/data/bucket/symbol_bucket.js
@@ -431,7 +431,7 @@ class SymbolBucket implements Bucket {
             if (text) {
                 const fontStack = textFont.evaluate(feature, {}).join(',');
                 const textAlongLine = layout.get('text-rotation-alignment') === 'map' && layout.get('symbol-placement') !== 'point';
-                this.allowVerticalPlacement = this.writingModes && this.writingModes.includes(WritingMode.vertical);
+                this.allowVerticalPlacement = this.writingModes && this.writingModes.indexOf(WritingMode.vertical) >= 0;
                 for (const section of text.sections) {
                     const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text.toString());
                     const sectionFont = section.fontStack || fontStack;

diff --git a/src/style/style_layer/symbol_style_layer.js b/src/style/style_layer/symbol_style_layer.js
@@ -60,7 +60,7 @@ class SymbolStyleLayer extends StyleLayer {
                 // remove duplicates, preserving order
                 const deduped = [];
                 for (const m of writingModes) {
-                    if (!(deduped.includes(m))) deduped.push(m);
+                    if (deduped.indexOf(m) < 0) deduped.push(m);
                 }
                 this.layout._values['text-writing-mode'] = deduped;
             } else {

diff --git a/src/symbol/placement.js b/src/symbol/placement.js
@@ -771,7 +771,6 @@ export class Placement {
                     bucket.text.placedSymbolArray.get(symbolInstance.verticalPlacedTextSymbolIndex).hidden = symbolHidden || verticalHidden;
                 }
 
-
                 const prevOffset = this.variableOffsets[symbolInstance.crossTileID];
                 if (prevOffset) {
                     this.markUsedJustification(bucket, prevOffset.anchor, symbolInstance, placedOrientation);