Merge branch 'master' into feature-user-layer-display-controls

seasketch · Jan 23, 2024 · 142893a · 142893a
2 parents ab54eaa + 4210b1b
commit 142893a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/packages/client/src/admin/data/arcgis/arcgis.ts b/packages/client/src/admin/data/arcgis/arcgis.ts
@@ -93,6 +93,12 @@ export function normalizeArcGISServerUrl(
       servicesRoot: "",
       location: "",
     };
+  } else if (/rest\/services/i.test(url)) {
+    const parts = url.split(/\/rest\/services/i);
+    const baseUrl = parts[0];
+    const servicesRoot = baseUrl + "/rest/services";
+    const location = parts[1].replace(/\/$/, "") || "/";
+    return { baseUrl, servicesRoot, location };
   } else {
     const baseUrl = url.replace(/\/$/, "");
     const servicesRoot = baseUrl + "/arcgis/rest/services";