[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble] data/maps/earth: VectorComposer deprecation
From: Thibaut Gridel <tgridel () free ! fr>
Date: 2014-01-03 19:37:05
Message-ID: E1VzAYL-0004Jd-O7 () scm ! kde ! org
[Download RAW message or body]
Git commit 51e4ce5588e9d3bd59c1c8c707aa22086a25823f by Thibaut Gridel.
Committed on 03/01/2014 at 19:32.
Pushed by tgridel into branch 'master'.
VectorComposer deprecation
The following patches remove the legacy drawing code used by so-called
vector map themes, which use data sets as their base for display.
Now, all rendering is done with the unified geodata framework.
REVIEW: 110005
BUG: 244025
BUG: 307788
M +17 -17 data/maps/earth/plain/plain.dgml
M +39 -35 data/maps/earth/srtm/srtm.dgml
M +1 -1 data/maps/earth/temp-july/temp-july.dgml
http://commits.kde.org/marble/51e4ce5588e9d3bd59c1c8c707aa22086a25823f
diff --git a/data/maps/earth/plain/plain.dgml b/data/maps/earth/plain/plain.dgml
index 79d4c46..b9f430f 100644
--- a/data/maps/earth/plain/plain.dgml
+++ b/data/maps/earth/plain/plain.dgml
@@ -33,31 +33,31 @@
<!-- In this place one could e.g. insert a sky plugin -->
<target/>
- <layer name="mwdbii" backend="vector" role="polyline">
- <vector name="pcoast" feature="coast">
+ <layer name="mwdbii" backend="geodata">
+ <geodata name="pcoast">
<sourcefile> mwdbii/PCOAST.PNT </sourcefile>
<brush color="#f2efe9" />
- </vector>
- <vector name="pdiffborder" feature="borders">
+ </geodata>
+ <geodata name="plake" property="waterbodies">
+ <sourcefile> mwdbii/PLAKE.PNT </sourcefile>
+ <brush color="#99b3cc" />
+ </geodata>
+ <geodata name="rivers" property="waterbodies">
+ <sourcefile> mwdbii/RIVER.PNT </sourcefile>
+ <pen color="#99b3cc" />
+ </geodata>
+ <geodata name="pdiffborder" property="borders">
<sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
<pen color="#cccbca" />
- </vector>
- <vector name="pusa48" feature="borders">
+ </geodata>
+ <geodata name="pusa48" property="borders">
<sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
<pen color="#cccbca" />
- </vector>
- <vector name="international dateline" feature="borders">
+ </geodata>
+ <geodata name="international dateline" property="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
- </vector>
- <vector name="plake" feature="waterbodies">
- <sourcefile> mwdbii/PLAKE.PNT </sourcefile>
- <pen color="#99b3cc" />
- </vector>
- <vector name="rivers" feature="waterbodies">
- <sourcefile> mwdbii/RIVER.PNT </sourcefile>
- <pen color="#99b3cc" />
- </vector>
+ </geodata>
</layer>
<layer name="standardplaces" backend="geodata">
diff --git a/data/maps/earth/srtm/srtm.dgml b/data/maps/earth/srtm/srtm.dgml
index f8b6c14..2452b2b 100644
--- a/data/maps/earth/srtm/srtm.dgml
+++ b/data/maps/earth/srtm/srtm.dgml
@@ -27,7 +27,7 @@
<!-- Now we create the layer structure that gets handled by the
layer management class -->
- <map bgcolor="#000000">
+ <map bgcolor="#99b3cc">
<canvas/>
<!-- In this place one could e.g. insert a sky plugin -->
<target/>
@@ -40,52 +40,55 @@
<storageLayout maximumTileLevel="5"/>
</texture>
</layer>
+
+ <!-- This layer provides the colorization -->
+ <layer name="colorme" backend="filter">
+ <filter name="texturecolorizer" type="colorize">
+ <palette type="sea">seacolors.leg</palette>
+ <palette type="land">landcolors.leg</palette>
+ </filter>
+ </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">
+ <layer name="mwdbii-canvas" backend="geodata">
+ <geodata name="pcoast" property="land" colorize="land">
<sourcefile> mwdbii/PCOAST.PNT </sourcefile>
- </vector>
- <vector name="pisland" feature="land">
+ </geodata>
+ <geodata name="pisland" property="land" colorize="land">
<sourcefile> mwdbii/PISLAND.PNT </sourcefile>
- </vector>
- <vector name="plakeisland" feature="land">
+ </geodata>
+ <geodata name="plakeisland" property="land" colorize="land">
<sourcefile> mwdbii/PLAKEISLAND.PNT </sourcefile>
- </vector>
- <vector name="plake" feature="sea">
+ </geodata>
+ <geodata name="plake" property="waterbodies" colorize="sea">
<sourcefile> mwdbii/PLAKE.PNT </sourcefile>
- </vector>
- <vector name="pglacier" feature="sea">
+ <brush color="f00e0eff" />
+ </geodata>
+ <geodata name="pglacier" property="ice" colorize="sea">
<sourcefile> mwdbii/PGLACIER.PNT </sourcefile>
- </vector>
+ <brush color="ffffffff" />
+ </geodata>
</layer>
- <!-- This layer provides the colorization -->
- <layer name="colorme" backend="filter">
- <filter name="texturecolorizer" type="colorize">
- <palette type="sea">seacolors.leg</palette>
- <palette type="land">landcolors.leg</palette>
- </filter>
- </layer>
- <layer name="mwdbii" backend="vector" role="polyline">
- <vector name="pdiffborder" feature="border">
+ <layer name="mwdbii" backend="geodata">
+ <geodata name="pdiffborder" property="borders">
<sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
<pen color="#f86649" />
- </vector>
- <vector name="pusa48" feature="border">
+ </geodata>
+ <geodata name="pusa48" property="borders">
<sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
<pen color="#f86649" />
- </vector>
- <vector name="international dateline" feature="border">
+ </geodata>
+ <geodata name="international dateline" property="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
- </vector>
- <vector name="rivers" feature="river">
+ </geodata>
+ <geodata name="rivers" property="waterbodies">
<sourcefile> mwdbii/RIVER.PNT </sourcefile>
<pen color="#637bff" />
- </vector>
+ </geodata>
</layer>
<layer name="standardplaces" backend="geodata">
@@ -251,6 +254,14 @@
</item>
</section>
+ <section name="ice" checkable="true" connect="ice" spacing="12">
+ <heading>Ice and Glaciers</heading>
+ </section>
+
+ <section name="relief" checkable="true" connect="relief" spacing="12">
+ <heading>Relief</heading>
+ </section>
+
<section name="elevation" checkable="false" spacing="12">
<heading>Elevation</heading>
@@ -320,13 +331,6 @@
</item>
</section>
- <section name="ice" checkable="true" connect="ice" spacing="12">
- <heading>Ice and Glaciers</heading>
- </section>
-
- <section name="relief" checkable="true" connect="relief" spacing="12">
- <heading>Relief</heading>
- </section>
<section name="coordinate-grid" checkable="true" connect="coordinate-grid" spacing="12">
<heading>Coordinate Grid</heading>
diff --git a/data/maps/earth/temp-july/temp-july.dgml b/data/maps/earth/temp-july/temp-july.dgml
index 887a3a4..42caa4f 100644
--- a/data/maps/earth/temp-july/temp-july.dgml
+++ b/data/maps/earth/temp-july/temp-july.dgml
@@ -50,7 +50,7 @@
</filter>
</layer>
- <layer name="mwdbii" backend="vector" role="polyline">
+ <layer name="mwdbii" backend="vector">
<vector name="pcoast">
<sourcefile> mwdbii/PCOAST.PNT </sourcefile>
<pen color="#555753" />
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic