diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..f2a3aa4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*.cs] +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true +insert_final_newline = true +dotnet_style_predefined_type_for_locals_parameters_members = true:error +dotnet_style_predefined_type_for_member_access = true:error +csharp_style_var_for_built_in_types = false:error +csharp_style_var_when_type_is_apparent = true:error +csharp_style_var_elsewhere = true:error diff --git a/src/NetTopologySuite.IO.SqlServerBytes/Serialization/Geography.cs b/src/NetTopologySuite.IO.SqlServerBytes/Serialization/Geography.cs index d2f994b..fc0219c 100644 --- a/src/NetTopologySuite.IO.SqlServerBytes/Serialization/Geography.cs +++ b/src/NetTopologySuite.IO.SqlServerBytes/Serialization/Geography.cs @@ -48,20 +48,20 @@ public static Geography ReadFrom(BinaryReader reader) geography.IsLargerThanAHemisphere = properties.HasFlag(SerializationProperties.IsLargerThanAHemisphere); } - var numberOfPoints = properties.HasFlag(SerializationProperties.IsSinglePoint) + int numberOfPoints = properties.HasFlag(SerializationProperties.IsSinglePoint) ? 1 : properties.HasFlag(SerializationProperties.IsSingleLineSegment) ? 2 : reader.ReadInt32(); - for (var i = 0; i < numberOfPoints; i++) + for (int i = 0; i < numberOfPoints; i++) { geography.Points.Add(Point.ReadFrom(reader)); } if (properties.HasFlag(SerializationProperties.HasZValues)) { - for (var i = 0; i < numberOfPoints; i++) + for (int i = 0; i < numberOfPoints; i++) { geography.ZValues.Add(reader.ReadDouble()); } @@ -69,13 +69,13 @@ public static Geography ReadFrom(BinaryReader reader) if (properties.HasFlag(SerializationProperties.HasMValues)) { - for (var i = 0; i < numberOfPoints; i++) + for (int i = 0; i < numberOfPoints; i++) { geography.MValues.Add(reader.ReadDouble()); } } - var hasSegments = false; + bool hasSegments = false; if (properties.HasFlag(SerializationProperties.IsSinglePoint) || properties.HasFlag(SerializationProperties.IsSingleLineSegment)) @@ -89,9 +89,9 @@ public static Geography ReadFrom(BinaryReader reader) } else { - var numberOfFigures = reader.ReadInt32(); + int numberOfFigures = reader.ReadInt32(); - for (var i = 0; i < numberOfFigures; i++) + for (int i = 0; i < numberOfFigures; i++) { var figure = Figure.ReadFrom(reader); @@ -124,9 +124,9 @@ public static Geography ReadFrom(BinaryReader reader) } else { - var numberOfShapes = reader.ReadInt32(); + int numberOfShapes = reader.ReadInt32(); - for (var i = 0; i < numberOfShapes; i++) + for (int i = 0; i < numberOfShapes; i++) { geography.Shapes.Add(Shape.ReadFrom(reader)); } @@ -134,9 +134,9 @@ public static Geography ReadFrom(BinaryReader reader) if (hasSegments) { - var numberOfSegments = reader.ReadInt32(); + int numberOfSegments = reader.ReadInt32(); - for (var i = 0; i < numberOfSegments; i++) + for (int i = 0; i < numberOfSegments; i++) { geography.Segments.Add(Segment.ReadFrom(reader)); } @@ -199,12 +199,12 @@ public void WriteTo(BinaryWriter writer) point.WriteTo(writer); } - foreach (var z in ZValues) + foreach (double z in ZValues) { writer.Write(z); } - foreach (var m in MValues) + foreach (double m in MValues) { writer.Write(m); } @@ -221,7 +221,7 @@ public void WriteTo(BinaryWriter writer) { // For version 1, we need to keep track of each figure's shape to determine whether a polygon's ring is // internal or external - for (var shapeIndex = 0; shapeIndex < Shapes.Count; shapeIndex++) + for (int shapeIndex = 0; shapeIndex < Shapes.Count; shapeIndex++) { var shape = Shapes[shapeIndex]; if (shape.FigureOffset == -1 || shape.IsCollection()) @@ -229,13 +229,13 @@ public void WriteTo(BinaryWriter writer) continue; } - var nextShapeIndex = shapeIndex + 1; + int nextShapeIndex = shapeIndex + 1; while (nextShapeIndex < Shapes.Count && Shapes[nextShapeIndex].FigureOffset == -1) { nextShapeIndex++; } - var lastFigureIndex = nextShapeIndex >= Shapes.Count + int lastFigureIndex = nextShapeIndex >= Shapes.Count ? Figures.Count - 1 : Shapes[nextShapeIndex].FigureOffset - 1; @@ -245,7 +245,7 @@ public void WriteTo(BinaryWriter writer) writer.Write((byte)LegacyFigureAttribute.ExteriorRing); writer.Write(Figures[shape.FigureOffset].PointOffset); - for (var figureIndex = shape.FigureOffset + 1; figureIndex <= lastFigureIndex; figureIndex++) + for (int figureIndex = shape.FigureOffset + 1; figureIndex <= lastFigureIndex; figureIndex++) { writer.Write((byte)LegacyFigureAttribute.InteriorRing); writer.Write(Figures[figureIndex].PointOffset); @@ -254,7 +254,7 @@ public void WriteTo(BinaryWriter writer) continue; } - for (var figureIndex = shape.FigureOffset; figureIndex <= lastFigureIndex; figureIndex++) + for (int figureIndex = shape.FigureOffset; figureIndex <= lastFigureIndex; figureIndex++) { writer.Write((byte)LegacyFigureAttribute.Stroke); writer.Write(Figures[figureIndex].PointOffset); diff --git a/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesReader.cs b/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesReader.cs index 0a06d38..d69cd21 100644 --- a/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesReader.cs +++ b/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesReader.cs @@ -124,35 +124,35 @@ private Geometry ToGeometry(Geography geography) return null; } - var handleZ = _handleOrdinates.HasFlag(Ordinates.Z) && geography.ZValues.Count > 0; - var handleM = _handleOrdinates.HasFlag(Ordinates.M) && geography.MValues.Count > 0; + bool handleZ = _handleOrdinates.HasFlag(Ordinates.Z) && geography.ZValues.Count > 0; + bool handleM = _handleOrdinates.HasFlag(Ordinates.M) && geography.MValues.Count > 0; var factory = _services.CreateGeometryFactory(geography.SRID); var geometries = new Dictionary>(); - var lastFigureIndex = geography.Figures.Count - 1; - var lastPointIndex = geography.Points.Count - 1; + int lastFigureIndex = geography.Figures.Count - 1; + int lastPointIndex = geography.Points.Count - 1; - for (var shapeIndex = geography.Shapes.Count - 1; shapeIndex >= 0; shapeIndex--) + for (int shapeIndex = geography.Shapes.Count - 1; shapeIndex >= 0; shapeIndex--) { var shape = geography.Shapes[shapeIndex]; var figures = new Stack(); if (shape.FigureOffset != -1) { - for (var figureIndex = lastFigureIndex; figureIndex >= shape.FigureOffset; figureIndex--) + for (int figureIndex = lastFigureIndex; figureIndex >= shape.FigureOffset; figureIndex--) { var figure = geography.Figures[figureIndex]; - var pointCount = figure.PointOffset != -1 + int pointCount = figure.PointOffset != -1 ? lastPointIndex + 1 - figure.PointOffset : 0; var coordinates = _sequenceFactory.Create(pointCount, _handleOrdinates); if (pointCount != 0) { - for (var pointIndex = figure.PointOffset; pointIndex <= lastPointIndex; pointIndex++) + for (int pointIndex = figure.PointOffset; pointIndex <= lastPointIndex; pointIndex++) { var point = geography.Points[pointIndex]; - var coordinateIndex = pointIndex - figure.PointOffset; + int coordinateIndex = pointIndex - figure.PointOffset; coordinates.SetOrdinate(coordinateIndex, Ordinate.X, IsGeography ? point.Long : point.X); coordinates.SetOrdinate(coordinateIndex, Ordinate.Y, IsGeography ? point.Lat : point.Y); diff --git a/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesWriter.cs b/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesWriter.cs index 37900dc..ee0f94a 100644 --- a/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesWriter.cs +++ b/src/NetTopologySuite.IO.SqlServerBytes/SqlServerBytesWriter.cs @@ -135,8 +135,8 @@ private Geography ToGeography(Geometry geometry) { var (currentGeometry, parentOffset) = geometries.Dequeue(); - var figureOffset = geography.Figures.Count; - var figureAdded = false; + int figureOffset = geography.Figures.Count; + bool figureAdded = false; switch (currentGeometry) { @@ -189,8 +189,8 @@ private Geography ToGeography(Geometry geometry) bool addFigure(Geometry g, FigureAttribute figureAttribute) { - var pointOffset = geography.Points.Count; - var pointsAdded = false; + int pointOffset = geography.Points.Count; + bool pointsAdded = false; foreach (var coordinate in g.Coordinates) { @@ -213,7 +213,7 @@ bool addFigure(Geometry g, FigureAttribute figureAttribute) if (_emitM) { - foreach (var m in g.GetOrdinates(Ordinate.M)) + foreach (double m in g.GetOrdinates(Ordinate.M)) { geography.MValues.Add(m); } diff --git a/test/NetTopologySuite.IO.SqlServerBytes.Test/SqlServerBytesReaderTest.cs b/test/NetTopologySuite.IO.SqlServerBytes.Test/SqlServerBytesReaderTest.cs index a090a2c..25b4e53 100644 --- a/test/NetTopologySuite.IO.SqlServerBytes.Test/SqlServerBytesReaderTest.cs +++ b/test/NetTopologySuite.IO.SqlServerBytes.Test/SqlServerBytesReaderTest.cs @@ -205,8 +205,8 @@ private Geometry Read( Ordinates handleOrdinates = Ordinates.XYZM, bool isGeography = false) { - var byteArray = new byte[bytes.Length / 2]; - for (var i = 0; i < bytes.Length; i += 2) + byte[] byteArray = new byte[bytes.Length / 2]; + for (int i = 0; i < bytes.Length; i += 2) { byteArray[i / 2] = byte.Parse(bytes.Substring(i, 2), NumberStyles.HexNumber); }