From svn_fusion at osgeo.org Mon Feb 24 01:45:08 2025 From: svn_fusion at osgeo.org (svn_fusion at osgeo.org) Date: Mon, 24 Feb 2025 01:45:08 -0800 Subject: [fusion-commits] r3064 - trunk/layers/MapGuide Message-ID: <20250224094508.A99D01C3FE0@trac.osgeo.org> Author: jng Date: 2025-02-24 01:45:05 -0800 (Mon, 24 Feb 2025) New Revision: 3064 Modified: trunk/layers/MapGuide/MapGuide.js Log: Fix clean JSON check. MG 3.3 no longer exists as it has been "upgraded" to 4.0 Modified: trunk/layers/MapGuide/MapGuide.js =================================================================== --- trunk/layers/MapGuide/MapGuide.js 2023-04-10 14:38:32 UTC (rev 3063) +++ trunk/layers/MapGuide/MapGuide.js 2025-02-24 09:45:05 UTC (rev 3064) @@ -203,10 +203,8 @@ if (vMajor > 2) { // 3.0 or higher this.bUseNativeServices = true; this.bHasTileSetSupport = true; - if (vMajor == 3) { // 3.x - if (vMinor >= 3) { // >= 3.3 - this.bHasCleanJsonSupport = true; - } + if (vMajor == 4) { // 4.x + this.bHasCleanJsonSupport = true; } } else { if (vMajor == 2) { // 2.x @@ -324,7 +322,7 @@ r.setParams({ version: "3.0.0" }); } if (this.bHasCleanJsonSupport) { //Clean json means no de-arrayification of responses required - r.setParams({ version: "3.3.0", clean: 1 }); + r.setParams({ version: "4.0.0", clean: 1 }); } var mapName = this.calcMapName(resourceId, true); r.setParams({ @@ -1473,7 +1471,7 @@ this.selectionColor, this.selectionImageFormat); if (this.bHasCleanJsonSupport) { //Clean json means no de-arrayification of responses required - r.setParams({ version: "3.3.0", clean: 1 }); + r.setParams({ version: "4.0.0", clean: 1 }); } var callback = OpenLayers.Function.bind(this.onNativeSelectionUpdate, this, zoomTo, returnAttributes); // use 'post' because selText could be a long string. @@ -1754,7 +1752,7 @@ this.selectionColor, this.selectionImageFormat); if (this.bHasCleanJsonSupport) { //Clean json means no de-arrayification of responses required - r.setParams({ version: "3.3.0", clean: 1 }); + r.setParams({ version: "4.0.0", clean: 1 }); } var callback = (options.extendSelection == true) ? OpenLayers.Function.bind(this.processAndMergeExtendedFeatureInfo, this) : OpenLayers.Function.bind(this.processExtendedFeatureInfo, this); // use 'post' because filter could be a long string. @@ -2034,7 +2032,7 @@ this.selectionColor, this.selectionImageFormat); if (this.bHasCleanJsonSupport) { //Clean json means no de-arrayification of responses required - r.setParams({ version: "3.3.0", clean: 1 }); + r.setParams({ version: "4.0.0", clean: 1 }); } oBroker.dispatchRequest(r, OpenLayers.Function.bind(this.parseMapTip, this)); } else {