[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/data
From:       Torsten Rahn <tackat () kde ! org>
Date:       2008-07-09 7:25:00
Message-ID: 1215588300.117088.6740.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 829804 by rahn:

Better colors for the precipitation maps ...



 M  +19 -31    maps/earth/precip-dec/precip-dec.dgml  
 M  +20 -32    maps/earth/precip-july/precip-july.dgml  
 M  +10 -10    precipcolors.leg  


--- trunk/KDE/kdeedu/marble/data/maps/earth/precip-dec/precip-dec.dgml #829803:829804
@@ -40,26 +40,6 @@
                 </texture>
             </layer>
             
-            <!-- This layer creates the coastlines that are needed to
-                colorize the elevation model properly -->
-            <layer name="mwdbii-canvas" backend="vector" role="filterhelper">
-                <vector name="pcoast" feature="land">
-                    <sourcefile format="PNT"> earth/mwdbii/PCOAST.PNT </sourcefile>
-                </vector>
-                <vector name="pisland" feature="land">
-                    <sourcefile format="PNT"> earth/mwdbii/PISLAND.PNT </sourcefile>
-                </vector>
-                <vector name="plakeisland" feature="land" connect="waterbodies">
-                    <sourcefile format="PNT"> earth/mwdbii/PLAKEISLAND.PNT </sourcefile>
-                </vector>
-                <vector name="plake" feature="sea" connect="waterbodies">
-                    <sourcefile format="PNT"> earth/mwdbii/PLAKE.PNT </sourcefile>
-                </vector>
-                <vector name="pglacier" feature="sea">
-                    <sourcefile format="PNT"> earth/mwdbii/PGLACIER.PNT </sourcefile>
-                </vector>
-            </layer>
-        
             <!-- This layer provides the colorization -->
             <layer name="colorme" backend="filter">
                 <filter name="texturecolorizer" type="colorize">
@@ -73,13 +53,17 @@
             </layer>
         
             <layer name="mwdbii" backend="vector" role="polyline">
+                <vector name="pcoast" feature="coast">
+                    <sourcefile format="PNT"> earth/mwdbii/PCOAST.PNT </sourcefile>
+                    <pen color="#555753" />
+                </vector>
                 <vector name="pdiffborder" feature="border" connect="borders">
                     <sourcefile format="PNT"> earth/mwdbii/PDIFFBORDER.PNT </sourcefile>
-                    <pen color="#f86649" />
+                    <pen color="#555753" />
                 </vector>
                 <vector name="pusa48" feature="border" connect="borders">
                     <sourcefile format="PNT"> earth/mwdbii/PUSA48.DIFF.PNT </sourcefile>
-                    <pen color="#f86649" />
+                    <pen color="#555753" />
                 </vector>
                 <vector name="international dateline" feature="border">
                     <sourcefile format="PNT"> earth/mwdbii/DATELINE.PNT </sourcefile>
@@ -152,6 +136,10 @@
                 </property>
             </group>
             <group name="Water Bodies">
+                <property name="coastlines">
+                    <available>true</available>
+                    <value>true</value>
+                </property>
                 <property name="waterbodies">
                     <available>false</available>
                     <value>false</value>
@@ -257,39 +245,39 @@
                 <heading>Precipitation</heading>
 
                 <item name="precip0">
-                    <icon color="#ff0000"/>
+                    <icon color="#ec7331"/>
                     <text>0 mm</text>
                 </item>
                 <item name="precip10">
-                    <icon color="#ff8000"/>
+                    <icon color="#f29b68"/>
                     <text>10 mm</text>
                 </item>
                 <item name="precip40">
-                    <icon color="#ffff00"/>
+                    <icon color="#ffeb55"/>
                     <text>40 mm</text>
                 </item>
                 <item name="precip63">
-                    <icon color="#80db00"/>
+                    <icon color="#77b753"/>
                     <text>63 mm</text>
                 </item>
                 <item name="precip89">
-                    <icon color="#00ba00"/>
+                    <icon color="#009966"/>
                     <text>89 mm</text>
                 </item>
                 <item name="precip127">
-                    <icon color="#4fac80"/>
+                    <icon color="#00a7b3"/>
                     <text>127 mm</text>
                 </item>
                 <item name="precip256">
-                    <icon color="#9f9fff"/>
+                    <icon color="#2c72c7"/>
                     <text>256 mm</text>
                 </item>
                 <item name="precip512">
-                    <icon color="#6a6aff"/>
+                    <icon color="#0057ae"/>
                     <text>512 mm</text>
                 </item>
                 <item name="precip1024">
-                    <icon color="#0000ff"/>
+                    <icon color="#00438a"/>
                     <text>1024 mm or more</text>
                 </item>
             </section>
--- trunk/KDE/kdeedu/marble/data/maps/earth/precip-july/precip-july.dgml #829803:829804
@@ -39,27 +39,7 @@
                     <installmap> precip-july.jpg </installmap>
                 </texture>
             </layer>
-            
-            <!-- This layer creates the coastlines that are needed to
-                colorize the elevation model properly -->
-            <layer name="mwdbii-canvas" backend="vector" role="filterhelper">
-                <vector name="pcoast" feature="land">
-                    <sourcefile format="PNT"> earth/mwdbii/PCOAST.PNT </sourcefile>
-                </vector>
-                <vector name="pisland" feature="land">
-                    <sourcefile format="PNT"> earth/mwdbii/PISLAND.PNT </sourcefile>
-                </vector>
-                <vector name="plakeisland" feature="land" connect="waterbodies">
-                    <sourcefile format="PNT"> earth/mwdbii/PLAKEISLAND.PNT </sourcefile>
-                </vector>
-                <vector name="plake" feature="sea" connect="waterbodies">
-                    <sourcefile format="PNT"> earth/mwdbii/PLAKE.PNT </sourcefile>
-                </vector>
-                <vector name="pglacier" feature="sea">
-                    <sourcefile format="PNT"> earth/mwdbii/PGLACIER.PNT </sourcefile>
-                </vector>
-            </layer>
-        
+                    
             <!-- This layer provides the colorization -->
             <layer name="colorme" backend="filter">
                 <filter name="texturecolorizer" type="colorize">
@@ -73,13 +53,17 @@
             </layer>
         
             <layer name="mwdbii" backend="vector" role="polyline">
+                <vector name="pcoast" feature="coast">
+                    <sourcefile format="PNT"> earth/mwdbii/PCOAST.PNT </sourcefile>
+                    <pen color="#555753" />
+                </vector>
                 <vector name="pdiffborder" feature="border" connect="borders">
                     <sourcefile format="PNT"> earth/mwdbii/PDIFFBORDER.PNT </sourcefile>
-                    <pen color="#f86649" />
+                    <pen color="#555753" />
                 </vector>
                 <vector name="pusa48" feature="border" connect="borders">
                     <sourcefile format="PNT"> earth/mwdbii/PUSA48.DIFF.PNT </sourcefile>
-                    <pen color="#f86649" />
+                    <pen color="#555753" />
                 </vector>
                 <vector name="international dateline" feature="border">
                     <sourcefile format="PNT"> earth/mwdbii/DATELINE.PNT </sourcefile>
@@ -152,6 +136,10 @@
                 </property>
             </group>
             <group name="Water Bodies">
+                <property name="coastlines">
+                    <available>true</available>
+                    <value>true</value>
+                </property>
                 <property name="waterbodies">
                     <available>false</available>
                     <value>false</value>
@@ -257,39 +245,39 @@
                 <heading>Precipitation</heading>
 
                 <item name="precip0">
-                    <icon color="#ff0000"/>
+                    <icon color="#ec7331"/>
                     <text>0 mm</text>
                 </item>
                 <item name="precip10">
-                    <icon color="#ff8000"/>
+                    <icon color="#f29b68"/>
                     <text>10 mm</text>
                 </item>
                 <item name="precip40">
-                    <icon color="#ffff00"/>
+                    <icon color="#ffeb55"/>
                     <text>40 mm</text>
                 </item>
                 <item name="precip63">
-                    <icon color="#80db00"/>
+                    <icon color="#77b753"/>
                     <text>63 mm</text>
                 </item>
                 <item name="precip89">
-                    <icon color="#00ba00"/>
+                    <icon color="#009966"/>
                     <text>89 mm</text>
                 </item>
                 <item name="precip127">
-                    <icon color="#4fac80"/>
+                    <icon color="#00a7b3"/>
                     <text>127 mm</text>
                 </item>
                 <item name="precip256">
-                    <icon color="#9f9fff"/>
+                    <icon color="#2c72c7"/>
                     <text>256 mm</text>
                 </item>
                 <item name="precip512">
-                    <icon color="#6a6aff"/>
+                    <icon color="#0057ae"/>
                     <text>512 mm</text>
                 </item>
                 <item name="precip1024">
-                    <icon color="#0000ff"/>
+                    <icon color="#00438a"/>
                     <text>1024 mm or more</text>
                 </item>
             </section>
--- trunk/KDE/kdeedu/marble/data/precipcolors.leg #829803:829804
@@ -1,10 +1,10 @@
-#ff0000=0
-#ff8000=0.04
-#ffff00=0.16
-#80db00=0.25
-#00ba00=0.35
-#4fac80=0.5
-#9f9fff=0.75
-#6a6aff=0.87
-#5050ff=0.93
-#0000ff=1
+#ec7331=0
+#f29b68=0.04
+#ffeb55=0.16
+#77b753=0.25
+#009966=0.35
+#00a7b3=0.5
+#2c72c7=0.75
+#0057ae=0.87
+#00438a=0.93
+#00316e=1
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic