Index: Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs
===================================================================
diff -u -r871b3650e857729db48daadfd19322c779298d1e -rc5008a06ddbdc34516ee880e44c719266185546c
--- Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs (.../FeatureBasedMapDataConverter.cs) (revision 871b3650e857729db48daadfd19322c779298d1e)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs (.../FeatureBasedMapDataConverter.cs) (revision c5008a06ddbdc34516ee880e44c719266185546c)
@@ -154,6 +154,17 @@
protected abstract IFeatureCategory CreateCategory(TFeatureBasedMapData mapData, Color color);
///
+ /// Converts an of to an
+ /// of .
+ ///
+ /// The of to convert.
+ /// The converted of .
+ protected static IEnumerable ConvertPoint2DElementsToCoordinates(IEnumerable points)
+ {
+ return points.Select(point => new Coordinate(point.X, point.Y)).ToArray();
+ }
+
+ ///
/// Creates the based on the .
///
/// The map data to base the scheme on.
@@ -182,17 +193,6 @@
return scheme;
}
- ///
- /// Converts an of to an
- /// of .
- ///
- /// The of to convert.
- /// The converted of .
- protected static IEnumerable ConvertPoint2DElementsToCoordinates(IEnumerable points)
- {
- return points.Select(point => new Coordinate(point.X, point.Y)).ToArray();
- }
-
private static void ValidateParameters(TFeatureBasedMapData data, TMapFeatureLayer layer)
{
if (data == null)
@@ -283,12 +283,6 @@
return CreateValueFilterExpression(attributeIndex, valueCriteria);
}
- var rangeCriteria = criteria as RangeCriteria;
- if (rangeCriteria != null)
- {
- return CreateRangeCriteriaFilterExpression(attributeIndex, rangeCriteria);
- }
-
throw new NotSupportedException($"Can't convert a {nameof(ICriteria)} of type {criteria.GetType()}");
}
@@ -314,32 +308,5 @@
throw new NotSupportedException($"The enum value {nameof(ValueCriteriaOperator)}.{valueOperator} is not supported.");
}
}
-
- ///
- /// Creates a filter expression based for an attribute and the range criteria to apply.
- ///
- /// The index of the attribute in the metadata table.
- /// The criteria to convert to an expression.
- /// The filter expression based on the
- /// and .
- /// Thrown when the
- /// cannot be used to create a filter expression.
- private static string CreateRangeCriteriaFilterExpression(int attributeIndex, RangeCriteria rangeCriteria)
- {
- RangeCriteriaOperator rangeCriteriaOperator = rangeCriteria.RangeCriteriaOperator;
- switch (rangeCriteriaOperator)
- {
- case RangeCriteriaOperator.AllBoundsInclusive:
- return $"[{attributeIndex}] >= {rangeCriteria.LowerBound} AND [{attributeIndex}] <= {rangeCriteria.UpperBound}";
- case RangeCriteriaOperator.LowerBoundInclusiveUpperBoundExclusive:
- return $"[{attributeIndex}] >= {rangeCriteria.LowerBound} AND [{attributeIndex}] < {rangeCriteria.UpperBound}";
- case RangeCriteriaOperator.LowerBoundExclusiveUpperBoundInclusive:
- return $"[{attributeIndex}] > {rangeCriteria.LowerBound} AND [{attributeIndex}] <= {rangeCriteria.UpperBound}";
- case RangeCriteriaOperator.AllBoundsExclusive:
- return $"[{attributeIndex}] > {rangeCriteria.LowerBound} AND [{attributeIndex}] < {rangeCriteria.UpperBound}";
- default:
- throw new NotSupportedException($"The enum value {nameof(RangeCriteriaOperator)}.{rangeCriteriaOperator} is not supported.");
- }
- }
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj
===================================================================
diff -u -r3c41a03f6a1173872af5d8507465e291f9e3f8f2 -rc5008a06ddbdc34516ee880e44c719266185546c
--- Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj (.../Core.Components.Gis.csproj) (revision 3c41a03f6a1173872af5d8507465e291f9e3f8f2)
+++ Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj (.../Core.Components.Gis.csproj) (revision c5008a06ddbdc34516ee880e44c719266185546c)
@@ -14,8 +14,6 @@
-
-
Fisheye: Tag c5008a06ddbdc34516ee880e44c719266185546c refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis/Theme/Criteria/RangeCriteria.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag c5008a06ddbdc34516ee880e44c719266185546c refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis/Theme/Criteria/RangeCriteriaOperator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs
===================================================================
diff -u -r871b3650e857729db48daadfd19322c779298d1e -rc5008a06ddbdc34516ee880e44c719266185546c
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs (.../FeatureBasedMapDataConverterTest.cs) (revision 871b3650e857729db48daadfd19322c779298d1e)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs (.../FeatureBasedMapDataConverterTest.cs) (revision c5008a06ddbdc34516ee880e44c719266185546c)
@@ -680,80 +680,6 @@
}, testConverter.CreatedCategories);
}
- [Test]
- [TestCase(RangeCriteriaOperator.AllBoundsInclusive, "[1] >= {0} AND [1] <= {1}", TestName = "AllBoundsInclusive")]
- [TestCase(RangeCriteriaOperator.LowerBoundInclusiveUpperBoundExclusive, "[1] >= {0} AND [1] < {1}", TestName = "LowerBoundInclusiveUpperBoundExclusive")]
- [TestCase(RangeCriteriaOperator.LowerBoundExclusiveUpperBoundInclusive, "[1] > {0} AND [1] <= {1}", TestName = "LowerBoundExclusiveUpperBoundInclusive")]
- [TestCase(RangeCriteriaOperator.AllBoundsExclusive, "[1] > {0} AND [1] < {1}", TestName = "AllBoundsExclusive")]
- public void ConvertLayerProperties_MapDataWithMapThemeAndValidRangeCriteria_SetsCorrectFilterExpression(RangeCriteriaOperator criteriaOperator,
- string expressionFormat)
- {
- // Setup
- var random = new Random(21);
- const string metadataAttributeName = "Meta";
- double lowerBound = random.NextDouble();
- double upperBound = 1 + lowerBound;
-
- var featureScheme = new PointScheme();
- var defaultCategory = new PointCategory();
- var category = new PointCategory();
-
- var rangeCriteria = new RangeCriteria(criteriaOperator, lowerBound, upperBound);
- var theme = new MapTheme(metadataAttributeName, new[]
- {
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- rangeCriteria)
- });
-
- var mapData = new TestFeatureBasedMapData("test data")
- {
- Features = new[]
- {
- new MapFeature(Enumerable.Empty())
- {
- MetaData =
- {
- {
- metadataAttributeName, new object()
- }
- }
- }
- },
- MapTheme = theme
- };
-
- var testConverter = new TestFeatureBasedMapDataConverter
- {
- CreatedFeatureScheme = featureScheme,
- CreatedDefaultCategory = defaultCategory,
- CreatedCategory = category
- };
-
- var mapLayer = new TestFeatureLayer();
-
- // Call
- testConverter.ConvertLayerProperties(mapData, mapLayer);
-
- // Assert
- Assert.AreSame(featureScheme, mapLayer.Symbology);
-
- Assert.IsNull(defaultCategory.FilterExpression);
- string expectedFilterExpression = string.Format(expressionFormat, lowerBound, upperBound);
- Assert.AreEqual(expectedFilterExpression, category.FilterExpression);
-
- CollectionAssert.AreEqual(new[]
- {
- defaultCategory,
- category
- }, mapLayer.Symbology.Categories);
-
- CollectionAssert.AreEqual(new[]
- {
- Tuple.Create(mapData, Color.Transparent),
- Tuple.Create(mapData, theme.CategoryThemes.Single().Color)
- }, testConverter.CreatedCategories);
- }
-
private class TestFeatureLayer : MapPointLayer
{
public TestFeatureLayer() : base(new FeatureSet())
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs
===================================================================
diff -u -r871b3650e857729db48daadfd19322c779298d1e -rc5008a06ddbdc34516ee880e44c719266185546c
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision 871b3650e857729db48daadfd19322c779298d1e)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision c5008a06ddbdc34516ee880e44c719266185546c)
@@ -263,105 +263,6 @@
AssertAreEqual(expectedSymbolizer, unEqualSchemeCategory.Symbolizer);
}
- [Test]
- public void ConvertLayerProperties_MapLineDataWithStyleAndRangeCriteria_ConvertDataToMapPointLayer()
- {
- // Setup
- const string metadataAttribute = "Meta";
- var random = new Random(21);
-
- var allBoundsInclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.AllBoundsInclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var lowerBoundInclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.LowerBoundInclusiveUpperBoundExclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var upperBoundInclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.LowerBoundExclusiveUpperBoundInclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var allBoundsExclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.AllBoundsExclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var theme = new MapTheme(metadataAttribute, new[]
- {
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- allBoundsInclusiveCriteria),
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- lowerBoundInclusiveCriteria),
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- upperBoundInclusiveCriteria),
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- allBoundsExclusiveCriteria)
- });
-
- var lineStyle = new LineStyle
- {
- Color = Color.FromKnownColor(random.NextEnum()),
- Width = random.Next(1, 48),
- DashStyle = LineDashStyle.DashDotDot
- };
- var mapLineData = new MapLineData("test", lineStyle)
- {
- Features = new[]
- {
- CreateMapFeatureWithMetaData(metadataAttribute)
- },
- MapTheme = theme
- };
-
- var mapLineLayer = new MapLineLayer();
-
- var converter = new MapLineDataConverter();
-
- // Call
- converter.ConvertLayerProperties(mapLineData, mapLineLayer);
-
- // Assert
- const DashStyle expectedDashStyle = DashStyle.DashDotDot;
- ILineSymbolizer expectedSymbolizer = CreateExpectedSymbolizer(lineStyle,
- expectedDashStyle,
- lineStyle.Color);
-
- ILineScheme appliedScheme = mapLineLayer.Symbology;
- Assert.AreEqual(5, appliedScheme.Categories.Count);
-
- ILineCategory baseCategory = appliedScheme.Categories[0];
- AssertAreEqual(expectedSymbolizer, baseCategory.Symbolizer);
- Assert.IsNull(baseCategory.FilterExpression);
-
- ILineCategory allBoundsInclusiveCategory = appliedScheme.Categories[1];
- string expectedFilter = $"[1] >= {allBoundsInclusiveCriteria.LowerBound} AND [1] <= {allBoundsInclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, allBoundsInclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(lineStyle,
- expectedDashStyle,
- theme.CategoryThemes.ElementAt(0).Color);
- AssertAreEqual(expectedSymbolizer, allBoundsInclusiveCategory.Symbolizer);
-
- ILineCategory lowerBoundInclusiveCategory = appliedScheme.Categories[2];
- expectedFilter = $"[1] >= {lowerBoundInclusiveCriteria.LowerBound} AND [1] < {lowerBoundInclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, lowerBoundInclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(lineStyle,
- expectedDashStyle,
- theme.CategoryThemes.ElementAt(1).Color);
- AssertAreEqual(expectedSymbolizer, lowerBoundInclusiveCategory.Symbolizer);
-
- ILineCategory upperBoundInclusiveCategory = appliedScheme.Categories[3];
- expectedFilter = $"[1] > {upperBoundInclusiveCriteria.LowerBound} AND [1] <= {upperBoundInclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, upperBoundInclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(lineStyle,
- expectedDashStyle,
- theme.CategoryThemes.ElementAt(2).Color);
- AssertAreEqual(expectedSymbolizer, upperBoundInclusiveCategory.Symbolizer);
-
- ILineCategory allBoundsExclusiveCategory = appliedScheme.Categories[4];
- expectedFilter = $"[1] > {allBoundsExclusiveCriteria.LowerBound} AND [1] < {allBoundsExclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, allBoundsExclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(lineStyle,
- expectedDashStyle,
- theme.CategoryThemes.ElementAt(3).Color);
- AssertAreEqual(expectedSymbolizer, allBoundsExclusiveCategory.Symbolizer);
- }
-
private static ILineSymbolizer CreateExpectedSymbolizer(LineStyle expectedLineStyle,
DashStyle expectedDashStyle,
Color expectedColor)
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs
===================================================================
diff -u -r871b3650e857729db48daadfd19322c779298d1e -rc5008a06ddbdc34516ee880e44c719266185546c
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision 871b3650e857729db48daadfd19322c779298d1e)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision c5008a06ddbdc34516ee880e44c719266185546c)
@@ -259,107 +259,6 @@
AssertAreEqual(expectedSymbolizer, unEqualSchemeCategory.Symbolizer);
}
- [Test]
- public void ConvertLayerProperties_MapPointDataWithStyleAndRangeCriteria_ConvertDataToMapPointLayer()
- {
- // Setup
- const string metadataAttribute = "Meta";
- var random = new Random(21);
-
- var allBoundsInclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.AllBoundsInclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var lowerBoundInclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.LowerBoundInclusiveUpperBoundExclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var upperBoundInclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.LowerBoundExclusiveUpperBoundInclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var allBoundsExclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.AllBoundsExclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var theme = new MapTheme(metadataAttribute, new[]
- {
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- allBoundsInclusiveCriteria),
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- lowerBoundInclusiveCriteria),
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- upperBoundInclusiveCriteria),
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- allBoundsExclusiveCriteria)
- });
-
- var pointStyle = new PointStyle
- {
- Color = Color.FromKnownColor(random.NextEnum()),
- Size = random.Next(1, 48),
- Symbol = PointSymbol.Circle,
- StrokeColor = Color.FromKnownColor(random.NextEnum()),
- StrokeThickness = random.Next(1, 48)
- };
- var mapPointData = new MapPointData("test", pointStyle)
- {
- Features = new[]
- {
- CreateMapFeatureWithMetaData(metadataAttribute)
- },
- MapTheme = theme
- };
-
- var mapPointLayer = new MapPointLayer();
-
- var converter = new MapPointDataConverter();
-
- // Call
- converter.ConvertLayerProperties(mapPointData, mapPointLayer);
-
- // Assert
- const PointShape expectedPointShape = PointShape.Ellipse;
- PointSymbolizer expectedSymbolizer = CreateExpectedSymbolizer(pointStyle,
- expectedPointShape,
- pointStyle.Color);
-
- IPointScheme appliedScheme = mapPointLayer.Symbology;
- Assert.AreEqual(5, appliedScheme.Categories.Count);
-
- IPointCategory baseCategory = appliedScheme.Categories[0];
- AssertAreEqual(expectedSymbolizer, baseCategory.Symbolizer);
- Assert.IsNull(baseCategory.FilterExpression);
-
- IPointCategory allBoundsInclusiveCategory = appliedScheme.Categories[1];
- string expectedFilter = $"[1] >= {allBoundsInclusiveCriteria.LowerBound} AND [1] <= {allBoundsInclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, allBoundsInclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(pointStyle,
- expectedPointShape,
- theme.CategoryThemes.ElementAt(0).Color);
- AssertAreEqual(expectedSymbolizer, allBoundsInclusiveCategory.Symbolizer);
-
- IPointCategory lowerBoundInclusiveCategory = appliedScheme.Categories[2];
- expectedFilter = $"[1] >= {lowerBoundInclusiveCriteria.LowerBound} AND [1] < {lowerBoundInclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, lowerBoundInclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(pointStyle,
- expectedPointShape,
- theme.CategoryThemes.ElementAt(1).Color);
- AssertAreEqual(expectedSymbolizer, lowerBoundInclusiveCategory.Symbolizer);
-
- IPointCategory upperBoundInclusiveCategory = appliedScheme.Categories[3];
- expectedFilter = $"[1] > {upperBoundInclusiveCriteria.LowerBound} AND [1] <= {upperBoundInclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, upperBoundInclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(pointStyle,
- expectedPointShape,
- theme.CategoryThemes.ElementAt(2).Color);
- AssertAreEqual(expectedSymbolizer, upperBoundInclusiveCategory.Symbolizer);
-
- IPointCategory allBoundsExclusiveCategory = appliedScheme.Categories[4];
- expectedFilter = $"[1] > {allBoundsExclusiveCriteria.LowerBound} AND [1] < {allBoundsExclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, allBoundsExclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(pointStyle,
- expectedPointShape,
- theme.CategoryThemes.ElementAt(3).Color);
- AssertAreEqual(expectedSymbolizer, allBoundsExclusiveCategory.Symbolizer);
- }
-
private static PointSymbolizer CreateExpectedSymbolizer(PointStyle expectedPointStyle,
PointShape expectedPointShape,
Color expectedColor)
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs
===================================================================
diff -u -r871b3650e857729db48daadfd19322c779298d1e -rc5008a06ddbdc34516ee880e44c719266185546c
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision 871b3650e857729db48daadfd19322c779298d1e)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision c5008a06ddbdc34516ee880e44c719266185546c)
@@ -337,98 +337,6 @@
AssertAreEqual(expectedSymbolizer, unEqualSchemeCategory.Symbolizer);
}
- [Test]
- public void ConvertLayerProperties_MapPointDataWithStyleAndRangeCriteria_ConvertDataToMapPointLayer()
- {
- // Setup
- const string metadataAttribute = "Meta";
- var random = new Random(21);
-
- var allBoundsInclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.AllBoundsInclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var lowerBoundInclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.LowerBoundInclusiveUpperBoundExclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var upperBoundInclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.LowerBoundExclusiveUpperBoundInclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var allBoundsExclusiveCriteria = new RangeCriteria(RangeCriteriaOperator.AllBoundsExclusive,
- random.NextDouble(),
- 1 + random.NextDouble());
- var theme = new MapTheme(metadataAttribute, new[]
- {
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- allBoundsInclusiveCriteria),
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- lowerBoundInclusiveCriteria),
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- upperBoundInclusiveCriteria),
- new CategoryTheme(Color.FromKnownColor(random.NextEnum()),
- allBoundsExclusiveCriteria)
- });
-
- var polygonStyle = new PolygonStyle
- {
- FillColor = Color.FromKnownColor(random.NextEnum()),
- StrokeColor = Color.FromKnownColor(random.NextEnum()),
- StrokeThickness = random.Next(1, 48)
- };
- var mapPointData = new MapPolygonData("test", polygonStyle)
- {
- Features = new[]
- {
- CreateMapFeatureWithMetaData(metadataAttribute)
- },
- MapTheme = theme
- };
-
- var mapPointLayer = new MapPolygonLayer();
-
- var converter = new MapPolygonDataConverter();
-
- // Call
- converter.ConvertLayerProperties(mapPointData, mapPointLayer);
-
- // Assert
- PolygonSymbolizer expectedSymbolizer = CreateExpectedSymbolizer(polygonStyle, polygonStyle.FillColor);
-
- IPolygonScheme appliedScheme = mapPointLayer.Symbology;
- Assert.AreEqual(5, appliedScheme.Categories.Count);
-
- IPolygonCategory baseCategory = appliedScheme.Categories[0];
- AssertAreEqual(expectedSymbolizer, baseCategory.Symbolizer);
- Assert.IsNull(baseCategory.FilterExpression);
-
- IPolygonCategory allBoundsInclusiveCategory = appliedScheme.Categories[1];
- string expectedFilter = $"[1] >= {allBoundsInclusiveCriteria.LowerBound} AND [1] <= {allBoundsInclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, allBoundsInclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(polygonStyle,
- theme.CategoryThemes.ElementAt(0).Color);
- AssertAreEqual(expectedSymbolizer, allBoundsInclusiveCategory.Symbolizer);
-
- IPolygonCategory lowerBoundInclusiveCategory = appliedScheme.Categories[2];
- expectedFilter = $"[1] >= {lowerBoundInclusiveCriteria.LowerBound} AND [1] < {lowerBoundInclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, lowerBoundInclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(polygonStyle,
- theme.CategoryThemes.ElementAt(1).Color);
- AssertAreEqual(expectedSymbolizer, lowerBoundInclusiveCategory.Symbolizer);
-
- IPolygonCategory upperBoundInclusiveCategory = appliedScheme.Categories[3];
- expectedFilter = $"[1] > {upperBoundInclusiveCriteria.LowerBound} AND [1] <= {upperBoundInclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, upperBoundInclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(polygonStyle,
- theme.CategoryThemes.ElementAt(2).Color);
- AssertAreEqual(expectedSymbolizer, upperBoundInclusiveCategory.Symbolizer);
-
- IPolygonCategory allBoundsExclusiveCategory = appliedScheme.Categories[4];
- expectedFilter = $"[1] > {allBoundsExclusiveCriteria.LowerBound} AND [1] < {allBoundsExclusiveCriteria.UpperBound}";
- Assert.AreEqual(expectedFilter, allBoundsExclusiveCategory.FilterExpression);
- expectedSymbolizer = CreateExpectedSymbolizer(polygonStyle,
- theme.CategoryThemes.ElementAt(3).Color);
- AssertAreEqual(expectedSymbolizer, allBoundsExclusiveCategory.Symbolizer);
- }
-
private static MapFeature CreateMapFeatureWithMetaData(string metadataAttributeName)
{
var random = new Random(21);
Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj
===================================================================
diff -u -r0eefe4fd03e9a34a58295a2f94705597189df4cd -rc5008a06ddbdc34516ee880e44c719266185546c
--- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj (.../Core.Components.Gis.Test.csproj) (revision 0eefe4fd03e9a34a58295a2f94705597189df4cd)
+++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj (.../Core.Components.Gis.Test.csproj) (revision c5008a06ddbdc34516ee880e44c719266185546c)
@@ -20,7 +20,6 @@
-
Fisheye: Tag c5008a06ddbdc34516ee880e44c719266185546c refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Test/Theme/Criteria/RangeCriteriaTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?