Map
Changes
ModelData/Class1.cs 70(+70 -0)
ModelData/ModelData.csproj 65(+65 -0)
ModelData/packages.config 7(+7 -0)
ModelData/Properties/AssemblyInfo.cs 36(+36 -0)
ModelWEB/Class1.cs 13(+13 -0)
ModelWEB/ModelWEB.csproj 53(+53 -0)
ModelWEB/Properties/AssemblyInfo.cs 36(+36 -0)
web-map.sln 12(+12 -0)
web-map/Controllers/HomeController.cs 11(+2 -9)
web-map/Controllers/MapController.cs 17(+17 -0)
web-map/packages.config 1(+0 -1)
web-map/Scripts/mapInit.js 93(+93 -0)
web-map/Views/Home/FAQ.cshtml 11(+7 -4)
web-map/Views/Home/Index.cshtml 11(+9 -2)
web-map/Views/Map/Map.cshtml 15(+15 -0)
web-map/Views/Shared/_Layout.cshtml 10(+5 -5)
web-map/web-map.csproj 9(+4 -5)
Details
ModelData/Class1.cs 70(+70 -0)
diff --git a/ModelData/Class1.cs b/ModelData/Class1.cs
new file mode 100644
index 0000000..e67efda
--- /dev/null
+++ b/ModelData/Class1.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDS.RDF;
+using VDS.RDF.Query;
+using VDS.RDF.Parsing;
+using VDS.RDF.Writing;
+
+namespace ModelData
+{
+ public class Class1
+ {
+
+ static void example(string[] args)
+ {
+ SparqlQueryParser parser = new SparqlQueryParser(); // просто парсер
+
+ SparqlQuery q = parser.ParseFromString("SELECT * WHERE { ?s a ?type }"); // а это экземпляр запроса, спарсенный из строки
+
+ // Пример параметризованного запроса, который затем парсится в SparqlQuery
+ /*
+
+ //Create a Parameterized String
+ SparqlParameterizedString queryString = new SparqlParameterizedString();
+
+ //Add a namespace declaration
+ queryString.Namespaces.AddNamespace("ex", new Uri("http://example.org/ns#"));
+
+ //Set the SPARQL command
+ //For more complex queries we can do this in multiple lines by using += on the
+ //CommandText property
+ //Note we can use @name style parameters here
+ queryString.CommandText = "SELECT * WHERE { ?s ex:property @value }";
+
+ //Inject a Value for the parameter
+ queryString.SetUri("value", new Uri("http://example.org/value"));
+
+ //When we call ToString() we get the full command text with namespaces appended as PREFIX
+ //declarations and any parameters replaced with their declared values
+ Console.WriteLine(queryString.ToString());
+
+ //We can turn this into a query by parsing it as in our previous example
+ SparqlQuery query = parser.ParseFromString(queryString);
+
+ */
+
+ string exQuery = "SELECT * WHERE { ?obj a ?subj }";
+
+ //Create endpoint and make our query
+ SparqlRemoteEndpoint endpoint = new SparqlRemoteEndpoint(new Uri("http://jena.denhome.keenetic.link/map/query"));
+ SparqlResultSet results = endpoint.QueryWithResultSet(exQuery);
+
+
+ System.IO.StreamWriter outStream = new System.IO.StreamWriter("D:\\gggg.txt");
+ outStream.Write(new System.IO.StreamReader(endpoint.QueryRaw(exQuery).GetResponseStream()).ReadToEnd()); outStream.Close();
+
+ //Now save this to disk as SPARQL JSON
+ SparqlJsonWriter writer = new SparqlJsonWriter();
+ writer.Save(results, "D:\\example.srj");
+
+ //We can then read this pack in again
+ SparqlJsonParser reader = new SparqlJsonParser();
+ SparqlResultSet results2 = new SparqlResultSet();
+ reader.Load(results2, "D:\\example.srj");
+
+ }
+ }
+}
ModelData/ModelData.csproj 65(+65 -0)
diff --git a/ModelData/ModelData.csproj b/ModelData/ModelData.csproj
new file mode 100644
index 0000000..0f0583e
--- /dev/null
+++ b/ModelData/ModelData.csproj
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{5DB5C021-7C14-4798-9C0D-79E280583112}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>ModelData</RootNamespace>
+ <AssemblyName>ModelData</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="dotNetRDF, Version=2.1.0.0, Culture=neutral, PublicKeyToken=6055ffe4c97cc780, processorArchitecture=MSIL">
+ <HintPath>..\packages\dotNetRDF.2.1.0\lib\net40\dotNetRDF.dll</HintPath>
+ </Reference>
+ <Reference Include="HtmlAgilityPack, Version=1.8.2.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+ <HintPath>..\packages\HtmlAgilityPack.1.8.2\lib\Net45\HtmlAgilityPack.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Configuration" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Security" />
+ <Reference Include="System.Web" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="System.Xml" />
+ <Reference Include="VDS.Common, Version=1.10.0.0, Culture=neutral, PublicKeyToken=ab5f4eb908061bf0, processorArchitecture=MSIL">
+ <HintPath>..\packages\VDS.Common.1.10.0\lib\net40-client\VDS.Common.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Class1.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
ModelData/packages.config 7(+7 -0)
diff --git a/ModelData/packages.config b/ModelData/packages.config
new file mode 100644
index 0000000..3dc6e4c
--- /dev/null
+++ b/ModelData/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="dotNetRDF" version="2.1.0" targetFramework="net45" />
+ <package id="HtmlAgilityPack" version="1.8.2" targetFramework="net45" />
+ <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
+ <package id="VDS.Common" version="1.10.0" targetFramework="net45" />
+</packages>
\ No newline at end of file
ModelData/Properties/AssemblyInfo.cs 36(+36 -0)
diff --git a/ModelData/Properties/AssemblyInfo.cs b/ModelData/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..57776c7
--- /dev/null
+++ b/ModelData/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Общие сведения об этой сборке предоставляются следующим набором
+// набора атрибутов. Измените значения этих атрибутов, чтобы изменить сведения,
+// связанные со сборкой.
+[assembly: AssemblyTitle("ModelData")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ModelData")]
+[assembly: AssemblyCopyright("Copyright © 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми
+// для компонентов COM. Если необходимо обратиться к типу в этой сборке через
+// COM, задайте атрибуту ComVisible значение TRUE для этого типа.
+[assembly: ComVisible(false)]
+
+// Следующий GUID служит для идентификации библиотеки типов, если этот проект будет видимым для COM
+[assembly: Guid("5db5c021-7c14-4798-9c0d-79e280583112")]
+
+// Сведения о версии сборки состоят из следующих четырех значений:
+//
+// Основной номер версии
+// Дополнительный номер версии
+// Номер сборки
+// Редакция
+//
+// Можно задать все значения или принять номер сборки и номер редакции по умолчанию.
+// используя "*", как показано ниже:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
ModelWEB/Class1.cs 13(+13 -0)
diff --git a/ModelWEB/Class1.cs b/ModelWEB/Class1.cs
new file mode 100644
index 0000000..5147e61
--- /dev/null
+++ b/ModelWEB/Class1.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ModelWEB
+{
+ public class Class1
+ {
+
+ }
+}
ModelWEB/ModelWEB.csproj 53(+53 -0)
diff --git a/ModelWEB/ModelWEB.csproj b/ModelWEB/ModelWEB.csproj
new file mode 100644
index 0000000..4c6ea50
--- /dev/null
+++ b/ModelWEB/ModelWEB.csproj
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>cb321371-8885-4fb8-b1cf-5d6370487c7e</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>ModelWEB</RootNamespace>
+ <AssemblyName>ModelWEB</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System"/>
+
+ <Reference Include="System.Core"/>
+ <Reference Include="System.Xml.Linq"/>
+ <Reference Include="System.Data.DataSetExtensions"/>
+
+
+ <Reference Include="Microsoft.CSharp"/>
+
+ <Reference Include="System.Data"/>
+
+ <Reference Include="System.Net.Http"/>
+
+ <Reference Include="System.Xml"/>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Class1.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ </Project>
ModelWEB/Properties/AssemblyInfo.cs 36(+36 -0)
diff --git a/ModelWEB/Properties/AssemblyInfo.cs b/ModelWEB/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..3be225d
--- /dev/null
+++ b/ModelWEB/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Общие сведения об этой сборке предоставляются следующим набором
+// набора атрибутов. Измените значения этих атрибутов, чтобы изменить сведения,
+// связанные со сборкой.
+[assembly: AssemblyTitle("ModelWEB")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ModelWEB")]
+[assembly: AssemblyCopyright("Copyright © 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми
+// для компонентов COM. Если необходимо обратиться к типу в этой сборке через
+// COM, задайте атрибуту ComVisible значение TRUE для этого типа.
+[assembly: ComVisible(false)]
+
+// Следующий GUID служит для идентификации библиотеки типов, если этот проект будет видимым для COM
+[assembly: Guid("cb321371-8885-4fb8-b1cf-5d6370487c7e")]
+
+// Сведения о версии сборки состоят из следующих четырех значений:
+//
+// Основной номер версии
+// Дополнительный номер версии
+// Номер сборки
+// Редакция
+//
+// Можно задать все значения или принять номер сборки и номер редакции по умолчанию.
+// используя "*", как показано ниже:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
web-map.sln 12(+12 -0)
diff --git a/web-map.sln b/web-map.sln
index f2f3230..4bf4f64 100644
--- a/web-map.sln
+++ b/web-map.sln
@@ -5,6 +5,10 @@ VisualStudioVersion = 15.0.27703.2047
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "web-map", "web-map\web-map.csproj", "{E5B347F9-E5DE-4924-A35C-8EC13B26ED5B}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelData", "ModelData\ModelData.csproj", "{5DB5C021-7C14-4798-9C0D-79E280583112}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelWEB", "ModelWEB\ModelWEB.csproj", "{CB321371-8885-4FB8-B1CF-5D6370487C7E}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,6 +19,14 @@ Global
{E5B347F9-E5DE-4924-A35C-8EC13B26ED5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5B347F9-E5DE-4924-A35C-8EC13B26ED5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5B347F9-E5DE-4924-A35C-8EC13B26ED5B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5DB5C021-7C14-4798-9C0D-79E280583112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5DB5C021-7C14-4798-9C0D-79E280583112}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5DB5C021-7C14-4798-9C0D-79E280583112}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5DB5C021-7C14-4798-9C0D-79E280583112}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CB321371-8885-4FB8-B1CF-5D6370487C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CB321371-8885-4FB8-B1CF-5D6370487C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CB321371-8885-4FB8-B1CF-5D6370487C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CB321371-8885-4FB8-B1CF-5D6370487C7E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
web-map/Controllers/HomeController.cs 11(+2 -9)
diff --git a/web-map/Controllers/HomeController.cs b/web-map/Controllers/HomeController.cs
index 015cb7b..6137484 100644
--- a/web-map/Controllers/HomeController.cs
+++ b/web-map/Controllers/HomeController.cs
@@ -13,16 +13,9 @@ namespace web_map.Controllers
return View();
}
- public ActionResult About()
+ public ActionResult FAQ()
{
- ViewBag.Message = "Your application description page.";
-
- return View();
- }
-
- public ActionResult Contact()
- {
- ViewBag.Message = "Your contact page.";
+ ViewBag.Message = "FAQ page.";
return View();
}
web-map/Controllers/MapController.cs 17(+17 -0)
diff --git a/web-map/Controllers/MapController.cs b/web-map/Controllers/MapController.cs
new file mode 100644
index 0000000..cde152f
--- /dev/null
+++ b/web-map/Controllers/MapController.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace web_map.Controllers
+{
+ public class MapController : Controller
+ {
+ // GET: Map
+ public ActionResult Map()
+ {
+ return View();
+ }
+ }
+}
\ No newline at end of file
web-map/packages.config 1(+0 -1)
diff --git a/web-map/packages.config b/web-map/packages.config
index 48b7551..1d88db4 100644
--- a/web-map/packages.config
+++ b/web-map/packages.config
@@ -2,7 +2,6 @@
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net45" />
<package id="bootstrap" version="3.3.7" targetFramework="net45" />
- <package id="dotNetRDF" version="2.1.0" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.8.2" targetFramework="net45" />
<package id="jQuery" version="3.3.1" targetFramework="net45" />
<package id="jQuery.Validation" version="1.17.0" targetFramework="net45" />
web-map/Scripts/mapInit.js 93(+93 -0)
diff --git a/web-map/Scripts/mapInit.js b/web-map/Scripts/mapInit.js
new file mode 100644
index 0000000..9ad700f
--- /dev/null
+++ b/web-map/Scripts/mapInit.js
@@ -0,0 +1,93 @@
+ymaps.ready(init);
+
+function init() {
+ var map = new ymaps.Map
+ ('map', {
+ center: [51.533103, 46.034158],
+ zoom: 7,
+ type: 'yandex#hybrid',
+ controls: ['zoomControl', 'rulerControl']
+ },
+ {
+ // Ограничим область карты.
+ restrictMapArea: [[48.795, 41.484], [53.823, 51.856]]
+ //restrictMapArea: [[49.795, 42.484], [52.823, 50.856]]
+ }
+ );
+ map.controls.get('zoomControl').options.set({ size: 'auto' });
+ map.controls.add(new ymaps.control.TypeSelector(['yandex#map', 'yandex#satellite', 'yandex#hybrid']));
+
+
+ // Загрузим регионы.
+ ymaps.borders.load
+ ('RU', { lang: 'ru', quality: 3 }).then
+ (function (result) {
+ // Создадим многоугольник, который будет скрывать весь мир, кроме заданной области.
+ var background = new ymaps.Polygon
+ (
+ [[
+ [85, -179.99],
+ [85, 179.99],
+ [-85, 179.99],
+ [-85, -179.99],
+ [85, -179.99]
+ ]],
+ {},
+ {
+ fillColor: '#ffffff',
+ strokeWidth: 0,
+ // Для того чтобы полигон отобразился на весь мир, нам нужно поменять
+ // алгоритм пересчета координат геометрии в пиксельные координаты.
+ coordRendering: 'straightPath'
+ }
+ );
+
+ // Найдём область по её iso коду.
+ var region = result.features.filter(function (feature) { return feature.properties.iso3166 == 'RU-SAR'; })[0];
+ // Добавим координаты этой области в полигон, который накрывает весь мир.
+ // В полигоне образуется полость, через которую будет видно заданную область.
+ var masks = region.geometry.coordinates;
+
+ masks.forEach(function (mask) { background.geometry.insert(1, mask); });
+ // Добавим многоугольник на карту.
+ map.geoObjects.add(background);
+ });
+
+ var allMarks = new ymaps.GeoObjectCollection({},
+ {
+ preset: 'islands#redStretchyIcon'
+ });
+
+ // Имя, тип_поселения, координаты, дата_основания
+ var response =
+ [
+ ["Саратов", "Город", [51.533103, 46.034158], 1590],
+ ["Балаково", "Город", [52.02782, 47.8007], 1911],
+ ["Балашов", "Город", [51.5502, 43.1667], 1780],
+ ["Маркс", "Город", [51.71111, 46.74861], 1942]
+ ]
+
+ function loadMarks() {
+ allMarks.removeAll();
+ //sendRequest
+ //var response = getRequest().then(function)
+ {
+ response.forEach(function (el, i, response) {
+ var tmp = new ymaps.Placemark(el[2],
+ {
+ iconContent: el[0],
+ //balloonContent: String(el[1]) + " " + String(el[0]) + ". Год основания " + String(el[3]),
+ hintContent: el[2]
+ }
+ );
+ tmp.events.add('click', function (e) {
+ e.preventDefault();
+ alert(String(el[1]) + " " + String(el[0]) + ". Год основания " + String(el[3]));
+ });
+ allMarks.add(tmp);
+ });
+ map.geoObjects.add(allMarks);
+ }
+ }
+ loadMarks();
+}
web-map/Views/Home/Index.cshtml 11(+9 -2)
diff --git a/web-map/Views/Home/Index.cshtml b/web-map/Views/Home/Index.cshtml
index 5615b77..219cd1d 100644
--- a/web-map/Views/Home/Index.cshtml
+++ b/web-map/Views/Home/Index.cshtml
@@ -1,8 +1,14 @@
@{
- ViewBag.Title = "MY home page";
+ ViewBag.Title = "Главная";
}
<div class="jumbotron">
+ <h1>Домашняя страница</h1>
+ <h2>Здесь будет описание проекта</h2>
+</div>
+
+<!--
+<div class="jumbotron">
<h1>ASP.NET</h1>
<p class="lead">ASP.NET is a free web framework for building great Web sites and Web applications using HTML, CSS and JavaScript.</p>
<p><a href="https://asp.net" class="btn btn-primary btn-lg">Learn more »</a></p>
@@ -28,4 +34,5 @@
<p>You can easily find a web hosting company that offers the right mix of features and price for your applications.</p>
<p><a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkId=301867">Learn more »</a></p>
</div>
-</div>
\ No newline at end of file
+</div>
+-->
web-map/Views/Map/Map.cshtml 15(+15 -0)
diff --git a/web-map/Views/Map/Map.cshtml b/web-map/Views/Map/Map.cshtml
new file mode 100644
index 0000000..81dd48e
--- /dev/null
+++ b/web-map/Views/Map/Map.cshtml
@@ -0,0 +1,15 @@
+@{
+ ViewBag.Title = "Map";
+}
+
+<script src="https://api-maps.yandex.ru/2.1/?lang=ru_RU&apikey=0ea4f7d6-01f0-471d-b717-ada9d94faa49&lang=ru_RU" type="text/javascript"></script>
+@section Scripts {@Scripts.Render("~/scripts/mapInit.js")}
+
+
+<h2>Здесь будет размещена карта</h2>
+
+<div id="map" style="width: 100%; height: 1000px; padding-left: 0px; ">
+</div>
+
+
+
web-map/Views/Shared/_Layout.cshtml 10(+5 -5)
diff --git a/web-map/Views/Shared/_Layout.cshtml b/web-map/Views/Shared/_Layout.cshtml
index 28712e2..c8dff71 100644
--- a/web-map/Views/Shared/_Layout.cshtml
+++ b/web-map/Views/Shared/_Layout.cshtml
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>@ViewBag.Title – приложение ASP.NET</title>
+ <title>@ViewBag.Title – интерактивная карта</title>
@Styles.Render("~/Content/css")
@Scripts.Render("~/bundles/modernizr")
</head>
@@ -17,13 +17,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- @Html.ActionLink("Имя приложения", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
+ @Html.ActionLink("Главная", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li>@Html.ActionLink("Домашняя страница", "Index", "Home")</li>
- <li>@Html.ActionLink("О программе", "About", "Home")</li>
- <li>@Html.ActionLink("Контакт", "Contact", "Home")</li>
+ <li>@Html.ActionLink("О проекте", "Index", "Home")</li>
+ <li>@Html.ActionLink("Карта", "Map", "Map")</li>
+ <li>@Html.ActionLink("Инструкция", "FAQ", "Home")</li>
</ul>
</div>
</div>
web-map/web-map.csproj 9(+4 -5)
diff --git a/web-map/web-map.csproj b/web-map/web-map.csproj
index 441b59f..dab25c5 100644
--- a/web-map/web-map.csproj
+++ b/web-map/web-map.csproj
@@ -45,9 +45,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="dotNetRDF, Version=2.1.0.0, Culture=neutral, PublicKeyToken=6055ffe4c97cc780, processorArchitecture=MSIL">
- <HintPath>..\packages\dotNetRDF.2.1.0\lib\net40\dotNetRDF.dll</HintPath>
- </Reference>
<Reference Include="HtmlAgilityPack, Version=1.8.2.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlAgilityPack.1.8.2\lib\Net45\HtmlAgilityPack.dll</HintPath>
</Reference>
@@ -171,6 +168,7 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Controllers\HomeController.cs" />
+ <Compile Include="Controllers\MapController.cs" />
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
@@ -200,6 +198,7 @@
<Content Include="Scripts\jquery.validate.min.js" />
<Content Include="Scripts\jquery.validate.unobtrusive.js" />
<Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
+ <Content Include="Scripts\mapInit.js" />
<Content Include="Scripts\modernizr-2.8.3.js" />
<Content Include="Web.config" />
<Content Include="Web.Debug.config">
@@ -212,9 +211,9 @@
<Content Include="Views\_ViewStart.cshtml" />
<Content Include="Views\Shared\Error.cshtml" />
<Content Include="Views\Shared\_Layout.cshtml" />
- <Content Include="Views\Home\About.cshtml" />
- <Content Include="Views\Home\Contact.cshtml" />
+ <Content Include="Views\Home\FAQ.cshtml" />
<Content Include="Views\Home\Index.cshtml" />
+ <Content Include="Views\Map\Map.cshtml" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />