Skip to content

Commit

Permalink
Lucene.Net 4.8.0-beta00016 (#11238)
Browse files Browse the repository at this point in the history
  • Loading branch information
@agriffard
agriffard committed Mar 11, 2022
1 parent 62eed89 commit b09867d
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 27 deletions.
8 changes: 4 additions & 4 deletions src/OrchardCore.Build/Dependencies.props
View file
Expand Up @@ -20,10 +20,10 @@
<PackageManagement Include="GraphQL" Version="2.4.0" />
<PackageManagement Include="Jint" Version="3.0.0-beta-2037" />
<PackageManagement Include="HtmlSanitizer" Version="7.1.488" />
<PackageManagement Include="Lucene.Net" Version="4.8.0-beta00015" />
<PackageManagement Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00015" />
<PackageManagement Include="Lucene.Net.QueryParser" Version="4.8.0-beta00015" />
<PackageManagement Include="Lucene.Net.Spatial" Version="4.8.0-beta00015" />
<PackageManagement Include="Lucene.Net" Version="4.8.0-beta00016" />
<PackageManagement Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
<PackageManagement Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
<PackageManagement Include="Lucene.Net.Spatial" Version="4.8.0-beta00016" />
<PackageManagement Include="MailKit" Version="3.1.1" />
<PackageManagement Include="Markdig" Version="0.27.0" />
<PackageManagement Include="MessagePack" Version="2.2.60" />
Expand Down
8 changes: 4 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.Lucene/Services/LuceneIndexManager.cs
View file
Expand Up @@ -19,7 +19,7 @@
using OrchardCore.Lucene.Model;
using OrchardCore.Lucene.Services;
using OrchardCore.Modules;
using Spatial4n.Core.Context;
using Spatial4n.Context;
using Directory = System.IO.Directory;
using LDirectory = Lucene.Net.Store.Directory;

Expand Down Expand Up @@ -65,7 +65,7 @@ LuceneIndexSettingsService luceneIndexSettingsService

// Typical geospatial context
// These can also be constructed from SpatialContextFactory
_ctx = SpatialContext.GEO;
_ctx = SpatialContext.Geo;

var maxLevels = 11; // Results in sub-meter precision for geohash

Expand Down Expand Up @@ -217,11 +217,11 @@ private Document CreateLuceneDocument(DocumentIndex documentIndex)
{
if (entry.Value is DateTimeOffset)
{
doc.Add(new StringField(entry.Name, DateTools.DateToString(((DateTimeOffset)entry.Value).UtcDateTime, DateTools.Resolution.SECOND), store));
doc.Add(new StringField(entry.Name, DateTools.DateToString(((DateTimeOffset)entry.Value).UtcDateTime, DateResolution.SECOND), store));
}
else
{
doc.Add(new StringField(entry.Name, DateTools.DateToString(((DateTime)entry.Value).ToUniversalTime(), DateTools.Resolution.SECOND), store));
doc.Add(new StringField(entry.Name, DateTools.DateToString(((DateTime)entry.Value).ToUniversalTime(), DateResolution.SECOND), store));
}
}
else
Expand Down
4 changes: 2 additions & 2 deletions ...rchardCore/OrchardCore.Lucene.Core/QueryProviders/Filters/GeoBoundingBoxFilterProvider.cs
View file
Expand Up @@ -6,7 +6,7 @@
using Lucene.Net.Spatial.Queries;
using Lucene.Net.Spatial.Util;
using Newtonsoft.Json.Linq;
using Spatial4n.Core.Context;
using Spatial4n.Context;

namespace OrchardCore.Lucene.QueryProviders.Filters
{
Expand All @@ -27,7 +27,7 @@ public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQuer
var queryObj = filter as JObject;
var first = queryObj.Properties().First();

var ctx = SpatialContext.GEO;
var ctx = SpatialContext.Geo;

var maxLevels = 11; //results in sub-meter precision for geohash

Expand Down
31 changes: 15 additions & 16 deletions src/OrchardCore/OrchardCore.Lucene.Core/QueryProviders/Filters/GeoDistanceFilterProvider.cs
View file
Expand Up @@ -8,11 +8,10 @@
using Lucene.Net.Spatial.Queries;
using Lucene.Net.Spatial.Util;
using Newtonsoft.Json.Linq;
using Spatial4n.Core.Context;
using Spatial4n.Core.Distance;
using Spatial4n.Core.Shapes;
using Spatial4n.Core.Shapes.Impl;
using Spatial4n.Core.Util;
using Spatial4n.Context;
using Spatial4n.Distance;
using Spatial4n.Shapes;
using Spatial4n.Util;

namespace OrchardCore.Lucene.QueryProviders.Filters
{
Expand All @@ -37,7 +36,7 @@ public FilteredQuery CreateFilteredQuery(ILuceneQueryService builder, LuceneQuer
return null;
}

var ctx = SpatialContext.GEO;
var ctx = SpatialContext.Geo;

var maxLevels = 11; //results in sub-meter precision for geohash

Expand Down Expand Up @@ -111,40 +110,40 @@ private static bool TryParseDistance(string distanceValue, out double distanceDe
{
case "mi":
case "miles":
distanceDegrees = DistanceUtils.Dist2Degrees(distance, DistanceUtils.EARTH_MEAN_RADIUS_MI);
distanceDegrees = DistanceUtils.Dist2Degrees(distance, DistanceUtils.EarthMeanRadiusMiles);
return true;
case "km":
case "kilometers":
distanceDegrees = DistanceUtils.Dist2Degrees(distance, DistanceUtils.EARTH_MEAN_RADIUS_KM);
distanceDegrees = DistanceUtils.Dist2Degrees(distance, DistanceUtils.EarthMeanRadiusKilometers);
return true;
case "ft":
case "feet":
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 5280, DistanceUtils.EARTH_MEAN_RADIUS_MI);
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 5280, DistanceUtils.EarthMeanRadiusMiles);
return true;
case "yd":
case "yards":
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1760, DistanceUtils.EARTH_MEAN_RADIUS_MI);
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1760, DistanceUtils.EarthMeanRadiusMiles);
return true;
case "in":
case "inch":
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 63360, DistanceUtils.EARTH_MEAN_RADIUS_MI);
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 63360, DistanceUtils.EarthMeanRadiusMiles);
return true;
case "m":
case "meters":
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1000, DistanceUtils.EARTH_MEAN_RADIUS_KM);
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1000, DistanceUtils.EarthMeanRadiusKilometers);
return true;
case "cm":
case "centimeters":
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 100000, DistanceUtils.EARTH_MEAN_RADIUS_KM);
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 100000, DistanceUtils.EarthMeanRadiusKilometers);
return true;
case "mm":
case "millimeters":
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1000000, DistanceUtils.EARTH_MEAN_RADIUS_KM);
distanceDegrees = DistanceUtils.Dist2Degrees(distance / 1000000, DistanceUtils.EarthMeanRadiusKilometers);
return true;
case "nm":
case "nmi":
case "nauticalmiles":
distanceDegrees = DistanceUtils.Dist2Degrees(distance * 1.852, DistanceUtils.EARTH_MEAN_RADIUS_KM);
distanceDegrees = DistanceUtils.Dist2Degrees(distance * 1.852, DistanceUtils.EarthMeanRadiusKilometers);
return true;
}

