diff --git a/MES_Wind/MES_test_new/clim10_test.asc.aux.xml b/MES_Wind/MES_test_new/clim10_test.asc.aux.xml
deleted file mode 100644
index dd3a306f3bb7aa8a9d719804d15c0513f08fa0f2..0000000000000000000000000000000000000000
--- a/MES_Wind/MES_test_new/clim10_test.asc.aux.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<PAMDataset>
- <PAMRasterBand band="1">
- <Metadata>
- <MDI key="STATISTICS_MAXIMUM">27</MDI>
- <MDI key="STATISTICS_MEAN">27</MDI>
- <MDI key="STATISTICS_MINIMUM">27</MDI>
- <MDI key="STATISTICS_STDDEV">0</MDI>
- </Metadata>
- </PAMRasterBand>
-</PAMDataset>
diff --git a/MES_Wind/MES_test_new/clim15_test.asc.aux.xml b/MES_Wind/MES_test_new/clim15_test.asc.aux.xml
deleted file mode 100644
index 454e69c0f6a1bf00a9dcc3bce70aae0be4dd8e7d..0000000000000000000000000000000000000000
--- a/MES_Wind/MES_test_new/clim15_test.asc.aux.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<PAMDataset>
- <PAMRasterBand band="1">
- <Metadata>
- <MDI key="STATISTICS_MAXIMUM">31</MDI>
- <MDI key="STATISTICS_MEAN">31</MDI>
- <MDI key="STATISTICS_MINIMUM">31</MDI>
- <MDI key="STATISTICS_STDDEV">0</MDI>
- </Metadata>
- </PAMRasterBand>
-</PAMDataset>
diff --git a/MES_Wind/MES_test_new/clim5_test.asc.aux.xml b/MES_Wind/MES_test_new/clim5_test.asc.aux.xml
deleted file mode 100644
index e29f1cdf349f27feccfca60f281e3bdd301e06d4..0000000000000000000000000000000000000000
--- a/MES_Wind/MES_test_new/clim5_test.asc.aux.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<PAMDataset>
- <PAMRasterBand band="1">
- <Metadata>
- <MDI key="STATISTICS_MAXIMUM">25</MDI>
- <MDI key="STATISTICS_MEAN">25</MDI>
- <MDI key="STATISTICS_MINIMUM">25</MDI>
- <MDI key="STATISTICS_STDDEV">0</MDI>
- </Metadata>
- </PAMRasterBand>
-</PAMDataset>
diff --git a/MES_Wind/MES_test_new/newstats.dbf b/MES_Wind/MES_test_new/newstats.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..626dc91f83f23592afc9e47e27ccd3953dc7ed9a
Binary files /dev/null and b/MES_Wind/MES_test_new/newstats.dbf differ
diff --git a/MES_Wind/MES_test_new/newstats.prj b/MES_Wind/MES_test_new/newstats.prj
new file mode 100644
index 0000000000000000000000000000000000000000..16d47272210f960b07555d39192b6e2c392217b0
--- /dev/null
+++ b/MES_Wind/MES_test_new/newstats.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223562997]],PRIMEM["Greenwich",0],UNIT["Degree",0.0174532925199433]], PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0],PARAMETER["False_Northing",0],PARAMETER["Central_Meridian",0],PARAMETER["Standard_Parallel_1",0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1]]
diff --git a/MES_Wind/MES_test_new/newstats.shp b/MES_Wind/MES_test_new/newstats.shp
new file mode 100644
index 0000000000000000000000000000000000000000..2588507a1aafb175bdd620be1c3f81b01ebe80d1
Binary files /dev/null and b/MES_Wind/MES_test_new/newstats.shp differ
diff --git a/MES_Wind/MES_test_new/newstats.shx b/MES_Wind/MES_test_new/newstats.shx
new file mode 100644
index 0000000000000000000000000000000000000000..7d1f51c56b70965ac3d861bf4f4de1044a20bcd8
Binary files /dev/null and b/MES_Wind/MES_test_new/newstats.shx differ
diff --git a/MES_Wind/MES_test_new/reslines.dbf b/MES_Wind/MES_test_new/reslines.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..21cfea8ca3a2b76e7c0b08cf5923b36788658f94
Binary files /dev/null and b/MES_Wind/MES_test_new/reslines.dbf differ
diff --git a/MES_Wind/MES_test_new/reslines.prj b/MES_Wind/MES_test_new/reslines.prj
new file mode 100644
index 0000000000000000000000000000000000000000..16d47272210f960b07555d39192b6e2c392217b0
--- /dev/null
+++ b/MES_Wind/MES_test_new/reslines.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223562997]],PRIMEM["Greenwich",0],UNIT["Degree",0.0174532925199433]], PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0],PARAMETER["False_Northing",0],PARAMETER["Central_Meridian",0],PARAMETER["Standard_Parallel_1",0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1]]
diff --git a/MES_Wind/MES_test_new/reslines.shp b/MES_Wind/MES_test_new/reslines.shp
new file mode 100644
index 0000000000000000000000000000000000000000..cd13990004c942bcd0ed702579382c4fa7db6051
Binary files /dev/null and b/MES_Wind/MES_test_new/reslines.shp differ
diff --git a/MES_Wind/MES_test_new/reslines.shx b/MES_Wind/MES_test_new/reslines.shx
new file mode 100644
index 0000000000000000000000000000000000000000..82f58fd54d00b9cf6137153ea1044bff9ca80880
Binary files /dev/null and b/MES_Wind/MES_test_new/reslines.shx differ
diff --git a/MES_Wind/MES_test_new/u_test.asc.aux.xml b/MES_Wind/MES_test_new/u_test.asc.aux.xml
deleted file mode 100644
index 276a5a5de7b7b2567ed2d6b2b5c21327def04577..0000000000000000000000000000000000000000
--- a/MES_Wind/MES_test_new/u_test.asc.aux.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<PAMDataset>
- <PAMRasterBand band="1">
- <Metadata>
- <MDI key="STATISTICS_MAXIMUM">40</MDI>
- <MDI key="STATISTICS_MEAN">9.0279719451695</MDI>
- <MDI key="STATISTICS_MINIMUM">-16.645999908447</MDI>
- <MDI key="STATISTICS_STDDEV">11,7818241119385</MDI>
- </Metadata>
- </PAMRasterBand>
-</PAMDataset>
diff --git a/MES_Wind/MES_test_new/v_test.asc.aux.xml b/MES_Wind/MES_test_new/v_test.asc.aux.xml
deleted file mode 100644
index 12def163cb1759f158da41b887afd945620395f4..0000000000000000000000000000000000000000
--- a/MES_Wind/MES_test_new/v_test.asc.aux.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<PAMDataset>
- <PAMRasterBand band="1">
- <Metadata>
- <MDI key="STATISTICS_MAXIMUM">19.999000549316</MDI>
- <MDI key="STATISTICS_MEAN">7.0301203373863</MDI>
- <MDI key="STATISTICS_MINIMUM">0</MDI>
- <MDI key="STATISTICS_STDDEV">5,49227428436279</MDI>
- </Metadata>
- </PAMRasterBand>
-</PAMDataset>
diff --git "a/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.dbf" "b/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.dbf"
deleted file mode 100644
index e3d52d4ecc582b3a6c3722a08d488f553dfd39eb..0000000000000000000000000000000000000000
Binary files "a/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.dbf" and /dev/null differ
diff --git "a/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.prj" "b/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.prj"
deleted file mode 100644
index a38820e25ab0dc8883ea7dba6ecceb28107fa376..0000000000000000000000000000000000000000
--- "a/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.prj"
+++ /dev/null
@@ -1 +0,0 @@
-PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0],AUTHORITY["EPSG",3857]]
\ No newline at end of file
diff --git "a/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.shp" "b/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.shp"
deleted file mode 100644
index 027fa4c0a8ff58f498418a1f87a9054eac7bb22a..0000000000000000000000000000000000000000
Binary files "a/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.shp" and /dev/null differ
diff --git "a/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.shx" "b/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.shx"
deleted file mode 100644
index 6f00beee28006cba9ab3268f346191b8ced01bbf..0000000000000000000000000000000000000000
Binary files "a/MES_Wind/MES_test_new/\320\233\320\255\320\237_polyline.shx" and /dev/null differ
diff --git "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.dbf" "b/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.dbf"
deleted file mode 100644
index 7f814c047b9c52dcee56c2f17318fca2dd742d49..0000000000000000000000000000000000000000
Binary files "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.dbf" and /dev/null differ
diff --git "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.prj" "b/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.prj"
deleted file mode 100644
index a38820e25ab0dc8883ea7dba6ecceb28107fa376..0000000000000000000000000000000000000000
--- "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.prj"
+++ /dev/null
@@ -1 +0,0 @@
-PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0],AUTHORITY["EPSG",3857]]
\ No newline at end of file
diff --git "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.shp" "b/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.shp"
deleted file mode 100644
index 060e02346cd0de5b24e79517d83d43a2e9d2e4e4..0000000000000000000000000000000000000000
Binary files "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.shp" and /dev/null differ
diff --git "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.shp.mwsymb" "b/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.shp.mwsymb"
deleted file mode 100644
index 390cadbe4f750c18f25be6d89a3773cf20c15df9..0000000000000000000000000000000000000000
--- "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.shp.mwsymb"
+++ /dev/null
@@ -1,10 +0,0 @@
-<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>
diff --git "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.shx" "b/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.shx"
deleted file mode 100644
index 9447a89b672814305c362a230c5214450d319f50..0000000000000000000000000000000000000000
Binary files "a/MES_Wind/MES_test_new/\320\237\320\276\320\264\321\201\321\202\320\260\320\275\321\206\320\270\320\270_\321\202\320\276\321\207\320\272\320\270_point.shx" and /dev/null differ
diff --git a/MES_Wind/frmMain.cs b/MES_Wind/frmMain.cs
index 5432ae08bdac0d03926b5afdb1a19e98cbedac1e..7b1d2b9b5d0ce5f1e2c8a34f69a2b0dc7ab0c3cb 100644
--- a/MES_Wind/frmMain.cs
+++ b/MES_Wind/frmMain.cs
@@ -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;
}
diff --git a/WindStressPRM/WindStressPRM.cs b/WindStressPRM/WindStressPRM.cs
index a6a8463e5b4d047ba83a697145d0e33cc942eac5..7075818bf1ddb9281c3de09638c504135fd39f84 100644
--- a/WindStressPRM/WindStressPRM.cs
+++ b/WindStressPRM/WindStressPRM.cs
@@ -347,7 +347,7 @@ namespace WindStressPRM
public string Name { get; set; }
/// <summary>
/// power, kW
- /// мощность, кВт
+ /// мощность, кВ
/// </summary>
public int Power { get; set; }
/// <summary>