Skip to content
This repository was archived by the owner on Jun 22, 2023. It is now read-only.

Commit 7b2110a

Browse files
committed
Fix build script files
1 parent 6594ddd commit 7b2110a

20 files changed

+772
-643
lines changed

GeoAPI.Pcl/BitConverterEx.cs

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,45 @@
1-
using System;
2-
3-
namespace GeoAPI
4-
{
5-
public static class BitConverterEx
6-
{
7-
public static Int64 DoubleToInt64Bits(double self)
8-
{
9-
var tmp = BitConverter.GetBytes(self);
10-
return BitConverter.ToInt64(tmp, 0);
11-
}
12-
13-
public static Double Int64BitsToDouble(Int64 self)
14-
{
15-
var tmp = BitConverter.GetBytes(self);
16-
return BitConverter.ToDouble(tmp, 0);
17-
}
18-
}
19-
20-
public interface ICloneable
21-
{
22-
object Clone();
23-
}
1+
using System;
2+
3+
namespace GeoAPI
4+
{
5+
/// <summary>
6+
/// A framework replacement for the System.BitConverter class
7+
/// </summary>
8+
/// <remarks>Only partial functionality is provided!</remarks>
9+
internal static class BitConverterEx
10+
{
11+
/// <summary>
12+
/// Function to convert the bits of a double to a the bits of a long
13+
/// </summary>
14+
/// <param name="self">The double value</param>
15+
/// <returns>The long value</returns>
16+
public static Int64 DoubleToInt64Bits(double self)
17+
{
18+
var tmp = BitConverter.GetBytes(self);
19+
return BitConverter.ToInt64(tmp, 0);
20+
}
21+
22+
/// <summary>
23+
/// Function to convert the bits of a long to a the bits of a double
24+
/// </summary>
25+
/// <param name="self">The long value</param>
26+
/// <returns>The double value</returns>
27+
public static Double Int64BitsToDouble(Int64 self)
28+
{
29+
var tmp = BitConverter.GetBytes(self);
30+
return BitConverter.ToDouble(tmp, 0);
31+
}
32+
}
33+
34+
/// <summary>
35+
/// A framework replacement for the System.ICloneable interface.
36+
/// </summary>
37+
public interface ICloneable
38+
{
39+
/// <summary>
40+
/// Function to create a new object that is a (deep) copy of the current instance.
41+
/// </summary>
42+
/// <returns>A new object that is a copy of this instance.</returns>
43+
object Clone();
44+
}
2445
}
Lines changed: 108 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,108 @@
1-
// Copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
2-
//
3-
// This file is part of SharpMap.
4-
// SharpMap is free software; you can redistribute it and/or modify
5-
// it under the terms of the GNU Lesser General Public License as published by
6-
// the Free Software Foundation; either version 2 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// SharpMap is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU Lesser General Public License for more details.
13-
14-
// You should have received a copy of the GNU Lesser General Public License
15-
// along with SharpMap; if not, write to the Free Software
16-
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17-
18-
using System;
19-
using System.Globalization;
20-
21-
namespace GeoAPI.CoordinateSystems
22-
{
23-
/// <summary>
24-
/// A named projection parameter value.
25-
/// </summary>
26-
/// <remarks>
27-
/// The linear units of parameters' values match the linear units of the containing
28-
/// projected coordinate system. The angular units of parameter values match the
29-
/// angular units of the geographic coordinate system that the projected coordinate
30-
/// system is based on. (Notice that this is different from <see cref="Parameter"/>,
31-
/// where the units are always meters and degrees.)
32-
/// </remarks>
33-
#if !PCL
34-
[Serializable]
35-
#endif
36-
public class ProjectionParameter
37-
{
38-
/// <summary>
39-
/// Initializes an instance of a ProjectionParameter
40-
/// </summary>
41-
/// <param name="name">Name of parameter</param>
42-
/// <param name="value">Parameter value</param>
43-
public ProjectionParameter(string name, double value)
44-
{
45-
_Name = name;
46-
_Value = value;
47-
}
48-
49-
50-
private string _Name;
51-
52-
/// <summary>
53-
/// Parameter name.
54-
/// </summary>
55-
public string Name
56-
{
57-
get { return _Name; }
58-
set { _Name = value; }
59-
}
60-
61-
private double _Value;
62-
63-
/// <summary>
64-
/// Parameter value.
65-
/// The linear units of a parameters' values match the linear units of the containing
66-
/// projected coordinate system. The angular units of parameter values match the
67-
/// angular units of the geographic coordinate system that the projected coordinate
68-
/// system is based on.
69-
/// </summary>
70-
public double Value
71-
{
72-
get { return _Value; }
73-
set { _Value = value; }
74-
}
75-
76-
/// <summary>
77-
/// Returns the Well-known text for this object
78-
/// as defined in the simple features specification.
79-
/// </summary>
80-
public string WKT
81-
{
82-
get
83-
{
84-
return String.Format(CultureInfo.InvariantCulture.NumberFormat, "PARAMETER[\"{0}\", {1}]", Name, Value);
85-
}
86-
}
87-
88-
/// <summary>
89-
/// Gets an XML representation of this object
90-
/// </summary>
91-
public string XML
92-
{
93-
get
94-
{
95-
return String.Format(CultureInfo.InvariantCulture.NumberFormat, "<CS_ProjectionParameter Name=\"{0}\" Value=\"{1}\"/>", Name, Value);
96-
}
97-
}
98-
99-
public override string ToString()
100-
{
101-
return string.Format("ProjektionParamter '{0}': {1}", Name, Value);
102-
}
103-
}
104-
}
1+
// Copyright 2005, 2006 - Morten Nielsen (www.iter.dk)
2+
//
3+
// This file is part of SharpMap.
4+
// SharpMap is free software; you can redistribute it and/or modify
5+
// it under the terms of the GNU Lesser General Public License as published by
6+
// the Free Software Foundation; either version 2 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// SharpMap is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Lesser General Public License for more details.
13+
14+
// You should have received a copy of the GNU Lesser General Public License
15+
// along with SharpMap; if not, write to the Free Software
16+
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17+
18+
using System;
19+
using System.Globalization;
20+
21+
namespace GeoAPI.CoordinateSystems
22+
{
23+
/// <summary>
24+
/// A named projection parameter value.
25+
/// </summary>
26+
/// <remarks>
27+
/// The linear units of parameters' values match the linear units of the containing
28+
/// projected coordinate system. The angular units of parameter values match the
29+
/// angular units of the geographic coordinate system that the projected coordinate
30+
/// system is based on. (Notice that this is different from <see cref="Parameter"/>,
31+
/// where the units are always meters and degrees.)
32+
/// </remarks>
33+
#if !PCL
34+
[Serializable]
35+
#endif
36+
public class ProjectionParameter
37+
{
38+
/// <summary>
39+
/// Initializes an instance of a ProjectionParameter
40+
/// </summary>
41+
/// <param name="name">Name of parameter</param>
42+
/// <param name="value">Parameter value</param>
43+
public ProjectionParameter(string name, double value)
44+
{
45+
_Name = name;
46+
_Value = value;
47+
}
48+
49+
50+
private string _Name;
51+
52+
/// <summary>
53+
/// Parameter name.
54+
/// </summary>
55+
public string Name
56+
{
57+
get { return _Name; }
58+
set { _Name = value; }
59+
}
60+
61+
private double _Value;
62+
63+
/// <summary>
64+
/// Parameter value.
65+
/// The linear units of a parameters' values match the linear units of the containing
66+
/// projected coordinate system. The angular units of parameter values match the
67+
/// angular units of the geographic coordinate system that the projected coordinate
68+
/// system is based on.
69+
/// </summary>
70+
public double Value
71+
{
72+
get { return _Value; }
73+
set { _Value = value; }
74+
}
75+
76+
/// <summary>
77+
/// Returns the Well-known text for this object
78+
/// as defined in the simple features specification.
79+
/// </summary>
80+
public string WKT
81+
{
82+
get
83+
{
84+
return String.Format(CultureInfo.InvariantCulture.NumberFormat, "PARAMETER[\"{0}\", {1}]", Name, Value);
85+
}
86+
}
87+
88+
/// <summary>
89+
/// Gets an XML representation of this object
90+
/// </summary>
91+
public string XML
92+
{
93+
get
94+
{
95+
return string.Format(CultureInfo.InvariantCulture.NumberFormat, "<CS_ProjectionParameter Name=\"{0}\" Value=\"{1}\"/>", Name, Value);
96+
}
97+
}
98+
99+
/// <summary>
100+
/// Function to get a textual representation of this envelope
101+
/// </summary>
102+
/// <returns>A textual representation of this envelope</returns>
103+
public override string ToString()
104+
{
105+
return string.Format("ProjectionParameter '{0}': {1}", Name, Value);
106+
}
107+
}
108+
}

GeoAPI/GeoAPI.csproj

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<!-- Define SolutionDir if not already set -->
5-
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(ProjectDir)..\</SolutionDir>
5+
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)\..</SolutionDir>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>
88
<ProductVersion>8.0.50727</ProductVersion>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</ProjectGuid>
@@ -14,34 +14,7 @@
1414
<AssemblyName>GeoAPI</AssemblyName>
1515
<SignAssembly>true</SignAssembly>
1616
<AssemblyOriginatorKeyFile>..\geoapi.snk</AssemblyOriginatorKeyFile>
17-
<SccProjectName>
18-
</SccProjectName>
19-
<SccLocalPath>
20-
</SccLocalPath>
21-
<SccAuxPath>
22-
</SccAuxPath>
23-
<SccProvider>
24-
</SccProvider>
2517
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
26-
<FileUpgradeFlags>
27-
</FileUpgradeFlags>
28-
<OldToolsVersion>2.0</OldToolsVersion>
29-
<UpgradeBackupLocation />
30-
<PublishUrl>publish\</PublishUrl>
31-
<Install>true</Install>
32-
<InstallFrom>Disk</InstallFrom>
33-
<UpdateEnabled>false</UpdateEnabled>
34-
<UpdateMode>Foreground</UpdateMode>
35-
<UpdateInterval>7</UpdateInterval>
36-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
37-
<UpdatePeriodically>false</UpdatePeriodically>
38-
<UpdateRequired>false</UpdateRequired>
39-
<MapFileExtensions>true</MapFileExtensions>
40-
<ApplicationRevision>0</ApplicationRevision>
41-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
42-
<IsWebBootstrapper>false</IsWebBootstrapper>
43-
<UseApplicationTrust>false</UseApplicationTrust>
44-
<BootstrapperEnabled>false</BootstrapperEnabled>
4518
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
4619
</PropertyGroup>
4720
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -59,7 +32,7 @@
5932
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
6033
<DebugType>pdbonly</DebugType>
6134
<Optimize>true</Optimize>
62-
<OutputPath>$(SolutionDir)$(Configuration)\$(TargetFrameworkIdentifier)$(TargetFrameworkVersion)\$(Platform)\</OutputPath>
35+
<OutputPath>$(SolutionDir)$(Configuration)\$(TargetFrameworkVersion)\$(Platform)\</OutputPath>
6336
<DefineConstants>TRACE</DefineConstants>
6437
<ErrorReport>prompt</ErrorReport>
6538
<WarningLevel>4</WarningLevel>
@@ -163,23 +136,6 @@
163136
<Folder Include="CoordinateSystems\Projections\" />
164137
<Folder Include="Features\" />
165138
</ItemGroup>
166-
<ItemGroup>
167-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
168-
<Visible>False</Visible>
169-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
170-
<Install>false</Install>
171-
</BootstrapperPackage>
172-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
173-
<Visible>False</Visible>
174-
<ProductName>.NET Framework 3.5 SP1</ProductName>
175-
<Install>true</Install>
176-
</BootstrapperPackage>
177-
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
178-
<Visible>False</Visible>
179-
<ProductName>Windows Installer 3.1</ProductName>
180-
<Install>true</Install>
181-
</BootstrapperPackage>
182-
</ItemGroup>
183139
<ItemGroup>
184140
<Reference Include="System.Data" />
185141
</ItemGroup>
@@ -192,11 +148,6 @@
192148
<Content Include="License.txt" />
193149
</ItemGroup>
194150
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
195-
<ProjectExtensions>
196-
<VisualStudio>
197-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
198-
</VisualStudio>
199-
</ProjectExtensions>
200151
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
201152
Other similar extension points exist, see Microsoft.Common.targets.-->
202153
<Target Name="BeforeBuild">

GeoAPI/Geometries/Envelope.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,10 @@ private static int GetHashCode(double value)
818818
// return !(obj1 == obj2);
819819
//}
820820

821+
/// <summary>
822+
/// Function to get a textual representation of this envelope
823+
/// </summary>
824+
/// <returns>A textual representation of this envelope</returns>
821825
public override string ToString()
822826
{
823827
var sb = new StringBuilder("Env[");

GeoAPI/Geometries/ICoordinateSequenceFilter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ namespace GeoAPI.Geometries
2424
/// An exception to this rule is when a new Geometry has been created via <see cref="ICloneable.Clone()"/>.
2525
/// In this case mutating the Geometry will not cause aliasing issues,
2626
/// and a filter is a convenient way to implement coordinate transformation.
27-
2827
/// </para>
2928
///</remarks>
3029
/// <author>Martin Davis</author>

0 commit comments

Comments
 (0)