Big commit

Yarik
1 parent cc1ac3ea
Showing 32 changed files with 729 additions and 19 deletions Show diff stats
src/MapConsole/OsmImport.cs
src/MapConsole/Program.cs
src/MapConsole/bin/Debug/netcoreapp1.0/MapConsole.dll
src/MapConsole/bin/Debug/netcoreapp1.0/MapConsole.pdb
src/MapConsole/bin/Debug/netcoreapp1.0/MapsDb.dll
src/MapConsole/bin/Debug/netcoreapp1.0/MapsDb.pdb
src/MapConsole/bin/Debug/netcoreapp1.0/MapsModels.dll
src/MapConsole/bin/Debug/netcoreapp1.0/MapsModels.pdb
src/Maps/Controllers/AuthorityController.cs
src/Maps/Controllers/ContractorController.cs
src/Maps/Controllers/RoadController.cs
src/Maps/Startup.cs
src/MapsDb/DataService/AuthorityDs.cs
src/MapsDb/DataService/ContractorDs.cs
src/MapsDb/DataService/CrossSectionDs.cs
src/MapsDb/DataService/RoadDs.cs
src/MapsDb/Interfaces/IAuthorityDs.cs
src/MapsDb/Interfaces/IContractorDs.cs
src/MapsDb/Interfaces/ICrossSectionDs.cs
src/MapsDb/Interfaces/IRoadDs.cs
@@ -153,6 +153,14 @@ namespace MapConsole
             Console.WriteLine(doc.ToString());
         }
