[mapguide-commits] r8195 - in sandbox/jng/tiling/Web/src: mapviewerjava mapviewernet mapviewerphp

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-06-10 05:45:04 -0700 (Tue, 10 Jun 2014)
New Revision: 8195

Modified:
   sandbox/jng/tiling/Web/src/mapviewerjava/legend.jsp
   sandbox/jng/tiling/Web/src/mapviewernet/legend.aspx
   sandbox/jng/tiling/Web/src/mapviewerphp/legend.php
Log:
Update AJAX viewer files to support Map Definitions linked to Tile Sets.

Modified: sandbox/jng/tiling/Web/src/mapviewerjava/legend.jsp
===================================================================
--- sandbox/jng/tiling/Web/src/mapviewerjava/legend.jsp	2014-06-10 10:08:48 UTC (rev 8194)
+++ sandbox/jng/tiling/Web/src/mapviewerjava/legend.jsp	2014-06-10 12:45:04 UTC (rev 8195)
@@ -78,7 +78,7 @@
 {
     output = new StringBuffer("\nvar layerData = new Array();\n");
     intermediateVar = 0;
-    
+
     // Initialize web tier with the site configuration file.
     InitializeWebTier();
 
@@ -299,7 +299,7 @@
                                                            rtLayerGroup.GetDisplayInLegend()? "true": "false",
                                                            rtLayerGroup.GetObjectId(),
                                                            StrEscape(rtLayerGroup.GetName()),
-                                                           rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMap? "true": "false"}));
+                                                           (rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMap || rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMapFromTileSet)? "true": "false"}));
                     }
                     else
                     {

Modified: sandbox/jng/tiling/Web/src/mapviewernet/legend.aspx
===================================================================
--- sandbox/jng/tiling/Web/src/mapviewernet/legend.aspx	2014-06-10 10:08:48 UTC (rev 8194)
+++ sandbox/jng/tiling/Web/src/mapviewernet/legend.aspx	2014-06-10 12:45:04 UTC (rev 8195)
@@ -302,7 +302,7 @@
                                                         rtLayerGroup.GetDisplayInLegend() ? "true" : "false",
                                                         rtLayerGroup.GetObjectId(),
                                                         StrEscape(rtLayerGroup.GetName()),
-                                                        rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMap? "true": "false"));
+                                                        (rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMap || rtLayerGroup.GetLayerGroupType() == MgLayerGroupType.BaseMapFromTileSet)? "true": "false"));
                     }
                     else
                     {

Modified: sandbox/jng/tiling/Web/src/mapviewerphp/legend.php
===================================================================
--- sandbox/jng/tiling/Web/src/mapviewerphp/legend.php	2014-06-10 10:08:48 UTC (rev 8194)
+++ sandbox/jng/tiling/Web/src/mapviewerphp/legend.php	2014-06-10 12:45:04 UTC (rev 8195)
@@ -231,7 +231,7 @@
                                                         $node->rtObject->GetDisplayInLegend()? "true": "false",
                                                         $node->rtObject->GetObjectId(),
                                                         StrEscape($node->rtObject->GetName()),
-                                                        $node->rtObject->GetLayerGroupType() == MgLayerGroupType::BaseMap? "true": "false");
+                                                        ($node->rtObject->GetLayerGroupType() == MgLayerGroupType::BaseMap || $node->rtObject->GetLayerGroupType() == MgLayerGroupType::BaseMapFromTileSet)? "true": "false");
                     }
                     else
                     {