From 98d0fc05c807cdeb6ec03c56f92e07d94bc0a8f5 Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Sun, 18 Mar 2018 23:20:32 +0100
Subject: [PATCH] Backport types

---
 src/ol/render/canvas/replaygroup.js | 10 +++++-----
 test/spec/ol/map.test.js            |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ol/render/canvas/replaygroup.js b/src/ol/render/canvas/replaygroup.js
index cfdcb7cba2..ddbd8da299 100644
--- a/src/ol/render/canvas/replaygroup.js
+++ b/src/ol/render/canvas/replaygroup.js
@@ -334,7 +334,7 @@ ol.render.canvas.ReplayGroup.prototype.forEachFeatureAtCoordinate = function(
         if (mask[i][j]) {
           if (imageData[(j * contextSize + i) * 4 + 3] > 0) {
             var result;
-            if (!(declutteredFeatures && (replayType == ReplayType.IMAGE || replayType == ReplayType.TEXT)) ||
+            if (!(declutteredFeatures && (replayType == ol.render.ReplayType.IMAGE || replayType == ol.render.ReplayType.TEXT)) ||
                 declutteredFeatures.indexOf(feature) !== -1) {
               result = callback(feature);
             }
@@ -352,18 +352,18 @@ ol.render.canvas.ReplayGroup.prototype.forEachFeatureAtCoordinate = function(
 
   /** @type {Array.<number>} */
   var zs = Object.keys(this.replaysByZIndex_).map(Number);
-  zs.sort(numberSafeCompareFunction);
+  zs.sort(ol.array.numberSafeCompareFunction);
 
   var i, j, replays, replay, result;
   for (i = zs.length - 1; i >= 0; --i) {
     var zIndexKey = zs[i].toString();
     replays = this.replaysByZIndex_[zIndexKey];
-    for (j = _ol_render_replay_.ORDER.length - 1; j >= 0; --j) {
-      replayType = _ol_render_replay_.ORDER[j];
+    for (j = ol.render.replay.ORDER.length - 1; j >= 0; --j) {
+      replayType = ol.render.replay.ORDER[j];
       replay = replays[replayType];
       if (replay !== undefined) {
         if (declutterReplays &&
-            (replayType == ReplayType.IMAGE || replayType == ReplayType.TEXT)) {
+            (replayType == ol.render.ReplayType.IMAGE || replayType == ol.render.ReplayType.TEXT)) {
           var declutter = declutterReplays[zIndexKey];
           if (!declutter) {
             declutterReplays[zIndexKey] = [replay, transform.slice(0)];
diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js
index 99d6e425b3..1ae5477e71 100644
--- a/test/spec/ol/map.test.js
+++ b/test/spec/ol/map.test.js
@@ -197,8 +197,8 @@ describe('ol.Map', function() {
       document.body.appendChild(target);
       map = new ol.Map({
         target: target,
-        layers: [new ol.layer.Vector_({
-          source: new ol.source.Vector_({
+        layers: [new ol.layer.Vector({
+          source: new ol.source.Vector({
             features: [new ol.Feature(new ol.geom.LineString([[-50, 0], [50, 0]]))]
           })
         })],
@@ -227,7 +227,7 @@ describe('ol.Map', function() {
     it('returns an array of found features with declutter: true', function() {
       var layer = map.getLayers().item(0);
       map.removeLayer(layer);
-      var otherLayer = new _ol_layer_Vector_({
+      var otherLayer = new ol.layer.Vector({
         declutter: true,
         source: layer.getSource()
       });
@@ -235,7 +235,7 @@ describe('ol.Map', function() {
       map.renderSync();
       var features = map.getFeaturesAtPixel([50, 50]);
       expect(features).to.be.an(Array);
-      expect(features[0]).to.be.an(_ol_Feature_);
+      expect(features[0]).to.be.an(ol.Feature);
     });
 
     it('respects options', function() {