Enable query by default, with prioritized default

format selection

- Enable query checkbox by default for all queryable services (WMS, WMTS,
  ESRI MapServer, ESRI ImageServer)
- Implement smart query format selection with priority:
  1. text/mapml (highest priority)
  2. application/json or application/geo+json
  3. text/html
  4. text/plain
  5. first available format (fallback)
- Change ESRI identify requests from f=html to f=json for broader
  compatibility across ArcGIS versions
- Update all tests to reflect query-enabled-by-default behavior

This improves user experience by making queryable layers immediately
interactive without requiring manual checkbox activation, and ensures
the best available format is selected automatically.

Author: prushforth

.github/copilot-instructions.md

@@ -165,10 +165,11 @@ Each projection has specific basemap configuration with zoom inputs, tile matrix
 - Extract from `<ResourceURL resourceType="FeatureInfo">` elements
 - Info formats specified in capabilities as MIME types
 
-**ESRI Identify** - Uses `identify` endpoint:
-- **MapServer**: `${baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&...`
-- **ImageServer**: `${baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&...`
-- Returns results in JSON format, supports various `returnGeometry` options
+**ESRI Identify** - Uses `identify` endpoint with JSON format:
+- **MapServer**: `${baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&...&f=json`
+- **ImageServer**: `${baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&...&f=json`
+- Uses `f=json` parameter to return ESRI JSON format for broad compatibility across ArcGIS versions
+- MapServer uses `returnGeometry=true`, ImageServer uses `returnCatalogItems=true`
 
 ## Common Pitfalls
 

src/capabilities.txt

@@ -8,6 +8,7 @@ Current Conditions, https://geo.weather.gc.ca/geomet/?lang=en&service=WMS&versio
 Coastal Flood Risk Index, https://geo.weather.gc.ca/geomet/?lang=en&service=WMS&version=1.3.0&request=GetCapabilities&layers=CoastalFloodRiskIndex
 Fire Weather Hotspots (2020), https://geo.weather.gc.ca/geomet/?lang=en&service=WMS&version=1.3.0&request=GetCapabilities&layers=RAQDPS-FW.CE_HOTSPOTS.2020
 Wildfire Hotspots, https://geo.weather.gc.ca/geomet/?lang=en&service=WMS&version=1.3.0&request=GetCapabilities&layers=WildfireHotspots
+Service web du Ministère de la Sécurité publique du Québec, https://geoegl.msp.gouv.qc.ca/apis/wss/inondation2020.fcgi?SERVICE=WMS&REQUEST=GetCapabilities
 Air Quality - NO2 Monthly Average, https://geo.weather.gc.ca/geomet/?lang=en&service=WMS&version=1.3.0&request=GetCapabilities&layers=RDAQA.CE_NO2-MAvg
 Weather Radio Stations, https://geo.weather.gc.ca/geomet/?lang=en&service=WMS&version=1.3.0&request=GetCapabilities&layers=WEATHERADIO
 Sea Ice Volume (1km), https://geo.weather.gc.ca/geomet/?lang=en&service=WMS&version=1.3.0&request=GetCapabilities&layers=WCPS_1km_SeaIceVol

src/script/mapmlify-layer.js

@@ -94,11 +94,15 @@ class MapmlifyLayer extends HTMLElement {
       this.#selectedProjection = c.projection || 'OSMTILE';
     }
 
-    // Query format default
+    // Query format default (smart selection based on priority)
     if (st === 'WMS') {
-      this.#selectedQueryFormat = c.getFeatureInfoFormats?.[0] || 'text/html';
+      this.#selectedQueryFormat = this.#selectBestQueryFormat(
+        c.getFeatureInfoFormats || []
+      );
     } else if (st === 'WMTS') {
-      this.#selectedQueryFormat = layer.infoFormats?.[0] || 'text/html';
+      this.#selectedQueryFormat = this.#selectBestQueryFormat(
+        layer.infoFormats || []
+      );
     }
 
     // Dimension defaults
@@ -109,7 +113,8 @@ class MapmlifyLayer extends HTMLElement {
     }));
 
     this.#boundsEnabled = true;
-    this.#queryEnabled = false;
+    // Query enabled by default if layer is queryable
+    this.#queryEnabled = this.#layerIsQueryable();
     this.#viewerActive = false;
     this.#sourceCodeVisible = false;
     this.#selectedExportMode = 'individual';
