Mercurial > dive4elements > gnv-client
changeset 861:2ab49a1e29ca
Added units to legend text of a wms layer (issue246).
gnv-artifacts/trunk@995 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 27 Apr 2010 10:06:02 +0000 (2010-04-27) |
parents | f94a95009423 |
children | 62cf1a5555b9 |
files | gnv-artifacts/ChangeLog gnv-artifacts/contrib/palette2polygonVM.xsl gnv-artifacts/doc/conf/maptemplates/flow-velocity_polygons.class.vm gnv-artifacts/doc/conf/maptemplates/salinity_polygons.class.vm gnv-artifacts/doc/conf/maptemplates/water-temperature_polygons.class.vm |
diffstat | 5 files changed, 139 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Mon Apr 26 13:31:11 2010 +0000 +++ b/gnv-artifacts/ChangeLog Tue Apr 27 10:06:02 2010 +0000 @@ -1,3 +1,15 @@ +2010-04-27 Ingo Weinzierl <ingo.weinzierl@intevation.de> + + Issue246 (Added missing units to the legend text.) + + * contrib/palette2polygonVM.xsl: Use description attribute from palette xml + file to create the legend text instead of from/to attributes. + + * doc/conf/maptemplates/flow-velocity_polygons.class.vm, + doc/conf/maptemplates/water-temperature_polygons.class.vm, + doc/conf/maptemplates/salinity_polygons.class.vm: Added units to the + legend text. + 2010-04-26 Ingo Weinzierl <ingo.weinzierl@intevation.de> Issue251
--- a/gnv-artifacts/contrib/palette2polygonVM.xsl Mon Apr 26 13:31:11 2010 +0000 +++ b/gnv-artifacts/contrib/palette2polygonVM.xsl Tue Apr 27 10:06:02 2010 +0000 @@ -10,7 +10,7 @@ <xsl:template match="range"> CLASS - NAME "<xsl:value-of select="./@from" /> - <xsl:value-of select="./@to" />" + NAME "<xsl:value-of select="./@description" />" EXPRESSION ("[CLASS]"="<xsl:value-of select ="./@index" />") STYLE COLOR "<xsl:value-of select="./@rgb" />"
--- a/gnv-artifacts/doc/conf/maptemplates/flow-velocity_polygons.class.vm Mon Apr 26 13:31:11 2010 +0000 +++ b/gnv-artifacts/doc/conf/maptemplates/flow-velocity_polygons.class.vm Tue Apr 27 10:06:02 2010 +0000 @@ -1,5 +1,7 @@ + + CLASS - NAME "-inf - 0.025" + NAME "< 0.025 [m/s]" EXPRESSION ("[CLASS]"="0") STYLE COLOR "#38a800" @@ -8,7 +10,7 @@ CLASS - NAME "0.025 - 0.05" + NAME "0.025 - 0.05 [m/s]" EXPRESSION ("[CLASS]"="1") STYLE COLOR "#56b800" @@ -17,7 +19,7 @@ CLASS - NAME "0.05 - 0.1" + NAME "0.05 - 0.1 [m/s]" EXPRESSION ("[CLASS]"="2") STYLE COLOR "#74c700" @@ -26,7 +28,7 @@ CLASS - NAME "0.1 - 0.3" + NAME "0.1 - 0.3 [m/s]" EXPRESSION ("[CLASS]"="3") STYLE COLOR "#96d600" @@ -35,7 +37,7 @@ CLASS - NAME "0.3 - 0.5" + NAME "0.3 - 0.5 [m/s]" EXPRESSION ("[CLASS]"="4") STYLE COLOR "#bfe600" @@ -44,7 +46,7 @@ CLASS - NAME "0.5 - 0.7" + NAME "0.5 - 0.7 [m/s]" EXPRESSION ("[CLASS]"="5") STYLE COLOR "#e9f500" @@ -53,7 +55,7 @@ CLASS - NAME "0.7 - 0.9" + NAME "0.7 - 0.9 [m/s]" EXPRESSION ("[CLASS]"="6") STYLE COLOR "#ffea00" @@ -62,7 +64,7 @@ CLASS - NAME "0.9 - 1.1" + NAME "0.9 - 1.1 [m/s]" EXPRESSION ("[CLASS]"="7") STYLE COLOR "#ffbb00" @@ -71,7 +73,7 @@ CLASS - NAME "1.1 - 1.3" + NAME "1.1 - 1.3 [m/s]" EXPRESSION ("[CLASS]"="8") STYLE COLOR "#ff8c00" @@ -80,7 +82,7 @@ CLASS - NAME "1.3 - 1.5" + NAME "1.3 - 1.5 [m/s]" EXPRESSION ("[CLASS]"="9") STYLE COLOR "#ff5e00" @@ -89,7 +91,7 @@ CLASS - NAME "1.5 - 1.7" + NAME "1.5 - 1.7 [m/s]" EXPRESSION ("[CLASS]"="10") STYLE COLOR "#ff2f00" @@ -98,7 +100,7 @@ CLASS - NAME "1.7 - inf" + NAME "> 1.7 [m/s]" EXPRESSION ("[CLASS]"="11") STYLE COLOR "#ff0000"
--- a/gnv-artifacts/doc/conf/maptemplates/salinity_polygons.class.vm Mon Apr 26 13:31:11 2010 +0000 +++ b/gnv-artifacts/doc/conf/maptemplates/salinity_polygons.class.vm Tue Apr 27 10:06:02 2010 +0000 @@ -1,7 +1,8 @@ CLASS - NAME "-inf - 2.0" + + NAME "< 2.0 [pSal]" EXPRESSION ("[CLASS]"="0") STYLE COLOR "#02db00" @@ -10,7 +11,8 @@ CLASS - NAME "2.0 - 3.0" + + NAME "2.0 - 3.0 [pSal]" EXPRESSION ("[CLASS]"="1") STYLE COLOR "#01e600" @@ -19,7 +21,8 @@ CLASS - NAME "3.0 - 4.0" + + NAME "3.0 - 4.0 [pSal]" EXPRESSION ("[CLASS]"="2") STYLE COLOR "#02f200" @@ -28,7 +31,8 @@ CLASS - NAME "4.0 - 5.0" + + NAME "4.0 - 5.0 [pSal]" EXPRESSION ("[CLASS]"="3") STYLE COLOR "#00ff00" @@ -37,7 +41,8 @@ CLASS - NAME "5.0 - 6.0" + + NAME "5.0 - 6.0 [pSal]" EXPRESSION ("[CLASS]"="4") STYLE COLOR "#23fd22" @@ -46,7 +51,8 @@ CLASS - NAME "6.0 - 7.0" + + NAME "6.0 - 7.0 [pSal]" EXPRESSION ("[CLASS]"="5") STYLE COLOR "#47fe46" @@ -55,7 +61,8 @@ CLASS - NAME "7.0 - 8.0" + + NAME "7.0 - 8.0 [pSal]" EXPRESSION ("[CLASS]"="6") STYLE COLOR "#5afd59" @@ -64,7 +71,8 @@ CLASS - NAME "8.0 - 9.0" + + NAME "8.0 - 9.0 [pSal]" EXPRESSION ("[CLASS]"="7") STYLE COLOR "#6ffe6e" @@ -73,7 +81,8 @@ CLASS - NAME "9.0 - 10.0" + + NAME "9.0 - 10.0 [pSal]" EXPRESSION ("[CLASS]"="8") STYLE COLOR "#89fd88" @@ -82,7 +91,8 @@ CLASS - NAME "10.0 - 12.0" + + NAME "10.0 - 12.0 [pSal]" EXPRESSION ("[CLASS]"="9") STYLE COLOR "#a5fea4" @@ -91,7 +101,8 @@ CLASS - NAME "12.0 - 14.0" + + NAME "12.0 - 14.0 [pSal]" EXPRESSION ("[CLASS]"="10") STYLE COLOR "#b3feb3" @@ -100,7 +111,8 @@ CLASS - NAME "14.0 - 16.0" + + NAME "14.0 - 16.0 [pSal]" EXPRESSION ("[CLASS]"="11") STYLE COLOR "#c2fec2" @@ -109,7 +121,8 @@ CLASS - NAME "16.0 - 18.0" + + NAME "16.0 - 18.0 [pSal]" EXPRESSION ("[CLASS]"="12") STYLE COLOR "#e0fee0" @@ -118,7 +131,8 @@ CLASS - NAME "18.0 - 20.0" + + NAME "18.0 - 20.0 [pSal]" EXPRESSION ("[CLASS]"="13") STYLE COLOR "#ffffff" @@ -127,7 +141,8 @@ CLASS - NAME "20.0 - 24.0" + + NAME "20.0 - 24.0 [pSal]" EXPRESSION ("[CLASS]"="14") STYLE COLOR "#fef5ef" @@ -136,7 +151,8 @@ CLASS - NAME "24.0 - 28.0" + + NAME "24.0 - 28.0 [pSal]" EXPRESSION ("[CLASS]"="15") STYLE COLOR "#feede0" @@ -145,7 +161,8 @@ CLASS - NAME "28.0 - 30.0" + + NAME "28.0 - 30.0 [pSal]" EXPRESSION ("[CLASS]"="16") STYLE COLOR "#fee5d1" @@ -154,7 +171,8 @@ CLASS - NAME "30.0 - 32.0" + + NAME "30.0 - 32.0 [pSal]" EXPRESSION ("[CLASS]"="17") STYLE COLOR "#fdd8ba" @@ -163,7 +181,8 @@ CLASS - NAME "32.0 - 34.0" + + NAME "32.0 - 34.0 [pSal]" EXPRESSION ("[CLASS]"="18") STYLE COLOR "#fecca4" @@ -172,7 +191,8 @@ CLASS - NAME "34.0 - 34.5" + + NAME "34.0 - 34.5 [pSal]" EXPRESSION ("[CLASS]"="19") STYLE COLOR "#fdbe8b" @@ -181,7 +201,8 @@ CLASS - NAME "34.5 - 35.0" + + NAME "34.5 - 35.0 [pSal]" EXPRESSION ("[CLASS]"="20") STYLE COLOR "#feb073" @@ -190,7 +211,8 @@ CLASS - NAME "35.0 - 35.2" + + NAME "35.0 - 35.2 [pSal]" EXPRESSION ("[CLASS]"="21") STYLE COLOR "#fda35b" @@ -199,7 +221,8 @@ CLASS - NAME "35.2 - 35.4" + + NAME "35.2 - 35.4 [pSal]" EXPRESSION ("[CLASS]"="22") STYLE COLOR "#fe9846" @@ -208,7 +231,8 @@ CLASS - NAME "35.4 - 35.6" + + NAME "35.4 - 35.6 [pSal]" EXPRESSION ("[CLASS]"="23") STYLE COLOR "#fd8422" @@ -217,7 +241,8 @@ CLASS - NAME "35.6 - 35.8" + + NAME "35.6 - 35.8 [pSal]" EXPRESSION ("[CLASS]"="24") STYLE COLOR "#fe7100" @@ -226,7 +251,8 @@ CLASS - NAME "35.8 - 36.0" + + NAME "35.8 - 36.0 [pSal]" EXPRESSION ("[CLASS]"="25") STYLE COLOR "#fe6900" @@ -235,7 +261,8 @@ CLASS - NAME "36.0 - 37.0" + + NAME "36.0 - 37.0 [pSal]" EXPRESSION ("[CLASS]"="26") STYLE COLOR "#fe6100" @@ -244,7 +271,8 @@ CLASS - NAME "37.0 - inf" + + NAME "> 37.0 [pSal]" EXPRESSION ("[CLASS]"="27") STYLE COLOR "#fe5900"
--- a/gnv-artifacts/doc/conf/maptemplates/water-temperature_polygons.class.vm Mon Apr 26 13:31:11 2010 +0000 +++ b/gnv-artifacts/doc/conf/maptemplates/water-temperature_polygons.class.vm Tue Apr 27 10:06:02 2010 +0000 @@ -1,7 +1,8 @@ CLASS - NAME "-inf - -1" + + NAME "< -1 [degC]" EXPRESSION ("[CLASS]"="0") STYLE COLOR "#ff33ff" @@ -10,7 +11,8 @@ CLASS - NAME "-1 - 0" + + NAME "-1 - 0 [degC]" EXPRESSION ("[CLASS]"="1") STYLE COLOR "#ff98ff" @@ -19,7 +21,8 @@ CLASS - NAME "0 - 1" + + NAME "0 - 1 [degC]" EXPRESSION ("[CLASS]"="2") STYLE COLOR "#3300cc" @@ -28,7 +31,8 @@ CLASS - NAME "1 - 2" + + NAME "1 - 2 [degC]" EXPRESSION ("[CLASS]"="3") STYLE COLOR "#3366ff" @@ -37,7 +41,8 @@ CLASS - NAME "2 - 3" + + NAME "2 - 3 [degC]" EXPRESSION ("[CLASS]"="4") STYLE COLOR "#3399ff" @@ -46,7 +51,8 @@ CLASS - NAME "3 - 4" + + NAME "3 - 4 [degC]" EXPRESSION ("[CLASS]"="5") STYLE COLOR "#33ccff" @@ -55,7 +61,8 @@ CLASS - NAME "4 - 5" + + NAME "4 - 5 [degC]" EXPRESSION ("[CLASS]"="6") STYLE COLOR "#33ffff" @@ -64,7 +71,8 @@ CLASS - NAME "5 - 6" + + NAME "5 - 6 [degC]" EXPRESSION ("[CLASS]"="7") STYLE COLOR "#007800" @@ -73,7 +81,8 @@ CLASS - NAME "6 - 7" + + NAME "6 - 7 [degC]" EXPRESSION ("[CLASS]"="8") STYLE COLOR "#009900" @@ -82,7 +91,8 @@ CLASS - NAME "7 - 8" + + NAME "7 - 8 [degC]" EXPRESSION ("[CLASS]"="9") STYLE COLOR "#00ba00" @@ -91,7 +101,8 @@ CLASS - NAME "8 - 9" + + NAME "8 - 9 [degC]" EXPRESSION ("[CLASS]"="10") STYLE COLOR "#00de00" @@ -100,7 +111,8 @@ CLASS - NAME "9 - 10" + + NAME "9 - 10 [degC]" EXPRESSION ("[CLASS]"="11") STYLE COLOR "#00ff00" @@ -109,7 +121,8 @@ CLASS - NAME "10 - 11" + + NAME "10 - 11 [degC]" EXPRESSION ("[CLASS]"="12") STYLE COLOR "#ffff33" @@ -118,7 +131,8 @@ CLASS - NAME "11 - 12" + + NAME "11 - 12 [degC]" EXPRESSION ("[CLASS]"="13") STYLE COLOR "#ffee33" @@ -127,7 +141,8 @@ CLASS - NAME "12 - 13" + + NAME "12 - 13 [degC]" EXPRESSION ("[CLASS]"="14") STYLE COLOR "#ffdd33" @@ -136,7 +151,8 @@ CLASS - NAME "13 - 14" + + NAME "13 - 14 [degC]" EXPRESSION ("[CLASS]"="15") STYLE COLOR "#ffcc33" @@ -145,7 +161,8 @@ CLASS - NAME "14 - 15" + + NAME "14 - 15 [degC]" EXPRESSION ("[CLASS]"="16") STYLE COLOR "#ffbb33" @@ -154,7 +171,8 @@ CLASS - NAME "15 - 16" + + NAME "15 - 16 [degC]" EXPRESSION ("[CLASS]"="17") STYLE COLOR "#ffaa00" @@ -163,7 +181,8 @@ CLASS - NAME "16 - 17" + + NAME "16 - 17 [degC]" EXPRESSION ("[CLASS]"="18") STYLE COLOR "#ff9900" @@ -172,7 +191,8 @@ CLASS - NAME "17 - 18" + + NAME "17 - 18 [degC]" EXPRESSION ("[CLASS]"="19") STYLE COLOR "#ff7700" @@ -181,7 +201,8 @@ CLASS - NAME "18 - 19" + + NAME "18 - 19 [degC]" EXPRESSION ("[CLASS]"="20") STYLE COLOR "#ff0000" @@ -190,7 +211,8 @@ CLASS - NAME "19 - 20" + + NAME "19 - 20 [degC]" EXPRESSION ("[CLASS]"="21") STYLE COLOR "#ed0000" @@ -199,7 +221,8 @@ CLASS - NAME "20 - 21" + + NAME "20 - 21 [degC]" EXPRESSION ("[CLASS]"="22") STYLE COLOR "#cc0000" @@ -208,7 +231,8 @@ CLASS - NAME "21 - 22" + + NAME "21 - 22 [degC]" EXPRESSION ("[CLASS]"="23") STYLE COLOR "#ba0000" @@ -217,7 +241,8 @@ CLASS - NAME "22 - 23" + + NAME "22 - 23 [degC]" EXPRESSION ("[CLASS]"="24") STYLE COLOR "#ab0000" @@ -226,7 +251,8 @@ CLASS - NAME "23 - 24" + + NAME "23 - 24 [degC]" EXPRESSION ("[CLASS]"="25") STYLE COLOR "#990000" @@ -235,7 +261,8 @@ CLASS - NAME "24 - 25" + + NAME "24 - 25 [degC]" EXPRESSION ("[CLASS]"="26") STYLE COLOR "#870000" @@ -244,7 +271,8 @@ CLASS - NAME "25 - inf" + + NAME "> 25 [degC]" EXPRESSION ("[CLASS]"="27") STYLE COLOR "#ab0089"