Skip to content
Snippets Groups Projects
Commit aa385292 authored by Debolskiy Andrey's avatar Debolskiy Andrey :bicyclist_tone5:
Browse files

Added new shape data. Merged with fixes by Anton for 28.09.2016 issues

parent 33a808e8
Branches
No related tags found
No related merge requests found
<MapWinGIS OcxVersion="4.8" FileType="LayerFile" FileVersion="0" Description="">
<Layer LayerType="Shapefile" LayerName="__point" LayerVisible="1" LayerKey="" Filename="">
<ShapefileClass>
<DefaultDrawingOptions FillColor="8665938" LineColor="9868950" />
<ShapefileCategoriesClass />
<LabelsClass Alignment="5" Generated="0" AvoidCollisions="0" Positioning="0" TextRenderingHint="5" />
<ChartsClass ValuesFontName="" />
</ShapefileClass>
</Layer>
</MapWinGIS>
File deleted
......@@ -84,13 +84,13 @@ namespace MES_Wind
string file_path = System.IO.Directory.GetParent(System.IO.Directory.GetParent(curDir).FullName).FullName + pathToTests;
string test = file_path + "u_test.asc";
map1.AddLayer(file_path + "powerstations.shp");
map1.AddLayer(file_path + "newstats.shp");
map1.AddLayer(file_path+"u_test.asc");
map1.AddLayer(file_path + "v_test.asc");
map1.AddLayer(file_path + "clim5_test.asc");
map1.AddLayer(file_path + "clim10_test.asc");
map1.AddLayer(file_path + "clim15_test.asc");
map1.AddLayer(file_path + "powerlines.shp");
map1.AddLayer(file_path + "reslines.shp");
//map1.ZoomToMaxExtent();
}
......@@ -172,7 +172,7 @@ namespace MES_Wind
WindStressPRM.Coordinate dummyClimCoords = new WindStressPRM.Coordinate(dummyCellCoords.X,dummyCellCoords.Y);
//add or substruct in range 0 - 27 to change what lines will be broken
double clim5 = j; // clim5RasterLayer.DataSet.Value[i, j];
double clim10 = clim10RasterLayer.DataSet.Value[i, j] - 10;
double clim10 = clim10RasterLayer.DataSet.Value[i, j] +1;
double clim15 = clim15RasterLayer.DataSet.Value[i, j];
if (Math.Abs(clim5 - RasterMissingValue) < eps)
{
......@@ -204,7 +204,7 @@ namespace MES_Wind
dummyline.Identifier = feature.Fid;
dummyline.Year = int.Parse(featureData["Year"].ToString());
dummyline.Height = double.Parse(featureData["HeightOffs"].ToString());
dummyline.Power = int.Parse(featureData["Power"].ToString());
dummyline.Power = int.Parse(featureData["Voltage"].ToString());
dummyline.PointFromID = int.Parse(featureData["PointFrom"].ToString());
dummyline.PointToID = int.Parse(featureData["PointTo"].ToString());
LineString featureline = feature.BasicGeometry as LineString;
......@@ -218,8 +218,8 @@ namespace MES_Wind
WindStressPRM.PowerStation dummystation = new WindStressPRM.PowerStation();
DataRow featureData = featurepoint.DataRow;
dummystation.Identifier = featurepoint.Fid;
dummystation.Name = featureData["Name"].ToString();
dummystation.Power = int.Parse(featureData["Power"].ToString());
dummystation.Name = featureData["Label"].ToString();
dummystation.Power = int.Parse(featureData["Voltage"].ToString());
int issr = int.Parse(featureData["IsSource"].ToString());
if (issr == 0)
{
......@@ -237,15 +237,15 @@ namespace MES_Wind
}
}
//casting stationtype
if (featureData["Type"].ToString().Trim().ToUpper() == "POLE")
if (featureData["Sttype"].ToString().Trim().ToUpper() == "POLE")
{
dummystation.Stationtype = WindStressPRM.PowerStation.StationType.Pole;
}
else if (featureData["Type"].ToString().Trim().ToUpper() == "TRANS")
else if (featureData["Sttype"].ToString().Trim().ToUpper() == "TRANS")
{
dummystation.Stationtype = WindStressPRM.PowerStation.StationType.Trans;
}
else if (featureData["Type"].ToString().Trim().ToUpper() == "ENDSTAT")
else if (featureData["Sttype"].ToString().Trim().ToUpper() == "ENDPOINT")
{
dummystation.Stationtype = WindStressPRM.PowerStation.StationType.Endstat;
}
......
......@@ -347,7 +347,7 @@ namespace WindStressPRM
public string Name { get; set; }
/// <summary>
/// power, kW
/// мощность, кВт
/// мощность, кВ
/// </summary>
public int Power { get; set; }
/// <summary>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment