Skip to content

Commit

Permalink
Merge branch 'release/1.6.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@emmanuelmathot
emmanuelmathot committed Oct 18, 2016
2 parents 8ca935f + 9dfface commit 0096a57
Show file tree
Hide file tree
Showing 17 changed files with 1,237 additions and 357 deletions.
4 changes: 2 additions & 2 deletions Terradue.OpenSearch.Client/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion("1.6.3.*")]
[assembly: AssemblyInformationalVersion("1.6.3")]
[assembly: AssemblyVersion("1.6.4.*")]
[assembly: AssemblyInformationalVersion("1.6.4")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
//[assembly: AssemblyDelaySign(false)]
Expand Down
278 changes: 138 additions & 140 deletions Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,143 +1,141 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1FB59AA7-3878-47CD-4267-F179F56C6470}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Terradue.OpenSearchClient</RootNamespace>
<AssemblyName>OpenSearchClient</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<PlatformTarget>x86</PlatformTarget>
<ConsolePause>true</ConsolePause>
<Commandlineparameters>https://data2.terradue.com/eop/sentinel2/dataset/description</Commandlineparameters>
<ExternalConsole>true</ExternalConsole>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Data" />
<Reference Include="System.ServiceModel" />
<Reference Include="Terradue.ServiceModel.Syndication">
<HintPath>..\packages\Terradue.ServiceModel.Syndication.1.0.0.0\lib\net40\Terradue.ServiceModel.Syndication.dll</HintPath>
</Reference>
<Reference Include="Mono.Addins">
<HintPath>..\packages\Mono.Addins.1.2\lib\net40\Mono.Addins.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack">
<HintPath>..\packages\HtmlAgilityPack.1.4.9\lib\Net40\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Core" />
<Reference Include="NetTopologySuite">
<HintPath>..\packages\NetTopologySuite.1.13.3.2\lib\net40-client\NetTopologySuite.dll</HintPath>
</Reference>
<Reference Include="PowerCollections">
<HintPath>..\packages\NetTopologySuite.1.13.3.2\lib\net40-client\PowerCollections.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.ShapeFile">
<HintPath>..\packages\NetTopologySuite.IO.1.13.3.2\lib\net40-client\NetTopologySuite.IO.ShapeFile.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.GeoTools">
<HintPath>..\packages\NetTopologySuite.IO.1.13.3.2\lib\net40-client\NetTopologySuite.IO.GeoTools.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.MsSqlSpatial">
<HintPath>..\packages\NetTopologySuite.IO.1.13.3.2\lib\net40-client\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.PostGis">
<HintPath>..\packages\NetTopologySuite.IO.1.13.3.2\lib\net40-client\NetTopologySuite.IO.PostGis.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.5\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="NuGet4Mono.Extensions">
<HintPath>..\packages\NuGet4Mono.Extensions.0.3.0\lib\net40\NuGet4Mono.Extensions.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics">
<HintPath>..\packages\MathNet.Numerics.3.7.1\lib\net40\MathNet.Numerics.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="ProjNet">
<HintPath>..\packages\ProjNet.1.2\lib\net20\ProjNet.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc.OwsContext">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.OwsContext.1.0.6\lib\net40\Terradue.ServiceModel.Ogc.OwsContext.dll</HintPath>
</Reference>
<Reference Include="GeoAPI">
<HintPath>..\packages\GeoAPI.1.7.3.1\lib\net40-client\GeoAPI.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.RdfEO">
<HintPath>..\packages\Terradue.OpenSearch.RdfEO.1.3.8\lib\net40\Terradue.OpenSearch.RdfEO.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.1.1.5\lib\net40\Terradue.ServiceModel.Ogc.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.GeoJson">
<HintPath>..\packages\Terradue.OpenSearch.GeoJson.1.3.8\lib\net40\Terradue.OpenSearch.GeoJson.dll</HintPath>
</Reference>
<Reference Include="Terradue.GeoJson">
<HintPath>..\packages\Terradue.GeoJson.1.7.9\lib\net40\Terradue.GeoJson.dll</HintPath>
</Reference>
<Reference Include="Terradue.Metadata.EarthObservation">
<HintPath>..\packages\Terradue.Metadata.EarthObservation.1.4.12\lib\net40\Terradue.Metadata.EarthObservation.dll</HintPath>
</Reference>

