Skip to content

Commit

Permalink
Release 1.8.29
Browse files Browse the repository at this point in the history
  • Loading branch information
floeschau committed May 24, 2019
1 parent 759afb7 commit f1939ff
Show file tree
Hide file tree
Showing 14 changed files with 84 additions and 71 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@
<Reference Include="Terradue.OpenSearch.Usgs, Version=1.1.3.14780, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Terradue.OpenSearch.Usgs.1.1.3\lib\net45\Terradue.OpenSearch.Usgs.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc.OwsContext, Version=1.1.2.26812, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.OwsContext.1.1.2\lib\net45\Terradue.ServiceModel.Ogc.OwsContext.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.2.1.1\lib\net45\Terradue.ServiceModel.Ogc.dll</HintPath>
</Reference>
Expand All @@ -105,16 +102,19 @@
<HintPath>..\packages\Terradue.ServiceModel.Syndication.1.0.4\lib\net452\Terradue.ServiceModel.Syndication.dll</HintPath>
</Reference>
<Reference Include="Terradue.GeoJson">
<HintPath>..\packages\Terradue.GeoJson.1.9.0\lib\net45\Terradue.GeoJson.dll</HintPath>
<HintPath>..\packages\Terradue.GeoJson.1.9.2\lib\net45\Terradue.GeoJson.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.SciHub">
<HintPath>..\packages\Terradue.OpenSearch.SciHub.1.7.4\lib\net45\Terradue.OpenSearch.SciHub.dll</HintPath>
</Reference>
<Reference Include="NuGet4Mono">
<HintPath>..\packages\NuGet4Mono.0.7.0\lib\net40\NuGet4Mono.exe</HintPath>
<HintPath>..\packages\NuGet4Mono.0.8.0\lib\net45\NuGet4Mono.exe</HintPath>
</Reference>
<Reference Include="NuGet4Mono.Extensions">
<HintPath>..\packages\NuGet4Mono.0.7.0\lib\net40\NuGet4Mono.Extensions.dll</HintPath>
<HintPath>..\packages\NuGet4Mono.Extensions.0.8.0\lib\net45\NuGet4Mono.Extensions.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc.OwsContext">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.OwsContext.1.2.0\lib\net45\Terradue.ServiceModel.Ogc.OwsContext.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Terradue.OpenSearch.Client.Test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
<package id="NetTopologySuite.IO" version="1.14.0.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
<package id="NuGet.Core" version="2.14.0" targetFramework="net45" />
<package id="NuGet4Mono" version="0.7.0" targetFramework="net471" />
<package id="NuGet4Mono.Extensions" version="0.7.0" targetFramework="net471" />
<package id="NuGet4Mono" version="0.8.0" targetFramework="net471" />
<package id="NuGet4Mono.Extensions" version="0.8.0" targetFramework="net471" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="ProjNet" version="1.2" targetFramework="net471" />
<package id="Terradue.GeoJson" version="1.9.0" targetFramework="net471" />
<package id="Terradue.GeoJson" version="1.9.2" targetFramework="net471" />
<package id="Terradue.Metadata.EarthObservation" version="1.5.9" targetFramework="net471" />
<package id="Terradue.OpenSearch" version="1.16.1" targetFramework="net471" />
<package id="Terradue.OpenSearch.SciHub" version="1.7.12" targetFramework="net471" />
<package id="Terradue.OpenSearch.Usgs" version="1.1.3" targetFramework="net471" />
<package id="Terradue.ServiceModel.Ogc" version="2.1.1" targetFramework="net45" />
<package id="Terradue.ServiceModel.Ogc.OwsContext" version="1.1.2" targetFramework="net45" />
<package id="Terradue.ServiceModel.Ogc.OwsContext" version="1.2.0" targetFramework="net471" />
<package id="Terradue.ServiceModel.Syndication" version="1.0.7" targetFramework="net471" />
</packages>
4 changes: 2 additions & 2 deletions Terradue.OpenSearch.Client/Properties/AssemblyInfo.cs
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.8.28.*")]
[assembly: AssemblyInformationalVersion("1.8.28")]
[assembly: AssemblyVersion("1.8.29.*")]
[assembly: AssemblyInformationalVersion("1.8.29")]
// 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
8 changes: 4 additions & 4 deletions Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<HintPath>..\packages\Terradue.OpenSearch.Usgs.1.1.3\lib\net45\Terradue.OpenSearch.Usgs.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc.OwsContext">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.OwsContext.1.1.2\lib\net45\Terradue.ServiceModel.Ogc.OwsContext.dll</HintPath>
<HintPath>..\packages\Terradue.ServiceModel.Ogc.OwsContext.1.2.0\lib\net45\Terradue.ServiceModel.Ogc.OwsContext.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack">
<HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
Expand All @@ -124,7 +124,7 @@
<HintPath>..\packages\Terradue.OpenSearch.1.16.1\lib\net45\Terradue.OpenSearch.dll</HintPath>
</Reference>
<Reference Include="Terradue.GeoJson">
<HintPath>..\packages\Terradue.GeoJson.1.9.1\lib\net45\Terradue.GeoJson.dll</HintPath>
<HintPath>..\packages\Terradue.GeoJson.1.9.2\lib\net45\Terradue.GeoJson.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.SciHub">
<HintPath>..\packages\Terradue.OpenSearch.SciHub.1.7.4\lib\net45\Terradue.OpenSearch.SciHub.dll</HintPath>
Expand All @@ -140,10 +140,10 @@
<HintPath>..\packages\Terradue.OpenSearch.SciHub.1.7.12\lib\net45\Terradue.OpenSearch.SciHub.dll</HintPath>
</Reference>
<Reference Include="NuGet4Mono">
<HintPath>..\packages\NuGet4Mono.0.7.0\lib\net45\NuGet4Mono.exe</HintPath>
<HintPath>..\packages\NuGet4Mono.0.8.0\lib\net45\NuGet4Mono.exe</HintPath>
</Reference>
<Reference Include="NuGet4Mono.Extensions">
<HintPath>..\packages\NuGet4Mono.Extensions.0.7.0\lib\net45\NuGet4Mono.Extensions.dll</HintPath>
<HintPath>..\packages\NuGet4Mono.Extensions.0.8.0\lib\net45\NuGet4Mono.Extensions.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
8 changes: 4 additions & 4 deletions Terradue.OpenSearch.Client/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
<package id="NetTopologySuite.IO" version="1.14.0.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
<package id="NuGet.Core" version="2.14.0" targetFramework="net45" />
<package id="NuGet4Mono" version="0.7.0" targetFramework="net471" />
<package id="NuGet4Mono.Extensions" version="0.7.0" targetFramework="net471" />
<package id="NuGet4Mono" version="0.8.0" targetFramework="net471" />
<package id="NuGet4Mono.Extensions" version="0.8.0" targetFramework="net471" />
<package id="ProjNet" version="1.2" targetFramework="net40" />
<package id="Terradue.GeoJson" version="1.9.1" targetFramework="net471" />
<package id="Terradue.GeoJson" version="1.9.2" targetFramework="net471" />
<package id="Terradue.Metadata.EarthObservation" version="1.5.9" targetFramework="net471" />
<package id="Terradue.OpenSearch" version="1.16.1" targetFramework="net471" />
<package id="Terradue.OpenSearch.GeoJson" version="1.3.21" targetFramework="net471" />
<package id="Terradue.OpenSearch.RdfEO" version="1.4.2" targetFramework="net471" />
<package id="Terradue.OpenSearch.SciHub" version="1.7.12" targetFramework="net471" />
<package id="Terradue.OpenSearch.Usgs" version="1.1.3" targetFramework="net471" />
<package id="Terradue.ServiceModel.Ogc" version="2.1.1" targetFramework="net45" />
<package id="Terradue.ServiceModel.Ogc.OwsContext" version="1.1.2" targetFramework="net45" />
<package id="Terradue.ServiceModel.Ogc.OwsContext" version="1.2.0" targetFramework="net471" />
<package id="Terradue.ServiceModel.Syndication" version="1.0.7" targetFramework="net471" />
</packages>
2 changes: 1 addition & 1 deletion Terradue.OpenSearch.Model.Base/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("1.8.28.*")]
[assembly: AssemblyVersion("1.8.29.*")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<HintPath>..\packages\Terradue.OpenSearch.Usgs.1.1.3\lib\net45\Terradue.OpenSearch.Usgs.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc.OwsContext">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.OwsContext.1.1.2\lib\net45\Terradue.ServiceModel.Ogc.OwsContext.dll</HintPath>
<HintPath>..\packages\Terradue.ServiceModel.Ogc.OwsContext.1.2.0\lib\net45\Terradue.ServiceModel.Ogc.OwsContext.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack">
<HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
Expand Down Expand Up @@ -189,10 +189,10 @@
<HintPath>..\packages\Terradue.OpenSearch.SciHub.1.7.12\lib\net45\Terradue.OpenSearch.SciHub.dll</HintPath>
</Reference>
<Reference Include="NuGet4Mono">
<HintPath>..\packages\NuGet4Mono.0.7.0\lib\net45\NuGet4Mono.exe</HintPath>
<HintPath>..\packages\NuGet4Mono.0.8.0\lib\net45\NuGet4Mono.exe</HintPath>
</Reference>
<Reference Include="NuGet4Mono.Extensions">
<HintPath>..\packages\NuGet4Mono.Extensions.0.7.0\lib\net45\NuGet4Mono.Extensions.dll</HintPath>
<HintPath>..\packages\NuGet4Mono.Extensions.0.8.0\lib\net45\NuGet4Mono.Extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@
using Terradue.ServiceModel.Ogc;
using Terradue.ServiceModel.Syndication;

namespace Terradue.OpenSearch.Model.EarthObservation.OpenSearchable
{
class Sentinel1AuxOpenSearchRequest : OpenSearchRequest
{
namespace Terradue.OpenSearch.Model.EarthObservation.OpenSearchable {




class Sentinel1AuxOpenSearchRequest : OpenSearchRequest {

static Regex identifierRegex = new Regex(@"^(?'mission'\w{3})_OPER_AUX_(?'type'\w{6})_(?'system'\w{4})_(?'proddate'\d{8}T\d{6})_V(?'startdate'\w{15})_(?'stopdate'\w{15})$");
NameValueCollection parameters;
readonly Uri auxSearchUrl;

Expand All @@ -34,8 +38,7 @@ class Sentinel1AuxOpenSearchRequest : OpenSearchRequest



public Sentinel1AuxOpenSearchRequest(Uri auxSearchUrl, NameValueCollection parameters) : base(new OpenSearchUrl(auxSearchUrl), "application/atom+xml")
{
public Sentinel1AuxOpenSearchRequest(Uri auxSearchUrl, NameValueCollection parameters) : base(new OpenSearchUrl(auxSearchUrl), "application/atom+xml") {
this.auxSearchUrl = auxSearchUrl;
var tmpurl = new UriBuilder(auxSearchUrl);
tmpurl.Path = "";
Expand All @@ -44,21 +47,17 @@ public Sentinel1AuxOpenSearchRequest(Uri auxSearchUrl, NameValueCollection param
this.parameters = parameters;
}

public override NameValueCollection OriginalParameters
{
get
{
public override NameValueCollection OriginalParameters {
get {
return parameters;
}

set
{
set {
parameters = value;
}
}

public override IOpenSearchResponse GetResponse()
{
public override IOpenSearchResponse GetResponse() {

AtomFeed feed = new AtomFeed();

Expand All @@ -73,19 +72,28 @@ public override IOpenSearchResponse GetResponse()

List<AtomItem> items = new List<AtomItem>();

string uid = null;
int day = 0, dayCount = 1;
DateTime startDate, stopDate;
DateTime startDate = DateTime.UtcNow, stopDate = DateTime.UtcNow;
if (!String.IsNullOrEmpty(parameters["uid"])) {
uid = parameters["uid"];
Match match = identifierRegex.Match(uid);
if (match.Success && DateTime.TryParseExact(match.Groups["proddate"].Value, "yyyyMMddTHHmmss", DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AssumeUniversal, out startDate)) {
startDate = startDate.ToUniversalTime();
count = 1;
startIndex = 1;
}
}
if (!String.IsNullOrEmpty(parameters["start"]) && DateTime.TryParse(parameters["start"], DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AssumeUniversal, out startDate)) {
startDate = startDate.ToUniversalTime();
} else {
startDate = DateTime.UtcNow;
}
if (!String.IsNullOrEmpty(parameters["stop"]) && DateTime.TryParse(parameters["stop"], DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AssumeUniversal, out stopDate)) {
stopDate = stopDate.ToUniversalTime();
dayCount = (stopDate - startDate).Days + 1;
log.DebugFormat("LOOP {0} {1} [{2}] [{3}]", startDate, dayCount, startDate, stopDate);
}



Dictionary<string, Uri> list = new Dictionary<string, Uri>();
int index = 0;
while (day < dayCount) {
Expand All @@ -110,9 +118,13 @@ public override IOpenSearchResponse GetResponse()

foreach (HtmlNode link in links) {
HtmlAttribute href = link.Attributes["href"];
if (!link.InnerText.EndsWith(".EOF", StringComparison.InvariantCulture)) continue;
string text = link.InnerText;
if (!text.EndsWith(".EOF", StringComparison.InvariantCulture)) continue;

index++;

if (uid != null && String.Format("{0}.EOF", uid) != text) continue;

if (index < startIndex) {
skippedCount++;
continue;
Expand All @@ -127,9 +139,9 @@ public override IOpenSearchResponse GetResponse()
}
addedCount++;
list.Add(link.InnerText, productUrl);
if (list.Count >= count) break;
if (uid != null || list.Count >= count) break;
}
log.DebugFormat("Items skipped: {0}, added: {1}", skippedCount, addedCount);
if (uid != null) log.DebugFormat("Items skipped: {0}, added: {1}", skippedCount, addedCount);

if (list.Count >= count) break; // break also from day loop

Expand All @@ -153,8 +165,9 @@ public override IOpenSearchResponse GetResponse()
return new Terradue.OpenSearch.Response.AtomOpenSearchResponse(feed);
}

IEnumerable<AtomItem> BuildAtomItem(IEnumerable<KeyValuePair<string, Uri>> products, bool withOrbits)
{


IEnumerable<AtomItem> BuildAtomItem(IEnumerable<KeyValuePair<string, Uri>> products, bool withOrbits) {

List<AtomItem> items = new List<AtomItem>();

Expand All @@ -179,11 +192,11 @@ IEnumerable<AtomItem> BuildAtomItem(IEnumerable<KeyValuePair<string, Uri>> produ
return items;
}

AtomItem CreateItemFromLink(string key, Uri url, bool withOrbits)
{


AtomItem CreateItemFromLink(string key, Uri url, bool withOrbits) {
string identifier = key.Replace(".EOF", "");
Match match = Regex.Match(identifier,
@"^(?'mission'\w{3})_OPER_AUX_(?'type'\w{6})_(?'system'\w{4})_(?'proddate'\w{15})_V(?'startdate'\w{15})_(?'stopdate'\w{15})$");
Match match = identifierRegex.Match(identifier);

if (!match.Success)
return null;
Expand Down Expand Up @@ -228,17 +241,19 @@ AtomItem CreateItemFromLink(string key, Uri url, bool withOrbits)

}

static Uri BuildUrl(Uri auxSearchUrl, string type, DateTime date)
{


static Uri BuildUrl(Uri auxSearchUrl, string type, DateTime date) {
UriBuilder url = new UriBuilder(auxSearchUrl);
url.Path += String.Format("/{0}/{1:yyyy/MM/dd}/", String.IsNullOrEmpty(type) ? "RESORB" : Regex.Replace(type, "^aux_", String.Empty).ToUpper(), date);
var qs = HttpUtility.ParseQueryString(String.Empty);
return url.Uri;

}

public static Terradue.ServiceModel.Ogc.Eop21.EarthObservationType OrbToEo(string identifier, string mission, string type, DateTime start, DateTime stop, DateTimeOffset published)
{


public static Terradue.ServiceModel.Ogc.Eop21.EarthObservationType OrbToEo(string identifier, string mission, string type, DateTime start, DateTime stop, DateTimeOffset published) {

Terradue.ServiceModel.Ogc.Eop21.EarthObservationType eo = new Terradue.ServiceModel.Ogc.Eop21.EarthObservationType();

Expand Down Expand Up @@ -280,17 +295,15 @@ public static Terradue.ServiceModel.Ogc.Eop21.EarthObservationType OrbToEo(strin

}

public static SyndicationElementExtension GenerateOrbitsExtension(Terradue.OpenSearch.Sentinel.Data.Earth_Explorer_File file)
{
public static SyndicationElementExtension GenerateOrbitsExtension(Terradue.OpenSearch.Sentinel.Data.Earth_Explorer_File file) {

SyndicationElementExtension extension = new SyndicationElementExtension(GetS1OrbitsFromEE(file), Terradue.Metadata.EarthObservation.Model.orbitListType.OrbitsSerializer);

return extension;
}


public static Terradue.Metadata.EarthObservation.Model.orbitListType GetS1OrbitsFromEE(Terradue.OpenSearch.Sentinel.Data.Earth_Explorer_File file)
{
public static Terradue.Metadata.EarthObservation.Model.orbitListType GetS1OrbitsFromEE(Terradue.OpenSearch.Sentinel.Data.Earth_Explorer_File file) {

Terradue.Metadata.EarthObservation.Model.orbitListType orbits = new Terradue.Metadata.EarthObservation.Model.orbitListType();

Expand Down
6 changes: 3 additions & 3 deletions Terradue.OpenSearch.Model.Base/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<package id="NetTopologySuite.IO" version="1.14.0.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
<package id="NuGet.Core" version="2.14.0" targetFramework="net45" />
<package id="NuGet4Mono" version="0.7.0" targetFramework="net471" />
<package id="NuGet4Mono.Extensions" version="0.7.0" targetFramework="net471" />
<package id="NuGet4Mono" version="0.8.0" targetFramework="net471" />
<package id="NuGet4Mono.Extensions" version="0.8.0" targetFramework="net471" />
<package id="ProjNet" version="1.2" targetFramework="net40" />
<package id="System.Interactive.Async" version="3.1.1" targetFramework="net471" />
<package id="System.IO" version="4.3.0" targetFramework="net471" />
Expand All @@ -38,6 +38,6 @@
<package id="Terradue.OpenSearch.SciHub" version="1.7.12" targetFramework="net471" />
<package id="Terradue.OpenSearch.Usgs" version="1.1.3" targetFramework="net471" />
<package id="Terradue.ServiceModel.Ogc" version="2.1.1" targetFramework="net45" />
<package id="Terradue.ServiceModel.Ogc.OwsContext" version="1.1.2" targetFramework="net45" />
<package id="Terradue.ServiceModel.Ogc.OwsContext" version="1.2.0" targetFramework="net471" />
<package id="Terradue.ServiceModel.Syndication" version="1.0.7" targetFramework="net471" />
</packages>
2 changes: 1 addition & 1 deletion Terradue.OpenSearch.Model/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("1.8.28.*")]
[assembly: AssemblyVersion("1.8.29.*")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
Loading

0 comments on commit f1939ff

Please sign in to comment.