+        public async Task Relation(int Id)
+        {
+            await Task.Run(async () => {
+                Curl curl = new Curl();
+                string result = await curl.GetRelation(Id);
+                this.SaveRelation(result);
+            });
+        }
         public async Task Relation()
         {
             await Task.Run(async () => {
@@ -184,23 +192,6 @@ namespace MapConsole
             XElement relationEl = doc.Root.Element("relation");
             string relationRemoteId = relationEl.Attribute("id").Value;
             string[] inserted = { 
-                // "443032",
-                // "395707",
-                // "2143285",
-                // "2143788",
-                // "2162219",
-                // "2683872",
-                // "1613996",
-                // "1147187",
-                // "1147852",
-                // "23751",
-                // "2143724",
-                // "451785",
-                // "2141546",
-                // "2143335",
-                // "1151237",
-                // "975415",
-                // "1602684"
             };
             if (inserted.Contains(relationRemoteId)) {
                 Console.WriteLine("Skipped relation " + relationRemoteId);
@@ -30,6 +30,11 @@ namespace MapConsole
                 case "relation":
                     osm.Relation().Wait();
                     break;
+                case "relationId":
+                    Console.WriteLine("Введите ID");
+                    string line = Console.ReadLine();
+                    osm.Relation(Int32.Parse(line)).Wait();
+                    break;
             }
         }
     }
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using MapsDb;
+using MapsDb.Interfaces;
+using MapsDb.DataService;
+using MapsModels.ViewModels;
+using MapsModels.DsModels;
+using System;
+
+namespace Maps.Controllers
+{
+    public class AuthorityController : Controller
+    {
+        private readonly IAuthorityDs _authorityDs;
+        private readonly IRoadDs _roadDs;
+        private readonly ICrossSectionDs _crossSectionDs;
+
+        public AuthorityController(IAuthorityDs AuthorityDs, IRoadDs RoadDs, ICrossSectionDs CrossSectionDs, IRegionDs RegionDs)
+        {
+            _authorityDs = AuthorityDs;
+            _roadDs = RoadDs;    
+            _crossSectionDs = CrossSectionDs;       
+        }
+
+        // GET: Authority
+        [HttpGet]
+        public async Task<IActionResult> Index([FromQuery] PaginationDsM data)
+        {
+     
+                var authoritys = await _authorityDs.GetIndexListAsync(data);
+
+                AuthorityListVm vm = new AuthorityListVm
+                {
+                    AuthorityEditDsM = authoritys.ToList()
+                };
+
+                return Json(vm);
+   
+
+
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> Directory(){
+            var Road = await _roadDs.GetSelectListAsync();
+            var CrossSection = await _crossSectionDs.GetSelectListAsync();
+
+            CatalogListVm vm = new CatalogListVm
+            {
+                RoadSelectListDsM = Road.ToList(),
+                CrossSectionSelectListDsM = CrossSection.ToList(),
+            };
+            return Json(vm);
+        }
+
+
+        [HttpPost]
+        public async Task<IActionResult> Create([FromBody] AuthorityEditDsM data)
+        {
+            var result = await _authorityDs.CreateAsync(data);
+            return Json(result);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> Update(int id, [FromBody] AuthorityEditDsM data){
+                await _authorityDs.UpdateAsync(data,id);
+                return Json(String.Empty);
+        }
+
+     
+        [HttpDelete]
+        public async Task<IActionResult> Delete(int id)
+        {   
+            try
+            {
+                int authority = await _authorityDs.DeleteAsync(id);
+                 return Json(authority);
+            }
+            catch (ArgumentNullException )
+            {
+                return NotFound();
+            }
+        }
+    }
+}
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using MapsDb;
+using MapsDb.Interfaces;
+using MapsDb.DataService;
+using MapsModels.ViewModels;
+using MapsModels.DsModels;
+using System;
+
+namespace Maps.Controllers
+{
+    public class ContractorController : Controller
+    {
+        private readonly IContractorDs _contractorDs;
+        private readonly IRoadDs _roadDs;
+        private readonly ICrossSectionDs _crossSectionDs;
+
+        public ContractorController(IContractorDs ContractorDs, IRoadDs RoadDs, ICrossSectionDs CrossSectionDs, IRegionDs RegionDs)
+        {
+            _contractorDs = ContractorDs;
+            _roadDs = RoadDs;    
+            _crossSectionDs = CrossSectionDs;       
+        }
+
+        // GET: Contractor
+        [HttpGet]
+        public async Task<IActionResult> Index([FromQuery] PaginationDsM data)
+        {
+     
+                var contractors = await _contractorDs.GetIndexListAsync(data);
+
+                ContractorListVm vm = new ContractorListVm
+                {
+                    ContractorEditDsM = contractors.ToList()
+                };
+
+                return Json(vm);
+   
+
+
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> Directory(){
+            var Road = await _roadDs.GetSelectListAsync();
+            var CrossSection = await _crossSectionDs.GetSelectListAsync();
+
+            CatalogListVm vm = new CatalogListVm
+            {
+                RoadSelectListDsM = Road.ToList(),
+                CrossSectionSelectListDsM = CrossSection.ToList(),
+            };
+            return Json(vm);
+        }
+
+
+        [HttpPost]
+        public async Task<IActionResult> Create([FromBody] ContractorEditDsM data)
+        {
+            var result = await _contractorDs.CreateAsync(data);
+            return Json(result);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> Update(int id, [FromBody] ContractorEditDsM data){
+                await _contractorDs.UpdateAsync(data,id);
+                return Json(String.Empty);
+        }
+
+     
+        [HttpDelete]
+        public async Task<IActionResult> Delete(int id)
+        {   
+            try
+            {
+                int contractor = await _contractorDs.DeleteAsync(id);
+                 return Json(contractor);
+            }
+            catch (ArgumentNullException )
+            {
+                return NotFound();
+            }
+        }
+    }
+}
@@ -94,5 +94,27 @@ namespace Maps.Controllers
             List<WayLook> result = _roadDs.GetRelationAsync(Id);
             return Json(result);
         }
+
+        [HttpGet]
+        public async Task<IActionResult> RoadByWay(int Id)
+        {
+            RoadVm result = _roadDs.GetByWay(Id);
+            if (result == null) {
+                return NotFound();
+            } else {
+                return Json(result);                
+            }
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> RoadByNode(int Id)
+        {
+            RoadVm result = _roadDs.GetByNode(Id);
+            if (result == null) {
+                return NotFound();
+            } else {
+                return Json(result);                
+            }
+        }
     }
 }
@@ -57,6 +57,10 @@ namespace Maps
                 cnf.CreateMap<SettlementAddressLinkEditDsM, SettlementAddressLink>();
                 cnf.CreateMap<RoadToCategory, RoadToCategoryEditDsM>();
                 cnf.CreateMap<RoadToCategoryEditDsM, RoadToCategory>();
+                cnf.CreateMap<AuthorityEditDsM, Authority>();
+                cnf.CreateMap<Authority, AuthorityEditDsM>();
+                cnf.CreateMap<ContractorEditDsM, Contractor>();
+                cnf.CreateMap<Contractor, ContractorEditDsM>();
             });
             services.AddScoped<IBusStopDs, BusStopDs>();
@@ -81,6 +85,8 @@ namespace Maps
             services.AddScoped<ISettlementAddressLinkDs, SettlementAddressLinkDs>();
             services.AddScoped<IRoadToCategoryDs, RoadToCategoryDs>();
             services.AddScoped<IRoadCategoryDs, RoadCategoryDs>();
+            services.AddScoped<IAuthorityDs, AuthorityDs>();
+            services.AddScoped<IContractorDs, ContractorDs>();
             // Add framework services.
             services.AddApplicationInsightsTelemetry(Configuration);
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using AutoMapper;
+using MapsDb.Interfaces;
+using MapsDb.Models;
+using MapsModels.DsModels;
+using Microsoft.EntityFrameworkCore;
+
+namespace MapsDb.DataService
+{
+    public class AuthorityDs : IAuthorityDs
+    {
+        private PostgresDbContext _context;
+        public AuthorityDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<AuthorityEditDsM>> GetIndexListAsync(PaginationDsM pagination){
+            return Task.Factory.StartNew(()=> { return GetAllAuthority(pagination); });
+        }
+        private IList<AuthorityEditDsM> GetAllAuthority(PaginationDsM pagination)
+        {
+
+            var filter =  pagination.filter;
+
+            IQueryable<Authority> data = _context.Authority
+            .Include(d=>d.Road)
+            .Include(d=>d.CrossSection);
+
+            IQueryable<AuthorityEditDsM> result = data
+            .Select(Authority => Mapper.Map<AuthorityEditDsM>(Authority))
+            .Skip(pagination.from)
+            .Take(pagination.perPage);
+
+            switch (pagination.orderType())
+            {
+                case "ASC":
+                    return result.OrderBy(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
+          
+                case "DESC":
+                    return result.OrderByDescending(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
+            
+                default:
+                    return result.OrderByDescending(i => i.Id).ToList();
+            }     
+            
+        }
+
+        public Task<Authority> CreateAsync(AuthorityEditDsM data){
+              return Task.Factory.StartNew(()=> { return Create(data); });
+        }
+        private Authority Create(AuthorityEditDsM data)
+        {   
+            
+            Authority Model = InsertModel(data);
+            _context.Authority.Add(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public Task<Authority> UpdateAsync(AuthorityEditDsM data, int id){
+            return Task.Factory.StartNew(()=> { return Update(data, id); });
+        }
+        private Authority Update(AuthorityEditDsM data, int id)
+        {   
+            Authority Model = InsertModel(data);
+            Model.Id = id;
+            _context.Authority.Update(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public Authority InsertModel(AuthorityEditDsM data){
+            Authority Model = Mapper.Map<Authority>(data);
+            return Model;
+        }
+        public async Task<int> DeleteAsync(int Id)
+        {
+            var authority = await _context.Authority.SingleOrDefaultAsync(x => x.Id == Id);
+            _context.Authority.Remove(authority);
+            return await _context.SaveChangesAsync();
+        }
+    }
+}
 \ No newline at end of file
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using AutoMapper;
+using MapsDb.Interfaces;
+using MapsDb.Models;
+using MapsModels.DsModels;
+using Microsoft.EntityFrameworkCore;
+
+namespace MapsDb.DataService
+{
+    public class ContractorDs : IContractorDs
+    {
+        private PostgresDbContext _context;
+        public ContractorDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<ContractorEditDsM>> GetIndexListAsync(PaginationDsM pagination){
+            return Task.Factory.StartNew(()=> { return GetAllContractor(pagination); });
+        }
+        private IList<ContractorEditDsM> GetAllContractor(PaginationDsM pagination)
+        {
+
+            var filter =  pagination.filter;
+
+            IQueryable<Contractor> data = _context.Contractor
+            .Include(d=>d.Road)
+            .Include(d=>d.CrossSection);
+
+            IQueryable<ContractorEditDsM> result = data
+            .Select(Contractor => Mapper.Map<ContractorEditDsM>(Contractor))
+            .Skip(pagination.from)
+            .Take(pagination.perPage);
+
+            switch (pagination.orderType())
+            {
+                case "ASC":
+                    return result.OrderBy(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
+          
+                case "DESC":
+                    return result.OrderByDescending(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
+            
+                default:
+                    return result.OrderByDescending(i => i.Id).ToList();
+            }     
+            
+        }
+
+        public Task<Contractor> CreateAsync(ContractorEditDsM data){
+              return Task.Factory.StartNew(()=> { return Create(data); });
+        }
+        private Contractor Create(ContractorEditDsM data)
+        {   
+            
+            Contractor Model = InsertModel(data);
+            _context.Contractor.Add(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public Task<Contractor> UpdateAsync(ContractorEditDsM data, int id){
+            return Task.Factory.StartNew(()=> { return Update(data, id); });
+        }
+        private Contractor Update(ContractorEditDsM data, int id)
+        {   
+            Contractor Model = InsertModel(data);
+            Model.Id = id;
+            _context.Contractor.Update(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public Contractor InsertModel(ContractorEditDsM data){
+            Contractor Model = Mapper.Map<Contractor>(data);
+            return Model;
+        }
+        public async Task<int> DeleteAsync(int Id)
+        {
+            var contractor = await _context.Contractor.SingleOrDefaultAsync(x => x.Id == Id);
+            _context.Contractor.Remove(contractor);
+            return await _context.SaveChangesAsync();
+        }
+    }
+}
 \ No newline at end of file
@@ -14,6 +14,17 @@ namespace MapsDb.DataService
         public CrossSectionDs(){
             _context = new PostgresDbContext();
         }
+        public Task<IList<CrossSectionSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<CrossSectionSelectListDsM> GetSelectList()
+        {
+           return _context.CrossSection.Select(x => new CrossSectionSelectListDsM
+            {
+                Id = x.Id, 
+                Name = x.Id.ToString()
+            }).ToList();
+        }
         public Task<IList<CrossSectionEditDsM>> GetIndexListAsync(PaginationDsM pagination){
             return Task.Factory.StartNew(()=> { return GetAllCrossSection(pagination); });
         }
@@ -144,5 +144,42 @@ namespace MapsDb.DataService
             }
             return result;
         }
+
+        public RoadVm GetByWay(int Id)
+        {
+            RoadVm road = _context.Road.Where(x => x.RelationToRoad.Any(y => y.Relation.WayToRelation.Any(z => z.WayId == Id))).Include(t => t.RoadType).Select(r => new RoadVm{
+                Id = r.Id,
+                Name = r.Name,
+                Value = r.Value,
+                Length = r.Length,
+                HistoricalBackground = r.HistoricalBackground,
+                EconomicValue = r.EconomicValue,
+                LawDoc = r.LawDoc,
+                AcceptTransferDoc = r.AcceptTransferDoc,
+                AcceptanceDoc = r.AcceptanceDoc,
+                AuthorityAct = r.AuthorityAct,
+                RoadType = r.RoadType.Value,
+                Index = r.Index
+            }).FirstOrDefault();
+            return road;
+        }
+        public RoadVm GetByNode(int Id)
+        {
+            RoadVm road = _context.Road.Where(x => x.RelationToRoad.Any(y => y.Relation.WayToRelation.Any(z => z.Way.NodeToWay.Any(a => a.NodeId == Id)))).Include(t => t.RoadType).Select(r => new RoadVm{
+                Id = r.Id,
+                Name = r.Name,
+                Value = r.Value,
+                Length = r.Length,
+                HistoricalBackground = r.HistoricalBackground,
+                EconomicValue = r.EconomicValue,
+                LawDoc = r.LawDoc,
+                AcceptTransferDoc = r.AcceptTransferDoc,
+                AcceptanceDoc = r.AcceptanceDoc,
+                AuthorityAct = r.AuthorityAct,
+                RoadType = r.RoadType.Value,
+                Index = r.Index
+            }).FirstOrDefault();
+            return road;
+        }
     }
 }
 \ No newline at end of file
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MapsModels.DsModels;
+using MapsDb.Models;
+namespace MapsDb.Interfaces
+{
+    public interface IAuthorityDs
+    {
+        Task<IList<AuthorityEditDsM>> GetIndexListAsync(PaginationDsM pagination);
+        Task<Authority> CreateAsync(AuthorityEditDsM authority);
+        Task<Authority> UpdateAsync(AuthorityEditDsM authority, int id);
+        Task<int> DeleteAsync(int Id);
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MapsModels.DsModels;
+using MapsDb.Models;
+namespace MapsDb.Interfaces
+{
+    public interface IContractorDs
+    {
+        Task<IList<ContractorEditDsM>> GetIndexListAsync(PaginationDsM pagination);
+        Task<Contractor> CreateAsync(ContractorEditDsM contractor);
+        Task<Contractor> UpdateAsync(ContractorEditDsM contractor, int id);
+        Task<int> DeleteAsync(int Id);
+    }
+}
 \ No newline at end of file
@@ -6,6 +6,7 @@ namespace MapsDb.Interfaces
 {
     public interface ICrossSectionDs
     {
+        Task<IList<CrossSectionSelectListDsM>> GetSelectListAsync();
         Task<IList<CrossSectionEditDsM>> GetIndexListAsync(PaginationDsM pagination);
         Task<CrossSection> CreateAsync(CrossSectionEditDsM CrossSection);
         Task<CrossSection> UpdateAsync(CrossSectionEditDsM CrossSection, int id);
@@ -15,5 +15,7 @@ namespace MapsDb.Interfaces
         Task<Road> UpdateAsync(RoadEditDsM road, int id);
         Task<int> DeleteAsync(int Id);
         List<WayLook> GetRelationAsync(int Id);
+        RoadVm GetByWay(int Id);
+        RoadVm GetByNode(int Id);
     }
 }
 \ No newline at end of file
+using System;
+using System.Collections.Generic;
+
+namespace MapsDb.Models
+{
+    public partial class Authority
+    {
+        public int Id { get; set; }
+        public int RoadId { get; set; }
+        public int? CrossSectionId { get; set; }
+        public string AuthorityName { get; set; }
+        public string Info { get; set; }
+        public int? RoadSectionNumber { get; set; }
+        public decimal Begin { get; set; }
+        public decimal End { get; set; }
+        public decimal Length { get; set; }
+        public string RightCoords { get; set; }
+        public string BeginScheme { get; set; }
+        public string EndScheme { get; set; }
+
+        public virtual CrossSection CrossSection { get; set; }
+        public virtual Road Road { get; set; }
+    }
+}
 \ No newline at end of file
+using System;
+using System.Collections.Generic;
+
+namespace MapsDb.Models
+{
+    public partial class Contractor
+    {
+        public int Id { get; set; }
+        public int RoadId { get; set; }
+        public int? CrossSectionId { get; set; }
+        public string ContractorName { get; set; }
+        public string Info { get; set; }
+        public int? RoadSectionNumber { get; set; }
+        public int? ContractorSectionNumber { get; set; }
+        public decimal? Begin { get; set; }
+        public decimal? End { get; set; }
+        public decimal Length { get; set; }
+        public string RightCoords { get; set; }
+        public string BeginScheme { get; set; }
+        public string EndScheme { get; set; }
+
+        public virtual CrossSection CrossSection { get; set; }
+        public virtual Road Road { get; set; }
+    }
+}
 \ No newline at end of file
 using System;
 using System.Collections.Generic;
-namespace MapsDb.Models
+namespace  MapsDb.Models
 {
     public partial class CrossSection
     {
+        public CrossSection()
+        {
+            Authority = new HashSet<Authority>();
+            Contractor = new HashSet<Contractor>();
+        }
+
         public int Id { get; set; }
         public int? RegionId { get; set; }
         public int? RoadId { get; set; }
@@ -23,6 +29,8 @@ namespace MapsDb.Models
         public int? YearRepair { get; set; }
         public int? StateCommonId { get; set; }
+        public virtual ICollection<Authority> Authority { get; set; }
+        public virtual ICollection<Contractor> Contractor { get; set; }
         public virtual Region Region { get; set; }
         public virtual Road Road { get; set; }
         public virtual StateCommon StateCommon { get; set; }
@@ -7,7 +7,9 @@ namespace MapsDb.Models
     {
         public Road()
         {
+            Authority = new HashSet<Authority>();
             BusStop = new HashSet<BusStop>();
+            Contractor = new HashSet<Contractor>();
             CrossSection = new HashSet<CrossSection>();
             FlowIntensity = new HashSet<FlowIntensity>();
             RelationToRoad = new HashSet<RelationToRoad>();
@@ -33,7 +35,9 @@ namespace MapsDb.Models
         public int? RoadTypeId { get; set; }
         public int Index { get; set; }
+        public virtual ICollection<Authority> Authority { get; set; }
         public virtual ICollection<BusStop> BusStop { get; set; }
+        public virtual ICollection<Contractor> Contractor { get; set; }
         public virtual ICollection<CrossSection> CrossSection { get; set; }
         public virtual ICollection<FlowIntensity> FlowIntensity { get; set; }
         public virtual ICollection<RelationToRoad> RelationToRoad { get; set; }
 using System;
+using MapsDb.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
-using MapsDb.Models;
+
 namespace MapsDb
 {
     public partial class PostgresDbContext : DbContext
     {
+        public virtual DbSet<Authority> Authority { get; set; }
         public virtual DbSet<BusStop> BusStop { get; set; }
+        public virtual DbSet<Contractor> Contractor { get; set; }
         public virtual DbSet<CrossSection> CrossSection { get; set; }
         public virtual DbSet<DepartmentAffiliation> DepartmentAffiliation { get; set; }
         public virtual DbSet<FlowIntensity> FlowIntensity { get; set; }
@@ -44,6 +47,60 @@ namespace MapsDb
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            modelBuilder.Entity<Authority>(entity =>
+            {
+                entity.ToTable("authority");
+
+                entity.Property(e => e.Id).HasColumnName("id");
+
+                entity.Property(e => e.AuthorityName)
+                    .HasColumnName("authority_name")
+                    .HasColumnType("varchar")
+                    .HasMaxLength(255);
+
+                entity.Property(e => e.Begin).HasColumnName("begin");
+
+                entity.Property(e => e.BeginScheme)
+                    .HasColumnName("begin_scheme")
+                    .HasColumnType("varchar")
+                    .HasMaxLength(255);
+
+                entity.Property(e => e.CrossSectionId).HasColumnName("cross_section_id");
+
+                entity.Property(e => e.End).HasColumnName("end");
+
+                entity.Property(e => e.EndScheme)
+                    .HasColumnName("end_scheme")
+                    .HasColumnType("varchar")
+                    .HasMaxLength(255);
+
+                entity.Property(e => e.Info).HasColumnName("info");
+
+                entity.Property(e => e.Length)
+                    .HasColumnName("length")
+                    .HasDefaultValueSql("0");
+
+                entity.Property(e => e.RightCoords)
+                    .HasColumnName("right_coords")
+                    .HasColumnType("varchar")
+                    .HasMaxLength(255);
+
+                entity.Property(e => e.RoadId).HasColumnName("road_id");
+
+                entity.Property(e => e.RoadSectionNumber).HasColumnName("road_section_number");
+
+                entity.HasOne(d => d.CrossSection)
+                    .WithMany(p => p.Authority)
+                    .HasForeignKey(d => d.CrossSectionId)
+                    .HasConstraintName("authority_cross_section_id_fk");
+
+                entity.HasOne(d => d.Road)
+                    .WithMany(p => p.Authority)
+                    .HasForeignKey(d => d.RoadId)
+                    .OnDelete(DeleteBehavior.Restrict)
+                    .HasConstraintName("authority_road_id_fk");
+            });
+
             modelBuilder.Entity<BusStop>(entity =>
             {
                 entity.ToTable("bus_stop");
@@ -127,6 +184,62 @@ namespace MapsDb
                     .HasConstraintName("bus_stop_surface_type_id_fkey");
             });
+            modelBuilder.Entity<Contractor>(entity =>
+            {
+                entity.ToTable("contractor");
+
+                entity.Property(e => e.Id).HasColumnName("id");
+
+                entity.Property(e => e.Begin).HasColumnName("begin");
+
+                entity.Property(e => e.BeginScheme)
+                    .HasColumnName("begin_scheme")
+                    .HasColumnType("varchar")
+                    .HasMaxLength(255);
+
+                entity.Property(e => e.ContractorName)
+                    .HasColumnName("contractor_name")
+                    .HasColumnType("varchar")
+                    .HasMaxLength(255);
+
+                entity.Property(e => e.ContractorSectionNumber).HasColumnName("contractor_section_number");
+
+                entity.Property(e => e.CrossSectionId).HasColumnName("cross_section_id");
+
+                entity.Property(e => e.End).HasColumnName("end");
+
+                entity.Property(e => e.EndScheme)
+                    .HasColumnName("end_scheme")
+                    .HasColumnType("varchar")
+                    .HasMaxLength(255);
+
+                entity.Property(e => e.Info).HasColumnName("info");
+
+                entity.Property(e => e.Length)
+                    .HasColumnName("length")
+                    .HasDefaultValueSql("0");
+
+                entity.Property(e => e.RightCoords)
+                    .HasColumnName("right_coords")
+                    .HasColumnType("varchar")
+                    .HasMaxLength(255);
+
+                entity.Property(e => e.RoadId).HasColumnName("road_id");
+
+                entity.Property(e => e.RoadSectionNumber).HasColumnName("road_section_number");
+
+                entity.HasOne(d => d.CrossSection)
+                    .WithMany(p => p.Contractor)
+                    .HasForeignKey(d => d.CrossSectionId)
+                    .HasConstraintName("contractor_cross_section_id_fk");
+
+                entity.HasOne(d => d.Road)
+                    .WithMany(p => p.Contractor)
+                    .HasForeignKey(d => d.RoadId)
+                    .OnDelete(DeleteBehavior.Restrict)
+                    .HasConstraintName("contractor_road_id_fk");
+            });
+
             modelBuilder.Entity<CrossSection>(entity =>
             {
                 entity.ToTable("cross_section");
+namespace MapsModels.DsModels
+{
+    public class AuthorityEditDsM
+    {
+        public int? Id { get; set; }
+        public int RoadId { get; set; }
+        public int? CrossSectionId { get; set; }
+        public string AuthorityName { get; set; }
+        public string Info { get; set; }
+        public int? RoadSectionNumber { get; set; }
+        public decimal Begin { get; set; }
+        public decimal End { get; set; }
+        public decimal Length { get; set; }
+        public string RightCoords { get; set; }
+        public string BeginScheme { get; set; }
+        public string EndScheme { get; set; }
+
+    }
+}
 \ No newline at end of file
+namespace MapsModels.DsModels
+{
+    public class ContractorEditDsM
+    {
+        public int? Id { get; set; }
+        public int RoadId { get; set; }
+        public int? CrossSectionId { get; set; }
+        public string ContractorName { get; set; }
+        public string Info { get; set; }
+        public int? RoadSectionNumber { get; set; }
+        public int? ContractorSectionNumber { get; set; }
+        public decimal? Begin { get; set; }
+        public decimal? End { get; set; }
+        public decimal Length { get; set; }
+        public string RightCoords { get; set; }
+        public string BeginScheme { get; set; }
+        public string EndScheme { get; set; }
+
+    }
+}
 \ No newline at end of file
+namespace MapsModels.DsModels
+{
+    public class CrossSectionSelectListDsM
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using MapsModels.DsModels;
+
+namespace MapsModels.ViewModels
+{
+    public class AuthorityListVm
+    {
+        public List<AuthorityEditDsM> AuthorityEditDsM { get; set; }
+    }
+}
@@ -18,5 +18,6 @@ namespace MapsModels.ViewModels
         public List<OrganizationSelectListDsM> OrganizationSelectListDsM { get; set; }
         public List<SettlementLocationSelectListDsM> SettlementLocationSelectListDsM { get; set; }
         public List<RoadCategorySelectListDsM> RoadCategorySelectListDsM { get; set; }
+        public List<CrossSectionSelectListDsM> CrossSectionSelectListDsM { get; set; }
     }
 }
+using System.Collections.Generic;
+using MapsModels.DsModels;
+
+namespace MapsModels.ViewModels
+{
+    public class ContractorListVm
+    {
+        public List<ContractorEditDsM> ContractorEditDsM { get; set; }
+    }
+}
+namespace MapsModels.ViewModels
+{
+    public class RoadVm
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Value { get; set; }
+        public double? Length { get; set; }
+        public string HistoricalBackground { get; set; }
+        public string EconomicValue { get; set; }
+        public string LawDoc { get; set; }
+        public string AcceptTransferDoc { get; set; }
+        public string AcceptanceDoc { get; set; }
+        public string AuthorityAct { get; set; }
+        public string RoadType { get; set; }
+        public int Index { get; set; }
+
+    }
+}
 \ No newline at end of file