[mapguide-commits] r6008 - in trunk/Tools/Maestro: MaestroAPITests
OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/CoordinateSystem
OSGeo.MapGuide.MaestroAPI/Expression
OSGeo.MapGuide.MaestroAPI/Feature OSGeo.MapGuide.MaestroAPI.Http
OSGeo.MapGuide.MaestroAPI.Native Thirdparty Thirdparty/NTS
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jul 27 08:43:04 EDT 2011
Author: jng
Date: 2011-07-27 05:43:04 -0700 (Wed, 27 Jul 2011)
New Revision: 6008
Added:
trunk/Tools/Maestro/Thirdparty/NTS/
trunk/Tools/Maestro/Thirdparty/NTS/NetTopologySuite.Merged.dll
trunk/Tools/Maestro/Thirdparty/NTS/readme.txt
Removed:
trunk/Tools/Maestro/Thirdparty/TF.NET/
Modified:
trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlReaderBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlRecord.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeature.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeRecord.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Utility.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ISimpleTransform.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/FdoFunctionNamespace.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ClrFdoTypeMap.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ReaderBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
Log:
#1760: Replace TF.net with NTS
Modified: trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2011-07-27 12:43:04 UTC (rev 6008)
@@ -49,6 +49,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
+ </Reference>
<Reference Include="NMock2, Version=2.0.0.44, Culture=neutral, PublicKeyToken=37d3be0adc87c2b7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Thirdparty\NMock\bin\NMock2.dll</HintPath>
@@ -61,10 +65,6 @@
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
- <Reference Include="Topology, Version=1.0.8.24721, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\TF.NET\Topology.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Properties\SignedAssemblyInfo.cs">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -20,17 +20,21 @@
using System;
using System.Collections.Generic;
using System.Text;
-using Topology.CoordinateSystems;
-using Topology.CoordinateSystems.Transformations;
+using ProjNet.CoordinateSystems.Transformations;
+using ProjNet.CoordinateSystems;
+using GeoAPI.CoordinateSystems.Transformations;
+using GeoAPI.CoordinateSystems;
+using GeoAPI.Geometries;
+using GisSharpBlog.NetTopologySuite.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
{
internal class ActualCoordinateSystem : MeterBasedCoordinateSystem
{
- private Topology.CoordinateSystems.Transformations.ICoordinateTransformation m_transform;
+ private ICoordinateTransformation m_transform;
private const string XY_M = "LOCAL_CS[\"Non-Earth (Meter)\",LOCAL_DATUM[\"Local Datum\",0],UNIT[\"Meter\", 1],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]]";
- internal ActualCoordinateSystem(Topology.CoordinateSystems.ICoordinateSystem coordinateSystem)
+ internal ActualCoordinateSystem(ICoordinateSystem coordinateSystem)
{
if (coordinateSystem == null)
throw new ArgumentNullException("coordinateSystem");
@@ -53,26 +57,26 @@
m_transform = f.CreateFromCoordinateSystems(coordinateSystem, cf.CreateFromWkt(XY_M));
}
- protected override double CalculateScale(Topology.Geometries.IEnvelope bbox, System.Drawing.Size size)
+ protected override double CalculateScale(IEnvelope bbox, System.Drawing.Size size)
{
double[] points = m_transform.MathTransform.Transform(new double[] { bbox.MinX, bbox.MinY, bbox.MaxX, bbox.MaxY });
- Topology.Geometries.IEnvelope localEnv = new Topology.Geometries.Envelope(points[0], points[2], points[1], points[3]);
+ IEnvelope localEnv = new Envelope(points[0], points[2], points[1], points[3]);
return base.CalculateScale(localEnv, size);
}
- protected override Topology.Geometries.IEnvelope AdjustBoundingBox(Topology.Geometries.IEnvelope bbox, double scale, System.Drawing.Size size)
+ protected override IEnvelope AdjustBoundingBox(IEnvelope bbox, double scale, System.Drawing.Size size)
{
double[] points = m_transform.MathTransform.Transform(new double[] { bbox.MinX, bbox.MinY, bbox.MaxX, bbox.MaxY });
- Topology.Geometries.IEnvelope localEnv = new Topology.Geometries.Envelope(points[0], points[2], points[1], points[3]);
+ IEnvelope localEnv = new Envelope(points[0], points[2], points[1], points[3]);
localEnv = base.AdjustBoundingBox(localEnv, scale, size);
points = m_transform.MathTransform.Inverse().Transform(new double[] { localEnv.MinX, localEnv.MinY, localEnv.MaxX, localEnv.MaxY });
- return new Topology.Geometries.Envelope(points[0], points[2], points[1], points[3]);
+ return new Envelope(points[0], points[2], points[1], points[3]);
}
- protected override double DistanceInMeters(Topology.Geometries.IPoint p1, Topology.Geometries.IPoint p2)
+ protected override double DistanceInMeters(IPoint p1, IPoint p2)
{
double[] points = m_transform.MathTransform.Transform(new double[] { p1.X, p1.Y, p2.X, p2.Y });
- return base.DistanceInMeters(new Topology.Geometries.Point(points[0], points[1]), new Topology.Geometries.Point(points[2], points[3]));
+ return base.DistanceInMeters(new Point(points[0], points[1]), new Point(points[2], points[3]));
}
//public override Topology.CoordinateSystems.ICoordinateSystem CoordinateSystem { get { return m_transform.SourceCS; } }
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -20,9 +20,11 @@
using System;
using System.Collections.Generic;
using System.Text;
-using Topology.Geometries;
using System.Drawing;
-using Topology.CoordinateSystems;
+using ProjNet.CoordinateSystems;
+using GeoAPI.CoordinateSystems;
+using GeoAPI.Geometries;
+using GisSharpBlog.NetTopologySuite.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
{
@@ -62,14 +64,14 @@
if (csb == null && coordSys != null)
{
- Topology.CoordinateSystems.IUnit unit = coordSys.GetUnits(0);
- if (unit is Topology.CoordinateSystems.IAngularUnit)
+ IUnit unit = coordSys.GetUnits(0);
+ if (unit is IAngularUnit)
{
- double radians = (unit as Topology.CoordinateSystems.IAngularUnit).RadiansPerUnit;
+ double radians = (unit as IAngularUnit).RadiansPerUnit;
csb = new DegreeBasedCoordinateSystem();
}
- else if (unit is Topology.CoordinateSystems.ILinearUnit)
- csb = new MeterBasedCoordinateSystem(((Topology.CoordinateSystems.ILinearUnit)unit).MetersPerUnit, ((Topology.CoordinateSystems.ILinearUnit)unit).MetersPerUnit);
+ else if (unit is ILinearUnit)
+ csb = new MeterBasedCoordinateSystem(((ILinearUnit)unit).MetersPerUnit, ((ILinearUnit)unit).MetersPerUnit);
}
if (csb == null)
@@ -136,8 +138,8 @@
public double DistanceInMeters(double x1, double y1, double x2, double y2)
{
return DistanceInMeters(
- new Topology.Geometries.Point(x1, y1),
- new Topology.Geometries.Point(x2, y2));
+ new GisSharpBlog.NetTopologySuite.Geometries.Point(x1, y1),
+ new GisSharpBlog.NetTopologySuite.Geometries.Point(x2, y2));
}
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ISimpleTransform.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ISimpleTransform.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ISimpleTransform.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -20,6 +20,10 @@
using System;
using System.Collections.Generic;
using System.Text;
+using GeoAPI.CoordinateSystems.Transformations;
+using GeoAPI.CoordinateSystems;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
{
@@ -46,9 +50,9 @@
/// </summary>
public class DefaultSimpleTransform : ISimpleTransform
{
- private Topology.CoordinateSystems.ICoordinateSystem _source;
- private Topology.CoordinateSystems.ICoordinateSystem _target;
- private Topology.CoordinateSystems.Transformations.ICoordinateTransformation _trans;
+ private ICoordinateSystem _source;
+ private ICoordinateSystem _target;
+ private ICoordinateTransformation _trans;
/// <summary>
/// Initializes a new instance of the <see cref="DefaultSimpleTransform"/> class.
@@ -57,10 +61,10 @@
/// <param name="targetCsWkt">The target cs WKT.</param>
public DefaultSimpleTransform(string sourceCsWkt, string targetCsWkt)
{
- var fact = new Topology.CoordinateSystems.CoordinateSystemFactory();
+ var fact = new CoordinateSystemFactory();
_source = fact.CreateFromWkt(sourceCsWkt);
_target = fact.CreateFromWkt(targetCsWkt);
- var tfact = new Topology.CoordinateSystems.Transformations.CoordinateTransformationFactory();
+ var tfact = new CoordinateTransformationFactory();
_trans = tfact.CreateFromCoordinateSystems(_source, _target);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -20,8 +20,9 @@
using System;
using System.Collections.Generic;
using System.Text;
-using Topology.Geometries;
using System.Drawing;
+using GeoAPI.Geometries;
+using GisSharpBlog.NetTopologySuite.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
{
@@ -50,7 +51,7 @@
public override double MetersPerUnitY { get { return UDM_Y; } }
- protected override double CalculateScale(IEnvelope bbox, Size size)
+ protected override double CalculateScale(GeoAPI.Geometries.IEnvelope bbox, Size size)
{
double picture_width_in_meters = (size.Width / DPI) / IPM;
double picture_height_in_meters = (size.Height / DPI) / IPM;
@@ -64,7 +65,7 @@
return Math.Max(width_scale, height_scale);
}
- protected override Topology.Geometries.IEnvelope AdjustBoundingBox(IEnvelope bbox, double scale, Size size)
+ protected override IEnvelope AdjustBoundingBox(IEnvelope bbox, double scale, Size size)
{
double picture_width_in_meters = ((size.Width / DPI) / IPM) * scale;
double picture_height_in_meters = ((size.Height / DPI) / IPM) * scale;
@@ -75,7 +76,7 @@
return new Envelope(bbox.Centre.X - (width_extent / 2), bbox.Centre.X + (width_extent / 2), bbox.Centre.Y - (height_extent / 2), bbox.Centre.Y + (height_extent / 2));
}
- protected override double DistanceInMeters(Topology.Geometries.IPoint p1, Topology.Geometries.IPoint p2)
+ protected override double DistanceInMeters(IPoint p1, IPoint p2)
{
double xdist = Math.Abs(p1.X - p2.X);
double ydist = Math.Abs(p1.Y - p2.Y);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/FdoFunctionNamespace.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/FdoFunctionNamespace.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/FdoFunctionNamespace.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -20,7 +20,7 @@
using System;
using System.Collections.Generic;
using System.Text;
-using Topology.Geometries;
+using GeoAPI.Geometries;
#pragma warning disable 1591, 0114, 0108
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ClrFdoTypeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ClrFdoTypeMap.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ClrFdoTypeMap.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -21,7 +21,7 @@
using System.Collections.Generic;
using System.Text;
using OSGeo.MapGuide.MaestroAPI.Schema;
-using Topology.Geometries;
+using GeoAPI.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.Feature
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -21,7 +21,6 @@
using System.Collections.Generic;
using System.Text;
using OSGeo.MapGuide.MaestroAPI.Schema;
-using Topology.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.Feature
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -20,7 +20,7 @@
using System;
using System.Collections.Generic;
using System.Text;
-using Topology.Geometries;
+using GeoAPI.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.Feature
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -21,7 +21,7 @@
using System.Collections.Generic;
using System.Text;
using OSGeo.MapGuide.MaestroAPI.Schema;
-using Topology.Geometries;
+using GeoAPI.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.Feature
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ReaderBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ReaderBase.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ReaderBase.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -20,6 +20,7 @@
using System;
using System.Collections.Generic;
using System.Text;
+using GeoAPI.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.Feature
{
@@ -122,7 +123,7 @@
return this.Current.GetString(name);
}
- public Topology.Geometries.IGeometry GetGeometry(string name)
+ public IGeometry GetGeometry(string name)
{
return this.Current.GetGeometry(name);
}
@@ -182,7 +183,7 @@
return this.Current.GetString(index);
}
- public Topology.Geometries.IGeometry GetGeometry(int index)
+ public IGeometry GetGeometry(int index)
{
return this.Current.GetGeometry(index);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -21,6 +21,7 @@
using System.Collections.Generic;
using System.Text;
using OSGeo.MapGuide.MaestroAPI.Schema;
+using GeoAPI.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.Feature
{
@@ -122,7 +123,7 @@
return ((StringValue)_values[name]).Value;
}
- public Topology.Geometries.IGeometry GetGeometry(string name)
+ public IGeometry GetGeometry(string name)
{
return ((GeometryValue)_values[name]).Value;
}
@@ -187,7 +188,7 @@
return GetString(_ordinalMap[index]);
}
- public Topology.Geometries.IGeometry GetGeometry(int index)
+ public IGeometry GetGeometry(int index)
{
return GetGeometry(_ordinalMap[index]);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2011-07-27 12:43:04 UTC (rev 6008)
@@ -39,14 +39,14 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Thirdparty\Flee\lib\Ciloci.Flee.dll</HintPath>
</Reference>
+ <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
- <Reference Include="Topology, Version=1.0.8.24721, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\TF.NET\Topology.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Generated\ApplicationDefinition-1.0.0.designer.cs">
@@ -485,6 +485,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Geometry\" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -36,6 +36,7 @@
using System.Collections.Specialized;
using OSGeo.MapGuide.MaestroAPI.Schema;
using OSGeo.MapGuide.MaestroAPI.Feature;
+using GeoAPI.Geometries;
namespace OSGeo.MapGuide.MaestroAPI
{
@@ -1565,7 +1566,7 @@
{
if (fsr.ReadNext())
{
- Topology.Geometries.IGeometry geom = fsr["extent"] as Topology.Geometries.IGeometry;
+ IGeometry geom = fsr["extent"] as IGeometry;
if (geom == null)
{
throw new Exception("No data found in resource: " + resourceID);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -19,7 +19,6 @@
#endregion
using System;
using System.Drawing;
-using Topology.Geometries;
using System.Collections.Generic;
using OSGeo.MapGuide.MaestroAPI.IO;
using OSGeo.MapGuide.MaestroAPI.Schema;
@@ -27,6 +26,7 @@
using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
using OSGeo.MapGuide.ObjectModels;
using System.Xml;
+using GeoAPI.Geometries;
namespace OSGeo.MapGuide.MaestroAPI
{
@@ -445,7 +445,7 @@
/// </summary>
public static Type GeometryType
{
- get { return typeof(Topology.Geometries.IGeometry); }
+ get { return typeof(IGeometry); }
}
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2011-07-27 12:43:04 UTC (rev 6008)
@@ -34,15 +34,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
- <Reference Include="Topology, Version=1.0.8.24721, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\TF.NET\Topology.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Properties\GlobalAssemblyInfo.cs">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlReaderBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlReaderBase.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlReaderBase.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -24,6 +24,7 @@
using System.IO;
using System.Xml;
using OSGeo.MapGuide.MaestroAPI.Schema;
+using GisSharpBlog.NetTopologySuite.IO;
namespace OSGeo.MapGuide.MaestroAPI.Http
{
@@ -31,7 +32,7 @@
public abstract class XmlReaderBase : ReaderBase
{
- protected Topology.IO.WKTReader _wktReader;
+ protected WKTReader _wktReader;
protected XmlTextReader _reader;
protected XmlProperty[] _properties;
@@ -62,7 +63,7 @@
public XmlReaderBase(Stream source)
{
_reader = new XmlTextReader(source);
- _wktReader = new Topology.IO.WKTReader();
+ _wktReader = new WKTReader();
_reader.WhitespaceHandling = WhitespaceHandling.Significant;
_propertyMap = new Dictionary<string, XmlProperty>();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlRecord.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlRecord.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlRecord.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -23,6 +23,7 @@
using OSGeo.MapGuide.MaestroAPI.Feature;
using OSGeo.MapGuide.MaestroAPI.Schema;
using System.Xml;
+using GisSharpBlog.NetTopologySuite.IO;
namespace OSGeo.MapGuide.MaestroAPI.Http
{
@@ -41,7 +42,7 @@
public class XmlRecord : RecordBase
{
- public XmlRecord(XmlProperty[] properties, Topology.IO.WKTReader wktReader, XmlNodeList propertyNodes, string nameElement, string valueElement)
+ public XmlRecord(XmlProperty[] properties, WKTReader wktReader, XmlNodeList propertyNodes, string nameElement, string valueElement)
{
for (int i = 0; i < properties.Length; i++)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -22,20 +22,21 @@
using System.Text;
using OSGeo.MapGuide.MaestroAPI.Feature;
using OSGeo.MapGuide.MaestroAPI.Schema;
+using GisSharpBlog.NetTopologySuite.IO;
namespace OSGeo.MapGuide.MaestroAPI.Native
{
public class LocalNativeDataReader : ReaderBase
{
private MgDataReader _reader;
- private Topology.IO.WKTReader _mgReader;
+ private WKTReader _mgReader;
private MgAgfReaderWriter _agfRw;
private MgWktReaderWriter _wktRw;
public LocalNativeDataReader(MgDataReader reader)
{
_reader = reader;
- _mgReader = new Topology.IO.WKTReader();
+ _mgReader = new WKTReader();
_agfRw = new MgAgfReaderWriter();
_wktRw = new MgWktReaderWriter();
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeature.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeature.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeature.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -22,12 +22,13 @@
using System.Text;
using OSGeo.MapGuide.MaestroAPI.Feature;
using OSGeo.MapGuide.MaestroAPI.Schema;
+using GisSharpBlog.NetTopologySuite.IO;
namespace OSGeo.MapGuide.MaestroAPI.Native
{
public class LocalNativeFeature : FeatureBase
{
- public LocalNativeFeature(MgFeatureReader reader, Topology.IO.WKTReader mgReader, MgAgfReaderWriter agfRw, MgWktReaderWriter wktRw)
+ public LocalNativeFeature(MgFeatureReader reader, WKTReader mgReader, MgAgfReaderWriter agfRw, MgWktReaderWriter wktRw)
: base(Utility.ConvertClassDefinition(reader.GetClassDefinition()))
{
for (int i = 0; i < reader.GetPropertyCount(); i++)
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -22,20 +22,21 @@
using System.Text;
using OSGeo.MapGuide.MaestroAPI.Exceptions;
using OSGeo.MapGuide.MaestroAPI.Feature;
+using GisSharpBlog.NetTopologySuite.IO;
namespace OSGeo.MapGuide.MaestroAPI.Native
{
public class LocalNativeFeatureReader : FeatureReaderBase
{
private MgFeatureReader _reader;
- private Topology.IO.WKTReader _mgReader;
+ private WKTReader _mgReader;
private MgAgfReaderWriter _agfRw;
private MgWktReaderWriter _wktRw;
public LocalNativeFeatureReader(MgFeatureReader reader)
{
_reader = reader;
- _mgReader = new Topology.IO.WKTReader();
+ _mgReader = new WKTReader();
_agfRw = new MgAgfReaderWriter();
_wktRw = new MgWktReaderWriter();
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeRecord.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeRecord.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeRecord.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -22,12 +22,13 @@
using System.Text;
using OSGeo.MapGuide.MaestroAPI.Feature;
using OSGeo.MapGuide.MaestroAPI.Schema;
+using GisSharpBlog.NetTopologySuite.IO;
namespace OSGeo.MapGuide.MaestroAPI.Native
{
public class LocalNativeRecord : RecordBase
{
- public LocalNativeRecord(MgReader reader, Topology.IO.WKTReader mgReader, MgAgfReaderWriter agfRw, MgWktReaderWriter wktRw)
+ public LocalNativeRecord(MgReader reader, WKTReader mgReader, MgAgfReaderWriter agfRw, MgWktReaderWriter wktRw)
{
for (int i = 0; i < reader.GetPropertyCount(); i++)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -22,20 +22,21 @@
using System.Text;
using OSGeo.MapGuide.MaestroAPI.Feature;
using OSGeo.MapGuide.MaestroAPI.Schema;
+using GisSharpBlog.NetTopologySuite.IO;
namespace OSGeo.MapGuide.MaestroAPI.Native
{
public class LocalNativeSqlReader : ReaderBase
{
private MgSqlDataReader _reader;
- private Topology.IO.WKTReader _mgReader;
+ private WKTReader _mgReader;
private MgAgfReaderWriter _agfRw;
private MgWktReaderWriter _wktRw;
public LocalNativeSqlReader(MgSqlDataReader reader)
{
_reader = reader;
- _mgReader = new Topology.IO.WKTReader();
+ _mgReader = new WKTReader();
_agfRw = new MgAgfReaderWriter();
_wktRw = new MgWktReaderWriter();
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native.csproj 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native.csproj 2011-07-27 12:43:04 UTC (rev 6008)
@@ -38,18 +38,14 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Thirdparty\MapGuideDotNetApi\MapGuideDotNetApi.dll</HintPath>
</Reference>
+ <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
- <Reference Include="Topology, Version=1.0.8.24721, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\TF.NET\Topology.dll</HintPath>
- </Reference>
- <Reference Include="Topology.IO.MapGuide, Version=1.0.8.40022, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\TF.NET\Topology.IO.MapGuide.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Properties\GlobalAssemblyInfo.cs">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Utility.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Utility.cs 2011-07-27 10:08:16 UTC (rev 6007)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Utility.cs 2011-07-27 12:43:04 UTC (rev 6008)
@@ -22,6 +22,7 @@
using System.Text;
using System.Drawing;
using OSGeo.MapGuide.MaestroAPI.Schema;
+using GeoAPI.Geometries;
namespace OSGeo.MapGuide.MaestroAPI.Native
{
@@ -121,7 +122,7 @@
/// </summary>
public static Type GeometryType
{
- get { return typeof(Topology.Geometries.IGeometry); }
+ get { return typeof(IGeometry); }
}
/// <summary>
Added: trunk/Tools/Maestro/Thirdparty/NTS/NetTopologySuite.Merged.dll
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Thirdparty/NTS/NetTopologySuite.Merged.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Thirdparty/NTS/readme.txt
===================================================================
--- trunk/Tools/Maestro/Thirdparty/NTS/readme.txt (rev 0)
+++ trunk/Tools/Maestro/Thirdparty/NTS/readme.txt 2011-07-27 12:43:04 UTC (rev 6008)
@@ -0,0 +1,3 @@
+This is a monolithic version of NetTopologySuite 1.8.
+
+NetTopologySuite and its dependent assemblies were combined with ILMerge
\ No newline at end of file
More information about the mapguide-commits
mailing list