- merge layer contract

- rename service
- added areas properties

SDK/Connection/V3/Layers.cs

@@ -19,6 +19,7 @@ namespace tDevkit
 
             return response;
         }
+
         public async Task<LayerContract> GetLayer(int id, string queryString = "")
         {
             string subUrl = Url.Combine(Address.Layers, Convert.ToString(id), queryString);
@@ -26,10 +27,11 @@ namespace tDevkit
 
             return response;
         }
-        public async Task<LayerNoGoContract[]> GetNoGoLayers(string deviceLogin, string queryString = "")
+
+        public async Task<LayerContract[]> GetLocalizationLayers(string deviceLogin, string queryString = "")
         {
             string subUrl = Url.Combine(Address.LayersNoGo, deviceLogin, queryString);
-            var response = await GetRequest<LayerNoGoContract[]>(subUrl);
+            var response = await GetRequest<LayerContract[]>(subUrl);
 
             return response;
         }

SDK/Contracts/Data/DeviceLocationContract.cs

@@ -36,6 +36,10 @@ namespace SDK.Contracts.Data
         public bool IsMoving { get; set; }
 
         public DistanceContract[] Distances { get; set; }
+
+        public int[] LocalizationAreas { get; set; }
+
+        public int[] NoGoAreas { get; set; }
     }
 
     public class DistanceContract

SDK/Contracts/Data/LayerContract.cs

@@ -28,5 +28,7 @@ namespace SDK.Contracts.Data
         public AreaContract[] Areas { get; set; }
 
         public DeviceContract[] Devices { get; set; }
+
+        public bool IsNoGO { get; set; }
     }
 }

SDK/Contracts/Data/LayerNoGoContract.cs

-using SDK.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SDK.Contracts.Data
-{
-    public class LayerNoGoContract : LayerContract
-    {
-        public bool IsNoGO { get; set; }
-    }
-}