@@ -1432,7 +1437,7 @@ class MapmlifyLayer extends HTMLElement {
         queryLink.setAttribute('data-query-link', 'true');
         queryLink.setAttribute(
           'tref',
-          `${c.baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&sr=${c.wkid}&layers=all:${layer.id}&tolerance=5&mapExtent={xmin},{ymin},{xmax},{ymax}&imageDisplay={w},{h},96&returnGeometry=true&f=html`
+          `${c.baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&sr=${c.wkid}&layers=all:${layer.id}&tolerance=5&mapExtent={xmin},{ymin},{xmax},{ymax}&imageDisplay={w},{h},96&returnGeometry=true&f=json`
         );
         mapExtent.appendChild(queryLink);
       }
@@ -1543,7 +1548,7 @@ class MapmlifyLayer extends HTMLElement {
       queryLink.setAttribute('data-query-link', 'true');
       queryLink.setAttribute(
         'tref',
-        `${c.baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&sr=${c.wkid}&tolerance=5&mapExtent={xmin},{ymin},{xmax},{ymax}&imageDisplay={w},{h},96&returnGeometry=false&returnCatalogItems=true&f=html`
+        `${c.baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&sr=${c.wkid}&tolerance=5&mapExtent={xmin},{ymin},{xmax},{ymax}&imageDisplay={w},{h},96&returnGeometry=false&returnCatalogItems=true&f=json`
       );
       mapExtent.appendChild(queryLink);
     }
