[mapguide-commits] r8300 - in trunk/MgDev: . Doc/devguide/source Doc/samples/dotnetsamples Doc/samples/dotnetsamples/working_with_feature_data Doc/samples/phpsamples Doc/samples/phpsamples/working_with_feature_data UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers_Advanced
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jul 10 05:06:21 PDT 2014
Author: jng
Date: 2014-07-10 05:06:21 -0700 (Thu, 10 Jul 2014)
New Revision: 8300
Modified:
trunk/MgDev/
trunk/MgDev/Doc/devguide/source/revision_history.rst
trunk/MgDev/Doc/devguide/source/working_with_feature_data.rst
trunk/MgDev/Doc/samples/dotnetsamples/readme.txt
trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/queryfeatures.aspx
trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/selectfeatures.aspx
trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/task_pane.aspx
trunk/MgDev/Doc/samples/phpsamples/readme.txt
trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/listselection.php
trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/queryfeatures.php
trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/selectfeatures.php
trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/task_pane.php
trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Districts.LayerDefinition_CONTENT.xml
trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers_Advanced/Districts.LayerDefinition_CONTENT.xml
Log:
Merged revision(s) 8299 from branches/2.6/MgDev:
#2466: Fix VotingDistricts layer in Sheboygan sample. The id used does not match the description of the feature. This submission fixes the Layer Definitions to use the correct ID.
Also, the developer's guide has been updated to use the correct district ID. Also the district number used in the example has been changed from 1 to 6 as going through each section of the samples sequentially produces more visible changes with district 6 instead of district 1.
........
Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212,8214,8217,8220-8221,8223-8225
/sandbox/rfc94:5099-5163
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212,8214,8217,8220-8221,8223-8225
/sandbox/rfc94:5099-5163
Modified: trunk/MgDev/Doc/devguide/source/revision_history.rst
===================================================================
--- trunk/MgDev/Doc/devguide/source/revision_history.rst 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/devguide/source/revision_history.rst 2014-07-10 12:06:21 UTC (rev 8300)
@@ -10,6 +10,9 @@
+---------+-----------------+-----------------+--------------------------------------------------------------+
| Version | Authors | Date | Summary of Changes |
+=========+=================+=================+==============================================================+
+| 2.0.1 | Jackie Ng | Jul 2014 | Updated code sample in section "Working with Feature Data" |
+| | | | to reflect the updated Sheboygan sample data set |
++=========+=================+=================+==============================================================+
| 2.0 | Jackie Ng | | First version of developer's guide in source form |
| | | | |
| | | | Added .net and Java code samples to match PHP examples |
Modified: trunk/MgDev/Doc/devguide/source/working_with_feature_data.rst
===================================================================
--- trunk/MgDev/Doc/devguide/source/working_with_feature_data.rst 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/devguide/source/working_with_feature_data.rst 2014-07-10 12:06:21 UTC (rev 8300)
@@ -328,7 +328,7 @@
``MgAgfReaderWriter::Read()`` method.
For example, the following sequence creates an ``MgGeometry`` object representing
-the boundaries of District 1 in the Sheboygan sample data.
+the boundaries of District 6 in the Sheboygan sample data.
**PHP**
@@ -336,11 +336,11 @@
.. code-block:: php
$districtQuery = new MgFeatureQueryOptions();
- $districtQuery->SetFilter("Autogenerated_SDF_ID = 1");
+ $districtQuery->SetFilter("ID = '1'");
$layer = $map->GetLayers()->GetItem('Districts');
$featureReader = $layer->SelectFeatures($districtQuery);
$featureReader->ReadNext();
- $districtGeometryData = $featureReader->GetGeometry('Data');
+ $districtGeometryData = $featureReader->GetGeometry($layer->GetFeatureGeometryName());
$agfReaderWriter = new MgAgfReaderWriter();
$districtGeometry = $agfReaderWriter->Read($districtGeometryData);
@@ -351,11 +351,11 @@
//This code fragment assumes you have imported the OSGeo.MapGuide namespace
MgFeatureQueryOptions districtQuery = new MgFeatureQueryOptions();
- districtQuery.SetFilter("Autogenerated_SDF_ID = 1");
+ districtQuery.SetFilter("ID = '1'");
MgLayer layer = (MgLayer)map.GetLayers().GetItem("Districts");
MgFeatureReader featureReader = layer.SelectFeatures(districtQuery);
featureReader.ReadNext();
- MgByteReader districtGeometryData = featureReader.GetGeometry("Data");
+ MgByteReader districtGeometryData = featureReader.GetGeometry(layer.GetFeatureGeometryName());
MgAgfReaderWriter agfReaderWriter = new MgAgfReaderWriter();
MgGeometry districtGeometry = agfReaderWriter.Read(districtGeometryData);
@@ -370,7 +370,7 @@
MgLayer layer = (MgLayer)map.GetLayers().GetItem("Districts");
MgFeatureReader featureReader = layer.SelectFeatures(districtQuery);
featureReader.ReadNext();
- MgByteReader districtGeometryData = featureReader.GetGeometry("Data");
+ MgByteReader districtGeometryData = featureReader.GetGeometry(layer.GetFeatureGeometryName());
MgAgfReaderWriter agfReaderWriter = new MgAgfReaderWriter();
MgGeometry districtGeometry = agfReaderWriter.Read(districtGeometryData);
@@ -467,7 +467,7 @@
selected features. See the Working With Feature Data sample, in the Developer's
Guide samples, for the complete version.
-It selects parcels within the boundaries of District 1 that are owned by
+It selects parcels within the boundaries of District 6 that are owned by
``SCHMITT``. This requires a spatial filter and a basic filter.
**PHP**
@@ -478,15 +478,15 @@
$map = new MgMap($siteConnection);
$map->Open($mapName);
- // Get the geometry for the boundaries of District 1
+ // Get the geometry for the boundaries of District 6
$districtQuery = new MgFeatureQueryOptions();
- $districtQuery->SetFilter("Autogenerated_SDF_ID = 1");
+ $districtQuery->SetFilter("ID = '6'");
$layer = $map->GetLayers()->GetItem('Districts');
$featureReader = $layer->SelectFeatures($districtQuery);
$featureReader->ReadNext();
- $districtGeometryData = $featureReader->GetGeometry('Data');
+ $districtGeometryData = $featureReader->GetGeometry($layer->GetFeatureGeometryName());
$featureReader->Close();
// Convert the AGF binary data to MgGeometry.
@@ -511,7 +511,7 @@
// For each selected feature, display the address.
echo '<p>Properties owned by Schmitt ';
- echo 'in District 1</p><p>';
+ echo 'in District 6</p><p>';
while ($featureReader->ReadNext())
{
@@ -530,14 +530,14 @@
MgMap map = new MgMap(siteConnection);
map.Open(mapName);
- // Get the geometry for the boundaries of District 1
+ // Get the geometry for the boundaries of District 6
MgFeatureQueryOptions districtQuery = new MgFeatureQueryOptions();
- districtQuery.SetFilter("Autogenerated_SDF_ID = 1");
+ districtQuery.SetFilter("ID = '6'");
MgLayer layer = (MgLayer)map.GetLayers().GetItem("Districts");
MgFeatureReader featureReader = layer.SelectFeatures(districtQuery);
featureReader.ReadNext();
- MgByteReader districtGeometryData = featureReader.GetGeometry("Data");
+ MgByteReader districtGeometryData = featureReader.GetGeometry(layer.GetFeatureGeometryName());
featureReader.Close();
// Convert the AGF binary data to MgGeometry
@@ -558,7 +558,7 @@
// For each selected feature, display the address
Response.Write("<p>Properties owned by Schmitt ");
- Response.Write("in District 1</p><p>");
+ Response.Write("in District 6</p><p>");
while (featureReader.ReadNext())
{
@@ -577,14 +577,14 @@
MgMap map = new MgMap(siteConnection);
map.Open(mapName);
- // Get the geometry for the boundaries of District 1
+ // Get the geometry for the boundaries of District 6
MgFeatureQueryOptions districtQuery = new MgFeatureQueryOptions();
- districtQuery.SetFilter("Autogenerated_SDF_ID = 1");
+ districtQuery.SetFilter("ID = '6'");
MgLayer layer = (MgLayer)map.GetLayers().GetItem("Districts");
MgFeatureReader featureReader = layer.SelectFeatures(districtQuery);
featureReader.ReadNext();
- MgByteReader districtGeometryData = featureReader.GetGeometry("Data");
+ MgByteReader districtGeometryData = featureReader.GetGeometry(layer.GetFeatureGeometryName());
featureReader.Close();
// Convert the AGF binary data to MgGeometry
@@ -605,7 +605,7 @@
// For each selected feature, display the address
response.getWriter().write("<p>Properties owned by Schmitt ");
- response.getWriter().write("in District 1</p><p>");
+ response.getWriter().write("in District 6</p><p>");
while (featureReader.ReadNext())
{
@@ -1014,15 +1014,15 @@
$map = new MgMap($siteConnection);
$map->Open($mapName);
- // Get the geometry for the boundaries of District 1
+ // Get the geometry for the boundaries of District 6
$districtQuery = new MgFeatureQueryOptions();
- $districtQuery->SetFilter("Autogenerated_SDF_ID = 1");
+ $districtQuery->SetFilter("ID = '6'");
$layer = $map->GetLayers()->GetItem('Districts');
$featureReader = $layer->SelectFeatures($districtQuery);
$featureReader->ReadNext();
- $districtGeometryData = $featureReader->GetGeometry('Data');
+ $districtGeometryData = $featureReader->GetGeometry($layer->GetFeatureGeometryName());
// Convert the AGF binary data to MgGeometry.
@@ -1093,17 +1093,17 @@
MgMap map = new MgMap(siteConnection);
map.Open(mapName);
- // Get the geometry for the boundaries of District 1
+ // Get the geometry for the boundaries of District 6
MgFeatureQueryOptions districtQuery = new MgFeatureQueryOptions();
- districtQuery.SetFilter("Autogenerated_SDF_ID = 1");
+ districtQuery.SetFilter("ID = '6'");
MgLayerBase layer = map.GetLayers().GetItem("Districts");
MgFeatureReader featureReader = layer.SelectFeatures(districtQuery);
MgByteReader districtGeometryData = null;
try {
featureReader.ReadNext();
- districtGeometryData = featureReader.GetGeometry("Data");
+ districtGeometryData = featureReader.GetGeometry(layer.GetFeatureGeometryName());
} finally { //Ensures the reader is closed regardless
featureReader.Close();
}
Modified: trunk/MgDev/Doc/samples/dotnetsamples/readme.txt
===================================================================
--- trunk/MgDev/Doc/samples/dotnetsamples/readme.txt 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/samples/dotnetsamples/readme.txt 2014-07-10 12:06:21 UTC (rev 8300)
@@ -6,6 +6,9 @@
Notes
-----
+You must use the Sheboygan sample data set that was released with MapGuide Open Source 2.6 or newer. This dataset has been updated and
+these samples have been updated to work against this version of the data set.
+
These samples assume that MapGuide Open Source is installed in the default location in
C:\Program Files\OSGeo\MapGuide
Modified: trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/queryfeatures.aspx
===================================================================
--- trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/queryfeatures.aspx 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/queryfeatures.aspx 2014-07-10 12:06:21 UTC (rev 8300)
@@ -62,17 +62,17 @@
MgMap map = new MgMap(siteConnection);
map.Open(mapName);
- // Get the geometry for the boundaries of District 1
+ // Get the geometry for the boundaries of District 6
MgFeatureQueryOptions districtQuery = new MgFeatureQueryOptions();
- districtQuery.SetFilter("Autogenerated_SDF_ID = 1");
+ districtQuery.SetFilter("ID = '6'");
MgLayerBase layer = map.GetLayers().GetItem("Districts");
MgFeatureReader featureReader = layer.SelectFeatures(districtQuery);
MgByteReader districtGeometryData = null;
try {
featureReader.ReadNext();
- districtGeometryData = featureReader.GetGeometry("Data");
+ districtGeometryData = featureReader.GetGeometry(layer.GetFeatureGeometryName());
} finally { //Ensures this block is always run
featureReader.Close();
}
@@ -98,7 +98,7 @@
// For each selected feature, display the address.
Response.Write("<p>Properties owned by Schmitt ");
- Response.Write("in District 1</p><p>");
+ Response.Write("in District 6</p><p>");
try {
while (featureReader.ReadNext())
Modified: trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/selectfeatures.aspx
===================================================================
--- trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/selectfeatures.aspx 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/selectfeatures.aspx 2014-07-10 12:06:21 UTC (rev 8300)
@@ -62,17 +62,17 @@
MgMap map = new MgMap(siteConnection);
map.Open(mapName);
- // Get the geometry for the boundaries of District 1
+ // Get the geometry for the boundaries of District 6
MgFeatureQueryOptions districtQuery = new MgFeatureQueryOptions();
- districtQuery.SetFilter("Autogenerated_SDF_ID = 1");
+ districtQuery.SetFilter("ID = '6'");
MgLayerBase layer = map.GetLayers().GetItem("Districts");
MgFeatureReader featureReader = layer.SelectFeatures(districtQuery);
MgByteReader districtGeometryData = null;
try {
featureReader.ReadNext();
- districtGeometryData = featureReader.GetGeometry("Data");
+ districtGeometryData = featureReader.GetGeometry(layer.GetFeatureGeometryName());
} finally { //Ensures the reader is closed regardless
featureReader.Close();
}
@@ -99,7 +99,7 @@
selection.AddFeatures(layer, featureReader, 0);
selectionXml = selection.ToXml();
- Response.Write("Selecting parcels owned by Schmitt in District 1");
+ Response.Write("Selecting parcels owned by Schmitt in District 6");
}
catch (MgException e)
{
Modified: trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/task_pane.aspx
===================================================================
--- trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/task_pane.aspx 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/samples/dotnetsamples/working_with_feature_data/task_pane.aspx 2014-07-10 12:06:21 UTC (rev 8300)
@@ -34,7 +34,7 @@
<script language="javascript">
function ZoomToDistrict()
{
- parent.parent.ZoomToView(-87.726134, 43.770338, 8000, true);
+ parent.parent.ZoomToView(-87.727698, 43.735028, 8000, true);
}
function listSelection()
{
@@ -57,12 +57,12 @@
%>
<ul>
<li>
- <a href="#" onclick="ZoomToDistrict();" >Zoom to District 1</a>
- <br />Position the map to display parcels in District 1
+ <a href="#" onclick="ZoomToDistrict();" >Zoom to District 6</a>
+ <br />Position the map to display parcels in District 6
</li>
<li>
<a href="queryfeatures.aspx?SESSION=<%= sessionId %>&MAPNAME=<%= mapName %>" >Query features</a>
- <br />List properties in District 1 owned by Schmitt
+ <br />List properties in District 6 owned by Schmitt
<br/>
<%
String fullPath = Server.MapPath("queryfeatures.aspx");
@@ -71,7 +71,7 @@
</li>
<li>
<a href="selectfeatures.aspx?SESSION=<%= sessionId %>&MAPNAME=<%= mapName %>" >Set active selection</a>
- <br />Select properties in District 1 owned by Schmitt
+ <br />Select properties in District 6 owned by Schmitt
<br/>
<%
fullPath = Server.MapPath("selectfeatures.aspx");
Modified: trunk/MgDev/Doc/samples/phpsamples/readme.txt
===================================================================
--- trunk/MgDev/Doc/samples/phpsamples/readme.txt 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/samples/phpsamples/readme.txt 2014-07-10 12:06:21 UTC (rev 8300)
@@ -6,6 +6,9 @@
Notes
-----
+You must use the Sheboygan sample data set that was released with MapGuide Open Source 2.6 or newer. This dataset has been updated and
+these samples have been updated to work against this version of the data set.
+
These samples assume that MapGuide Open Source is installed in the default location in
C:\Program Files\OSGeo\MapGuide
Modified: trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/listselection.php
===================================================================
--- trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/listselection.php 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/listselection.php 2014-07-10 12:06:21 UTC (rev 8300)
@@ -110,6 +110,7 @@
$val = $featureReader->GetString('NAME') . '<br /> ' . $featureReader->GetString('RPROPAD');
echo $val . '<br />';
}
+ $featureReader->Close();
}
}
}
Modified: trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/queryfeatures.php
===================================================================
--- trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/queryfeatures.php 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/queryfeatures.php 2014-07-10 12:06:21 UTC (rev 8300)
@@ -53,9 +53,11 @@
$map = new MgMap($siteConnection);
$map->Open($mapName);
- // Get the geometry for the boundaries of District 1
+ // Get the geometry for the boundaries of District 6
$districtQuery = new MgFeatureQueryOptions();
+ $districtQuery->SetFilter("ID = '6'"); //ID property is string
+
$layer = $map->GetLayers()->GetItem('Districts');
$classDef = $layer->GetClassDefinition();
$clsIdProps = $classDef->GetIdentityProperties();
@@ -90,13 +92,14 @@
// For each selected feature, display the address.
echo '<p>Properties owned by Schmitt ';
- echo 'in District 1</p><p>';
+ echo 'in District 6</p><p>';
while ($featureReader->ReadNext())
{
$val = $featureReader->GetString('RPROPAD');
echo $val . '<br />';
}
+ $featureReader->Close();
echo '</p>';
}
catch (MgException $e)
Modified: trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/selectfeatures.php
===================================================================
--- trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/selectfeatures.php 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/selectfeatures.php 2014-07-10 12:06:21 UTC (rev 8300)
@@ -55,22 +55,15 @@
$map = new MgMap($siteConnection);
$map->Open($mapName);
- // Get the geometry for the boundaries of District 1
+ // Get the geometry for the boundaries of District 6
$layer = $map->GetLayers()->GetItem('Districts');
- // Use the layer's class definition to determine its identity property and geometry property name
- $clsDef = $layer->GetClassDefinition();
- $idProps = $clsDef->GetIdentityProperties();
- $idProp = $idProps->GetItem(0);
- $idName = $idProp->GetName();
- $geomName = $clsDef->GetDefaultGeometryPropertyName();
-
$districtQuery = new MgFeatureQueryOptions();
- $districtQuery->SetFilter("$idName = 1");
+ $districtQuery->SetFilter("ID = '6'"); //ID property is string
$featureReader = $layer->SelectFeatures($districtQuery);
$featureReader->ReadNext();
- $districtGeometryData = $featureReader->GetGeometry($geomName);
+ $districtGeometryData = $featureReader->GetGeometry($layer->GetFeatureGeometryName());
// Convert the AGF binary data to MgGeometry.
@@ -95,7 +88,7 @@
$selection->AddFeatures($layer, $featureReader, 0);
$selectionXml = $selection->ToXml();
- echo 'Selecting parcels owned by Schmitt in District 1';
+ echo 'Selecting parcels owned by Schmitt in District 6';
}
catch (MgException $e)
{
Modified: trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/task_pane.php
===================================================================
--- trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/task_pane.php 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/Doc/samples/phpsamples/working_with_feature_data/task_pane.php 2014-07-10 12:06:21 UTC (rev 8300)
@@ -24,7 +24,7 @@
<script language="javascript">
function ZoomToDistrict()
{
- parent.parent.ZoomToView(-87.726134, 43.770338, 8000, true);
+ parent.parent.ZoomToView(-87.727698, 43.735028, 8000, true);
}
function listSelection()
{
@@ -48,12 +48,12 @@
?>
<ul>
<li>
- <a href="#" onclick="ZoomToDistrict();" >Zoom to District 1</a>
- <br />Position the map to display parcels in District 1
+ <a href="#" onclick="ZoomToDistrict();" >Zoom to District 6</a>
+ <br />Position the map to display parcels in District 6
</li>
<li>
<a href="queryfeatures.php?SESSION=<?= $sessionId ?>&MAPNAME=<?= $mapName ?>" >Query features</a>
- <br />List properties in District 1 owned by Schmitt
+ <br />List properties in District 6 owned by Schmitt
<br/>
<?php
$fileName = 'queryfeatures.php';
@@ -64,7 +64,7 @@
</li>
<li>
<a href="selectfeatures.php?SESSION=<?= $sessionId ?>&MAPNAME=<?= $mapName ?>" >Set active selection</a>
- <br />Select properties in District 1 owned by Schmitt
+ <br />Select properties in District 6 owned by Schmitt
<br/>
<?php
$fileName = 'selectfeatures.php';
Modified: trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Districts.LayerDefinition_CONTENT.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Districts.LayerDefinition_CONTENT.xml 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers/Districts.LayerDefinition_CONTENT.xml 2014-07-10 12:06:21 UTC (rev 8300)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.0.0" xsi:noNamespaceSchemaLocation="LayerDefinition-1.0.0.xsd">
<VectorLayerDefinition>
<ResourceId>Library://Samples/Sheboygan/Data/VotingDistricts.FeatureSource</ResourceId>
@@ -9,13 +9,13 @@
<MinScale>10000</MinScale>
<AreaTypeStyle>
<AreaRule>
- <LegendLabel/>
+ <LegendLabel />
<Label>
<Unit>Points</Unit>
<SizeContext>DeviceUnits</SizeContext>
<SizeX>0</SizeX>
<SizeY>10</SizeY>
- <Text>concat('District ', FeatId)</Text>
+ <Text>concat('District ', ID)</Text>
<FontName>Verdana</FontName>
<ForegroundColor>FF625231</ForegroundColor>
<BackgroundColor>FFFFFFFF</BackgroundColor>
Modified: trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers_Advanced/Districts.LayerDefinition_CONTENT.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers_Advanced/Districts.LayerDefinition_CONTENT.xml 2014-07-10 11:54:30 UTC (rev 8299)
+++ trunk/MgDev/UnitTest/TestData/Samples/Sheboygan/Library/Samples/Sheboygan/Layers_Advanced/Districts.LayerDefinition_CONTENT.xml 2014-07-10 12:06:21 UTC (rev 8300)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<LayerDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="2.4.0" xsi:noNamespaceSchemaLocation="LayerDefinition-2.4.0.xsd">
<VectorLayerDefinition>
<ResourceId>Library://Samples/Sheboygan/Data/VotingDistricts.FeatureSource</ResourceId>
- <Watermarks/>
+ <Watermarks />
<FeatureName>Default:VotingDistricts</FeatureName>
<FeatureNameType>FeatureClass</FeatureNameType>
<Geometry>Geometry</Geometry>
@@ -10,7 +10,7 @@
<MinScale>10000</MinScale>
<CompositeTypeStyle>
<CompositeRule>
- <LegendLabel/>
+ <LegendLabel />
<CompositeSymbolization>
<SymbolInstance>
<SimpleSymbolDefinition>
@@ -192,21 +192,21 @@
</Parameter>
<Parameter>
<Identifier>GHOSTCOLOR</Identifier>
- <DefaultValue/>
+ <DefaultValue />
<DisplayName>Ghost Color</DisplayName>
<Description>Ghost Color</Description>
<DataType>GhostColor</DataType>
</Parameter>
<Parameter>
<Identifier>FRAMELINECOLOR</Identifier>
- <DefaultValue/>
+ <DefaultValue />
<DisplayName>Frame Line Color</DisplayName>
<Description>Frame Line Color</Description>
<DataType>FrameLineColor</DataType>
</Parameter>
<Parameter>
<Identifier>FRAMEFILLCOLOR</Identifier>
- <DefaultValue/>
+ <DefaultValue />
<DisplayName>Frame Fill Color</DisplayName>
<Description>Frame Fill Color</Description>
<DataType>FrameFillColor</DataType>
@@ -259,7 +259,7 @@
<Override>
<SymbolName>MTEXT</SymbolName>
<ParameterIdentifier>CONTENT</ParameterIdentifier>
- <ParameterValue>Concat('District ', FeatId)</ParameterValue>
+ <ParameterValue>Concat('District ', ID)</ParameterValue>
</Override>
<Override>
<SymbolName>MTEXT</SymbolName>
More information about the mapguide-commits
mailing list