<Reference Include="Terradue.OpenSearch">
<HintPath>..\packages\Terradue.OpenSearch.1.13.0\lib\net40\Terradue.OpenSearch.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Terradue.OpenSearch.SciHub">
<HintPath>..\packages\Terradue.OpenSearch.SciHub.1.2.2\lib\net40\Terradue.OpenSearch.SciHub.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Terradue\OpenSearch\Client\OpenSearchClient.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Terradue.OpenSearch.Client.csproj" />
<None Include="Resources\ne_110m_land\ne_110m_land.shx" />
<None Include="Resources\ne_110m_land\ne_110m_land.shp" />
<None Include="Resources\ne_110m_land\ne_110m_land.prj" />
<None Include="Resources\ne_110m_land\ne_110m_land.dbf" />
</ItemGroup>
<ItemGroup>
<Folder Include="Terradue\OpenSearch\" />
<Folder Include="Terradue\OpenSearch\Client\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Terradue.OpenSearch.Model\Terradue.OpenSearch.Model.csproj">
<Project>{BFFA2485-B9AC-4DE4-BABF-4DD96590F9D4}</Project>
<Name>Terradue.OpenSearch.Model</Name>
</ProjectReference>
<ProjectReference Include="..\Terradue.OpenSearch.Model.Base\Terradue.OpenSearch.Model.Base.csproj">
<Project>{6222FD31-E454-4D76-9AAF-0535787A6A1B}</Project>
<Name>Terradue.OpenSearch.Model.Base</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1FB59AA7-3878-47CD-4267-F179F56C6470}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Terradue.OpenSearchClient</RootNamespace>
<AssemblyName>OpenSearchClient</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<PlatformTarget>x86</PlatformTarget>
<ConsolePause>true</ConsolePause>
<Commandlineparameters>https://data2.terradue.com/eop/sentinel2/dataset/description</Commandlineparameters>
<ExternalConsole>true</ExternalConsole>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Data" />
<Reference Include="System.ServiceModel" />
<Reference Include="Terradue.ServiceModel.Syndication">
<HintPath>..\packages\Terradue.ServiceModel.Syndication.1.0.0.0\lib\net40\Terradue.ServiceModel.Syndication.dll</HintPath>
</Reference>
<Reference Include="Mono.Addins">
<HintPath>..\packages\Mono.Addins.1.2\lib\net40\Mono.Addins.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack">
<HintPath>..\packages\HtmlAgilityPack.1.4.9\lib\Net40\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Core" />
<Reference Include="NetTopologySuite">
<HintPath>..\packages\NetTopologySuite.1.13.3.2\lib\net40-client\NetTopologySuite.dll</HintPath>
</Reference>
<Reference Include="PowerCollections">
<HintPath>..\packages\NetTopologySuite.1.13.3.2\lib\net40-client\PowerCollections.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.ShapeFile">
<HintPath>..\packages\NetTopologySuite.IO.1.13.3.2\lib\net40-client\NetTopologySuite.IO.ShapeFile.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.GeoTools">
<HintPath>..\packages\NetTopologySuite.IO.1.13.3.2\lib\net40-client\NetTopologySuite.IO.GeoTools.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.MsSqlSpatial">
<HintPath>..\packages\NetTopologySuite.IO.1.13.3.2\lib\net40-client\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.PostGis">
<HintPath>..\packages\NetTopologySuite.IO.1.13.3.2\lib\net40-client\NetTopologySuite.IO.PostGis.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.5\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="NuGet4Mono.Extensions">
<HintPath>..\packages\NuGet4Mono.Extensions.0.3.0\lib\net40\NuGet4Mono.Extensions.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics">
<HintPath>..\packages\MathNet.Numerics.3.7.1\lib\net40\MathNet.Numerics.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="ProjNet">
<HintPath>..\packages\ProjNet.1.2\lib\net20\ProjNet.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc.OwsContext">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.OwsContext.1.0.6\lib\net40\Terradue.ServiceModel.Ogc.OwsContext.dll</HintPath>
</Reference>
<Reference Include="GeoAPI">
<HintPath>..\packages\GeoAPI.1.7.3.1\lib\net40-client\GeoAPI.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.RdfEO">
<HintPath>..\packages\Terradue.OpenSearch.RdfEO.1.3.8\lib\net40\Terradue.OpenSearch.RdfEO.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.1.1.5\lib\net40\Terradue.ServiceModel.Ogc.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.GeoJson">
<HintPath>..\packages\Terradue.OpenSearch.GeoJson.1.3.8\lib\net40\Terradue.OpenSearch.GeoJson.dll</HintPath>
</Reference>
<Reference Include="Terradue.GeoJson">
<HintPath>..\packages\Terradue.GeoJson.1.7.9\lib\net40\Terradue.GeoJson.dll</HintPath>
</Reference>
<Reference Include="Terradue.Metadata.EarthObservation">
<HintPath>..\packages\Terradue.Metadata.EarthObservation.1.4.12\lib\net40\Terradue.Metadata.EarthObservation.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch">
<HintPath>..\packages\Terradue.OpenSearch.1.13.0\lib\net40\Terradue.OpenSearch.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.SciHub">
<HintPath>..\packages\Terradue.OpenSearch.SciHub.1.2.2\lib\net40\Terradue.OpenSearch.SciHub.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Terradue\OpenSearch\Client\OpenSearchClient.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Terradue.OpenSearch.Client.csproj" />
<None Include="Resources\ne_110m_land\ne_110m_land.shx" />
<None Include="Resources\ne_110m_land\ne_110m_land.shp" />
<None Include="Resources\ne_110m_land\ne_110m_land.prj" />
<None Include="Resources\ne_110m_land\ne_110m_land.dbf" />
</ItemGroup>
<ItemGroup>
<Folder Include="Terradue\OpenSearch\" />
<Folder Include="Terradue\OpenSearch\Client\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Terradue.OpenSearch.Model\Terradue.OpenSearch.Model.csproj">
<Project>{BFFA2485-B9AC-4DE4-BABF-4DD96590F9D4}</Project>
<Name>Terradue.OpenSearch.Model</Name>
</ProjectReference>
<ProjectReference Include="..\Terradue.OpenSearch.Model.Base\Terradue.OpenSearch.Model.Base.csproj">
<Project>{6222FD31-E454-4D76-9AAF-0535787A6A1B}</Project>
<Name>Terradue.OpenSearch.Model.Base</Name>
</ProjectReference>
</ItemGroup>
</Project>
10 changes: 10 additions & 0 deletions Terradue.OpenSearch.Model.Base/Terradue.OpenSearch.Model.Base.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,19 @@
<Reference Include="Terradue.Metadata.EarthObservation">
<HintPath>..\packages\Terradue.Metadata.EarthObservation.1.4.12\lib\net40\Terradue.Metadata.EarthObservation.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="Terradue.OpenSearch.SciHub">
<HintPath>..\packages\Terradue.OpenSearch.SciHub.1.2.1\lib\net40\Terradue.OpenSearch.SciHub.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch">
<HintPath>..\packages\Terradue.OpenSearch.1.13.0\lib\net40\Terradue.OpenSearch.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack">
<HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net40\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.SciHub">
<HintPath>..\packages\Terradue.OpenSearch.SciHub.1.2.2\lib\net40\Terradue.OpenSearch.SciHub.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down Expand Up @@ -135,6 +142,8 @@
<Compile Include="Terradue\OpenSearch\Model\EarthObservation\IdMetadataExtractor.cs" />
<Compile Include="Terradue\OpenSearch\Model\EarthObservation\WrsLatitudeGridMetadataExtractor.cs" />
<Compile Include="Terradue\OpenSearch\Model\GeoTime\LinkMetadataExtractor.cs" />
<Compile Include="Terradue\OpenSearch\Model\EarthObservation\OpenSearchable\Sentinel1Qc\Sentinel1QcOpenSearchable.cs" />
<Compile Include="Terradue\OpenSearch\Model\EarthObservation\OpenSearchable\Sentinel1Qc\Sentinel1QcOpenSearchRequest.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
Expand All @@ -144,6 +153,7 @@
<Folder Include="Terradue\OpenSearch\Model\EarthObservation\OpenSearchable\" />
<Folder Include="Terradue\OpenSearch\New Folder\" />
<Folder Include="Terradue\OpenSearch\Model\Schemas\" />
<Folder Include="Terradue\OpenSearch\Model\EarthObservation\OpenSearchable\Sentinel1Qc\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
Expand Down
16 changes: 13 additions & 3 deletions ...del.Base/Terradue/OpenSearch/Model/EarthObservation/EarthObservationDataModelExtension.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,21 @@ public override IOpenSearchable CreateOpenSearchable(List<Uri> baseUrls, string
}

