From 99ca9f4152ab9c34ab737fecb41f0ddc40bc1a0e Mon Sep 17 00:00:00 2001 From: Imran Date: Mon, 25 Nov 2019 20:59:07 +0500 Subject: [PATCH] [GEOS-9409] AA rev 1 --- data/app-schema-tutorial/styles/default_line.sld | 2 +- data/app-schema-tutorial/styles/default_point.sld | 4 ++-- data/app-schema-tutorial/styles/default_polygon.sld | 6 +++--- data/app-schema-tutorial/styles/raster.sld | 2 +- data/citecsw-2.0.2/styles/default_line.sld | 2 +- data/citecsw-2.0.2/styles/default_point.sld | 4 ++-- data/citecsw-2.0.2/styles/default_polygon.sld | 4 ++-- data/citecsw-2.0.2/styles/raster.sld | 2 +- data/citensg-1.0/styles/default_generic.sld | 6 +++--- data/citensg-1.0/styles/default_line.sld | 6 +++--- data/citensg-1.0/styles/default_point.sld | 6 +++--- data/citensg-1.0/styles/default_polygon.sld | 6 +++--- data/citensg-1.0/styles/default_raster.sld | 2 +- data/citensg-1.0/styles/raster_with_scales.sld | 4 ++-- data/citewcs-1.0/styles/raster.sld | 2 +- data/citewcs-1.1/styles/default_line.sld | 8 ++++---- data/citewcs-1.1/styles/default_point.sld | 8 ++++---- data/citewcs-1.1/styles/default_polygon.sld | 6 +++--- data/citewcs-1.1/styles/raster.sld | 2 +- data/citewfs-2.0/styles/default_generic.sld | 8 ++++---- data/citewfs-2.0/styles/default_line.sld | 6 +++--- data/citewfs-2.0/styles/default_point.sld | 6 +++--- data/citewfs-2.0/styles/default_polygon.sld | 2 +- data/citewfs-2.0/styles/default_raster.sld | 2 +- data/citewms-1.1/styles/Bridges.sld | 2 +- data/citewms-1.1/styles/Buildings.sld | 6 +++--- data/citewms-1.1/styles/DividedRoutes.sld | 6 +++--- data/citewms-1.1/styles/Forests.sld | 6 +++--- data/citewms-1.1/styles/Lakes.sld | 6 +++--- data/citewms-1.1/styles/MapNeatline.sld | 6 +++--- data/citewms-1.1/styles/Ponds.sld | 6 +++--- data/citewms-1.1/styles/Streams.sld | 6 +++--- data/citewms-1.1/styles/basicPolygon.sld | 6 ++---- data/citewms-1.1/styles/blue.sld | 2 +- data/citewms-1.1/styles/capitals.sld | 2 +- data/citewms-1.1/styles/normal.sld | 2 +- data/citewms-1.3/styles/BasicPolygon.sld | 4 ++-- data/citewms-1.3/styles/Bridges.sld | 4 ++-- data/citewms-1.3/styles/Buildings.sld | 4 ++-- data/citewms-1.3/styles/DividedRoutes.sld | 4 ++-- data/citewms-1.3/styles/Forests.sld | 6 +++--- data/citewms-1.3/styles/Lakes.sld | 6 +++--- data/citewms-1.3/styles/MapNeatline.sld | 6 +++--- data/citewms-1.3/styles/Ponds.sld | 6 +++--- data/citewms-1.3/styles/Streams.sld | 6 +++--- data/citewms-1.3/styles/default_line.sld | 6 +++--- data/citewms-1.3/styles/default_point.sld | 6 +++--- data/citewms-1.3/styles/default_polygon.sld | 6 +++--- data/citewms-1.3/styles/default_raster.sld | 2 +- data/minimal/styles/default_generic.sld | 8 ++++---- data/minimal/styles/default_line.sld | 2 +- data/minimal/styles/default_point.sld | 4 ++-- data/minimal/styles/default_polygon.sld | 6 +++--- data/minimal/styles/raster.sld | 2 +- data/release/styles/default_generic.sld | 8 ++++---- data/release/styles/default_line2.sld | 2 +- data/release/styles/default_point.sld | 6 +++--- data/release/styles/raster.sld | 2 +- data/release/styles/simpleRoads.sld | 2 +- data/release/styles/simple_streams.sld | 4 ++-- src/kml/src/test/resources/org/geoserver/kml/notthere.sld | 6 +++--- .../main/java/org/geoserver/config/default_generic.sld | 8 ++++---- .../src/main/java/org/geoserver/config/default_line.sld | 2 +- .../src/main/java/org/geoserver/config/default_point.sld | 6 +++--- .../main/java/org/geoserver/config/default_polygon.sld | 4 ++-- .../src/main/java/org/geoserver/config/default_raster.sld | 2 +- .../java/org/geoserver/wms/web/data/default_point.sld | 4 ++-- .../test/resources/org/geoserver/wms/wms_1_1_1/raster.sld | 2 +- 68 files changed, 153 insertions(+), 155 deletions(-) diff --git a/data/app-schema-tutorial/styles/default_line.sld b/data/app-schema-tutorial/styles/default_line.sld index 253b5f6b342..f32da9e3cd4 100644 --- a/data/app-schema-tutorial/styles/default_line.sld +++ b/data/app-schema-tutorial/styles/default_line.sld @@ -12,7 +12,7 @@ - A boring default style + Green Line A sample style that just prints out a green line diff --git a/data/app-schema-tutorial/styles/default_point.sld b/data/app-schema-tutorial/styles/default_point.sld index 88d112f8cd9..a7f2a91992e 100644 --- a/data/app-schema-tutorial/styles/default_point.sld +++ b/data/app-schema-tutorial/styles/default_point.sld @@ -12,7 +12,7 @@ - A boring default style + Red Square point A sample style that just prints out a purple square @@ -21,7 +21,7 @@ Rule 1 - RedSquare + Red Square point A red fill with an 11 pixel size diff --git a/data/app-schema-tutorial/styles/default_polygon.sld b/data/app-schema-tutorial/styles/default_polygon.sld index ca49eec4882..f14b2272c08 100644 --- a/data/app-schema-tutorial/styles/default_polygon.sld +++ b/data/app-schema-tutorial/styles/default_polygon.sld @@ -12,7 +12,7 @@ - A boring default style + Grey Polygon A sample style that just prints out a transparent red interior with a red outline @@ -21,8 +21,8 @@ Rule 1 - RedFill RedOutline - 50% transparent red fill with a red outline 1 pixel in width + Grey Polygon + opaque grey fill with a black outline 1 pixel in width diff --git a/data/app-schema-tutorial/styles/raster.sld b/data/app-schema-tutorial/styles/raster.sld index 5f78ee074c8..c0166473e16 100644 --- a/data/app-schema-tutorial/styles/raster.sld +++ b/data/app-schema-tutorial/styles/raster.sld @@ -5,7 +5,7 @@ http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0"> raster_layer raster - A sample default style + Opaque Raster A sample style for rasters Feature diff --git a/data/citecsw-2.0.2/styles/default_line.sld b/data/citecsw-2.0.2/styles/default_line.sld index 35cbb282b04..c3abb411be2 100644 --- a/data/citecsw-2.0.2/styles/default_line.sld +++ b/data/citecsw-2.0.2/styles/default_line.sld @@ -7,7 +7,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - default_line + Blue Line Default Line diff --git a/data/citecsw-2.0.2/styles/default_point.sld b/data/citecsw-2.0.2/styles/default_point.sld index 2c054300987..ebc771716df 100644 --- a/data/citecsw-2.0.2/styles/default_point.sld +++ b/data/citecsw-2.0.2/styles/default_point.sld @@ -10,14 +10,14 @@ default_point - Default Point + Red Square point A sample style that draws a point rule1 - Red Square + Red Square point A 6 pixel square with a red fill and no stroke diff --git a/data/citecsw-2.0.2/styles/default_polygon.sld b/data/citecsw-2.0.2/styles/default_polygon.sld index 531ef9fc84f..c6ca2af7fff 100644 --- a/data/citecsw-2.0.2/styles/default_polygon.sld +++ b/data/citecsw-2.0.2/styles/default_polygon.sld @@ -10,14 +10,14 @@ default_polygon - Default Polygon + Grey Polygon A sample style that draws a polygon rule1 - Gray Polygon with Black Outline + Grey Polygon with Black Outline A polygon with a gray fill and a 1 pixel black outline diff --git a/data/citecsw-2.0.2/styles/raster.sld b/data/citecsw-2.0.2/styles/raster.sld index dddd736665d..a2dcf3b9239 100644 --- a/data/citecsw-2.0.2/styles/raster.sld +++ b/data/citecsw-2.0.2/styles/raster.sld @@ -10,7 +10,7 @@ default_raster - Default Raster + Opaque Raster A sample style that draws a raster, good for displaying imagery diff --git a/data/citensg-1.0/styles/default_generic.sld b/data/citensg-1.0/styles/default_generic.sld index 1107b6355c1..57d332bb230 100644 --- a/data/citensg-1.0/styles/default_generic.sld +++ b/data/citensg-1.0/styles/default_generic.sld @@ -13,7 +13,7 @@ raster - raster + Opaque Raster @@ -47,7 +47,7 @@ Line - Line + Blue Line @@ -65,7 +65,7 @@ point - Point + Red Square Point diff --git a/data/citensg-1.0/styles/default_line.sld b/data/citensg-1.0/styles/default_line.sld index 3f2be9c0ef6..e76b2fe7df0 100644 --- a/data/citensg-1.0/styles/default_line.sld +++ b/data/citensg-1.0/styles/default_line.sld @@ -12,7 +12,7 @@ - Green Line + Blue Line A sample style that just prints out a green line @@ -21,8 +21,8 @@ Rule 1 - Green Line - A green line with a 2 pixel width + Blue Line + A blue line with a 1 pixel width diff --git a/data/citensg-1.0/styles/default_point.sld b/data/citensg-1.0/styles/default_point.sld index 694174633d9..db9f9dc3928 100644 --- a/data/citensg-1.0/styles/default_point.sld +++ b/data/citensg-1.0/styles/default_point.sld @@ -12,7 +12,7 @@ - A simple default style + Red Square point A sample style that just prints out a purple square @@ -21,8 +21,8 @@ Rule 1 - RedSquare - A red fill with an 11 pixel size + Red Square point + A red square with 6 size diff --git a/data/citensg-1.0/styles/default_polygon.sld b/data/citensg-1.0/styles/default_polygon.sld index d2c17d4b562..bfcfe2ec370 100644 --- a/data/citensg-1.0/styles/default_polygon.sld +++ b/data/citensg-1.0/styles/default_polygon.sld @@ -12,7 +12,7 @@ - A simple default style + Grey Polygon A sample style that just prints out a transparent red interior with a red outline @@ -21,8 +21,8 @@ Rule 1 - RedFill RedOutline - 50% transparent red fill with a red outline 1 pixel in width + Grey Polygon and Black Outline + Grey fill with a black outline 1 pixel in width diff --git a/data/citensg-1.0/styles/default_raster.sld b/data/citensg-1.0/styles/default_raster.sld index 5e7b133ac38..c0166473e16 100644 --- a/data/citensg-1.0/styles/default_raster.sld +++ b/data/citensg-1.0/styles/default_raster.sld @@ -5,7 +5,7 @@ http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0"> raster_layer raster - A simple default style + Opaque Raster A sample style for rasters Feature diff --git a/data/citensg-1.0/styles/raster_with_scales.sld b/data/citensg-1.0/styles/raster_with_scales.sld index aa179151246..a61e195e97b 100644 --- a/data/citensg-1.0/styles/raster_with_scales.sld +++ b/data/citensg-1.0/styles/raster_with_scales.sld @@ -5,8 +5,8 @@ http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0"> raster_layer raster - A simple default style - A sample style for rasters + Opaque Raster + A sample style for rasters visible between 300000 and 1000000 map scale Feature diff --git a/data/citewcs-1.0/styles/raster.sld b/data/citewcs-1.0/styles/raster.sld index 5e7b133ac38..c0166473e16 100644 --- a/data/citewcs-1.0/styles/raster.sld +++ b/data/citewcs-1.0/styles/raster.sld @@ -5,7 +5,7 @@ http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0"> raster_layer raster - A simple default style + Opaque Raster A sample style for rasters Feature diff --git a/data/citewcs-1.1/styles/default_line.sld b/data/citewcs-1.1/styles/default_line.sld index e06cff468a1..5cc8579dbee 100644 --- a/data/citewcs-1.1/styles/default_line.sld +++ b/data/citewcs-1.1/styles/default_line.sld @@ -12,8 +12,8 @@ - A simple default style - A sample style that just prints out a green line + Blue Line + A sample style that just prints out a blue line @@ -21,8 +21,8 @@ Rule 1 - Green Line - A green line with a 2 pixel width + Blue Line + A blue line diff --git a/data/citewcs-1.1/styles/default_point.sld b/data/citewcs-1.1/styles/default_point.sld index 4ab6501b6a9..8a217bfe122 100644 --- a/data/citewcs-1.1/styles/default_point.sld +++ b/data/citewcs-1.1/styles/default_point.sld @@ -12,8 +12,8 @@ - A simple default style - A sample style that just prints out a purple square + Red Square point + A sample style that just prints out a red square @@ -21,8 +21,8 @@ Rule 1 - RedSquare - A red fill with an 11 pixel size + Red Square point + A red fill with 6 pixel size diff --git a/data/citewcs-1.1/styles/default_polygon.sld b/data/citewcs-1.1/styles/default_polygon.sld index 1c789df9302..ddfdbe553a3 100644 --- a/data/citewcs-1.1/styles/default_polygon.sld +++ b/data/citewcs-1.1/styles/default_polygon.sld @@ -12,7 +12,7 @@ - A simple default style + Grey Polygon A sample style that just prints out a transparent red interior with a red outline @@ -21,8 +21,8 @@ Rule 1 - RedFill RedOutline - 50% transparent red fill with a red outline 1 pixel in width + Grey Fill and Black Outline + Grey fill with a black outline 1 pixel in width diff --git a/data/citewcs-1.1/styles/raster.sld b/data/citewcs-1.1/styles/raster.sld index 5e7b133ac38..fb31967a703 100644 --- a/data/citewcs-1.1/styles/raster.sld +++ b/data/citewcs-1.1/styles/raster.sld @@ -5,7 +5,7 @@ http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0"> raster_layer raster - A simple default style + A sample style for rasters Feature diff --git a/data/citewfs-2.0/styles/default_generic.sld b/data/citewfs-2.0/styles/default_generic.sld index 1107b6355c1..a08a68fe300 100644 --- a/data/citewfs-2.0/styles/default_generic.sld +++ b/data/citewfs-2.0/styles/default_generic.sld @@ -13,7 +13,7 @@ raster - raster + Opaque Raster @@ -26,7 +26,7 @@ Polygon - Polygon + Grey Polygon @@ -47,7 +47,7 @@ Line - Line + Blue Line @@ -65,7 +65,7 @@ point - Point + Red Square Point diff --git a/data/citewfs-2.0/styles/default_line.sld b/data/citewfs-2.0/styles/default_line.sld index 8a68da2c3f2..513ba314af8 100644 --- a/data/citewfs-2.0/styles/default_line.sld +++ b/data/citewfs-2.0/styles/default_line.sld @@ -12,7 +12,7 @@ - A simple green line + Blue Line A sample style that just prints out a green line @@ -21,8 +21,8 @@ Rule 1 - Green Line - A green line with a 2 pixel width + Blue Line + A blue line diff --git a/data/citewfs-2.0/styles/default_point.sld b/data/citewfs-2.0/styles/default_point.sld index f2008efbafa..138ceaceb24 100644 --- a/data/citewfs-2.0/styles/default_point.sld +++ b/data/citewfs-2.0/styles/default_point.sld @@ -12,7 +12,7 @@ - A simple red square + Red Square Point A sample style that just prints out a red square @@ -21,8 +21,8 @@ Rule 1 - RedSquare - A red fill with an 11 pixel size + Red Square Point + A red square of 6 pixel size diff --git a/data/citewfs-2.0/styles/default_polygon.sld b/data/citewfs-2.0/styles/default_polygon.sld index a0ada0baeed..2bc32fda3a4 100644 --- a/data/citewfs-2.0/styles/default_polygon.sld +++ b/data/citewfs-2.0/styles/default_polygon.sld @@ -21,7 +21,7 @@ Rule 1 - GreyFill BlackOutline + Grey Fill and Black Outline Grey fill with a black outline 1 pixel in width diff --git a/data/citewfs-2.0/styles/default_raster.sld b/data/citewfs-2.0/styles/default_raster.sld index 5e7b133ac38..c0166473e16 100644 --- a/data/citewfs-2.0/styles/default_raster.sld +++ b/data/citewfs-2.0/styles/default_raster.sld @@ -5,7 +5,7 @@ http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0"> raster_layer raster - A simple default style + Opaque Raster A sample style for rasters Feature diff --git a/data/citewms-1.1/styles/Bridges.sld b/data/citewms-1.1/styles/Bridges.sld index 1e221e2f8bd..c0adae02e06 100644 --- a/data/citewms-1.1/styles/Bridges.sld +++ b/data/citewms-1.1/styles/Bridges.sld @@ -13,7 +13,7 @@ name Abstract - title + Grey Square Point diff --git a/data/citewms-1.1/styles/Buildings.sld b/data/citewms-1.1/styles/Buildings.sld index 50b19931771..1c9eae03d44 100644 --- a/data/citewms-1.1/styles/Buildings.sld +++ b/data/citewms-1.1/styles/Buildings.sld @@ -6,14 +6,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> Default Styler - Default Styler + Dashed Outline Feature name - Abstract - title + White Polygon with outline of 2 width using butt line cap + Dashed Outline diff --git a/data/citewms-1.1/styles/DividedRoutes.sld b/data/citewms-1.1/styles/DividedRoutes.sld index 26161601565..4e4d8313dfd 100644 --- a/data/citewms-1.1/styles/DividedRoutes.sld +++ b/data/citewms-1.1/styles/DividedRoutes.sld @@ -6,14 +6,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> Default Styler - Default Styler + Black Line Feature name - Abstract - title + Black Line with 5 pixels + Black Line diff --git a/data/citewms-1.1/styles/Forests.sld b/data/citewms-1.1/styles/Forests.sld index 2f53e42472d..cff2b792752 100644 --- a/data/citewms-1.1/styles/Forests.sld +++ b/data/citewms-1.1/styles/Forests.sld @@ -6,14 +6,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> Default Styler - Default Styler + PNG Filled Polygon Feature name - Abstract - title + External graphic is used as a pattern to fill polygon + PNG Filled Polygon diff --git a/data/citewms-1.1/styles/Lakes.sld b/data/citewms-1.1/styles/Lakes.sld index 7bf7fa1bac1..b9744ec2a08 100644 --- a/data/citewms-1.1/styles/Lakes.sld +++ b/data/citewms-1.1/styles/Lakes.sld @@ -6,14 +6,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> Default Styler - Default Styler + Blue Polygon Feature name - Abstract - title + An opaque blue filled polygon with black dashed outline + Blue Polygon diff --git a/data/citewms-1.1/styles/MapNeatline.sld b/data/citewms-1.1/styles/MapNeatline.sld index 95cc7edd828..d66cced6891 100644 --- a/data/citewms-1.1/styles/MapNeatline.sld +++ b/data/citewms-1.1/styles/MapNeatline.sld @@ -6,14 +6,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> Default Styler - Default Styler + Grey Polygon Feature name - Abstract - title + A sample style that just prints out a grey interior with a black outline + Grey Polygon diff --git a/data/citewms-1.1/styles/Ponds.sld b/data/citewms-1.1/styles/Ponds.sld index 4b167c0c907..69c08ffec95 100644 --- a/data/citewms-1.1/styles/Ponds.sld +++ b/data/citewms-1.1/styles/Ponds.sld @@ -6,14 +6,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> Default Styler - Default Styler + Cyan Polygon Feature name - Abstract - title + Opaque polygon filled with Cyan color and black dashed stroke of 1 px width + Cyan Polygon diff --git a/data/citewms-1.1/styles/Streams.sld b/data/citewms-1.1/styles/Streams.sld index f969115a0ed..1fca147820a 100644 --- a/data/citewms-1.1/styles/Streams.sld +++ b/data/citewms-1.1/styles/Streams.sld @@ -11,9 +11,9 @@ Streams - name - Abstract - title + A Blue line with width of 2 pixels and dashed stroke + Dashed Blue Line + Dashed Blue Line diff --git a/data/citewms-1.1/styles/basicPolygon.sld b/data/citewms-1.1/styles/basicPolygon.sld index 1ac35d5de27..9fe78d6e029 100644 --- a/data/citewms-1.1/styles/basicPolygon.sld +++ b/data/citewms-1.1/styles/basicPolygon.sld @@ -8,10 +8,8 @@ Blue - A blue linestring style - A sample style that uses a filter, printing only the - lines with a LENGTH property of over 5000. This will work - with the default bc_roads layer + Blue Polygon + Blue filled polygon with black outline with width of 2 pixels/Abstract> diff --git a/data/citewms-1.1/styles/blue.sld b/data/citewms-1.1/styles/blue.sld index 245382d43f9..4ce676b9cf6 100644 --- a/data/citewms-1.1/styles/blue.sld +++ b/data/citewms-1.1/styles/blue.sld @@ -11,7 +11,7 @@ A styling layer used for the unit tests of sldstyler Blue - A blue linestring style + Blue Polygon A sample style that uses a filter, printing only the lines with a LENGTH property of over 5000. This will work with the default bc_roads layer diff --git a/data/citewms-1.1/styles/capitals.sld b/data/citewms-1.1/styles/capitals.sld index 15fe4c7f45e..a74f9195929 100644 --- a/data/citewms-1.1/styles/capitals.sld +++ b/data/citewms-1.1/styles/capitals.sld @@ -14,7 +14,7 @@ name Abstract - title + Black Circle Point diff --git a/data/citewms-1.1/styles/normal.sld b/data/citewms-1.1/styles/normal.sld index 96aebd3394c..4aaefa973a9 100644 --- a/data/citewms-1.1/styles/normal.sld +++ b/data/citewms-1.1/styles/normal.sld @@ -4,7 +4,7 @@ normal - A simple default style + default polygon style A sample style that just prints out a black line for everything diff --git a/data/citewms-1.3/styles/BasicPolygon.sld b/data/citewms-1.3/styles/BasicPolygon.sld index fec59de1d67..56471af32b4 100644 --- a/data/citewms-1.3/styles/BasicPolygon.sld +++ b/data/citewms-1.3/styles/BasicPolygon.sld @@ -4,8 +4,8 @@ Blue Blue - A blue linestring style - A sample style that uses a filter, printing only the lines with a LENGTH property of over 5000. This will work with the default bc_roads layer + Blue Polygon + A filled polygon with outline of 2 pixel width name diff --git a/data/citewms-1.3/styles/Bridges.sld b/data/citewms-1.3/styles/Bridges.sld index 4c5019b548f..6cee5642acd 100644 --- a/data/citewms-1.3/styles/Bridges.sld +++ b/data/citewms-1.3/styles/Bridges.sld @@ -10,8 +10,8 @@ Feature name - title - Abstract + Default Marker + Default Marker with size of 6 pixels diff --git a/data/citewms-1.3/styles/Buildings.sld b/data/citewms-1.3/styles/Buildings.sld index 5772be66596..93afa43de26 100644 --- a/data/citewms-1.3/styles/Buildings.sld +++ b/data/citewms-1.3/styles/Buildings.sld @@ -10,8 +10,8 @@ Feature name - title - Abstract + White Polygon + White polygon with an outline with default stroke color and width of 2 pixels #FFFFFF diff --git a/data/citewms-1.3/styles/DividedRoutes.sld b/data/citewms-1.3/styles/DividedRoutes.sld index c839492960d..29cb452f34c 100644 --- a/data/citewms-1.3/styles/DividedRoutes.sld +++ b/data/citewms-1.3/styles/DividedRoutes.sld @@ -10,8 +10,8 @@ Feature name - title - Abstract + Default Line Color + Line with default color and 5 pixel wide stroke 5 diff --git a/data/citewms-1.3/styles/Forests.sld b/data/citewms-1.3/styles/Forests.sld index 8d8cd226dda..d06531281a0 100644 --- a/data/citewms-1.3/styles/Forests.sld +++ b/data/citewms-1.3/styles/Forests.sld @@ -6,14 +6,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> Default Styler - Default Styler + PNG Filled Polygon Feature name - Abstract - title + External graphic is used as a pattern to fill polygon + PNG Filled Polygon diff --git a/data/citewms-1.3/styles/Lakes.sld b/data/citewms-1.3/styles/Lakes.sld index 41b2f4a72af..a87147b4ab8 100644 --- a/data/citewms-1.3/styles/Lakes.sld +++ b/data/citewms-1.3/styles/Lakes.sld @@ -4,14 +4,14 @@ Default Styler Default Styler - Default Styler + Blue Polygon name Feature name - title - Abstract + Blue Polygon + Polygon with blue fill and default stroke #4040C0 diff --git a/data/citewms-1.3/styles/MapNeatline.sld b/data/citewms-1.3/styles/MapNeatline.sld index 3f53b1515b1..67dda452239 100644 --- a/data/citewms-1.3/styles/MapNeatline.sld +++ b/data/citewms-1.3/styles/MapNeatline.sld @@ -4,14 +4,14 @@ Default Styler Default Styler - Default Styler + Transparent Polygon name Feature name - title - Abstract + Transparent Polygon + Transparent Polygon with defult stroke 0.0 diff --git a/data/citewms-1.3/styles/Ponds.sld b/data/citewms-1.3/styles/Ponds.sld index ce6217ed632..c214704d7cd 100644 --- a/data/citewms-1.3/styles/Ponds.sld +++ b/data/citewms-1.3/styles/Ponds.sld @@ -4,14 +4,14 @@ Default Styler Default Styler - Default Styler + Cyan Polygon name Feature name - title - Abstract + Cyan Polygon + Polygon with Cyan color fill and default stroke #00FFFF diff --git a/data/citewms-1.3/styles/Streams.sld b/data/citewms-1.3/styles/Streams.sld index 544ee0776fb..4b64884704b 100644 --- a/data/citewms-1.3/styles/Streams.sld +++ b/data/citewms-1.3/styles/Streams.sld @@ -4,14 +4,14 @@ Default Styler Default Styler - Default Styler + Blue Polygon name Streams name - title - Abstract + >Blue Polygon + Polygon with blue fill and 2 pixel wide stroke #4040C0 diff --git a/data/citewms-1.3/styles/default_line.sld b/data/citewms-1.3/styles/default_line.sld index 3201a2372a8..fcdf88f775e 100644 --- a/data/citewms-1.3/styles/default_line.sld +++ b/data/citewms-1.3/styles/default_line.sld @@ -12,7 +12,7 @@ - A simple green line + Blue Line A sample style that just prints out a green line @@ -21,8 +21,8 @@ Rule 1 - Green Line - A green line with a 2 pixel width + Blue Line + A blue line with a 2 pixel width diff --git a/data/citewms-1.3/styles/default_point.sld b/data/citewms-1.3/styles/default_point.sld index cc78ebf2feb..5fa67343b12 100644 --- a/data/citewms-1.3/styles/default_point.sld +++ b/data/citewms-1.3/styles/default_point.sld @@ -12,7 +12,7 @@ - simple red square + Red Square point A sample style that just prints out a red square @@ -21,8 +21,8 @@ Rule 1 - RedSquare - A red fill with an 11 pixel size + Red Square point + A red fill with 6 pixels size diff --git a/data/citewms-1.3/styles/default_polygon.sld b/data/citewms-1.3/styles/default_polygon.sld index 531ef9fc84f..43fba555f00 100644 --- a/data/citewms-1.3/styles/default_polygon.sld +++ b/data/citewms-1.3/styles/default_polygon.sld @@ -10,15 +10,15 @@ default_polygon - Default Polygon + Grey Polygon with Black Outline A sample style that draws a polygon rule1 - Gray Polygon with Black Outline - A polygon with a gray fill and a 1 pixel black outline + Grey Polygon with Black Outline + A polygon with a grey fill and a 1 pixel black outline #AAAAAA diff --git a/data/citewms-1.3/styles/default_raster.sld b/data/citewms-1.3/styles/default_raster.sld index 5e7b133ac38..c0166473e16 100644 --- a/data/citewms-1.3/styles/default_raster.sld +++ b/data/citewms-1.3/styles/default_raster.sld @@ -5,7 +5,7 @@ http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0"> raster_layer raster - A simple default style + Opaque Raster A sample style for rasters Feature diff --git a/data/minimal/styles/default_generic.sld b/data/minimal/styles/default_generic.sld index fa0a6b81e17..734b336ba71 100644 --- a/data/minimal/styles/default_generic.sld +++ b/data/minimal/styles/default_generic.sld @@ -13,7 +13,7 @@ raster - raster + Opaque Raster @@ -26,7 +26,7 @@ Polygon - Polygon + Grey Polygon @@ -47,7 +47,7 @@ Line - Line + Blue Line @@ -65,7 +65,7 @@ point - Point + Red Square Point diff --git a/data/minimal/styles/default_line.sld b/data/minimal/styles/default_line.sld index 35cbb282b04..f80d632db10 100644 --- a/data/minimal/styles/default_line.sld +++ b/data/minimal/styles/default_line.sld @@ -10,7 +10,7 @@ default_line - Default Line + Blue Line A sample style that draws a line diff --git a/data/minimal/styles/default_point.sld b/data/minimal/styles/default_point.sld index 2c054300987..ebc771716df 100644 --- a/data/minimal/styles/default_point.sld +++ b/data/minimal/styles/default_point.sld @@ -10,14 +10,14 @@ default_point - Default Point + Red Square point A sample style that draws a point rule1 - Red Square + Red Square point A 6 pixel square with a red fill and no stroke diff --git a/data/minimal/styles/default_polygon.sld b/data/minimal/styles/default_polygon.sld index 531ef9fc84f..a439ed45fee 100644 --- a/data/minimal/styles/default_polygon.sld +++ b/data/minimal/styles/default_polygon.sld @@ -10,15 +10,15 @@ default_polygon - Default Polygon + Grey Polygon A sample style that draws a polygon rule1 - Gray Polygon with Black Outline - A polygon with a gray fill and a 1 pixel black outline + Grey Polygon with Black Outline + A polygon with a grey fill and a 1 pixel black outline #AAAAAA diff --git a/data/minimal/styles/raster.sld b/data/minimal/styles/raster.sld index dddd736665d..a2dcf3b9239 100644 --- a/data/minimal/styles/raster.sld +++ b/data/minimal/styles/raster.sld @@ -10,7 +10,7 @@ default_raster - Default Raster + Opaque Raster A sample style that draws a raster, good for displaying imagery diff --git a/data/release/styles/default_generic.sld b/data/release/styles/default_generic.sld index fa0a6b81e17..734b336ba71 100644 --- a/data/release/styles/default_generic.sld +++ b/data/release/styles/default_generic.sld @@ -13,7 +13,7 @@ raster - raster + Opaque Raster @@ -26,7 +26,7 @@ Polygon - Polygon + Grey Polygon @@ -47,7 +47,7 @@ Line - Line + Blue Line @@ -65,7 +65,7 @@ point - Point + Red Square Point diff --git a/data/release/styles/default_line2.sld b/data/release/styles/default_line2.sld index 95ecabaebcd..de59a9ea120 100644 --- a/data/release/styles/default_line2.sld +++ b/data/release/styles/default_line2.sld @@ -12,7 +12,7 @@ - simple green line + Green line A sample style that just prints out a green line diff --git a/data/release/styles/default_point.sld b/data/release/styles/default_point.sld index 2c054300987..b8ba3210fdd 100644 --- a/data/release/styles/default_point.sld +++ b/data/release/styles/default_point.sld @@ -10,14 +10,14 @@ default_point - Default Point - A sample style that draws a point + Red Square Point + A sample style that draws a red square point rule1 - Red Square + Red Square Point A 6 pixel square with a red fill and no stroke diff --git a/data/release/styles/raster.sld b/data/release/styles/raster.sld index dddd736665d..a2dcf3b9239 100644 --- a/data/release/styles/raster.sld +++ b/data/release/styles/raster.sld @@ -10,7 +10,7 @@ default_raster - Default Raster + Opaque Raster A sample style that draws a raster, good for displaying imagery diff --git a/data/release/styles/simpleRoads.sld b/data/release/styles/simpleRoads.sld index 9700f87b3ce..1b30ccc948f 100644 --- a/data/release/styles/simpleRoads.sld +++ b/data/release/styles/simpleRoads.sld @@ -6,7 +6,7 @@ Simple Roads - Default Styler for simple road segments + Red Line Light red line, 2px wide diff --git a/data/release/styles/simple_streams.sld b/data/release/styles/simple_streams.sld index 5f951cc4dde..522fde2a750 100644 --- a/data/release/styles/simple_streams.sld +++ b/data/release/styles/simple_streams.sld @@ -6,12 +6,12 @@ Simple Streams - Default Styler for streams segments + Streams Blue lines, 2px wide Feature - Streams + Blue Line diff --git a/src/kml/src/test/resources/org/geoserver/kml/notthere.sld b/src/kml/src/test/resources/org/geoserver/kml/notthere.sld index f135781a144..7f53fdff002 100644 --- a/src/kml/src/test/resources/org/geoserver/kml/notthere.sld +++ b/src/kml/src/test/resources/org/geoserver/kml/notthere.sld @@ -11,8 +11,8 @@ - A simple default style - A sample style that just prints out a purple square + Missing Graphic + A sample style that uses external graphic but does not point to any png file @@ -20,7 +20,7 @@ Rule 1 - RedSquare + Missing Graphic Nothing there... diff --git a/src/main/src/main/java/org/geoserver/config/default_generic.sld b/src/main/src/main/java/org/geoserver/config/default_generic.sld index 1107b6355c1..a08a68fe300 100644 --- a/src/main/src/main/java/org/geoserver/config/default_generic.sld +++ b/src/main/src/main/java/org/geoserver/config/default_generic.sld @@ -13,7 +13,7 @@ raster - raster + Opaque Raster @@ -26,7 +26,7 @@ Polygon - Polygon + Grey Polygon @@ -47,7 +47,7 @@ Line - Line + Blue Line @@ -65,7 +65,7 @@ point - Point + Red Square Point diff --git a/src/main/src/main/java/org/geoserver/config/default_line.sld b/src/main/src/main/java/org/geoserver/config/default_line.sld index 0525afd9c46..626ebcf3458 100644 --- a/src/main/src/main/java/org/geoserver/config/default_line.sld +++ b/src/main/src/main/java/org/geoserver/config/default_line.sld @@ -12,7 +12,7 @@ - simple blue line + Blue Line A sample style that just prints out a blue line diff --git a/src/main/src/main/java/org/geoserver/config/default_point.sld b/src/main/src/main/java/org/geoserver/config/default_point.sld index a08d0e19fc1..68307d50c92 100644 --- a/src/main/src/main/java/org/geoserver/config/default_point.sld +++ b/src/main/src/main/java/org/geoserver/config/default_point.sld @@ -12,7 +12,7 @@ - simple red square + Red Square point A sample style that just prints out a red square @@ -21,8 +21,8 @@ Rule 1 - RedSquare - A red fill with an 6 pixel size + Red Square point + A red fill with 6 pixels size diff --git a/src/main/src/main/java/org/geoserver/config/default_polygon.sld b/src/main/src/main/java/org/geoserver/config/default_polygon.sld index e5baa943dc6..292e9d3b4c1 100644 --- a/src/main/src/main/java/org/geoserver/config/default_polygon.sld +++ b/src/main/src/main/java/org/geoserver/config/default_polygon.sld @@ -12,7 +12,7 @@ - simple grey polygon + Grey Polygon A sample style that just prints out a grey interior with a black outline @@ -21,7 +21,7 @@ Rule 1 - GreyFill BlackOutline + Grey Fill and Black Outline Grey fill with a black outline 1 pixel in width diff --git a/src/main/src/main/java/org/geoserver/config/default_raster.sld b/src/main/src/main/java/org/geoserver/config/default_raster.sld index 5e7b133ac38..c0166473e16 100644 --- a/src/main/src/main/java/org/geoserver/config/default_raster.sld +++ b/src/main/src/main/java/org/geoserver/config/default_raster.sld @@ -5,7 +5,7 @@ http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0"> raster_layer raster - A simple default style + Opaque Raster A sample style for rasters Feature diff --git a/src/web/wms/src/test/java/org/geoserver/wms/web/data/default_point.sld b/src/web/wms/src/test/java/org/geoserver/wms/web/data/default_point.sld index 7d0d9f10fee..f9170e8f810 100644 --- a/src/web/wms/src/test/java/org/geoserver/wms/web/data/default_point.sld +++ b/src/web/wms/src/test/java/org/geoserver/wms/web/data/default_point.sld @@ -12,8 +12,8 @@ - A simple purple square - A sample style that just prints out a purple square + Red Square point + A sample style that just prints out a red square diff --git a/src/wms/src/test/resources/org/geoserver/wms/wms_1_1_1/raster.sld b/src/wms/src/test/resources/org/geoserver/wms/wms_1_1_1/raster.sld index 5e7b133ac38..03470f12789 100644 --- a/src/wms/src/test/resources/org/geoserver/wms/wms_1_1_1/raster.sld +++ b/src/wms/src/test/resources/org/geoserver/wms/wms_1_1_1/raster.sld @@ -5,7 +5,7 @@ http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0"> raster_layer raster - A simple default style + Simple Raster A sample style for rasters Feature