Merge pull request #35 from carlst99/develop

Beta Release 1

.gitignore

@@ -1,6 +1,9 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+*.csv
+*.lock
+
 # User-specific files
 *.suo
 *.user

LINZCsvConverter/FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Realm />
+</Weavers>

LINZCsvConverter/FodyWeavers.xsd

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="Realm" minOccurs="0" maxOccurs="1">
+          <xs:complexType></xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

LINZCsvConverter/LINZCsvConverter.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <Description>Helper project to convert LINZ AIMS street address CSV data to the DB format used by TrialManager</Description>
+    <ApplicationIcon />
+    <OutputType>Exe</OutputType>
+    <StartupObject></StartupObject>
+    <Configurations>Debug;Release;Test</Configurations>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CsvHelper" Version="12.1.2" />
+    <PackageReference Include="MessagePack" Version="1.7.3.7" />
+    <PackageReference Include="Realm" Version="4.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Resources\nz-street-address.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>

LINZCsvConverter/Model/Location.cs

@@ -0,0 +1,61 @@
+using MessagePack;
+using System;
+
+namespace LINZCsvConverter.Model
+{
+    [MessagePackObject]
+    public struct Location
+    {
+        /// <summary>
+        /// Gets the X coordinate of this location point
+        /// </summary>
+        [Key(0)]
+        public double Gd2000X { get; set; }
+
+        /// <summary>
+        /// Gets the Y coordinate of this location point
+        /// </summary>
+        [Key(1)]
+        public double Gd2000Y { get; set; }
+
+        #region Object overrides
+
+        public override string ToString()
+        {
+            return Gd2000X + "," + Gd2000Y;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is Location loc
+                && loc.Gd2000X.Equals(Gd2000X)
+                && loc.Gd2000Y.Equals(Gd2000Y);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 23;
+                hash = (hash * 13) + Gd2000X.GetHashCode();
+                return (hash * 13) + Gd2000Y.GetHashCode();
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets the absolute distance, in coordinate points, from one location to another
+        /// </summary>
+        /// <param name="lFrom"></param>
+        /// <param name="lTo"></param>
+        /// <returns>The distance between the two location points, 'as the crow flies'</returns>
+        public static double DistanceTo(Location lFrom, Location lTo)
+        {
+            double xDistance = Math.Abs(lFrom.Gd2000X - lTo.Gd2000X);
+            double yDistance = Math.Abs(lFrom.Gd2000Y - lTo.Gd2000Y);
+
+            return Math.Sqrt(Math.Pow(xDistance, 2) + Math.Pow(yDistance, 2));
+        }
+    }
+}

LINZCsvConverter/Model/SuburbLocalityLocation.cs

@@ -0,0 +1,107 @@
+using CsvHelper.Configuration.Attributes;
+using MessagePack;
+using Realms;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LINZCsvConverter.Model
+{
+    public class SuburbLocalityLocation : RealmObject
+    {
+        [Required]
+        private byte[] LocationRaw { get; set; }
+
+        [Ignored]
+        public List<double> XCollection { get; } = new List<double>();
+
+        [Ignored]
+        public List<double> YCollection { get; } = new List<double>();
+
+        [Name("town_city")]
+        public string TownCityName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary DB key
+        /// </summary>
+        [PrimaryKey]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the location
+        /// </summary>
+        [Name("suburb_locality")]
+        [Required]
+        [Indexed]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the GD2000 X coordinate of this location
+        /// </summary>
+        [Name("gd2000_xcoord")]
+        [Ignored]
+        public double Gd2000X { get; set; }
+
+        /// <summary>
+        /// Gets or sets the GD2000 Y coordinate of this location
+        /// </summary>
+        [Name("gd2000_ycoord")]
+        [Ignored]
+        public double Gd2000Y { get; set; }
+
+        /// <summary>
+        /// Gets or sets the NZ Geodetic Datum 2000 (NZGD2000) coordinate point for this location
+        /// </summary>
+        public Location Location
+        {
+            get
+            {
+                if (LocationRaw != null)
+                    return MessagePackSerializer.Deserialize<Location>(LocationRaw);
+                else
+                    return new Location();
+            }
+            set => LocationRaw = MessagePackSerializer.Serialize(value);
+        }
+
+        public void Merge(SuburbLocalityLocation obj)
+        {
+            XCollection.Add(obj.Gd2000X);
+            YCollection.Add(obj.Gd2000Y);
+        }
+
+        public void Prepare()
+        {
+            if (XCollection.Count > 0)
+                Gd2000X = XCollection.Average();
+
+            if (YCollection.Count > 0)
+                Gd2000Y = YCollection.Average();
+
+            Location = new Location
+            {
+                Gd2000X = Gd2000X,
+                Gd2000Y = Gd2000Y
+            };
+        }
+
+        #region Object overrides
+
+        public override string ToString() => Name;
+
+        public override bool Equals(object obj)
+        {
+            return obj is SuburbLocalityLocation lb
+                && lb.Name.Equals(Name);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (13 * 7) + Name.GetHashCode();
+            }
+        }
+
+        #endregion
+    }
+}

LINZCsvConverter/Model/TownCityLocation.cs

@@ -0,0 +1,85 @@
+using CsvHelper.Configuration.Attributes;
+using MessagePack;
+using Realms;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LINZCsvConverter.Model
+{
+    public class TownCityLocation : RealmObject
+    {
+        [Required]
+        private byte[] LocationRaw { get; set; }
+
+        public IList<SuburbLocalityLocation> Suburbs { get; }
+
+        /// <summary>
+        /// Gets or sets the primary DB key
+        /// </summary>
+        [PrimaryKey]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the location
+        /// </summary>
+        [Name("suburb_locality")]
+        [Required]
+        [Indexed]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the NZ Geodetic Datum 2000 (NZGD2000) coordinate point for this location
+        /// </summary>
+        public Location Location
+        {
+            get
+            {
+                if (LocationRaw != null)
+                    return MessagePackSerializer.Deserialize<Location>(LocationRaw);
+                else
+                    return new Location();
+            }
+            set => LocationRaw = MessagePackSerializer.Serialize(value);
+        }
+
+        public void Prepare()
+        {
+            List<double> gd2000X = new List<double>();
+            List<double> gd2000Y = new List<double>();
+
+            foreach (SuburbLocalityLocation sLoc in Suburbs)
+            {
+                gd2000X.Add(sLoc.Gd2000X);
+                gd2000Y.Add(sLoc.Gd2000Y);
+            }
+
+            double Gd2000X = gd2000X.Average();
+            double Gd2000Y = gd2000Y.Average();
+            Location = new Location
+            {
+                Gd2000X = Gd2000X,
+                Gd2000Y = Gd2000Y
+            };
+        }
+
+        #region Object overrides
+
+        public override string ToString() => Name;
+
+        public override bool Equals(object obj)
+        {
+            return obj is TownCityLocation lb
+                && lb.Name.Equals(Name);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (13 * 7) + Name.GetHashCode();
+            }
+        }
+
+        #endregion
+    }
+}