foreach (var url in baseUrls) {
var e = OpenSearchFactory.FindOpenSearchable(ose, url, ext.DiscoveryContentType);
IOpenSearchable e = null;
// QC Sentinel1 case
if (url.Host == "qc.sentinel1.eo.esa.int")
{
log.DebugFormat("QC Sentinel1 source. Trying to get the earthobservation profile");
e = new Sentinel1QcOpenSearchable(url, ose);
entities.Add(e);
continue;
}
e = OpenSearchFactory.FindOpenSearchable(ose, url, ext.DiscoveryContentType, lax);
if (!e.DefaultMimeType.Contains("profile=http://earth.esa.int/eop")) {
try {
e = OpenSearchFactory.FindOpenSearchable(ose, url, "application/atom+xml; profile=http://earth.esa.int/eop/2.1");
e = OpenSearchFactory.FindOpenSearchable(ose, url, "application/atom+xml; profile=http://earth.esa.int/eop/2.1", lax);
} catch (InvalidOperationException){
e = OpenSearchFactory.FindOpenSearchable(ose, url, "application/atom+xml");
e = OpenSearchFactory.FindOpenSearchable(ose, url, "application/atom+xml", lax);
}
if (!e.DefaultMimeType.Contains("xml"))
throw new InvalidOperationException("No Url in the OpenSearch Description Document that could fit the EOP data model");
Expand All @@ -94,6 +103,7 @@ public override IOpenSearchable CreateOpenSearchable(List<Uri> baseUrls, string
log.DebugFormat("Cwic source. Trying to get the earthobservation profile");
e = CwicOpenSearchable.CreateFrom((Terradue.OpenSearch.GenericOpenSearchable)e, ose);
}

entities.Add(e);
}

Expand Down
Loading

0 comments on commit 0096a57

Please sign in to comment.