This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
from 0987be2363 Merge branch 'geoapi-4.0' into geoapi-3.1.
add 9992bd5235 Style : add internal implementation of GeoAPI Style
add 4ee789634f Review of the new style package added in previous commit.
Summary of changes:
add b35d75f713 Rename `org.apache.sis.internal.style` package as
`org.apache.sis.style.se1`. By moving the package outside `internal` namespace,
we are making it public. However we still target SIS 1.5, not SIS 1.4, for
release.
add d38b17c046 Add a placeholder for a JAXB adapter for expressions, then
verifies that current JAXB annotations are valid.
add 1dacb571d6 Add `CoverageStyle` and reintroduce `StyleFactory` classes
(in different form). `CoverageStyle` is defined by OGC 05-077r4 in complement
to `FeatureTypeStyle`. Those two classes are identical except for the kind of
data on which they work: `FeatureTypeStyle` styles `Feature` while
`CoverageStyle` styles `BandedCoverage`. For making that difference possible,
it was necessary to add parameterized type <R> on all classes in replacement
for the previously hard-coded <Featu [...]
add 5ee494c8e8 Remove last links to GeoAPI-pending `org.opengis.style`
package. Add a `Style` interface as a placeholder for future style API (to be
determined according the result of OGC/ISO works).
new 27cab0a6de Merge the style classes from branch 'geoapi-4.0' into
geoapi-3.1.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/sis/xml/Namespaces.java | 18 +-
core/sis-portrayal/pom.xml | 5 +
.../sis/internal/map/ExceptionPresentation.java | 4 +-
.../apache/sis/internal/map/ListChangeEvent.java | 4 +-
.../org/apache/sis/internal/map/NotifiedList.java | 4 +-
.../org/apache/sis/internal/map/Presentation.java | 4 +-
.../sis/internal/map/PropertyNameCollector.java | 4 +-
.../sis/internal/map/ResourceSymbolizer.java | 22 +-
.../org/apache/sis/internal/map/SEPortrayer.java | 66 ++-
.../apache/sis/internal/map/SEPresentation.java | 9 +-
.../apache/sis/internal/map/SymbologyVisitor.java | 162 +++----
.../org/apache/sis/internal/map/package-info.java | 4 +-
.../java/org/apache/sis/portrayal/MapLayer.java | 2 +-
.../ResourceSymbolizer.java => style/Style.java} | 21 +-
.../sis/{internal/map => style}/package-info.java | 27 +-
.../org/apache/sis/style/se1/AbstractStyle.java | 347 +++++++++++++
.../java/org/apache/sis/style/se1/AnchorPoint.java | 160 ++++++
.../org/apache/sis/style/se1/ChannelSelection.java | 193 ++++++++
.../java/org/apache/sis/style/se1/ColorMap.java | 94 ++++
.../org/apache/sis/style/se1/ColorReplacement.java | 87 ++++
.../apache/sis/style/se1/ContrastEnhancement.java | 168 +++++++
.../org/apache/sis/style/se1/ContrastMethod.java | 54 +++
.../org/apache/sis/style/se1/CoverageStyle.java | 68 +++
.../java/org/apache/sis/style/se1/Description.java | 160 ++++++
.../org/apache/sis/style/se1/Displacement.java | 163 +++++++
.../se1/ElseFilter.java} | 41 +-
.../se1/ExpressionAdapter.java} | 40 +-
.../org/apache/sis/style/se1/ExternalGraphic.java | 139 ++++++
.../org/apache/sis/style/se1/FeatureTypeStyle.java | 81 ++++
.../main/java/org/apache/sis/style/se1/Fill.java | 248 ++++++++++
.../main/java/org/apache/sis/style/se1/Font.java | 224 +++++++++
.../java/org/apache/sis/style/se1/Graphic.java | 351 ++++++++++++++
.../java/org/apache/sis/style/se1/GraphicFill.java | 138 ++++++
.../org/apache/sis/style/se1/GraphicStroke.java | 203 ++++++++
.../org/apache/sis/style/se1/GraphicalElement.java | 52 ++
.../org/apache/sis/style/se1/GraphicalSymbol.java | 181 +++++++
.../main/java/org/apache/sis/style/se1/Halo.java | 170 +++++++
.../org/apache/sis/style/se1/LabelPlacement.java | 80 +++
.../org/apache/sis/style/se1/LegendGraphic.java | 130 +++++
.../org/apache/sis/style/se1/LinePlacement.java | 283 +++++++++++
.../org/apache/sis/style/se1/LineSymbolizer.java | 173 +++++++
.../main/java/org/apache/sis/style/se1/Mark.java | 293 +++++++++++
.../se1/OverlapBehavior.java} | 49 +-
.../org/apache/sis/style/se1/PointPlacement.java | 209 ++++++++
.../org/apache/sis/style/se1/PointSymbolizer.java | 172 +++++++
.../apache/sis/style/se1/PolygonSymbolizer.java | 324 +++++++++++++
.../org/apache/sis/style/se1/RasterSymbolizer.java | 358 ++++++++++++++
.../main/java/org/apache/sis/style/se1/Rule.java | 513 ++++++++++++++++++++
.../org/apache/sis/style/se1/SelectedChannel.java | 173 +++++++
.../se1/SemanticType.java} | 62 +--
.../org/apache/sis/style/se1/ShadedRelief.java | 155 ++++++
.../main/java/org/apache/sis/style/se1/Stroke.java | 492 +++++++++++++++++++
.../org/apache/sis/style/se1/StyleElement.java | 220 +++++++++
.../org/apache/sis/style/se1/StyleFactory.java | 534 +++++++++++++++++++++
.../java/org/apache/sis/style/se1/Symbolizer.java | 314 ++++++++++++
.../java/org/apache/sis/style/se1/Symbology.java | 255 ++++++++++
.../org/apache/sis/style/se1/TextSymbolizer.java | 288 +++++++++++
.../java/org/apache/sis/style/se1/Translucent.java | 49 ++
.../org/apache/sis/style/se1/package-info.java | 66 +++
.../sis/internal/map/MockFeatureTypeStyle.java | 104 ----
.../sis/internal/map/MockLineSymbolizer.java | 113 -----
.../java/org/apache/sis/internal/map/MockRule.java | 131 -----
.../org/apache/sis/internal/map/MockStyle.java | 86 ----
.../apache/sis/internal/map/SEPortrayerTest.java | 182 +++----
.../org/apache/sis/style/se1/AnchorPointTest.java} | 50 +-
.../apache/sis/style/se1/ChannelSelectionTest.java | 71 +++
.../sis/style/se1/ContrastEnhancementTest.java | 67 +++
.../org/apache/sis/style/se1/DescriptionTest.java | 60 +++
.../apache/sis/style/se1/DisplacementTest.java} | 50 +-
.../apache/sis/style/se1/ExternalGraphicTest.java | 102 ++++
.../apache/sis/style/se1/FeatureTypeStyleTest.java | 134 ++++++
.../java/org/apache/sis/style/se1/FillTest.java | 93 ++++
.../java/org/apache/sis/style/se1/FontTest.java | 100 ++++
.../apache/sis/style/se1/GraphicStrokeTest.java} | 56 ++-
.../java/org/apache/sis/style/se1/GraphicTest.java | 128 +++++
.../java/org/apache/sis/style/se1/HaloTest.java | 73 +++
.../apache/sis/style/se1/LinePlacementTest.java | 125 +++++
.../apache/sis/style/se1/LineSymbolizerTest.java | 72 +++
.../java/org/apache/sis/style/se1/MarkTest.java | 86 ++++
.../apache/sis/style/se1/PointPlacementTest.java | 90 ++++
.../apache/sis/style/se1/PointSymbolizerTest.java} | 54 +--
.../sis/style/se1/PolygonSymbolizerTest.java | 109 +++++
.../apache/sis/style/se1/RasterSymbolizerTest.java | 146 ++++++
.../java/org/apache/sis/style/se1/RuleTest.java | 184 +++++++
.../apache/sis/style/se1/SelectedChannelTest.java | 68 +++
.../org/apache/sis/style/se1/ShadedReliefTest.java | 66 +++
.../java/org/apache/sis/style/se1/StrokeTest.java | 187 ++++++++
.../org/apache/sis/style/se1/StyleTestCase.java | 120 +++++
.../org/apache/sis/style/se1/SymbolizerTest.java | 103 ++++
.../org/apache/sis/style/se1/SymbologyTest.java | 114 +++++
.../apache/sis/style/se1/TextSymbolizerTest.java | 122 +++++
.../java/org/apache/sis/style/se1/XmlTest.java} | 49 +-
92 files changed, 11288 insertions(+), 917 deletions(-)
copy
core/sis-portrayal/src/main/java/org/apache/sis/{internal/map/ResourceSymbolizer.java
=> style/Style.java} (62%)
copy core/sis-portrayal/src/main/java/org/apache/sis/{internal/map =>
style}/package-info.java (50%)
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/AbstractStyle.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/AnchorPoint.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ChannelSelection.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ColorMap.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ColorReplacement.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ContrastEnhancement.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ContrastMethod.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/CoverageStyle.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Description.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Displacement.java
copy
core/sis-portrayal/src/main/java/org/apache/sis/{internal/map/ResourceSymbolizer.java
=> style/se1/ElseFilter.java} (53%)
copy
core/sis-portrayal/src/main/java/org/apache/sis/{internal/map/package-info.java
=> style/se1/ExpressionAdapter.java} (52%)
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ExternalGraphic.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/FeatureTypeStyle.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Fill.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Font.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Graphic.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicFill.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicStroke.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicalElement.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicalSymbol.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Halo.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LabelPlacement.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LegendGraphic.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LinePlacement.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LineSymbolizer.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Mark.java
copy
core/sis-portrayal/src/main/java/org/apache/sis/{internal/map/PropertyNameCollector.java
=> style/se1/OverlapBehavior.java} (52%)
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PointPlacement.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PointSymbolizer.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PolygonSymbolizer.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/RasterSymbolizer.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Rule.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/SelectedChannel.java
copy
core/sis-portrayal/src/main/java/org/apache/sis/{internal/map/PropertyNameCollector.java
=> style/se1/SemanticType.java} (51%)
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ShadedRelief.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Stroke.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/StyleElement.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/StyleFactory.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Symbolizer.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Symbology.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/TextSymbolizer.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Translucent.java
create mode 100644
core/sis-portrayal/src/main/java/org/apache/sis/style/se1/package-info.java
delete mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/internal/map/MockFeatureTypeStyle.java
delete mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/internal/map/MockLineSymbolizer.java
delete mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/internal/map/MockRule.java
delete mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/internal/map/MockStyle.java
copy
core/sis-portrayal/src/{main/java/org/apache/sis/internal/map/PropertyNameCollector.java
=> test/java/org/apache/sis/style/se1/AnchorPointTest.java} (52%)
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ChannelSelectionTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ContrastEnhancementTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/DescriptionTest.java
copy
core/sis-portrayal/src/{main/java/org/apache/sis/internal/map/PropertyNameCollector.java
=> test/java/org/apache/sis/style/se1/DisplacementTest.java} (52%)
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ExternalGraphicTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FeatureTypeStyleTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FillTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FontTest.java
copy
core/sis-portrayal/src/{main/java/org/apache/sis/internal/map/PropertyNameCollector.java
=> test/java/org/apache/sis/style/se1/GraphicStrokeTest.java} (50%)
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/GraphicTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/HaloTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/LinePlacementTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/LineSymbolizerTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/MarkTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PointPlacementTest.java
copy
core/sis-portrayal/src/{main/java/org/apache/sis/internal/map/PropertyNameCollector.java
=> test/java/org/apache/sis/style/se1/PointSymbolizerTest.java} (52%)
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PolygonSymbolizerTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/RasterSymbolizerTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/RuleTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/SelectedChannelTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ShadedReliefTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StrokeTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StyleTestCase.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/SymbolizerTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/SymbologyTest.java
create mode 100644
core/sis-portrayal/src/test/java/org/apache/sis/style/se1/TextSymbolizerTest.java
copy
core/sis-portrayal/src/{main/java/org/apache/sis/internal/map/PropertyNameCollector.java
=> test/java/org/apache/sis/style/se1/XmlTest.java} (50%)