Expand All @@ -155,7 +154,7 @@ private static bool TryGetPointFromJToken(JToken geoToken, out IPoint point)
{
point = null;

var ctx = SpatialContext.GEO;
var ctx = SpatialContext.Geo;

switch (geoToken.Type)
{
Expand Down
2 changes: 1 addition & 1 deletion src/docs/resources/libraries/README.md
View file
Expand Up @@ -16,7 +16,7 @@ The below table lists the different .NET libraries used in Orchard Core:
| [Image Sharp](https://github.com/SixLabors/ImageSharp.Web) | Middleware for ASP.NET-Core for image manipulation. | 1.0.5 |[Apache-2.0](https://github.com/SixLabors/ImageSharp.Web/blob/master/LICENSE) |
| [Irony.Core](https://github.com/daxnet/irony) | A modified version of the Irony project with .NET Core support | 1.0.7 | [MIT](https://github.com/daxnet/irony/blob/master/LICENSE) |
| [Jint](https://github.com/sebastienros/jint) | Javascript Interpreter for .NET. | 3.0.0-beta-2037 | [MIT](https://github.com/sebastienros/jint/blob/dev/LICENSE) |
| [Lucene.Net](https://github.com/apache/lucenenet) | .NET full-text search engine. | 4.8.0-beta00015 | [Apache-2.0](https://github.com/apache/lucenenet/blob/master/LICENSE.txt) |
| [Lucene.Net](https://github.com/apache/lucenenet) | .NET full-text search engine. | 4.8.0-beta00016 | [Apache-2.0](https://github.com/apache/lucenenet/blob/master/LICENSE.txt) |
| [MailKit](https://github.com/jstedfast/MailKit) | A cross-platform .NET library for IMAP, POP3, and SMTP. | 3.1.1 | [MIT](https://github.com/jstedfast/MailKit/blob/master/LICENSE) |
| [Markdig](https://github.com/lunet-io/markdig) | .NET Markdown engine. | 0.27.0 | [BSD-2-Clause](https://github.com/lunet-io/markdig/blob/master/license.txt) |
| [MessagePack](https://github.com/neuecc/MessagePack-CSharp) | Extremely Fast MessagePack Serializer for C# | 2.2.60 | [MIT](https://github.com/neuecc/MessagePack-CSharp/blob/master/LICENSE) |
Expand Down

0 comments on commit b09867d

Please sign in to comment.