follow up

Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>

Author: igorDykhta

src/components/src/loading-indicator.tsx

@@ -69,33 +69,31 @@ const LoadingIndicator: React.FC<LoadingIndicatorProps & {theme: any}> = ({
   const numRasterTilesInProgress = getNumRasterTilesBeingLoaded();
   const numVectorTilesInProgress = getNumVectorTilesBeingLoaded();
 
-  const rasterMessage =
-    numRasterTilesInProgress < 1
-      ? ''
-      : `${numRasterTilesInProgress} raster tile${
-          numRasterTilesInProgress === 1 ? ' is' : 's are'
-        } being loaded`;
-
-  const vectorMessage =
-    numVectorTilesInProgress < 1
-      ? ''
-      : `${numVectorTilesInProgress} vector tile${
-          numVectorTilesInProgress === 1 ? ' is' : 's are'
-        } being loaded`;
-
   let extraMessage = '';
-  if (rasterMessage && vectorMessage) {
-    extraMessage = `${rasterMessage.replace(' being loaded', '')} and ${vectorMessage}`;
-  } else if (rasterMessage) {
-    extraMessage = rasterMessage;
-  } else if (vectorMessage) {
-    extraMessage = vectorMessage;
+  if (numRasterTilesInProgress > 0 && numVectorTilesInProgress > 0) {
+    // Both types loading: show combined count
+    const totalTiles = numRasterTilesInProgress + numVectorTilesInProgress;
+    extraMessage = `${totalTiles} tile${totalTiles === 1 ? ' is' : 's are'} being loaded`;
+  } else if (numRasterTilesInProgress > 0) {
+    // Only raster tiles loading
+    extraMessage = `${numRasterTilesInProgress} raster tile${
+      numRasterTilesInProgress === 1 ? ' is' : 's are'
+    } being loaded`;
+  } else if (numVectorTilesInProgress > 0) {
+    // Only vector tiles loading
+    extraMessage = `${numVectorTilesInProgress} vector tile${
+      numVectorTilesInProgress === 1 ? ' is' : 's are'
+    } being loaded`;
   }
 
   return (
     <StyledContainer $isVisible={isVisible} $left={left}>
-      <Spinner />
-      <span>{`Loading... ${extraMessage}`}</span>
+      {isVisible && (
+        <>
+          <Spinner />
+          <span>{`Loading... ${extraMessage}`}</span>
+        </>
+      )}
     </StyledContainer>
   );
 };

src/layers/src/vector-tile/mvt-layer.ts

@@ -32,12 +32,9 @@ export class MVTLayer<ExtraProps> extends _MVTLayer<ExtraProps> {
     if (getTileData) {
       incrementVectorTileLoading();
       try {
-        const result = await getTileData(tile);
+        return await getTileData(tile);
+      } finally {
         decrementVectorTileLoading();
-        return result;
-      } catch (error) {
-        decrementVectorTileLoading();
-        throw error;
       }
     }
     return null;