Skip to content

Commit

Permalink
Merge pull request #26 from YPermitin/develop
Browse files Browse the repository at this point in the history 
Исправление ошибок
  • Loading branch information
@YPermitin
YPermitin authored Nov 17, 2023
2 parents b87a145 + f188361 commit a63229a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
44 changes: 22 additions & 22 deletions Libs/YPermitin.FIASToolSet.DistributionLoader/FIASDistributionLoader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,15 @@ public string ExtractDataForRegion(Region region)
distributionFileType = DistributionFileType.GARFIASXmlDelta;

var availableRegions = Distribution.GetAvailableRegions(distributionFileType);
var regionItem = availableRegions.FirstOrDefault(e => e == region.Code.ToString());
var regionItem = availableRegions.FirstOrDefault(e => e == region.Code.ToString("00"));
if (regionItem == null)
{
throw new RegionNotFoundException(
$"Не найден регион с кодом \"{region.Code}\" среди доступных регионов в дистрибутиве ФИАС.",
region.ToString());
}

Distribution.ExtractDistributionRegionFiles(distributionFileType, region.Code.ToString());
Distribution.ExtractDistributionRegionFiles(distributionFileType, region.Code.ToString("00"));

return GetDataDirectoryForRegion(region);
}
Expand All @@ -215,7 +215,7 @@ public string ExtractDataForRegion(Region region)
/// <returns>Путь к каталогу с данными по региону</returns>
public string GetDataDirectoryForRegion(Region region)
{
return Path.Combine(_distributionDirectory, region.Code.ToString());
return Path.Combine(_distributionDirectory, region.Code.ToString("00"));
}

/// <summary>
Expand All @@ -230,7 +230,7 @@ public void RemoveDistributionRegionDirectory(Region region)
else
distributionFileType = DistributionFileType.GARFIASXmlDelta;

Distribution.RemoveDistributionRegionDirectory(distributionFileType, region.Code.ToString());
Distribution.RemoveDistributionRegionDirectory(distributionFileType, region.Code.ToString("00"));
}

public async Task SetInstallationToStatusNew()
Expand Down Expand Up @@ -992,7 +992,7 @@ public async Task LoadAddressObjects(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

AddressObjectCollection fiasAddressObjects;
Expand Down Expand Up @@ -1036,7 +1036,7 @@ public async Task LoadAddressObjectDivisions(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

AddressObjectDivisionCollection fiasAddressObjectDivisions;
Expand Down Expand Up @@ -1080,7 +1080,7 @@ public async Task LoadAddressObjectParameters(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

AddressObjectParameterCollection fiasAddressObjectParameters;
Expand Down Expand Up @@ -1124,7 +1124,7 @@ public async Task LoadAddressObjectsAdmHierarchy(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

AddressObjectAdmHierarchyCollection fiasAddressObjectsAdmHierarchy;
Expand Down Expand Up @@ -1168,7 +1168,7 @@ public async Task LoadAddressObjectsMunHierarchy(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

MunHierarchyCollection fiasAddressObjectsMunHierarchy;
Expand Down Expand Up @@ -1212,7 +1212,7 @@ public async Task LoadApartments(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

ApartmentCollection fiasApartments;
Expand Down Expand Up @@ -1256,7 +1256,7 @@ public async Task LoadApartmentParameters(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

ApartmentParameterCollection fiasApartmentParameters;
Expand Down Expand Up @@ -1300,7 +1300,7 @@ public async Task LoadCarPlaces(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

CarPlaceCollection fiasCarPlaces;
Expand Down Expand Up @@ -1344,7 +1344,7 @@ public async Task LoadCarPlaceParameters(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

CarPlaceParameterCollection fiasCarPlaceParameters;
Expand Down Expand Up @@ -1388,7 +1388,7 @@ public async Task LoadHouses(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

HouseCollection fiasHouses;
Expand Down Expand Up @@ -1432,7 +1432,7 @@ public async Task LoadHouseParameters(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

HouseParameterCollection fiasHouseParameters;
Expand Down Expand Up @@ -1476,7 +1476,7 @@ public async Task LoadRooms(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

RoomCollection fiasRooms;
Expand Down Expand Up @@ -1520,7 +1520,7 @@ public async Task LoadRoomParameters(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

RoomParameterCollection fiasRoomParameters;
Expand Down Expand Up @@ -1564,7 +1564,7 @@ public async Task LoadSteads(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

SteadCollection fiasSteads;
Expand Down Expand Up @@ -1608,7 +1608,7 @@ public async Task LoadSteadParameters(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

SteadParameterCollection fiasSteadParameters;
Expand Down Expand Up @@ -1652,7 +1652,7 @@ public async Task LoadNormativeDocuments(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

NormativeDocumentCollection fiasNormativeDocuments;
Expand Down Expand Up @@ -1696,7 +1696,7 @@ public async Task LoadChangeHistory(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

ChangeHistoryCollection fiasChangeHistory;
Expand Down Expand Up @@ -1740,7 +1740,7 @@ public async Task LoadObjectsRegistry(Region region)
.FirstOrDefault(e => e.Code == region.Code);
if (fiasDistributionRegion == null)
{
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString());
throw new RegionNotFoundException("Не удалось найти регион.", region.Code.ToString("00"));
}

ObjectRegistryCollection fiasObjectsRegistry;
Expand Down
2 changes: 1 addition & 1 deletion Libs/YPermitin.FIASToolSet.DistributionReader/FIASDistributionReader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ private T GetInternalCollection<T>(Region region = null)
if (region == null)
workingDirectory = _workingDirectory;
else
workingDirectory = Path.Combine(_workingDirectory, region.Code.ToString());
workingDirectory = Path.Combine(_workingDirectory, region.Code.ToString("00"));

string dataFile;
string[] foundFiles;
Expand Down

0 comments on commit a63229a

Please sign in to comment.