From 1326ab92babd2fdc780a5054d632cf9714c58d67 Mon Sep 17 00:00:00 2001
From: Wessel Tip <wessel@go2it.eu>
Date: Tue, 11 Jun 2024 11:32:11 +0200
Subject: [PATCH] feat: Voeg map name support toe

---
 .../469f6bec-f113-4467-9d39-7ac38558045a.xml  |  66 ------------------
 .../.idea/.idea.REST API/.idea/workspace.xml  |   7 +-
 src/Server/Console/JsonClasses/Database.cs    |   2 +
 src/Server/Console/Program.cs                 |   5 +-
 src/Server/Console/Routes/RouteDatabase.cs    |  13 ++--
 src/Server/Console/Routes/RoutePath.cs        |   3 +-
 .../Console/bin/Debug/net8.0/Console.dll      | Bin 16384 -> 16896 bytes
 .../Console/bin/Debug/net8.0/Console.pdb      | Bin 15692 -> 15744 bytes
 src/Web/src/components/mapCanvas.jsx          |  28 ++++----
 9 files changed, 33 insertions(+), 91 deletions(-)

diff --git a/src/Server/.idea/.idea.REST API/.idea/dataSources/469f6bec-f113-4467-9d39-7ac38558045a.xml b/src/Server/.idea/.idea.REST API/.idea/dataSources/469f6bec-f113-4467-9d39-7ac38558045a.xml
index 7f75353..60d559b 100644
--- a/src/Server/.idea/.idea.REST API/.idea/dataSources/469f6bec-f113-4467-9d39-7ac38558045a.xml	
+++ b/src/Server/.idea/.idea.REST API/.idea/dataSources/469f6bec-f113-4467-9d39-7ac38558045a.xml	
@@ -44,71 +44,5 @@ replication:{&apos;class&apos;: &apos;org.apache.cassandra.locator.LocalStrategy
 replication:{&apos;class&apos;: &apos;org.apache.cassandra.locator.SimpleStrategy&apos;, &apos;replication_factor&apos;: &apos;2&apos;}
 </Properties>
     </schema>
-    <table id="10" parent="3" name="maps">
-      <Properties>caching:{&apos;keys&apos;: &apos;ALL&apos;, &apos;rows_per_partition&apos;: &apos;ALL&apos;}
-compression:{&apos;sstable_compression&apos;: &apos;org.apache.cassandra.io.compress.LZ4Compressor&apos;}
-bloom_filter_fp_chance:0.01
-default_time_to_live:0
-speculative_retry:99.0PERCENTILE
-gc_grace_seconds:864000
-max_index_interval:2048
-memtable_flush_period_in_ms:0
-min_index_interval:128
-read_repair_chance:0
-crc_check_chance:1
-dclocal_read_repair_chance:0
-compaction:{&apos;class&apos;: &apos;SizeTieredCompactionStrategy&apos;}
-</Properties>
-    </table>
-    <table id="11" parent="3" name="routes">
-      <Properties>caching:{&apos;keys&apos;: &apos;ALL&apos;, &apos;rows_per_partition&apos;: &apos;ALL&apos;}
-compression:{&apos;sstable_compression&apos;: &apos;org.apache.cassandra.io.compress.LZ4Compressor&apos;}
-bloom_filter_fp_chance:0.01
-default_time_to_live:0
-speculative_retry:99.0PERCENTILE
-gc_grace_seconds:864000
-max_index_interval:2048
-memtable_flush_period_in_ms:0
-min_index_interval:128
-read_repair_chance:0
-crc_check_chance:1
-dclocal_read_repair_chance:0
-compaction:{&apos;class&apos;: &apos;SizeTieredCompactionStrategy&apos;}
-</Properties>
-    </table>
-    <column id="12" parent="10" name="id">
-      <DasType>uuid|0s</DasType>
-      <Position>1</Position>
-    </column>
-    <column id="13" parent="10" name="version">
-      <DasType>int|0s</DasType>
-      <Position>2</Position>
-    </column>
-    <column id="14" parent="10" name="date">
-      <DasType>timestamp|0s</DasType>
-      <Position>3</Position>
-    </column>
-    <column id="15" parent="10" name="objects">
-      <DasType>text|0s</DasType>
-      <Position>4</Position>
-    </column>
-    <key id="16" parent="10" name="primary key">
-      <Columns>id
-version|ASC
-date|ASC
-</Columns>
-    </key>
-    <column id="17" parent="11" name="id">
-      <DasType>uuid|0s</DasType>
-      <Position>1</Position>
-    </column>
-    <column id="18" parent="11" name="path">
-      <DasType>text|0s</DasType>
-      <Position>2</Position>
-    </column>
-    <key id="19" parent="11" name="primary key">
-      <Columns>id
-</Columns>
-    </key>
   </database-model>
 </dataSource>
\ No newline at end of file
diff --git a/src/Server/.idea/.idea.REST API/.idea/workspace.xml b/src/Server/.idea/.idea.REST API/.idea/workspace.xml
index 1fe2d9e..231935c 100755
--- a/src/Server/.idea/.idea.REST API/.idea/workspace.xml	
+++ b/src/Server/.idea/.idea.REST API/.idea/workspace.xml	
@@ -8,9 +8,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="79f184c3-e88e-45be-9116-5fa813562754" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.REST API/.idea/dataSources/469f6bec-f113-4467-9d39-7ac38558045a.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.REST API/.idea/dataSources/469f6bec-f113-4467-9d39-7ac38558045a.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.REST API/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.REST API/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Console/JsonClasses/Database.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Console/JsonClasses/Database.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Console/Program.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Console/Program.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Console/Routes/RouteMap.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Console/Routes/RoutePath.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Console/Routes/RouteDatabase.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Console/Routes/RouteDatabase.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Console/Routes/RoutePath.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Console/Routes/RoutePath.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Console/bin/Debug/net8.0/Console.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Console/bin/Debug/net8.0/Console.dll" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Console/bin/Debug/net8.0/Console.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Console/bin/Debug/net8.0/Console.pdb" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../Web/src/components/mapCanvas.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/../Web/src/components/mapCanvas.jsx" afterDir="false" />
@@ -120,7 +123,7 @@
       <workItem from="1717668473610" duration="971000" />
       <workItem from="1717670832494" duration="901000" />
       <workItem from="1717673464254" duration="1428000" />
-      <workItem from="1718093417281" duration="2913000" />
+      <workItem from="1718093417281" duration="4387000" />
     </task>
     <servers />
   </component>
diff --git a/src/Server/Console/JsonClasses/Database.cs b/src/Server/Console/JsonClasses/Database.cs
index 8fd661f..473b6bc 100755
--- a/src/Server/Console/JsonClasses/Database.cs
+++ b/src/Server/Console/JsonClasses/Database.cs
@@ -6,11 +6,13 @@ public class Data {
   public int version;
   public string date;
   public string id;
+  public string name;
 }
 
 public class RowData {
   public string Id;
   public int[][] Objects;
   public int Version;
+  public string Name;
   public DateTime Date;
 }
diff --git a/src/Server/Console/Program.cs b/src/Server/Console/Program.cs
index 9b5aea9..5ea247b 100755
--- a/src/Server/Console/Program.cs
+++ b/src/Server/Console/Program.cs
@@ -40,10 +40,11 @@ internal static class Program {
     session.Execute(@"
       CREATE TABLE IF NOT EXISTS Roommapper.Maps(
       Id uuid,
-      Objects text,
       Version int,
+      Name text,
+      Objects text,
       Date timestamp,
-      PRIMARY KEY (Id,Version,Date)
+      PRIMARY KEY (Id,Name)
     )");
 
     session.Execute(@"
diff --git a/src/Server/Console/Routes/RouteDatabase.cs b/src/Server/Console/Routes/RouteDatabase.cs
index 2ce06f2..c0679d7 100755
--- a/src/Server/Console/Routes/RouteDatabase.cs
+++ b/src/Server/Console/Routes/RouteDatabase.cs
@@ -12,13 +12,13 @@ public class RouteDatabase(ISession cassandraSession): IRoute {
   /// </summary>
   public HttpResponse Get(HttpRequest request) {
     try {
-
       // Prepare the select statement based on the given criteria
       // If no criteria is given, throw an exception.
       // Using a prepare due to the potential of SQL injection when accepting
       // any form of user data.
       var queries = new Dictionary<string, Func<string, BoundStatement>> {
         ["id"] = id => cassandraSession.Prepare(@"SELECT * FROM Roommapper.Maps WHERE Id = ?;").Bind(Guid.Parse(id)),
+        ["name"] = name => cassandraSession.Prepare(@"SELECT * FROM Roommapper.Maps WHERE Name = ?;").Bind(name),
         ["date"] = date => cassandraSession.Prepare(@"SELECT * FROM roommapper.maps WHERE Date = ?;").Bind(DateTime.Parse(date)),
         ["version"] = version => cassandraSession.Prepare(@"SELECT * FROM roommapper.maps WHERE Version = ?;").Bind(int.Parse(version)),
         ["all"] = _ => cassandraSession.Prepare(@"SELECT * FROM roommapper.maps;").Bind()
@@ -29,7 +29,7 @@ public class RouteDatabase(ISession cassandraSession): IRoute {
         .Select(query => query.Value(request.QueryString[query.Key]))
         .FirstOrDefault();
 
-      if (selectStatement == null) throw new Exception("No valid search criteria given, give one of (id, date, version).");
+      if (selectStatement == null) throw new Exception("No valid search criteria given, give one of (id, date, version, name).");
 
 
       // Execute the query and return all rows in an array
@@ -65,9 +65,9 @@ public class RouteDatabase(ISession cassandraSession): IRoute {
       var uuid = Guid.NewGuid();
 
       var insertStatement = cassandraSession.Prepare(@"
-        INSERT INTO Roommapper.Maps(Id, Date, Version, Objects)
-        VALUES (?, toTimeStamp(now()), ?, ?);
-      ").Bind(uuid, 1, parsedBody.objects);
+        INSERT INTO Roommapper.Maps(Id, Name, Date, Version, Objects)
+        VALUES (?, ?, toTimeStamp(now()), ?, ?);
+      ").Bind(uuid, parsedBody.name, 1, parsedBody.objects);
 
       cassandraSession.Execute(insertStatement);
 
@@ -126,7 +126,8 @@ public class RouteDatabase(ISession cassandraSession): IRoute {
       Id = row.GetValue<Guid>("id").ToString(),
       Objects = $"[{row.GetValue<string>("objects")}]".FromJson<int[][]>(),
       Version = row.GetValue<int>("version"),
-      Date = row.GetValue<DateTime>("date")
+      Date = row.GetValue<DateTime>("date"),
+      Name = row.GetValue<string>("name")
     }).ToList().ToJson();
   }
 }
diff --git a/src/Server/Console/Routes/RoutePath.cs b/src/Server/Console/Routes/RoutePath.cs
index e68c0e3..1664a6a 100644
--- a/src/Server/Console/Routes/RoutePath.cs
+++ b/src/Server/Console/Routes/RoutePath.cs
@@ -18,6 +18,7 @@ public class RoutePath(ISession cassandraSession): IRoute {
       // any form of user data.
       var queries = new Dictionary<string, Func<string, BoundStatement>> {
         ["id"] = id => cassandraSession.Prepare(@"SELECT * FROM Roommapper.Routes WHERE Id = ?;").Bind(Guid.Parse(id)),
+        ["name"] = name => cassandraSession.Prepare(@"SELECT * FROM Roommapper.Routes WHERE Id = ?;").Bind(name)
       };
 
       var selectStatement = queries
@@ -25,7 +26,7 @@ public class RoutePath(ISession cassandraSession): IRoute {
         .Select(query => query.Value(request.QueryString[query.Key]))
         .FirstOrDefault();
 
-      if (selectStatement == null) throw new Exception("No valid search criteria given, give one of (id).");
+      if (selectStatement == null) throw new Exception("No valid search criteria given, give one of (id, name).");
 
       // Execute the query and return all rows in an array
       var rowSet = cassandraSession.Execute(selectStatement);
diff --git a/src/Server/Console/bin/Debug/net8.0/Console.dll b/src/Server/Console/bin/Debug/net8.0/Console.dll
index ee6bf232a9112c13270c37452557164fc89d165e..36d31f872da0f20c377d65dd1e1fc1aa13a718a2 100755
GIT binary patch
delta 4935
zcmb7I3vg7`8UD|GoSWS|Hwhc^An#2Uc1aiV4i8BrMWDPRC^bS75=DiLH%y0+!UoA$
zs=VT{SSZzkjs<)ajEYWal~S!{IyTH$2DK`*j<r4-Mr#MHV!w0lh9oF;dNcRi^ZoyS
z{{O%Kf6lpg(%sFvd)Th6`57s%zCqFJEag)y3lUX85aS46S=M`aX+q~Rq6Jd0lBmb*
z%}a^vCW-^UcPUYW$kT%2dRFXywGyIS+*RT(7GO2vX;#c;h__gN?ql#EuWN8?WKs{p
zBoz@caNJyMo)!`dwXZanE*9y*<O@2r^ND(DfOCH?k=rg4JN0>yL?R>gB8#<xUc1Ji
z_S{{V?Cr>hMO;<7bkrqHQVfp~@3Pm!!e0p8#C(_CbBTQ4W$zdwH9L?%)gNV6S{LRU
z_HL-cJ{eL@4<kpnJ%*^=e#oGNcKdNT6UE_V9~Y~QtiZ6nj4;~1-M%nvZkXbTF?QOp
zy-ebA`x)jX_j54JeF>RGpD&PN*9g-rV|R)gvyeS6R+wJ?PZ-&si!QS`HJ4MnH#`CP
z#&XNM*Gk)K7mBCNGM^s`KkDtKWHZ6=f5#cw!4YD6rby&trYs&Qx^4t9!jmw|uM-8}
z#2#tqFNMZlELQN&Qu%BhHQ+u~JbMFNg#9v}Pt|{vKt8^`LBv{<BBio(M4pZ;{JOce
zF&UlU`o<Le5Oqvd9{b^pU*zLp(lHH^@N~!VfFsYoT>iQv&$(Rwjw8pa8uF9iIQo~P
z$P-7clw>R^-f<Naeq<0p+yZgh%4T1PPpz`7yDe(>SmEzNZT}Ku`w>8RmZV2TeN2Jp
zozJK;4=Xz}WRii0vqY~eUEC9sdi60_cFct320!+KJ67w`<f?m9I+zVX#`bv3^Ledp
z$bcR2rSUEo3=a6lrfmx<NxC>2Q=InKm`hDHEV&@j7z5F>T?I~h{0iwcx-#Ne5|$PA
z-OK${DL#y!l$_xj$|{=ACUGKeyg2VlPdR<Ls?aS$3BIg&$I=z9N7hC5dN;LeF@BVi
z+fRx{cjmWcktu%V&dv1T*?beziZ&r5<08+LRi6ikzHX0r-+fE{2guVcS4J^3a%Fg7
zhn10rpUYPU7TQop<s_dST^Zw5L$NVNH#8s{sy*WtFUFRBYe%(xM@3ECbaqU1#^w6`
zu|wtJ!5H3!>KhYd?U6-9a)vF7SeG+>*jQQm=OQ~)PnqnC75VYCBfA;nigq&w-P{l#
z?WX$*-F!BFRm#`mPKiT@YDaZW1-nnmed16;Vtlk+IN1KLcER3hS1JY<IS$96c8w8>
z6RV447boOv{sP$mRGd<<0XE_nFAGlxn#O&)-7k(NrbW<I!)Fi1QM+z`0t~|>VC(T%
z*4R02Kej<&W2`jNZMkK`SXzONFp>hfx5GH;0~;Zg0@-TiVI$^^Na43ympn_HO|}V3
zS#7ek?eU@_DXo0>NUep?Lt3>3^#kEK$YjDOA1(3XhNQx{VW-c<i)~4T`NM*|gs2}s
zsu6HpG;3Wc;+Q9=UY=-OOW-w;`5W+~&i^o8j_wI19eC^TZduvk63Y4^iLckMZe;yd
z$dFg6->@@0h}=HT%EKZFCgn{)2}a7UPy*ziCiBmf`|b+)i%&ehntPE}!6qb(&YiI^
zUb4<!z4oRKNaze|bQ}6raP1PBi5|;Cs9@H$vuEPBAx|t$p6r5q9ArfKVtexVNJJi;
zxHv7>&zqcHP#D(UG!rQa?+Z?U(6S9qkLoed7AQQc$?=y8Hz>&wHLg>0`+2|NrpL@d
zEYEk1K}w)4l){qf1N|v8nO-(u1U_dz1rI_$9|4Kc>VP*|br5aQ&YNDctOvN4eri0x
zIc+v&S`CnM3Lz~{KT)`bWSA05hIxk%BGC-9ABi?FDc=b>r*#O->4cJWA|Xz5jD917
z)|!Q81|0xKlIb{;f!mQar$#vC6l-j;I2|(ngbDX!ayALJ2sYQiotr!=WEL=imZ|{v
zS^e1iM8_rI$Y<1z)BlKZn3XHW(1vMNDVI#gokVvV4l^T){+&sx;Yp;DDW+4RV#}1N
zK_11vpd475<W=l5#oUyp*j!8M5@{^yc}bLrzLvvVI_XG8Ho2UVDQko-l?o{`tn^Yb
z%<A}bozZJFcNB8Ek1x<Uy=5#01~fTd$|N3BSfX$zzZR0y%H|0rDbkiha+|S0ub^jW
zh3-Y-Es!kXYk{{|c0?(DFha4xQRoYEWifZtDWeCelwvIt_0p$oE7%Q+z01z>b*S1Q
z#qJzCfEMZWWK_4wS_d{3rzDYMY0$zb>%u&fwt+>6?xf|`4g~#up)_^exTzQig~N91
zZmLquaT7~haVATrGDI95#A{QsS=u^^r?YrN5^bg`W1pTtdE+IMK6mShRHm5YC5dj7
zED}|EsC|SonbuE`6P*w#<PSPbhDfEA6D4y(jG_ICIca<8@F><diXB(1ckF4i2lakQ
zvB=QGR~6ktIrJcujU_UKqf4VU#kNojJ))=4?kL*@HkOV@*<P@8`Y_5K0?VK*d<GMC
z|KnhpG%d=?=%}7WOC1)W>GV5&9Caz`<d#i8Qp^dTO}nBKWop^<?g(8D4Mue`wH(R`
zIRRyAxl|uzGGHFv7-cdZKKta3Fj0SoRVc~Vu@iEQ9tP^P3f2aFtV_#5?DcQ5{{W}u
zXzl;D6f$lE+el73rZ9l-REA9^@gtSvb1FFp)r3*@Lt35ckzPF>s2)dFJz2P2G+;8E
z8gf^p1Kl(pm_(BlRx7Nfh!o9MWRb$_6*d7G?FWvbXBEB%<n#|<2Hj4bW+_c#Pw;AB
zomC6Go?Qd^89om?LR!W_wj3LFz-*>Hz?*@4O}Tsr%pS-i>@Hwx#Mn)p^f!GE9i^XJ
z2dS1#HXo(gY>Ih|s@X|?oDN~aNm>o$ki1~MfivtG<0G715)aW9uCYQD>_pV&W1h~M
zSgw}OP9ULT;KRm5b_&|bz*?M!r|5Pg3ErBFNR<*z1vZ)oX*GL+X0g?54xh(vXY;is
zz(sf?bh0rTM_`#mp~5T`GN{I7z#a<H31c};RpZU<9Qy^E86BVEZ?eto0(WUHChIL9
zI1}Rzc5oH4xRn)Z9=3?pYMt~Nj*&fV1wwo91Zy<L%Go;Ydr?QWwL?p1nsH8BO;e47
zG#)k=v_tHa^_6y%>haOuK#y2idLi{$c^F^Ni}f<vCYEKKOMZ}b&;jG5!gK6a+GmKR
znT3H9+O4!nKc{e|-h%NAL*hz>&nui^Dv8*Wd3EG47An5QFI_>s9}>AoS}w`T^+7cr
zZP$qXAs6<@>qTtA%l$p@4R+(OF_axXz@k@BU(|O~Rt$@o)w*ta^NJM}V$Hb!#LRD6
z(@JZb*7UVy_gSn%bQRwqx`J-eT@(_p7x}IE)I@8jRs5!CoH$Z6L1@MEO(pAVE&hvc
zt&OUu2YhV1SQYqTY>;wkNcwi*I&HHqs)G%e{A>+2_Prg<(^weR&9PBSY_*cUizOGC
z2!*`jXC+>bib1V#HVyYxG(~tqIpT}Zhe_h|oweDK{qyfXoOfp6;hVSiU6|Bi6t`AZ
zwv|;^SG2a3wX{?=SFdUdRfNhzr4_B^)h&}NLv59-nkqug;+~2kZ^M^uy~O4%lr_2q
z_j~w<(R)?ml?pFkjIZ9s)#Ck%{G>!-q(9C2>w13t*?Ql<7nF#s%Erl2;T=X)C|$jh
zGjQ9V4`htr+;+#Q{g^*={aTK5d-J^7W6Q+J%DEz><@P01UC`#WQYHS{sEn%dSAoZr
z;}-l?QZpp0z(bIS@Cg#4Qe{yNc?(U3MF`qT*fc4N=DsCUp3<~|%0AEZLDn0x{tIm!
Bni>EA

delta 4609
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

diff --git a/src/Server/Console/bin/Debug/net8.0/Console.pdb b/src/Server/Console/bin/Debug/net8.0/Console.pdb
index 74b6ef266c391bcbdf957cfade23355dc1404207..5dfc8b33d4aa03c31143ac6b09f47e8b384f78e2 100755
GIT binary patch
delta 1880
zcmah~3s4hB7~Z`+2;m`x@Ca%N5S~FuLLfj=1)(Sri#CR-iUlE1a8QabRD?hh8B?e7
zI4WfX25M2HLjY+7$Bw*wP>?!mTU2lW(H7L!4sAhv(EbOuWv0&bZoYrN@7sU({<+)R
zy?P)oyGRnJW+LR8i;&y|p>YIUxqD~Yjt_PLMSK=QbjnjHktgtKimy^dML^pFx=jLl
zWqL*;=tU%*dlvVu)Ej2@xlP6RZg`neTwLT}Y7cz^fJ<?6ID;ah;+ZrJ*O!I@{OD-C
zA2^7C8vPh3NytFCfGPk@#6)aBFrWosC1#>MViQydI4@?Q>wrN(v_A{o2Sh<7|Gk)K
z>zvO-sS+m20PF?iNSNM859A1-<ez~oR6fU9s7AtqWEQFeG?Fyp?plA0kQp*Z)(9h8
zc+PzQrR_k^0G9&H;kE}&U36&v)|B%NfYOf8-%Bo|>6ShM#~K`$S2I?;((a&}$$pv+
z=aB2^PS}miq&sP-x8w}j;#c$YK)Wo^4xn8ZXg+B71zG{xbAhJj^ID+YKzlFH)O><}
zb;}dF2y6O%31shwkpaFN_013z<12(^gJ3BD=ZM(Qn$7WYu?4i203P)6{X8JQi{XKo
zXcN-|nV>3G0{C@))evKa9dmpHV!04u7W!RC!*tZaaGi^Rn1%|7Pz^SP>B7Ofz=#EF
zBP{_^wW0*fM&+Wt;H1;@z?l_QL)<FvfLH*LjSS+Exv_|#9>620c|w8n{X+>hlKCe9
zzwDm}F+frcu|Ql6{^t3W5w7IRmj}hir?<RmGK6_|$FmJlSEiI>-NUZ8$lcOvxvc8)
zyN>1!!!_#j@v+&Yqp6CA&pEw45fRqA%WC4GRmsxTlXvW=N3Qe@e$9(GWt&=ilq@u@
z<ei>y|8~IMP;p~jA4972k+pu5FmO6^Y)hbGP?>vC*-l2Y<9J@Hy4x@4<lh(iu=gY;
ztq$A3^ZhBtvNXN&Li>!OXGKIy51UVD9G^uVJ*bX0oBrkbifruzn^j94vP$a;4`+9C
z!X|4@N9M2Vry<m!9A48cw90)FpZPed_$yWGv5+@XlJDtwJH~ZSi%ymW7P*%=9i5#%
zd3^EWaIf^TQwOuAbF#|Ta4cfBg>gEUWyV?vO6v@lCXL-8o4*@EDz~l@hg;8TQZ@N`
zDusUePMeB>h}cxQ<=MWZIG*HlhN2>Dq{O?Sc#~(7`*2(u?~LBfzRQ(Y+T3xw;OY-;
zc2g0Kt-Yi5cgCBBY_9P?Ea+qZ*wB0{dTPh0Ks-7)qIgF;qI1x#b-r^vJS*ts9}nth
zT+UQ(`eOg6PnE?^w~wuZg8qEm$Ky6?Dl!I6$mEOOYpa*`U2X4KyshP0Cin8)iT+7`
z`HlX1YnR#T^F6|~w>|r;)vk)0E`p5}7ssB4bY@02-uSfEE$ZH9tq+gH)}EL;%=K-v
z-4`+2PClBN%$(NjHhUp&&x$Mk)p+jGP{wc3WPMm#KD*I@*|`W480Q_!c2Q>}k=rbj
zJ(8u;6iIM!U~-BiDM^|btWFUI3Il}xfyn{ENn)umMXKH!C`@dbvds3h*@BH~Y}8<*
z0UJNT##(GVOX{Uk_82x!V&e<kXhB|*I<Z(RIx=UlIOJn#*pk<b!Hwy-@c;}Uqk;@>
zuT6N4n=JoH!%dFlbWmsHYcnktrmcok0dWwv5MqQ0f6Sz_b8=~(R<LU<VZ&bx$HM#M
zY_PY0hII}2&<cF0m(cIC!?+-dOT!rJMhLw-ksn9o4-i@fp}k4yl;pY)0X?0LLP<@C
zFYY3ZA={TTy$L_q)GTudJIr8W#Gn6BP2jk(bjHU2DU{qO6LM%!S|H7ny`Z!hvQp;b
zp_O6Xmsl?+bQlWLw^~t!X}1&FGeo|M$iGhPhrJ4m$e(3pIFURgPxd(Mi)r%(v2v(t
qTrtxeG1ufcQ*UDn$AM~8wo6F%TV7nloEblFdULr{pTN-(p}zoF%?UUF

delta 1810
zcmah}3rti;6utBI_gFrnA}pw|@^L|h{lfBD<r@_cBOnSE0bv0_lqv*8#07Rmu@%u*
zP!N^YmTJ)jBxto#q1GZ+tD<cMMZpk@)nF52Ya>YSL(`Ddq;GTXoO9;hnY(ZDrl{cB
z)(Ta;h7aJh9l%NeFa*e>b2nvdNY6nEBj|BiFD4p*2B>5CqL|PS9P3b@RG|*a%1%c8
zdRo5AJP%1&RpHQm>%9lPd$ujRv#&yAG7ab45aNB!!912o_x+urv-9A9my`=pQgna^
zO;R3cWjxR!jv}~nKA0kW5zPn-1s`%00@#B%r=Z~mq6e`^Ny9@#2zK({hY#`NJ|9w4
ze8@y>L~K#<9YKer^xq;H_Kb5HDpfSpB91YpRA0n&0$>VeFa-#(f8-j1)z+v7kgE}9
z__IOHKCdTe)@gsI?Qp(>@#N@d-bQB%Rye*}(eO^sMqSPP%+Zr9CXVYsq)a~7Ax4a|
zvoKrnZhaAI#|hdQwaWw@hFUT~vv1dRf@bU8TFiNVME8>i1tKYd-FOP@2>@;(mEnQ2
z2hBDo7vg9-&JQTeakM~)an?mD!Td`+3Gm?qz61ntluknbgtQLhN?H3j@5fjp146?~
z8HaG8gXc6Jy$A<NsQ?`@!R3O{y2x9BRvae@Q}yyBB7_=w9y(dvB6LRNbr=&B?HCOh
zg|Ji6KVAzIyMdTu*9k!Gs0^Tl;G;}J-k~hQC{xv8G$`uOU-9;=gQJ}_3%nB(vsxAk
z?i2Ct)Y1z-WbK=(ET1D882RG#vV>9Hy^6-u9g4rm%2zh|Opr;8n3H_uf&Hx+-`^Lx
zG;etI=qsj>9DAa<WbYniyq%Z-<yz*f$zgGP!yd~V@7_9r;okGH;j<Y}x@5PU^TNyR
z8ce+_!X-K;R~Ro|?4}*8<qZm!_^z++Yz_P|=i`}?hhJTMws&`kHci#*-tvdgnbM6`
zakg-l=hv^jd!gEK_;~xF)qlQucw9$06{z#aM%R2=9C@7sa4I??oFlhvd)_G88uj_>
zThCWb{yprnUVLUKP@~<PzM0b#vcD{KtgR<AJUr66w`<m5#N)Q=E@%3Dx~G)xFO7@p
zqg*l<9_;gqO=;LaeQ``_QyM>S`{GPpQb3r=!@m0o<>9kURThHGN1Hq>=d1|6dNQzI
z5wj{KtRkuF+poLZwfuD+hTs6#;Pw~pww14(p6yZ%e=-_zreovz^x?8}^8>tj>w;si
zTP%HJ`uMxbj>_8n2YyO^L&%+9J2&XwJpCx<WtVooq+8Q$usIwXdW@Ur;oqycQfs68
zrSj>``9}(tWZkMs9Y`3Q*6K63YosaeRGfXPF}JnLQ06~mtdA6(o?QOflUz-Q=8#$6
z0&SbKU1_LSdG~hz&cN)Ot6s)6T&vFwnzXW(d&F`q`?s2N+wP7zTnB&m=ksiAFJvqg
zeUp)}cExg6lc)i!!W*yogd(J<s=!g3%~V*VN#ruw8n09@xsQ+9J2g$~?TMr38bz|)
zQ<kh%%Ttufv{aQs)iQHZf$P)+VoW8*B4XT4j8()~PmE`o2DMr^NQ^Itag;P#FwfKu
zw1DP<8IPXAO!W?&@tzvexSli?U;*=?cbUt36GlkWq<_;$({#q(r(?-`Gc6{jEyg<@
ztbmxy2oOq1cwDo>G>)qUUd%Iu_!Z+N9}B*wpr)DYeok)1JfhbS!xge4nlcEi3E9zY
z%^`&7vnhQmRh&Q-_fRFtRLLV|tM6QH7#Gyc311I#oVn|}p61P=q<CGKF%f<?4*$~{
zqxX|pQCwl6J;#-v&`c=P={L{0_$txQC;H1&Nd@*`2ry@RC?26o0;%E{Dj%;VB4g|{
z2gn-cfo}verV)vEdJxXr{pms;pMVqLn*lGpa2ERlR!<W#3+B7o?iyE#RwCA%BeG?O
Jxwduy{{R!b`bPi&

diff --git a/src/Web/src/components/mapCanvas.jsx b/src/Web/src/components/mapCanvas.jsx
index 25102b1..daaae70 100644
--- a/src/Web/src/components/mapCanvas.jsx
+++ b/src/Web/src/components/mapCanvas.jsx
@@ -15,8 +15,8 @@ export default class MapCanvas extends React.Component {
     // Get a reference to the canvas element so we can draw on it
     this.canvasRef = React.createRef();
     this.state = {
-      inputValue: '8a97354d-d4ac-43c6-8b32-528cc24e3ede',
-      searchOption: 'id',
+      inputValue: '',
+      searchOption: 'name',
       canvasWidth: props.width   || this.defaultWidth,
       canvasHeight: props.height || this.defaultHeight,
     };
@@ -33,16 +33,18 @@ export default class MapCanvas extends React.Component {
     this.draw();
   }
 
-  async getLinePoints(endpoint = '') {
+  async getLinePoints(endpoint = '', altKey, altVal) {
     try {
       const { searchOption, inputValue } = this.state;
-      const url = `${API_ENDPOINT}/database/${endpoint}?${searchOption}=${inputValue}`;
+      const key = altKey || this.state.searchOption;
+      const val = altVal || this.state.inputValue;
+      const url = `${API_ENDPOINT}/database/${endpoint}?${key}=${val}`;
       const data = await (await fetch(url)).json();
 
       // Combine all found sets into a singular array.
-      const map = [];
+      const map = { 'id': data.length < 2 ? data[0].Id : undefined, 'points': [] };
       if (!Array.isArray(data) || data.length < 1) return map;
-      data.forEach((set) => set.Objects.forEach((coord) => map.push(coord)));
+      data.forEach((set) => set.Objects.forEach((coord) => map.points.push(coord)));
 
       return map;
     } catch (ex) {
@@ -55,9 +57,8 @@ export default class MapCanvas extends React.Component {
     // Get the 2D context from the canvas element
     const ctx = this.canvasRef.current.getContext('2d');
     // Get the points to draw from the server
-    const points = await this.getLinePoints();
-    const route = await this.getLinePoints("path");
-    // const route = await this.getRoutePoints();
+    const map = await this.getLinePoints();
+    const route = await this.getLinePoints('path', 'id', map ? map.id : '');
 
     // Set the font for the text we will draw on the canvas
     ctx.font = "24px Comic Sans MS";
@@ -66,7 +67,7 @@ export default class MapCanvas extends React.Component {
     ctx.clearRect(0, 0, this.state.canvasWidth, this.state.canvasHeight);
 
     // If there are no points, display a message and return
-    if (!points || points.length < 1) {
+    if (!map || map.points.length < 1) {
       ctx.fillText("No valid entry found.", 10, this.state.canvasHeight / 2);
       return;
     }
@@ -74,14 +75,14 @@ export default class MapCanvas extends React.Component {
     // Loop trough all coordinates, draw a dot at each point to form a top-down
     // view of the objects.
     ctx.fillStyle = "#000";
-    points.forEach(point => {
+    map.points.forEach(point => {
       ctx.beginPath();
       ctx.arc(point[1], point[0], 1, 0, 2 * Math.PI);
       ctx.fill();
     });
 
     ctx.fillStyle = "#800000";
-    route.forEach(point => {
+    route.points.forEach(point => {
       ctx.beginPath();
       ctx.arc(point[1], point[0], 1, 0, 2 * Math.PI);
       ctx.fill();
@@ -99,9 +100,8 @@ export default class MapCanvas extends React.Component {
             value={searchOption}
             onChange={(val) => this.setState({ searchOption: val })}
           >
+            <Select value="name">Name</Select>
             <Select value="id">ID</Select>
-            <Select value="version">Version</Select>
-            <Select value="date">Date</Select>
             <Select value="all">All</Select>
           </Select>
           <Input