Change getUid return type from number to string

src/ol/renderer/Layer.js

@@ -138,7 +138,7 @@ class LayerRenderer extends Observable {
        * @param {import("../PluggableMap.js").FrameState} frameState Frame state.
        */
       const postRenderFunction = function(tileSource, map, frameState) {
-        const tileSourceKey = getUid(tileSource).toString();
+        const tileSourceKey = getUid(tileSource);
         if (tileSourceKey in frameState.usedTiles) {
           tileSource.expireCache(frameState.viewState.projection,
             frameState.usedTiles[tileSourceKey]);
@@ -160,7 +160,7 @@ class LayerRenderer extends Observable {
    */
   updateUsedTiles(usedTiles, tileSource, z, tileRange) {
     // FIXME should we use tilesToDrawByZ instead?
-    const tileSourceKey = getUid(tileSource).toString();
+    const tileSourceKey = getUid(tileSource);
     const zKey = z.toString();
     if (tileSourceKey in usedTiles) {
       if (zKey in usedTiles[tileSourceKey]) {
@@ -206,7 +206,7 @@ class LayerRenderer extends Observable {
     opt_tileCallback,
     opt_this
   ) {
-    const tileSourceKey = getUid(tileSource).toString();
+    const tileSourceKey = getUid(tileSource);
     if (!(tileSourceKey in frameState.wantedTiles)) {
       frameState.wantedTiles[tileSourceKey] = {};
     }

src/ol/renderer/Map.js

@@ -123,9 +123,8 @@ class MapRenderer extends Disposable {
      * @return {?} Callback result.
      */
     function forEachFeatureAtCoordinate(feature, layer) {
-      const key = getUid(feature).toString();
       const managed = frameState.layerStates[getUid(layer)].managed;
-      if (!(key in frameState.skippedFeatureUids && !managed)) {
+      if (!(getUid(feature) in frameState.skippedFeatureUids && !managed)) {
         return callback.call(thisArg, feature, managed ? layer : null);
       }
     }
@@ -207,7 +206,7 @@ class MapRenderer extends Disposable {
    * @return {import("./Layer.js").default} Layer renderer.
    */
   getLayerRenderer(layer) {
-    const layerKey = getUid(layer).toString();
+    const layerKey = getUid(layer);
     if (layerKey in this.layerRenderers_) {
       return this.layerRenderers_[layerKey];
     } else {

src/ol/renderer/canvas/VectorLayer.js

@@ -244,7 +244,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
          * @return {?} Callback result.
          */
         function(feature) {
-          const key = getUid(feature).toString();
+          const key = getUid(feature);
           if (!(key in features)) {
             features[key] = true;
             return callback.call(thisArg, feature, layer);

src/ol/renderer/canvas/VectorTileLayer.js

@@ -269,7 +269,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
            * @return {?} Callback result.
            */
           function(feature) {
-            const key = getUid(feature).toString();
+            const key = getUid(feature);
             if (!(key in features)) {
               features[key] = true;
               return callback.call(thisArg, feature, layer);

src/ol/renderer/vector.js

@@ -38,7 +38,7 @@ const GEOMETRY_RENDERERS = {
  * @return {number} Order.
  */
 export function defaultOrder(feature1, feature2) {
-  return getUid(feature1) - getUid(feature2);
+  return parseInt(getUid(feature1), 10) - parseInt(getUid(feature2), 10);
 }
 
 

src/ol/renderer/webgl/VectorLayer.js

@@ -128,7 +128,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
          * @return {?} Callback result.
          */
         function(feature) {
-          const key = getUid(feature).toString();
+          const key = getUid(feature);
           if (!(key in features)) {
             features[key] = true;
             return callback.call(thisArg, feature, layer);