enable eslint prefer-includes check.

Signed-off-by: Roberto Raggi <roberto.raggi@here.com>

.eslintrc.json

@@ -29,7 +29,6 @@
         "@typescript-eslint/naming-convention": "off",
         "@typescript-eslint/restrict-plus-operands": "off",
         "@typescript-eslint/dot-notation": "off",
-        "@typescript-eslint/prefer-includes": "off",
         "@typescript-eslint/no-namespace": "off",
         "@typescript-eslint/prefer-optional-chain": "off",
         "@typescript-eslint/no-floating-promises": "off",

@here/harp-datasource-protocol/lib/WorkerServiceProtocol.ts

@@ -94,7 +94,7 @@ export namespace WorkerServiceProtocol {
      * Test if `error` thrown by [[CreateServiceRequest]] was caused by unknown type of service.
      */
     export function isUnknownServiceError(error: Error): boolean {
-        return /unknown targetServiceType requested: /.test(error.message);
+        return error.message.includes("unknown targetServiceType requested: ");
     }
 
     /**

@here/harp-datasource-protocol/lib/operators/StringOperators.ts

@@ -31,7 +31,7 @@ const operators = {
             const left = context.evaluate(call.args[0]);
             const right = context.evaluate(call.args[1]);
             if (typeof left === "string" && typeof right === "string") {
-                return left.indexOf(right) !== -1;
+                return left.includes(right);
             }
             return false;
         }

@here/harp-examples/lib/PerformanceUtils.ts

@@ -80,7 +80,7 @@ export namespace PerformanceUtils {
         const availableExtensions = context.getSupportedExtensions();
         if (
             availableExtensions !== null &&
-            availableExtensions.indexOf("WEBGL_debug_renderer_info") > -1
+            availableExtensions.includes("WEBGL_debug_renderer_info")
         ) {
             const infoExtension = context.getExtension("WEBGL_debug_renderer_info");
             if (infoExtension !== null) {

@here/harp-examples/src/datasource_features_lines-and-points.ts

@@ -115,7 +115,7 @@ export namespace LinesPointsFeaturesExample {
         const featuresList: MapViewFeature[] = [];
         for (const type of Object.keys(features)) {
             for (const featureName of Object.keys(features[type])) {
-                const name = featureName.indexOf("unknown") === -1 ? featureName : undefined;
+                const name = !featureName.includes("unknown") ? featureName : undefined;
                 // snippet:harp_demo_features_linespoints_1.ts
                 const feature = new MapViewLineFeature(features[type][featureName], { name, type });
                 // end:harp_demo_features_linespoints_1.ts

@here/harp-examples/src/datasource_features_polygons.ts

@@ -79,7 +79,7 @@ export namespace PolygonsFeaturesExample {
     setCaption();
 
     function getJoiningDate(j: number) {
-        let joiningDate = steps.find(year => EU.steps[year].joining.indexOf(j) > -1)!;
+        let joiningDate = steps.find(year => EU.steps[year].joining.includes(j))!;
         const actualDate = EU.steps[joiningDate].actualJoining;
         if (actualDate !== undefined) {
             joiningDate = actualDate;
@@ -94,11 +94,11 @@ export namespace PolygonsFeaturesExample {
             const features: MapViewFeature[] = [];
             let age = steps.length;
             let k = 0;
-            while (EU.steps[steps[k]].joining.indexOf(j) === -1) {
+            while (!EU.steps[steps[k]].joining.includes(j)) {
                 age--;
                 k++;
             }
-            if (stateGroup.indexOf("germany") > -1) {
+            if (stateGroup.includes("germany")) {
                 age = steps.length;
             }
 
@@ -152,17 +152,17 @@ export namespace PolygonsFeaturesExample {
             if (step !== steps[currentStep]) {
                 dataSourcesToReShow.push(...EU.steps[step].joining);
                 for (const leaving of EU.steps[step].leaving) {
-                    if (dataSourcesToReShow.indexOf(leaving) > -1) {
+                    if (dataSourcesToReShow.includes(leaving)) {
                         dataSourcesToReShow.splice(dataSourcesToReShow.indexOf(leaving), 1);
                     }
                 }
             } else {
                 dataSourcesToShow.push(...EU.steps[step].joining);
                 for (const leaving of EU.steps[step].leaving) {
-                    if (dataSourcesToReShow.indexOf(leaving) > -1) {
+                    if (dataSourcesToReShow.includes(leaving)) {
                         dataSourcesToReShow.splice(dataSourcesToReShow.indexOf(leaving), 1);
                     }
-                    if (dataSourcesToShow.indexOf(leaving) > -1) {
+                    if (dataSourcesToShow.includes(leaving)) {
                         dataSourcesToShow.splice(dataSourcesToShow.indexOf(leaving), 1);
                     }
                 }
@@ -171,14 +171,14 @@ export namespace PolygonsFeaturesExample {
         }
         dataSourcesToReShow.forEach(value => {
             const datasource = featuresDataSources[value];
-            if (displayedDataSourceCache.indexOf(datasource) < 0) {
+            if (!displayedDataSourceCache.includes(datasource)) {
                 map.addDataSource(datasource);
                 displayedDataSourceCache.push(datasource);
             }
         });
         dataSourcesToShow.forEach(value => {
             const datasource = featuresDataSources[value];
-            if (displayedDataSourceCache.indexOf(datasource) < 0) {
+            if (!displayedDataSourceCache.includes(datasource)) {
                 map.addDataSource(datasource);
                 displayedDataSourceCache.push(datasource);
             }

@here/harp-examples/src/performance_benchmark.ts

@@ -978,11 +978,7 @@ export namespace PerformanceBenchmark {
         }
 
         let str = value.toFixed(digits);
-        while (
-            str.length > 1 &&
-            str.indexOf(".") >= 0 &&
-            (str.endsWith("0") || str.endsWith("."))
-        ) {
+        while (str.length > 1 && str.includes(".") && (str.endsWith("0") || str.endsWith("."))) {
             str = str.substr(0, str.length - 1);
         }
 

@here/harp-mapview/lib/DecodedTileHelpers.ts

@@ -627,7 +627,7 @@ function applyShaderTechniqueToMaterial(technique: ShaderTechnique, material: TH
         // Omit base color and related transparency attributes if its defined in technique
         if (
             baseColorPropName === propertyName ||
-            (hasBaseColor && TRANSPARENCY_PROPERTY_KEYS.indexOf(propertyName) !== -1)
+            (hasBaseColor && TRANSPARENCY_PROPERTY_KEYS.includes(propertyName))
         ) {
             return false;
         }

@here/harp-mapview/lib/EventDispatcher.ts

@@ -37,7 +37,7 @@ export class EventDispatcher {
         if (listeners === undefined) {
             return false;
         }
-        return listener !== undefined ? listeners.indexOf(listener) >= 0 : true;
+        return listener !== undefined ? listeners.includes(listener) : true;
     }
 
     /**
@@ -52,7 +52,7 @@ export class EventDispatcher {
             listeners = [];
             this.m_listeners.set(type, listeners);
         }
-        if (listeners.indexOf(listener) === -1) {
+        if (!listeners.includes(listener)) {
             listeners.push(listener);
         }
     }

@here/harp-mapview/lib/MapView.ts

@@ -2207,7 +2207,7 @@ export class MapView extends EventDispatcher {
                 });
             })
             .then(() => {
-                const alreadyRemoved = this.m_tileDataSources.indexOf(dataSource) === -1;
+                const alreadyRemoved = !this.m_tileDataSources.includes(dataSource);
                 if (alreadyRemoved) {
                     return;
                 }
@@ -2963,7 +2963,7 @@ export class MapView extends EventDispatcher {
         }
 
         // Add as datasource if it was not added before
-        const isPresent = this.m_tileDataSources.indexOf(elevationSource) !== -1;
+        const isPresent = this.m_tileDataSources.includes(elevationSource);
         if (!isPresent) {
             await this.addDataSource(elevationSource);
         }

@here/harp-mapview/lib/geometry/TileGeometryCreator.ts

@@ -709,7 +709,7 @@ export class TileGeometryCreator {
                 }
 
                 if (
-                    group.createdOffsets!.indexOf(tile.offset) !== -1 ||
+                    group.createdOffsets!.includes(tile.offset) ||
                     technique._kindState === false ||
                     (techniqueFilter !== undefined && !techniqueFilter(technique))
                 ) {

@here/harp-mapview/lib/image/ImageCache.ts

@@ -97,7 +97,7 @@ export class ImageCache {
     registerImage(mapView: MapView, url: string, imageData?: ImageData | ImageBitmap): ImageItem {
         let imageCacheItem = this.findImageCacheItem(url);
         if (imageCacheItem !== undefined) {
-            if (mapView !== undefined && imageCacheItem.mapViews.indexOf(mapView) < 0) {
+            if (mapView !== undefined && !imageCacheItem.mapViews.includes(mapView)) {
                 imageCacheItem.mapViews.push(mapView);
             }
             return imageCacheItem.imageItem;

@here/harp-mapview/lib/image/MapViewImageCache.ts

@@ -47,7 +47,7 @@ export class MapViewImageCache {
         }
         const oldNames = this.m_url2Name.get(url);
         if (oldNames !== undefined) {
-            if (oldNames.indexOf(name) < 0) {
+            if (!oldNames.includes(name)) {
                 oldNames.push(name);
             }
         } else {

@here/harp-mapview/test/TextElementsRendererTestFixture.ts

@@ -246,8 +246,8 @@ export class TestFixture {
         for (let i = 0; i < allElements.length; ++i) {
             const element = allElements[i];
             const addElement = elementEnabled[i];
-            const elementPresent = [...tileElementGroups.groups.values()].find(
-                group => group.elements.indexOf(element) !== -1
+            const elementPresent = [...tileElementGroups.groups.values()].find(group =>
+                group.elements.includes(element)
             );
             if (addElement && !elementPresent) {
                 tile.addTextElement(element);

@here/harp-mapview/test/VisibleTileSetTest.ts

@@ -231,11 +231,11 @@ describe("VisibleTileSet", function() {
         dsValid: DataSource[]
     ) => {
         dstl.forEach(dataSourceTileList => {
-            if (dsSkipped.indexOf(dataSourceTileList.dataSource) !== -1) {
+            if (dsSkipped.includes(dataSourceTileList.dataSource)) {
                 dataSourceTileList.visibleTiles.forEach(tile => {
                     expect(tile["skipRendering"]).is.true;
                 });
-            } else if (dsValid.indexOf(dataSourceTileList.dataSource) !== -1) {
+            } else if (dsValid.includes(dataSourceTileList.dataSource)) {
                 dataSourceTileList.visibleTiles.forEach(tile => {
                     expect(tile["skipRendering"]).is.false;
                 });

@here/harp-test-utils/lib/TestDataUtils.ts

@@ -30,7 +30,7 @@ export const testResourcesRoot =
 export function getTestResourceUrl(module: string, fileName: string) {
     const modulePath = path.dirname(require.resolve(module + "/package.json"));
     const resultPath = path.join(testResourcesRoot, modulePath, fileName);
-    if (resultPath.indexOf("\\") !== -1) {
+    if (resultPath.includes("\\")) {
         // node-fetch on windows, needs proper URL
         return "file://" + resultPath.replace(/\\/g, "/");
     } else {

@here/harp-text-canvas/lib/rendering/FontCatalog.ts

@@ -384,7 +384,7 @@ export class FontCatalog {
             if (glyph === undefined) {
                 let glyphPromise = this.m_loadingGlyphs.get(glyphHash);
                 if (glyphPromise === undefined) {
-                    if (font.charset.indexOf(String.fromCodePoint(codePoint)) === -1) {
+                    if (!font.charset.includes(String.fromCodePoint(codePoint))) {
                         const replacementGlyph = this.createReplacementGlyph(codePoint, char, font);
                         fontGlyphMap!.set(codePoint, replacementGlyph);
                         this.m_glyphTextureCache.add(glyphHash, replacementGlyph);

@here/harp-vectortile-datasource/lib/OmvDataFilter.ts

@@ -669,7 +669,7 @@ export class OmvGenericFeatureFilter implements OmvFeatureFilter {
                 continue;
             }
 
-            if (item.geometryTypes !== undefined && item.geometryTypes.indexOf(geometryType) >= 0) {
+            if (item.geometryTypes !== undefined && item.geometryTypes.includes(geometryType)) {
                 return true;
             }
         }
@@ -680,7 +680,7 @@ export class OmvGenericFeatureFilter implements OmvFeatureFilter {
                 continue;
             }
 
-            if (item.geometryTypes !== undefined && item.geometryTypes.indexOf(geometryType) >= 0) {
+            if (item.geometryTypes !== undefined && item.geometryTypes.includes(geometryType)) {
                 return false;
             }
         }

@here/harp-vectortile-datasource/lib/OmvDebugLabelsTile.ts

@@ -304,7 +304,7 @@ export class OmvDebugLabelsTile extends Tile {
                 const elementIndex = this.preparedTextPaths.indexOf(textPath);
 
                 const createDebugInfo =
-                    (!textFilter || (text && text.indexOf(textFilter) >= 0)) &&
+                    (!textFilter || (text && text.includes(textFilter))) &&
                     (indexFilter === undefined || indexFilter === elementIndex);
 
                 if (createDebugInfo) {

@here/harp-vectortile-datasource/lib/OmvDecoderDefs.ts

@@ -72,7 +72,7 @@ export namespace OmvFilterString {
             case OmvFilterString.StringMatch.EndsWith:
                 return filterString.value.endsWith(str);
             default:
-                return str.indexOf(filterString.value) >= 0;
+                return str.includes(filterString.value);
         }
     }
 }

@here/harp-vectortile-datasource/lib/OmvRestClient.ts

@@ -480,7 +480,7 @@ export class OmvRestClient implements DataProvider {
 
     private addQueryParams(url: string, queryParams: QueryParameters): string {
         let queryString = "";
-        let sep = url.indexOf("?") !== -1 ? "&" : "?";
+        let sep = url.includes("?") ? "&" : "?";
         for (const prop in queryParams) {
             if (!queryParams.hasOwnProperty(prop)) {
                 continue;

@here/harp-vectortile-datasource/lib/OmvTomTomFeatureModifier.ts

@@ -154,7 +154,7 @@ export class OmvTomTomFeatureModifier extends OmvGenericFeatureModifier {
     }
 
     private isIndustrial(layer: string): boolean {
-        return layer.indexOf("Industrial") >= 0 || layer === "Airport";
+        return layer.includes("Industrial") || layer === "Airport";
     }
 
     private isPark(layer: string): boolean {
@@ -163,8 +163,8 @@ export class OmvTomTomFeatureModifier extends OmvGenericFeatureModifier {
             layer === "City park" ||
             layer === "National park" ||
             layer === "Regional park" ||
-            layer.indexOf("grass") >= 0 ||
-            layer.indexOf("greens") >= 0
+            layer.includes("grass") ||
+            layer.includes("greens")
         );
     }
 
@@ -192,7 +192,7 @@ export class OmvTomTomFeatureModifier extends OmvGenericFeatureModifier {
     }
 
     private isRoadLabel(layer: string): boolean {
-        return layer.indexOf("road label") >= 0;
+        return layer.includes("road label");
     }
 
     private isRoadPath(layer: string): boolean {
@@ -210,31 +210,31 @@ export class OmvTomTomFeatureModifier extends OmvGenericFeatureModifier {
 
     private isRoadStreet(layer: string): boolean {
         return (
-            layer.indexOf("Minor local road") >= 0 ||
-            layer.indexOf("minor local road") >= 0 ||
-            layer.indexOf("Toll local road") >= 0 ||
-            layer.indexOf("Local road") >= 0
+            layer.includes("Minor local road") ||
+            layer.includes("minor local road") ||
+            layer.includes("Toll local road") ||
+            layer.includes("Local road")
         );
     }
 
     private isRoadPrimary(layer: string): boolean {
         return (
-            layer.indexOf("Major local road") >= 0 ||
-            layer.indexOf("Major road") >= 0 ||
-            layer.indexOf("major road") >= 0 ||
-            layer.indexOf("Motorway") >= 0 ||
-            layer.indexOf("motorway") >= 0 ||
-            layer.indexOf("International road") >= 0 ||
-            layer.indexOf("international road") >= 0
+            layer.includes("Major local road") ||
+            layer.includes("Major road") ||
+            layer.includes("major road") ||
+            layer.includes("Motorway") ||
+            layer.includes("motorway") ||
+            layer.includes("International road") ||
+            layer.includes("international road")
         );
     }
 
     private isRoadSecondary(layer: string): boolean {
         return (
-            layer.indexOf("connecting road") >= 0 ||
-            layer.indexOf("Connecting road") >= 0 ||
-            layer.indexOf("secondary road") >= 0 ||
-            layer.indexOf("Secondary road") >= 0
+            layer.includes("connecting road") ||
+            layer.includes("Connecting road") ||
+            layer.includes("secondary road") ||
+            layer.includes("Secondary road")
         );
     }
 
@@ -287,9 +287,7 @@ export class OmvTomTomFeatureModifier extends OmvGenericFeatureModifier {
 
     private isPoiLabel(layer: string): boolean {
         return (
-            layer === "National park name" ||
-            layer === "Landmark label" ||
-            layer.indexOf("label") >= 0
+            layer === "National park name" || layer === "Landmark label" || layer.includes("label")
         );
     }
 
@@ -298,14 +296,14 @@ export class OmvTomTomFeatureModifier extends OmvGenericFeatureModifier {
     }
 
     private isBuilding(layer: string): boolean {
-        return layer.indexOf("building") >= 0;
+        return layer.includes("building");
     }
 
     private isTunnel(layer: string): boolean {
-        return layer.indexOf("tunnel") >= 0;
+        return layer.includes("tunnel");
     }
 
     private isBridge(layer: string): boolean {
-        return layer.indexOf("bridge") >= 0;
+        return layer.includes("bridge");
     }
 }

@here/harp-vectortile-datasource/test/OmvTest.ts

@@ -63,9 +63,7 @@ export class RoadFeatureFilter implements OmvFeatureModifier {
     doProcessLineFeature(_layer: string, env: MapEnv): boolean {
         const roadClass = env.lookup("class");
         const isRoad =
-            roadClass !== undefined &&
-            roadClass !== null &&
-            roadClass.toString().indexOf("rail") < 0;
+            roadClass !== undefined && roadClass !== null && !roadClass.toString().includes("rail");
         return isRoad;
     }