Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Benchmark.SpatialLite.Osm/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,28 @@ private static void Main(string[] args)
foreach (var benchmark in benchmarks)
{
long avgTime = avgTime = DoTest(benchmark.Item2, benchmark.Item1);
tw.WriteLine(string.Format("{0} ms \t\t{1}", avgTime, benchmark.Item1));
tw.WriteLine(string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0} ms \t\t{1}", avgTime, benchmark.Item1));
Comment thread
lukaskabrt marked this conversation as resolved.
Outdated
}
}
}
}

private static long DoTest(Action testAction, string testName)
{
Console.WriteLine(string.Format("Starting benchmark '{0}'", testName));
Console.WriteLine(string.Format(System.Globalization.CultureInfo.InvariantCulture, "Starting benchmark '{0}'", testName));

long totalTime = 0;
for (int i = 0; i < 10; i++)
{
Console.Write(string.Format("Run ({0}/{1}) ...", i + 1, 10));
Console.Write(string.Format(System.Globalization.CultureInfo.InvariantCulture, "Run ({0}/{1}) ...", i + 1, 10));
Stopwatch watch = new Stopwatch();
watch.Start();

testAction();

watch.Stop();
totalTime += watch.ElapsedMilliseconds;
Console.WriteLine(string.Format("\t\t({0} ms)", watch.ElapsedMilliseconds));
Console.WriteLine(string.Format(System.Globalization.CultureInfo.InvariantCulture, "\t\t({0} ms)", watch.ElapsedMilliseconds));
}

Console.WriteLine();
Expand Down
4 changes: 2 additions & 2 deletions src/SpatialLite.Core/API/Coordinate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public struct Coordinate : IEquatable<Coordinate>
/// <remarks>
/// The empty coordinate has all coordinates equal to NaN.
/// </remarks>
public static Coordinate Empty = new Coordinate(double.NaN, double.NaN, double.NaN, double.NaN);
public static readonly Coordinate Empty = new Coordinate(double.NaN, double.NaN, double.NaN, double.NaN);

/// <summary>
/// Initializes a new instance of the <c>Coordinate</c> struct with X, Y ordinates.
Expand Down Expand Up @@ -139,7 +139,7 @@ public override readonly string ToString()
/// </summary>
/// <param name="obj">The <c>object</c> to compare with the current <c>Coordinate</c></param>
/// <returns>true if the specified <c>object</c> is equal to the current <c>Coordinate</c>; otherwise, false.</returns>
public override bool Equals(object obj)
public override readonly bool Equals(object obj)
{
Coordinate? other = obj as Coordinate?;
if (other == null)
Expand Down
38 changes: 19 additions & 19 deletions src/SpatialLite.Core/IO/WktWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace SpatialLite.Core.IO;
public class WktWriter : IDisposable
{

private static readonly System.Globalization.CultureInfo _invariantCulture = System.Globalization.CultureInfo.InvariantCulture;
private static readonly System.Globalization.CultureInfo InvariantCulture = System.Globalization.CultureInfo.InvariantCulture;
Comment thread
lukaskabrt marked this conversation as resolved.
Outdated

private bool _disposed = false;
private readonly TextWriter _writer;
Expand Down Expand Up @@ -103,33 +103,33 @@ public static string WriteToString(IGeometry geometry)
/// <param name="writer">The output Stream the Geometry will be written to.</param>
protected static void Write(IGeometry geometry, TextWriter writer)
{
if (geometry is IPoint)
if (geometry is IPoint point)
{
AppendPointTaggedText((IPoint)geometry, writer);
AppendPointTaggedText(point, writer);
}
else if (geometry is ILineString)
else if (geometry is ILineString lineString)
{
AppendLineStringTaggedText((ILineString)geometry, writer);
AppendLineStringTaggedText(lineString, writer);
}
else if (geometry is IPolygon)
else if (geometry is IPolygon polygon)
{
AppendPolygonTaggedText((IPolygon)geometry, writer);
AppendPolygonTaggedText(polygon, writer);
}
else if (geometry is IMultiPoint)
else if (geometry is IMultiPoint multiPoint)
{
AppendMultiPointTaggedText((IMultiPoint)geometry, writer);
AppendMultiPointTaggedText(multiPoint, writer);
}
else if (geometry is IMultiLineString)
else if (geometry is IMultiLineString multiLineString)
{
AppendMultiLineStringTaggedText((IMultiLineString)geometry, writer);
AppendMultiLineStringTaggedText(multiLineString, writer);
}
else if (geometry is IMultiPolygon)
else if (geometry is IMultiPolygon multiPolygon)
{
AppendMultiPolygonTaggetText((IMultiPolygon)geometry, writer);
AppendMultiPolygonTaggetText(multiPolygon, writer);
}
else if (geometry is IGeometryCollection<IGeometry>)
else if (geometry is IGeometryCollection<IGeometry> geometryCollection)
{
AppendGeometryCollectionTaggedText((IGeometryCollection<IGeometry>)geometry, writer);
AppendGeometryCollectionTaggedText(geometryCollection, writer);
}
}

Expand All @@ -140,20 +140,20 @@ protected static void Write(IGeometry geometry, TextWriter writer)
/// <param name="writer">The output Stream to Appent WKT representation to.</param>
private static void AppendCoordinate(Coordinate coordinate, TextWriter writer)
{
writer.Write(coordinate.X.ToString(_invariantCulture));
writer.Write(coordinate.X.ToString(InvariantCulture));
writer.Write(' ');
writer.Write(coordinate.Y.ToString(_invariantCulture));
writer.Write(coordinate.Y.ToString(InvariantCulture));

if (coordinate.Is3D)
{
writer.Write(' ');
writer.Write(coordinate.Z.ToString(_invariantCulture));
writer.Write(coordinate.Z.ToString(InvariantCulture));
}

if (coordinate.IsMeasured)
{
writer.Write(' ');
writer.Write(coordinate.M.ToString(_invariantCulture));
writer.Write(coordinate.M.ToString(InvariantCulture));
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/SpatialLite.Core/Measurements.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ namespace SpatialLite.Core;
public class Measurements
{

private static readonly Measurements _euclidean2D;
private static readonly Measurements _sphere2D;
private static readonly Measurements euclidean2DInstance;
private static readonly Measurements sphere2DInstance;

/// <summary>
/// Initializes static members of the Measurements class.
/// </summary>
static Measurements()
{
_euclidean2D = new Measurements(new Euclidean2DCalculator());
_sphere2D = new Measurements(new Sphere2DCalculator());
euclidean2DInstance = new Measurements(new Euclidean2DCalculator());
sphere2DInstance = new Measurements(new Sphere2DCalculator());
}

/// <summary>
Expand All @@ -38,7 +38,7 @@ public static Measurements Euclidean2D
{
get
{
return _euclidean2D;
return euclidean2DInstance;
}
}

Expand All @@ -49,7 +49,7 @@ public static Measurements Sphere2D
{
get
{
return _sphere2D;
return sphere2DInstance;
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/SpatialLite.Core/Topology.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ namespace SpatialLite.Core;
public class Topology
{

private static readonly Topology _euclidean2D;
private static readonly Topology euclidean2DInstance;

/// <summary>
/// Initializes static members of the Topology class.
/// </summary>
static Topology()
{
_euclidean2D = new Topology(new Euclidean2DLocator());
euclidean2DInstance = new Topology(new Euclidean2DLocator());
}

/// <summary>
Expand All @@ -27,7 +27,7 @@ public static Topology Euclidean2D
{
get
{
return _euclidean2D;
return euclidean2DInstance;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/SpatialLite.Gps/IO/GpxReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ private void InitializeReader()

string version = _xmlReader.GetAttribute("version");
if (version == null || (version != "1.0" && version != "1.1"))
throw new InvalidDataException(string.Format("Invalid version of GPX document. Expected '1.0' or '1.1' found {0}.", version));
throw new InvalidDataException(string.Format(System.Globalization.CultureInfo.InvariantCulture, "Invalid version of GPX document. Expected '1.0' or '1.1' found {0}.", version));

_insideGpx = true;

Expand Down
4 changes: 2 additions & 2 deletions src/SpatialLite.Osm/Geometries/OsmGeometryDatabase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static OsmGeometryDatabase Load(IOsmReader reader, bool ignoreReferential
{
if (!ignoreReferentialErrors)
{
throw new ArgumentException(string.Format("Way (ID = {0}) references missing node.", entityInfo.ID));
throw new ArgumentException(string.Format(System.Globalization.CultureInfo.InvariantCulture, "Way (ID = {0}) references missing node.", entityInfo.ID));
}
}
else
Expand Down Expand Up @@ -79,7 +79,7 @@ public static OsmGeometryDatabase Load(IOsmReader reader, bool ignoreReferential
{
if (!ignoreReferentialErrors)
{
throw new ArgumentException(string.Format("Relation (ID = {0}) references missing OSM entity.", memberInfo.Reference));
throw new ArgumentException(string.Format(System.Globalization.CultureInfo.InvariantCulture, "Relation (ID = {0}) references missing OSM entity.", memberInfo.Reference));
}

db.Relations.Remove(relation);
Expand Down
2 changes: 1 addition & 1 deletion src/SpatialLite.Osm/Geometries/RelationMember.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static RelationMember FromRelationMemberInfo(RelationMemberInfo info, IEn
{
if (throwOnMissing)
{
throw new ArgumentException(string.Format("Referenced Entity (ID = {0}, type = {1}) not found in entities collection.", info.Reference, info.MemberType), "info.Reference");
throw new ArgumentException(string.Format(System.Globalization.CultureInfo.InvariantCulture, "Referenced Entity (ID = {0}, type = {1}) not found in entities collection.", info.Reference, info.MemberType), "info.Reference");
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/SpatialLite.Osm/Geometries/Way.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static Way FromWayInfo(WayInfo info, IEntityCollection<IOsmGeometry> enti
{
if (throwOnMissing)
{
throw new ArgumentException(string.Format("Referenced Node (ID = {0}) not found in entities collection.", nodeID), "info.ID");
throw new ArgumentException(string.Format(System.Globalization.CultureInfo.InvariantCulture, "Referenced Node (ID = {0}) not found in entities collection.", nodeID), "info.ID");
}

return null;
Expand Down
6 changes: 3 additions & 3 deletions src/SpatialLite.Osm/IO/OsmXmlWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ private void WriteRelation(RelationInfo info)
_writer.WriteStartElement("member");
_writer.WriteAttributeString("ref", info.Members[i].Reference.ToString(_culture));
_writer.WriteAttributeString("role", info.Members[i].Role);
_writer.WriteAttributeString("type", info.Members[i].MemberType.ToString().ToLower());
_writer.WriteAttributeString("type", info.Members[i].MemberType.ToString().ToLower(_culture));
_writer.WriteEndElement();
}

Expand Down Expand Up @@ -265,8 +265,8 @@ private void WriteMetadata(EntityMetadata medatata)
_writer.WriteAttributeString("user", medatata.User);
}

_writer.WriteAttributeString("visible", medatata.Visible.ToString().ToLower());
_writer.WriteAttributeString("timestamp", medatata.Timestamp.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"));
_writer.WriteAttributeString("visible", medatata.Visible.ToString().ToLower(_culture));
_writer.WriteAttributeString("timestamp", medatata.Timestamp.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'", _culture));
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/SpatialLite.Osm/IO/PbfReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private void ProcessOsmHeader(OsmHeader header)
{
if (supportedFeatures.Contains(required) == false)
{
throw new NotSupportedException(string.Format("Processing specified PBF file requires '{0}' feature which isn't supported by PbfReader.", required));
throw new NotSupportedException(string.Format(System.Globalization.CultureInfo.InvariantCulture, "Processing specified PBF file requires '{0}' feature which isn't supported by PbfReader.", required));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/SpatialLite.Osm/IO/PbfWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void Write(IEntityInfo entity)

if (entity.Metadata.User == null)
{
throw new ArgumentNullException("Entity.Metadata.User cannot be null.");
throw new ArgumentNullException(nameof(entity), "Entity.Metadata.User cannot be null.");
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/SpatialLite.Osm/RelationMemberInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ public struct RelationMemberInfo
/// <summary>
/// The type of the member (node, way, relation)
/// </summary>
public EntityType MemberType;
public EntityType MemberType { get; set; }

/// <summary>
/// The role of the member in relation
/// </summary>
public string Role;
public string Role { get; set; }

/// <summary>
/// The ID of the member entity
/// </summary>
public long Reference;
public long Reference { get; set; }

/// <summary>
/// Initializes a new instance of the RelationMemberInfo structure with values from specific RelationMember.
Expand Down
4 changes: 2 additions & 2 deletions src/Tests.SpatialLite.Gps/PathHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ internal static class PathHelper
{
private const string TempDirectoryName = "Temp";

private static readonly string _realGpxFilePath = Path.GetFullPath(Path.Combine("Data", "Gpx", "gpx-real-file.gpx"));
public static string RealGpxFilePath => _realGpxFilePath;
private static readonly string RealGpxFilePathValue = Path.GetFullPath(Path.Combine("Data", "Gpx", "gpx-real-file.gpx"));
public static string RealGpxFilePath => RealGpxFilePathValue;

public static string GetTempFilePath(string filename)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void Save_CallsIOsmWriterWriteForAllEntities()
List<IOsmGeometry> written = new();
Mock<IOsmWriter> writerM = new();

writerM.Setup(w => w.Write(It.IsAny<IOsmGeometry>())).Callback<IOsmGeometry>((e) => written.Add(e));
writerM.Setup(w => w.Write(It.IsAny<IOsmGeometry>())).Callback<IOsmGeometry>(written.Add);

OsmGeometryDatabase target = new(_data);
target.Save(writerM.Object);
Expand Down
1 change: 0 additions & 1 deletion src/Tests.SpatialLite.Osm/Geometries/RelationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,4 @@ public void EntityType_Returns_Relation()

Assert.Equal(EntityType.Relation, target.EntityType);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,6 @@ public void Clear_ThowsNotSupportedException()
{
WayCoordinateList target = new(_nodes);

Assert.Throws<NotSupportedException>(() => target.Clear());
Assert.Throws<NotSupportedException>(target.Clear);
}
}
2 changes: 1 addition & 1 deletion src/Tests.SpatialLite.Osm/Geometries/WayTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void Coordinates_GetsPositionOfNodesIfWayCastedToLineString()
{
int id = 11;
Way way = new(id, _nodes);
LineString target = (LineString)way;
LineString target = way;

Assert.Equal(_nodes.Count, target.Coordinates.Count);
for (int i = 0; i < _nodes.Count; i++)
Expand Down
Loading