Consult the .gdb workspace suffix only as a last resort (#1911)

The geodatabase short circuit ran before the dataset was looked at, so a
raster in a plain folder named "*.gdb" whose dataset named a real .tif
stopped resolving, where it used to load. The factory check still
returns immediately, but the suffix is now consulted only after the
joined path fails to name a GeoTIFF, so a readable raster still wins and
only an unopenable dataset falls through to it. Pinned with a test, and
the comment no longer claims parity with resolveDataSource, whose own
suffix check sits in a branch that could not have resolved anyway.

Author: giswqs

apps/geolibre-desktop/src/lib/arcgis-project-import.ts

@@ -447,20 +447,28 @@ function resolveRasterSource(
   const dataset = stringValue(connection.dataset);
   if (!workspace && !dataset) return { reason: "missing-source" };
   if (isNetworkPath(workspace)) return { reason: "network-path" };
-  // Recognized by either the factory or the workspace path, the way a
-  // geodatabase feature class is (see {@link resolveDataSource}), but reported
-  // under its own reason: the desktop build's Add Data -> File Geodatabase
-  // source lists only feature classes that carry geometry, so pointing a
-  // raster at it would send the user somewhere that cannot open their data.
-  if (
-    stringValue(connection.workspaceFactory).toLowerCase().includes("filegdb") ||
-    extension(workspace) === "gdb"
-  ) {
+  // Reported under its own reason rather than the feature class one: the
+  // desktop build's Add Data -> File Geodatabase source lists only feature
+  // classes that carry geometry, so pointing a raster at it would send the
+  // user somewhere that cannot open their data.
+  if (stringValue(connection.workspaceFactory).toLowerCase().includes("filegdb")) {
     return { reason: "file-geodatabase-raster" };
   }
-  if (!workspace || !dataset) return { reason: "missing-source" };
+  // Past this point the factory did not name a geodatabase, so only the
+  // workspace suffix is left to go on -- and it is consulted last, after the
+  // joined path fails. A readable GeoTIFF is therefore still loaded from a
+  // plain folder that happens to be named "*.gdb"; only a dataset the app
+  // cannot open falls through to the suffix, where naming the geodatabase
+  // beats a bare "format".
+  const looksLikeGeodatabase = extension(workspace) === "gdb";
+  if (!workspace || !dataset) {
+    return looksLikeGeodatabase
+      ? { reason: "file-geodatabase-raster" }
+      : { reason: "missing-source" };
+  }
   const path = resolveRelativePath(joinPath(workspace, dataset), projectPath);
-  return ["tif", "tiff"].includes(extension(path)) ? { path } : { reason: "format" };
+  if (["tif", "tiff"].includes(extension(path))) return { path };
+  return looksLikeGeodatabase ? { reason: "file-geodatabase-raster" } : { reason: "format" };
 }
 
 function resolveDataSource(

tests/arcgis-project-import.test.ts

@@ -248,6 +248,31 @@ describe("ArcGIS Pro project import", () => {
     );
   });
 
+  it("still loads a GeoTIFF from a plain folder whose name ends in .gdb", () => {
+    // The workspace suffix is a last resort, not a short circuit: a readable
+    // dataset wins over a folder that merely looks like a geodatabase. ArcGIS
+    // reserves .gdb for real geodatabases, so this is unlikely -- but the
+    // suffix check must not cost a raster that would otherwise have loaded.
+    const mapx = {
+      type: "CIMMap",
+      name: "Elevation",
+      defaultExtent: { xmin: -80, ymin: 30, xmax: -70, ymax: 40, spatialReference: { wkid: 4326 } },
+      layerDefinitions: [
+        {
+          type: "CIMRasterLayer",
+          name: "DEM",
+          dataConnection: {
+            workspaceConnectionString: "DATABASE=C:\\data\\rasters.gdb",
+            dataset: "dem.tif",
+          },
+        },
+      ],
+    };
+    const result = importArcgisProject(JSON.stringify(mapx), "C:\\projects\\main.mapx");
+    assert.deepEqual(result.warnings, []);
+    assert.equal(result.rasters[0].sourcePath, "C:/data/rasters.gdb/dem.tif");
+  });
+
   it("reports a geodatabase raster with no dataset name as a geodatabase", () => {
     // The geodatabase check deliberately precedes the missing-dataset guard,
     // so this matches what the vector resolver already did for the same