[mapguide-commits] r8207 - in sandbox/jng/tiling/Web/src: mapviewerjava mapviewernet mapviewerphp
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Jun 14 08:02:09 PDT 2014
Author: jng
Date: 2014-06-14 08:02:09 -0700 (Sat, 14 Jun 2014)
New Revision: 8207
Modified:
sandbox/jng/tiling/Web/src/mapviewerjava/mapframe.jsp
sandbox/jng/tiling/Web/src/mapviewernet/mapframe.aspx
sandbox/jng/tiling/Web/src/mapviewerphp/mapframe.php
Log:
Update AJAX viewers in light of the moving of GetTileSetDefinition() from MgLayerGroup to MgMap
Modified: sandbox/jng/tiling/Web/src/mapviewerjava/mapframe.jsp
===================================================================
--- sandbox/jng/tiling/Web/src/mapviewerjava/mapframe.jsp 2014-06-14 14:57:54 UTC (rev 8206)
+++ sandbox/jng/tiling/Web/src/mapviewerjava/mapframe.jsp 2014-06-14 15:02:09 UTC (rev 8207)
@@ -92,16 +92,26 @@
MgSiteConnection site = new MgSiteConnection();
site.Open(userInfo);
- MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
- int tileSizeX = tileSrvc.GetDefaultTileSizeX();
- int tileSizeY = tileSrvc.GetDefaultTileSizeY();
-
MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
- MgMap map = new MgMap();
+ MgMap map = new MgMap(site);
MgResourceIdentifier resId = new MgResourceIdentifier(mapDefinition);
String mapName = resId.GetName();
- map.Create(resourceSrvc, resId, mapName);
+ map.Create(resId, mapName);
+
+ MgResourceIdentifier tileSetId = map.GetTileSetDefinition();
+
+ MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
+ int tileSizeX = tileSrvc.GetDefaultTileSizeX();
+ int tileSizeY = tileSrvc.GetDefaultTileSizeY();
+ if (null != tileSetId)
+ {
+ //Overwrite the map definition with tile set id (this is for GETTILE requests) and
+ //use size settings from that tile set
+ mapDefinition = tileSetId.ToString();
+ tileSizeX = tileSrvc.GetDefaultTileSizeX(tileSetId);
+ tileSizeY = tileSrvc.GetDefaultTileSizeY(tileSetId);
+ }
//create an empty selection object and store it in the session repository
MgSelection sel = new MgSelection(map);
Modified: sandbox/jng/tiling/Web/src/mapviewernet/mapframe.aspx
===================================================================
--- sandbox/jng/tiling/Web/src/mapviewernet/mapframe.aspx 2014-06-14 14:57:54 UTC (rev 8206)
+++ sandbox/jng/tiling/Web/src/mapviewernet/mapframe.aspx 2014-06-14 15:02:09 UTC (rev 8207)
@@ -97,16 +97,24 @@
MgSiteConnection site = new MgSiteConnection();
site.Open(userInfo);
- MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
- int tileSizeX = tileSrvc.GetDefaultTileSizeX();
- int tileSizeY = tileSrvc.GetDefaultTileSizeY();
-
MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
- MgMap map = new MgMap();
+ MgMap map = new MgMap(site);
MgResourceIdentifier resId = new MgResourceIdentifier(mapDefinition);
String mapName = resId.GetName();
- map.Create(resourceSrvc, resId, mapName);
+ map.Create(resId, mapName);
+
+ MgTileService tileSrvc = (MgTileService)site.CreateService(MgServiceType.TileService);
+ int tileSizeX = tileSrvc.GetDefaultTileSizeX();
+ int tileSizeY = tileSrvc.GetDefaultTileSizeY();
+ if (null != tileSetId)
+ {
+ //Overwrite the map definition with tile set id (this is for GETTILE requests) and
+ //use size settings from that tile set
+ mapDefinition = tileSetId.ToString();
+ tileSizeX = tileSrvc.GetDefaultTileSizeX(tileSetId);
+ tileSizeY = tileSrvc.GetDefaultTileSizeY(tileSetId);
+ }
//create an empty selection object and store it in the session repository
MgSelection sel = new MgSelection(map);
Modified: sandbox/jng/tiling/Web/src/mapviewerphp/mapframe.php
===================================================================
--- sandbox/jng/tiling/Web/src/mapviewerphp/mapframe.php 2014-06-14 14:57:54 UTC (rev 8206)
+++ sandbox/jng/tiling/Web/src/mapviewerphp/mapframe.php 2014-06-14 15:02:09 UTC (rev 8207)
@@ -75,17 +75,26 @@
$site = new MgSiteConnection();
$site->Open($userInfo);
- $tileSrvc = $site->CreateService(MgServiceType::TileService);
-
- $tileSizeX = $tileSrvc->GetDefaultTileSizeX();
- $tileSizeY = $tileSrvc->GetDefaultTileSizeY();
-
$resourceSrvc = $site->CreateService(MgServiceType::ResourceService);
- $map = new MgMap();
+ $map = new MgMap($site);
$resId = new MgResourceIdentifier($mapDefinition);
$mapName = $resId->GetName();
- $map->Create($resourceSrvc, $resId, $mapName);
+ $map->Create($resId, $mapName);
+
+ $tileSetId = $map->GetTileSetDefinition();
+
+ $tileSrvc = $site->CreateService(MgServiceType::TileService);
+ $tileSizeX = $tileSrvc->GetDefaultTileSizeX();
+ $tileSizeY = $tileSrvc->GetDefaultTileSizeY();
+ if (NULL != $tileSetId)
+ {
+ //Overwrite the map definition with tile set id (this is for GETTILE requests) and
+ //use size settings from that tile set
+ $mapDefinition = $tileSetId->ToString();
+ $tileSizeX = $tileSrvc->GetDefaultTileSizeX($tileSetId);
+ $tileSizeY = $tileSrvc->GetDefaultTileSizeY($tileSetId);
+ }
//create an empty selection object and store it in the session repository
$sel = new MgSelection($map);
More information about the mapguide-commits
mailing list