@@ -1691,7 +1696,7 @@ class MapmlifyLayer extends HTMLElement {
       queryLink.setAttribute('data-query-link', 'true');
       queryLink.setAttribute(
         'tref',
-        `${c.baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&sr=${c.wkid}&layers=all:${layer.id}&tolerance=5&mapExtent={xmin},{ymin},{xmax},{ymax}&imageDisplay={w},{h},96&returnGeometry=true&f=html`
+        `${c.baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&sr=${c.wkid}&layers=all:${layer.id}&tolerance=5&mapExtent={xmin},{ymin},{xmax},{ymax}&imageDisplay={w},{h},96&returnGeometry=true&f=json`
       );
       mapExtent.appendChild(queryLink);
     } else {
@@ -1731,7 +1736,7 @@ class MapmlifyLayer extends HTMLElement {
       queryLink.setAttribute('data-query-link', 'true');
       queryLink.setAttribute(
         'tref',
-        `${c.baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&sr=${c.wkid}&tolerance=5&mapExtent={xmin},{ymin},{xmax},{ymax}&imageDisplay={w},{h},96&returnGeometry=false&returnCatalogItems=true&f=html`
+        `${c.baseUrl}/identify?geometry={i},{j}&geometryType=esriGeometryPoint&sr=${c.wkid}&tolerance=5&mapExtent={xmin},{ymin},{xmax},{ymax}&imageDisplay={w},{h},96&returnGeometry=false&returnCatalogItems=true&f=json`
       );
       mapExtent.appendChild(queryLink);
     } else {
@@ -1743,6 +1748,39 @@ class MapmlifyLayer extends HTMLElement {
 
   // ─── SHARED HELPERS ───────────────────────────────────
 
+  // Select best query format based on priority:
+  // 1. text/mapml
+  // 2. application/json or application/geo+json
+  // 3. text/html
+  // 4. text/plain
+  // 5. first format in list (fallback)
+  #selectBestQueryFormat(formats) {
+    if (!formats || formats.length === 0) return 'text/html';
+
+    // Check for text/mapml (highest priority)
+    const mapml = formats.find((f) => f.toLowerCase() === 'text/mapml');
+    if (mapml) return mapml;
+
+    // Check for application/json or application/geo+json
+    const json = formats.find(
+      (f) =>
+        f.toLowerCase() === 'application/json' ||
+        f.toLowerCase() === 'application/geo+json'
+    );
+    if (json) return json;
+
+    // Check for text/html
+    const html = formats.find((f) => f.toLowerCase() === 'text/html');
+    if (html) return html;
+
+    // Check for text/plain
+    const plain = formats.find((f) => f.toLowerCase() === 'text/plain');
+    if (plain) return plain;
+
+    // Fallback to first format
+    return formats[0];
+  }
+
   #layerIsQueryable() {
     const c = this.#config;
     const st = c.serviceType;

tests/esri-imageserver.spec.js

@@ -97,19 +97,17 @@ test.describe('ESRI ImageServer — Query', () => {
     await expect(layer.locator('.query-format-selector')).toHaveCount(1);
   });
 
-  test('enabling query adds identify link', async ({ page }) => {
+  test('query enabled by default adds identify link', async ({ page }) => {
     await loadService(page, SERVICE_URL);
     await activateLayer(page, 0);
-    const layer = page.locator('mapmlify-layer').nth(0);
-    await layer.locator('.query-format-selector input[type="checkbox"]').check();
-    // Wait for viewer rebuild
-    await layer.locator('mapml-viewer').waitFor({ timeout: 15000 });
+    // Query is enabled by default for queryable services
     const mapLayer = viewerLocator(page, 0, 'map-layer[data-esri-layer]');
     const queryLink = mapLayer.locator('map-link[rel="query"]');
     await expect(queryLink).toHaveCount(1);
     const tref = await queryLink.getAttribute('tref');
     expect(tref).toContain('/identify?');
     expect(tref).toContain('geometry={i},{j}');
     expect(tref).toContain('geometryType=esriGeometryPoint');
+    expect(tref).toContain('f=json');
   });
 });

tests/esri-mapserver.spec.js

@@ -134,19 +134,17 @@ test.describe('ESRI MapServer (Dynamic)', () => {
     await expect(extent.locator('map-input[name="h"]')).toHaveCount(1);
   });
 
-  test('enabling query adds identify link', async ({ page }) => {
+  test('query enabled by default adds identify link', async ({ page }) => {
     await loadService(page, DYNAMIC_URL);
     await activateLayer(page, 0);
-    const layer = page.locator('mapmlify-layer').nth(0);
-    await layer.locator('.query-format-selector input[type="checkbox"]').check();
-    // Wait for viewer rebuild
-    await layer.locator('mapml-viewer').waitFor({ timeout: 15000 });
+    // Query is enabled by default for queryable services
     const mapLayer = viewerLocator(page, 0, 'map-layer[data-esri-layer]');
     const queryLink = mapLayer.locator('map-link[rel="query"]');
     await expect(queryLink).toHaveCount(1);
     const tref = await queryLink.getAttribute('tref');
     expect(tref).toContain('/identify?');
     expect(tref).toContain('geometry={i},{j}');
     expect(tref).toContain('geometryType=esriGeometryPoint');
+    expect(tref).toContain('f=json');
   });
 });

tests/wms-111.spec.js

@@ -51,9 +51,7 @@ test.describe('WMS 1.1.1 — Version-Specific Parameters', () => {
   test('query tref uses X/Y instead of I/J', async ({ page }) => {
     await loadService(page, SERVICE_URL);
     await activateLayer(page, 0);
-    // Enable query
-    const layer = page.locator('mapmlify-layer').nth(0);
-    await layer.locator('.query-format-selector input[type="checkbox"]').check();
+    // Query is enabled by default
     const queryLink = viewerLocator(page, 0, 'map-link[rel="query"]');
     await expect(queryLink).toHaveCount(1);
     const tref = await queryLink.getAttribute('tref');

tests/wms-130.spec.js

@@ -123,21 +123,18 @@ test.describe('WMS 1.3.0 — Image Link', () => {
 });
 
 test.describe('WMS 1.3.0 — Query Link', () => {
-  test('queryable layer has no query link by default', async ({ page }) => {
+  test('queryable layer has query link by default', async ({ page }) => {
     await loadService(page, SERVICE_URL);
     await activateLayer(page, 0);
-    // Query is disabled by default
+    // Query is enabled by default for queryable layers
     const queryLinks = viewerLocator(page, 0, 'map-link[rel="query"]');
-    await expect(queryLinks).toHaveCount(0);
+    await expect(queryLinks).toHaveCount(1);
   });
 
-  test('enabling query adds query link with I/J params', async ({ page }) => {
+  test('query link uses I/J params for WMS 1.3.0', async ({ page }) => {
     await loadService(page, SERVICE_URL);
     await activateLayer(page, 0);
-    // Enable query checkbox
-    const layer = page.locator('mapmlify-layer').nth(0);
-    await layer.locator('.query-format-selector input[type="checkbox"]').check();
-    // Wait for query link to appear
+    // Query is enabled by default
     const queryLink = viewerLocator(page, 0, 'map-link[rel="query"]');
     await expect(queryLink).toHaveCount(1);
     const tref = await queryLink.getAttribute('tref');

tests/wmts.spec.js

@@ -106,14 +106,10 @@ test.describe('WMTS — Tile Link', () => {
 });
 
 test.describe('WMTS — Query Link', () => {
-  test('queryable layer gets query link when enabled', async ({ page }) => {
+  test('queryable layer gets query link by default', async ({ page }) => {
     await loadService(page, SERVICE_URL);
     await activateLayer(page, 0);
-    // Enable query
-    const layer = page.locator('mapmlify-layer').nth(0);
-    await layer.locator('.query-format-selector input[type="checkbox"]').check();
-    // Wait for viewer rebuild
-    await layer.locator('mapml-viewer').waitFor({ timeout: 15000 });
+    // Query is enabled by default for queryable layers
     const mapLayer = viewerLocator(page, 0, 'map-layer[data-wmts-layer]');
     const queryLink = mapLayer.locator('map-link[rel="query"]');
     await expect(queryLink).toHaveCount(1);