Map
Details
diff --git a/ModelData/BusinessModel/BaseAndInterface/BaseOntologyEntity.cs b/ModelData/BusinessModel/BaseAndInterface/BaseOntologyEntity.cs
index 97cbaf0..3971ca3 100644
--- a/ModelData/BusinessModel/BaseAndInterface/BaseOntologyEntity.cs
+++ b/ModelData/BusinessModel/BaseAndInterface/BaseOntologyEntity.cs
@@ -13,14 +13,7 @@ namespace ModelData.BusinessModel.BaseAndInterface
public string URL { set; get; }
-
- public string Title
- {
- get
- {
- return URL.Split('\\')[0];
- }
- }
+ public string Title { set; get; }
}
}
diff --git a/ModelData/BusinessModel/BusinessDataManager.cs b/ModelData/BusinessModel/BusinessDataManager.cs
index 6eda5ea..23a1e98 100644
--- a/ModelData/BusinessModel/BusinessDataManager.cs
+++ b/ModelData/BusinessModel/BusinessDataManager.cs
@@ -61,8 +61,6 @@ namespace ModelData.BusinessModel
lst_settlements.Add(settlement);
}
}
-
- static int u = 0;
private void LoadInfoAboutSettlement(string URL)
{
System.IO.StreamWriter wr = new System.IO.StreamWriter("D:\\out.txt", true);
ModelData/BusinessModel/ClassDiagram.cd 316(+316 -0)
diff --git a/ModelData/BusinessModel/ClassDiagram.cd b/ModelData/BusinessModel/ClassDiagram.cd
new file mode 100644
index 0000000..8bbe638
--- /dev/null
+++ b/ModelData/BusinessModel/ClassDiagram.cd
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Class Name="ModelData.BusinessModel.BaseAndInterface.BaseOntologyEntity">
+ <Position X="5.75" Y="4" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAEAAAAAAAAAAACAAAAAAAAAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\BaseAndInterface\BaseOntologyEntity.cs</FileName>
+ </TypeIdentifier>
+ <Lollipop Position="1.023" />
+ </Class>
+ <Class Name="ModelData.BusinessModel.BusinessDataManager">
+ <Position X="8" Y="4.75" Width="1.5" />
+ <AssociationLine Name="lst_settlements" Type="ModelData.BusinessModel.Settlement" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="9.5" Y="7.75" />
+ <Point X="10" Y="7.75" />
+ <Point X="10" Y="4.5" />
+ <Point X="10.75" Y="4.5" />
+ <Point X="10.75" Y="4.75" />
+ </Path>
+ <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+ <Position X="-0.148" Y="0.277" Height="0.182" Width="1.233" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <AssociationLine Name="dataManager" Type="ModelData.BusinessModel.BusinessDataManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="8.125" Y="9.064" />
+ <Point X="8.125" Y="9.471" />
+ <Point X="9.312" Y="9.471" />
+ <Point X="9.312" Y="9.064" />
+ </Path>
+ <MemberNameLabel ManuallyPlaced="true">
+ <Position X="0.068" Y="0.206" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <TypeIdentifier>
+ <HashCode>AAQAIAAAAAAAAQBAAAIAAAAAAABAIAACACICQADCBAA=</HashCode>
+ <FileName>BusinessModel\BusinessDataManager.cs</FileName>
+ </TypeIdentifier>
+ <ShowAsAssociation>
+ <Field Name="dataManager" />
+ </ShowAsAssociation>
+ <ShowAsCollectionAssociation>
+ <Field Name="lst_settlements" />
+ </ShowAsCollectionAssociation>
+ </Class>
+ <Class Name="ModelData.BusinessModel.Position">
+ <Position X="13.25" Y="3.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAYAA=</HashCode>
+ <FileName>BusinessModel\Position.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="ModelData.BusinessModel.Settlement">
+ <Position X="10.25" Y="4.75" Width="1.5" />
+ <AssociationLine Name="position" Type="ModelData.BusinessModel.Position" FixedToPoint="true">
+ <Path>
+ <Point X="11.75" Y="5.125" />
+ <Point X="13.25" Y="5.125" />
+ </Path>
+ <MemberNameLabel ManuallyPlaced="true">
+ <Position X="0.3" Y="-0.005" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <TypeIdentifier>
+ <HashCode>EAAEgACAhgggAAAMAAAAIAQAACAQAAAAAQAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\Settlement.cs</FileName>
+ </TypeIdentifier>
+ <ShowAsAssociation>
+ <Property Name="position" />
+ </ShowAsAssociation>
+ <ShowAsCollectionAssociation>
+ <Property Name="Names" />
+ </ShowAsCollectionAssociation>
+ </Class>
+ <Class Name="ModelData.BusinessModel.SettlementName">
+ <Position X="12.5" Y="5.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAAAAAIAAAAQAAAAAAAAAAAAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\Settlement.cs</FileName>
+ </TypeIdentifier>
+ <ShowAsAssociation>
+ <Property Name="Interval" />
+ </ShowAsAssociation>
+ </Class>
+ <Class Name="ModelData.BusinessModel.TimeInterval">
+ <Position X="12.5" Y="7.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\Settlement.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="ModelData.BusinessModel.ExtraEntities.DataSourseEntity">
+ <Position X="5.75" Y="8" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAACAAABAAAAAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\ExtraEntities\DataSourseEntity.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="ModelData.BusinessModel.MainEntities.Region" Collapsed="true">
+ <Position X="3.75" Y="1.25" Width="1.5" />
+ <AssociationLine Name="partOfRegion" Type="ModelData.BusinessModel.MainEntities.Region" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="3.875" Y="1.25" />
+ <Point X="3.875" Y="0.781" />
+ <Point X="5.062" Y="0.781" />
+ <Point X="5.062" Y="1.25" />
+ </Path>
+ </AssociationLine>
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\ExtraEntities\Region.cs</FileName>
+ </TypeIdentifier>
+ <ShowAsAssociation>
+ <Property Name="partOfRegion" />
+ </ShowAsAssociation>
+ </Class>
+ <Class Name="ModelData.BusinessModel.MainEntities.EditedSettlement">
+ <Position X="4" Y="7.25" Width="1.5" />
+ <Compartments>
+ <Compartment Name="Nested Types" Collapsed="false" />
+ </Compartments>
+ <NestedTypes>
+ <Enum Name="ModelData.BusinessModel.MainEntities.EditedSettlement.Enum_SettlementType" Collapsed="true">
+ <TypeIdentifier>
+ <NewMemberFileName>BusinessModel\MainEntities\EditedSettlement.cs</NewMemberFileName>
+ </TypeIdentifier>
+ </Enum>
+ </NestedTypes>
+ <InheritanceLine Type="ModelData.BusinessModel.BaseAndInterface.BaseOntologyEntity" FixedToPoint="true">
+ <Path>
+ <Point X="6.5" Y="5.747" />
+ <Point X="6.5" Y="6.875" />
+ <Point X="5.25" Y="6.875" />
+ <Point X="5.25" Y="7.25" />
+ </Path>
+ </InheritanceLine>
+ <AssociationLine Name="data" Type="ModelData.BusinessModel.ExtraEntities.DataSourseEntity" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="5.5" Y="7.75" />
+ <Point X="6.5" Y="7.75" />
+ <Point X="6.5" Y="8" />
+ </Path>
+ </AssociationLine>
+ <AssociationLine Name="before" Type="ModelData.BusinessModel.MainEntities.Settlement" FixedToPoint="true">
+ <Path>
+ <Point X="4.875" Y="7.25" />
+ <Point X="4.875" Y="3.733" />
+ </Path>
+ <MemberNameLabel ManuallyPlaced="true">
+ <Position X="-0.421" Y="0.362" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <AssociationLine Name="hasBeginning" Type="ModelData.BusinessModel.Tools.Period" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="4" Y="8.375" />
+ <Point X="3.844" Y="8.375" />
+ <Point X="3.844" Y="6.316" />
+ <Point X="3.5" Y="6.316" />
+ </Path>
+ <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+ <Position X="-0.482" Y="-0.89" Height="0.182" Width="1.108" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <TypeIdentifier>
+ <HashCode>BAAAAAAQAAAAAAAAABAAAAAAACAAAAAAAAAQAAAAAAA=</HashCode>
+ <FileName>BusinessModel\MainEntities\EditedSettlement.cs</FileName>
+ </TypeIdentifier>
+ <ShowAsAssociation>
+ <Property Name="data" />
+ <Property Name="before" />
+ <Property Name="hasBeginning" />
+ </ShowAsAssociation>
+ </Class>
+ <Class Name="ModelData.BusinessModel.MainEntities.Settlement">
+ <Position X="3.75" Y="2.5" Width="1.5" />
+ <InheritanceLine Type="ModelData.BusinessModel.BaseAndInterface.BaseOntologyEntity" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="6.125" Y="4" />
+ <Point X="6.125" Y="3.25" />
+ <Point X="5.25" Y="3.25" />
+ </Path>
+ </InheritanceLine>
+ <AssociationLine Name="EditedSettlements" Type="ModelData.BusinessModel.MainEntities.EditedSettlement">
+ <MemberNameLabel ManuallyPlaced="true">
+ <Position X="-0.607" Y="1.245" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <AssociationLine Name="Coordinate" Type="ModelData.BusinessModel.Tools.Coordinate" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="3.75" Y="3.188" />
+ <Point X="2.75" Y="3.188" />
+ <Point X="2.75" Y="2.882" />
+ </Path>
+ <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+ <Position X="-0.588" Y="0.383" Height="0.182" Width="0.983" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <AssociationLine Name="hasBeginning" Type="ModelData.BusinessModel.Tools.Period" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="3.875" Y="3.733" />
+ <Point X="3.875" Y="5.639" />
+ <Point X="3.5" Y="5.639" />
+ </Path>
+ <MemberNameLabel ManuallyPlaced="true">
+ <Position X="-0.367" Y="0.558" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAABAAAABAAAAAAAAAAAAAAAAAAAACCAAA=</HashCode>
+ <FileName>BusinessModel\MainEntities\Settlement.cs</FileName>
+ </TypeIdentifier>
+ <ShowAsAssociation>
+ <Property Name="Coordinate" />
+ <Property Name="hasBeginning" />
+ </ShowAsAssociation>
+ <ShowAsCollectionAssociation>
+ <Property Name="EditedSettlements" />
+ </ShowAsCollectionAssociation>
+ </Class>
+ <Class Name="ModelData.BusinessModel.RDF.Queries">
+ <Position X="9.75" Y="1" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>IAAAAAAAASAEAgAAAAAAMAAAAAAAAAAAAIAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\RDF\Queries.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="ModelData.BusinessModel.RDF.RDFQuery">
+ <Position X="8" Y="1" Width="1.5" />
+ <Compartments>
+ <Compartment Name="Nested Types" Collapsed="false" />
+ </Compartments>
+ <NestedTypes>
+ <Enum Name="ModelData.BusinessModel.RDF.RDFQuery.QueryType">
+ <TypeIdentifier>
+ <NewMemberFileName>BusinessModel\RDF\RDFQuery.cs</NewMemberFileName>
+ </TypeIdentifier>
+ </Enum>
+ </NestedTypes>
+ <TypeIdentifier>
+ <HashCode>AAAAAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\RDF\RDFQuery.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="ModelData.BusinessModel.Tools.Coordinate">
+ <Position X="2" Y="0.75" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AIAAAAEAACAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\Tools\Coordinate.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="ModelData.BusinessModel.Tools.Period">
+ <Position X="2" Y="5.25" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAEAAAAAAAIAAAAAAAACAAAAAAAAAAAAACA=</HashCode>
+ <FileName>BusinessModel\Tools\Period.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="ModelData.BusinessModel.UnitOfWork.Context">
+ <Position X="2" Y="7.25" Width="1.5" />
+ <AssociationLine Name="settlements" Type="ModelData.BusinessModel.MainEntities.Settlement" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="2" Y="8.412" />
+ <Point X="1.625" Y="8.412" />
+ <Point X="1.625" Y="3.625" />
+ <Point X="3.75" Y="3.625" />
+ </Path>
+ <MemberNameLabel ManuallyPlaced="true">
+ <Position X="0.247" Y="-0.213" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAAAACAAAAAAAAAAAAAACACIAQABCAAA=</HashCode>
+ <FileName>BusinessModel\UnitOfWork\Context.cs</FileName>
+ </TypeIdentifier>
+ <ShowAsCollectionAssociation>
+ <Property Name="settlements" />
+ </ShowAsCollectionAssociation>
+ </Class>
+ <Class Name="ModelData.WebModel.MapPoint">
+ <Position X="13.25" Y="1.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAAAoAAAAAAQAACAAAAAAAAAAAAAAAAA=</HashCode>
+ <FileName>WebModel\MapPoint.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="ModelData.WebModel.WebDataManager">
+ <Position X="11.5" Y="1" Width="1.5" />
+ <AssociationLine Name="dataManager" Type="ModelData.WebModel.WebDataManager" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="11.625" Y="3.257" />
+ <Point X="11.625" Y="3.507" />
+ <Point X="12.938" Y="3.507" />
+ <Point X="12.938" Y="3.257" />
+ </Path>
+ <MemberNameLabel ManuallyPlaced="true">
+ <Position X="0.12" Y="0.268" />
+ </MemberNameLabel>
+ </AssociationLine>
+ <TypeIdentifier>
+ <HashCode>AAEAAAAAAAAAAQBAAAAAAAAAAABAIAAAAAAKAAAAAAA=</HashCode>
+ <FileName>WebModel\WebDataManager.cs</FileName>
+ </TypeIdentifier>
+ <ShowAsAssociation>
+ <Field Name="dataManager" />
+ </ShowAsAssociation>
+ </Class>
+ <Interface Name="ModelData.BusinessModel.BaseAndInterface.I_URLcs">
+ <Position X="5.75" Y="1" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAEAAAAAAAAAAACAAAAAAAAAAAAAAAAA=</HashCode>
+ <FileName>BusinessModel\BaseAndInterface\I_URLcs.cs</FileName>
+ </TypeIdentifier>
+ </Interface>
+ <Font Name="Segoe UI" Size="9" />
+</ClassDiagram>
\ No newline at end of file
diff --git a/ModelData/BusinessModel/MainEntities/Settlement.cs b/ModelData/BusinessModel/MainEntities/Settlement.cs
index b019c03..e3d1be0 100644
--- a/ModelData/BusinessModel/MainEntities/Settlement.cs
+++ b/ModelData/BusinessModel/MainEntities/Settlement.cs
@@ -12,11 +12,16 @@ namespace ModelData.BusinessModel.MainEntities
public class Settlement : BaseOntologyEntity
{
public Coordinate Coordinate { set; get; }
-
- public Period hasBeginning { set; get; }
-
public Dictionary<string, string> Properties { set; get; }
public List<EditedSettlement> EditedSettlements { set; get; }
+ public Settlement (string URL, string Title, Coordinate Coordinate)
+ {
+ this.URL = URL;
+ this.Title = Title;
+ this.Coordinate = Coordinate;
+ Properties = new Dictionary<string, string>();
+ EditedSettlements = new List<EditedSettlement>();
+ }
}
}
diff --git a/ModelData/BusinessModel/UnitOfWork/Context.cs b/ModelData/BusinessModel/UnitOfWork/Context.cs
index 1b23754..9a500c7 100644
--- a/ModelData/BusinessModel/UnitOfWork/Context.cs
+++ b/ModelData/BusinessModel/UnitOfWork/Context.cs
@@ -13,23 +13,16 @@ namespace ModelData.BusinessModel.UnitOfWork
public class Context
{
- public IEnumerable<Settlement> settlements { set; get; }
+ public List<MainEntities.Settlement> settlements { set; get; }
//public IEnumerable<EditedSettlement> editedSettlements { set; get; }
-
-
- private void LoadAllSettlements(string YearMin, string YearMax)
+ public Context () { settlements = new List<MainEntities.Settlement>(); }
+ private void GetAllSettlements(string YearMin, string YearMax)
{
var lst_query = RDFQuery.GetData(RDFQuery.QueryType.AllSettlements, new string[] { YearMin, YearMax });
- Settlement settlement;
-
foreach (var elem in lst_query)
{
- int pop = int.Parse(elem["population"].ToString().Split('^')[0]);
- settlement = new Settlement(elem["settlement"].ToString(), elem["name"].ToString(), new Position(elem["long"], elem["lat"]))
- {
- Population = elem["population"] != null ? elem["population"].ToString() : "0"
- };
- lst_settlements.Add(settlement);
+ var settlement = new MainEntities.Settlement(elem["name"].ToString(), elem["name"].ToString(), new Tools.Period());
+ settlements.Add(settlement);
}
}
ModelData/ModelData.csproj 1(+1 -0)
diff --git a/ModelData/ModelData.csproj b/ModelData/ModelData.csproj
index 2d4ba28..49dcf1e 100644
--- a/ModelData/ModelData.csproj
+++ b/ModelData/ModelData.csproj
@@ -74,6 +74,7 @@
<Compile Include="WebModel\WebDataManager.cs" />
</ItemGroup>
<ItemGroup>
+ <None Include="BusinessModel\ClassDiagram.cd" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />