[mapguide-commits] r1350 - in trunk/MgDev/Web/src: mapviewernet
mapviewerphp
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Mar 22 16:25:47 EDT 2007
Author: chrisclaydon
Date: 2007-03-22 16:25:46 -0400 (Thu, 22 Mar 2007)
New Revision: 1350
Modified:
trunk/MgDev/Web/src/mapviewernet/setselection.aspx
trunk/MgDev/Web/src/mapviewerphp/setselection.php
Log:
RFC15 Addendum2 Viewer file updates (except jsp)
Modified: trunk/MgDev/Web/src/mapviewernet/setselection.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/setselection.aspx 2007-03-22 20:18:50 UTC (rev 1349)
+++ trunk/MgDev/Web/src/mapviewernet/setselection.aspx 2007-03-22 20:25:46 UTC (rev 1350)
@@ -79,16 +79,10 @@
MgResourceIdentifier featureSource = new MgResourceIdentifier(layer.GetFeatureSourceId());
MgFeatureReader features = featureSrvc.SelectFeatures(featureSource, featureClassName, query);
int featCount = 0;
- MgGeometry geometry = null;
while (features.ReadNext())
{
if (featCount++ == 1)
break;
- MgClassDefinition classDef = features.GetClassDefinition();
- String geomPropName = classDef.GetDefaultGeometryPropertyName();
- MgByteReader geomReader = features.GetGeometry(geomPropName);
- MgAgfReaderWriter agfRW = new MgAgfReaderWriter();
- geometry = agfRW.Read(geomReader);
}
if (featCount != 1)
{
@@ -98,7 +92,7 @@
MgRenderingService renderingSrvc = (MgRenderingService)site.CreateService(MgServiceType.RenderingService);
MgStringCollection layerNames = new MgStringCollection();
layerNames.Add(layer.GetName());
- MgFeatureInformation featInfo = renderingSrvc.QueryFeatures(map, layerNames, geometry, MgFeatureSpatialOperations.Intersects, 1);
+ MgFeatureInformation featInfo = renderingSrvc.QueryFeatures(map, layerNames, null, MgFeatureSpatialOperations.Intersects, selText, 1, true);
Response.Write(featInfo.ToXml().ToString());
}
}
Modified: trunk/MgDev/Web/src/mapviewerphp/setselection.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/setselection.php 2007-03-22 20:18:50 UTC (rev 1349)
+++ trunk/MgDev/Web/src/mapviewerphp/setselection.php 2007-03-22 20:25:46 UTC (rev 1350)
@@ -68,15 +68,10 @@
$featureSource = new MgResourceIdentifier($layer->GetFeatureSourceId());
$features = $featureSrvc->SelectFeatures($featureSource, $featureClassName, $query);
$featCount = 0;
- $geometry = null;
- while($features->ReadNext()) {
+ while($features->ReadNext())
+ {
if($featCount++ == 1)
break;
- $classDef = $features->GetClassDefinition();
- $geomPropName = $classDef->GetDefaultGeometryPropertyName();
- $geomReader = $features->GetGeometry($geomPropName);
- $agfRW = new MgAgfReaderWriter();
- $geometry = $agfRW->Read($geomReader);
}
if($featCount != 1) {
echo "Error: There must be exactly one feature in the set."; ///NOXLATE dbg report only
@@ -85,7 +80,7 @@
$renderingSrvc = $site->CreateService(MgServiceType::RenderingService);
$layerNames = new MgStringCollection();
$layerNames->Add($layer->GetName());
- $featInfo = $renderingSrvc->QueryFeatures($map, $layerNames, $geometry, MgFeatureSpatialOperations::Intersects, 1);
+ $featInfo = $renderingSrvc->QueryFeatures($map, $layerNames, NULL, MgFeatureSpatialOperations::Intersects, $selText, 1, true);
header('Content-Type: text/xml; charset: UTF-8');
echo $featInfo->ToXml()->ToString();
}
More information about the mapguide-commits
mailing list