[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble] /: Vector maps: use feature attribute to connect data files to map property
From: Thibaut Gridel <tgridel () free ! fr>
Date: 2014-01-03 19:37:04
Message-ID: E1VzAYK-0004Jd-Nn () scm ! kde ! org
[Download RAW message or body]
Git commit 4c06e951c8e46b06ecda8d448c2bb487d52876b3 by Thibaut Gridel.
Committed on 31/03/2013 at 20:20.
Pushed by tgridel into branch 'master'.
Vector maps: use feature attribute to connect data files to map property
M +4 -4 data/maps/earth/bluemarble/bluemarble.dgml
M +5 -5 data/maps/earth/plain/plain.dgml
M +4 -4 data/maps/earth/precip-dec/precip-dec.dgml
M +4 -4 data/maps/earth/precip-july/precip-july.dgml
M +4 -4 data/maps/earth/temp-dec/temp-dec.dgml
M +5 -5 data/maps/earth/temp-july/temp-july.dgml
M +1 -0 src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp
http://commits.kde.org/marble/4c06e951c8e46b06ecda8d448c2bb487d52876b3
diff --git a/data/maps/earth/bluemarble/bluemarble.dgml \
b/data/maps/earth/bluemarble/bluemarble.dgml index b59b2a1..60165b3 100644
--- a/data/maps/earth/bluemarble/bluemarble.dgml
+++ b/data/maps/earth/bluemarble/bluemarble.dgml
@@ -55,20 +55,20 @@
</layer>
<layer name="mwdbii" backend="vector" role="polyline">
- <vector name="pdiffborder" feature="border">
+ <vector name="pdiffborder" feature="borders">
<sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
<pen color="#ffe300" />
</vector>
- <vector name="pusa48" feature="border">
+ <vector name="pusa48" feature="borders">
<sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
<pen color="#ffe300" />
</vector>
- <vector name="international dateline" feature="border">
+ <vector name="international dateline" feature="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
</vector>
<!--
- <vector name="rivers" feature="river">
+ <vector name="rivers" feature="waterbodies">
<sourcefile> mwdbii/RIVER.PNT </sourcefile>
<pen color="#637bff" />
</vector>
diff --git a/data/maps/earth/plain/plain.dgml b/data/maps/earth/plain/plain.dgml
index 54f2419..79d4c46 100644
--- a/data/maps/earth/plain/plain.dgml
+++ b/data/maps/earth/plain/plain.dgml
@@ -38,23 +38,23 @@
<sourcefile> mwdbii/PCOAST.PNT </sourcefile>
<brush color="#f2efe9" />
</vector>
- <vector name="pdiffborder" feature="border">
+ <vector name="pdiffborder" feature="borders">
<sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
<pen color="#cccbca" />
</vector>
- <vector name="pusa48" feature="border">
+ <vector name="pusa48" feature="borders">
<sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
<pen color="#cccbca" />
</vector>
- <vector name="international dateline" feature="border">
+ <vector name="international dateline" feature="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
</vector>
- <vector name="plake" feature="lake">
+ <vector name="plake" feature="waterbodies">
<sourcefile> mwdbii/PLAKE.PNT </sourcefile>
<pen color="#99b3cc" />
</vector>
- <vector name="rivers" feature="river">
+ <vector name="rivers" feature="waterbodies">
<sourcefile> mwdbii/RIVER.PNT </sourcefile>
<pen color="#99b3cc" />
</vector>
diff --git a/data/maps/earth/precip-dec/precip-dec.dgml \
b/data/maps/earth/precip-dec/precip-dec.dgml index 0d25081..7b0ceb7 100644
--- a/data/maps/earth/precip-dec/precip-dec.dgml
+++ b/data/maps/earth/precip-dec/precip-dec.dgml
@@ -54,19 +54,19 @@
<sourcefile> mwdbii/PCOAST.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="pdiffborder" feature="border">
+ <vector name="pdiffborder" feature="borders">
<sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="pusa48" feature="border">
+ <vector name="pusa48" feature="borders">
<sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="international dateline" feature="border">
+ <vector name="international dateline" feature="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
</vector>
- <vector name="rivers" feature="river">
+ <vector name="rivers" feature="waterbodies">
<sourcefile> mwdbii/RIVER.PNT </sourcefile>
<pen color="#637bff" />
</vector>
diff --git a/data/maps/earth/precip-july/precip-july.dgml \
b/data/maps/earth/precip-july/precip-july.dgml index 7a80f8b..dd31f71 100644
--- a/data/maps/earth/precip-july/precip-july.dgml
+++ b/data/maps/earth/precip-july/precip-july.dgml
@@ -54,19 +54,19 @@
<sourcefile> mwdbii/PCOAST.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="pdiffborder" feature="border">
+ <vector name="pdiffborder" feature="borders">
<sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="pusa48" feature="border">
+ <vector name="pusa48" feature="borders">
<sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="international dateline" feature="border">
+ <vector name="international dateline" feature="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
</vector>
- <vector name="rivers" feature="river">
+ <vector name="rivers" feature="waterbodies">
<sourcefile> mwdbii/RIVER.PNT </sourcefile>
<pen color="#637bff" />
</vector>
diff --git a/data/maps/earth/temp-dec/temp-dec.dgml \
b/data/maps/earth/temp-dec/temp-dec.dgml index 31524d5..28cb661 100644
--- a/data/maps/earth/temp-dec/temp-dec.dgml
+++ b/data/maps/earth/temp-dec/temp-dec.dgml
@@ -54,19 +54,19 @@
<sourcefile> mwdbii/PCOAST.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="pdiffborder" feature="border">
+ <vector name="pdiffborder" feature="borders">
<sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="pusa48" feature="border">
+ <vector name="pusa48" feature="borders">
<sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="international dateline" feature="border">
+ <vector name="international dateline" feature="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
</vector>
- <vector name="rivers" feature="river">
+ <vector name="rivers" feature="waterbodies">
<sourcefile> mwdbii/RIVER.PNT </sourcefile>
<pen color="#637bff" />
</vector>
diff --git a/data/maps/earth/temp-july/temp-july.dgml \
b/data/maps/earth/temp-july/temp-july.dgml index aa8a7cd..623eaa9 100644
--- a/data/maps/earth/temp-july/temp-july.dgml
+++ b/data/maps/earth/temp-july/temp-july.dgml
@@ -51,23 +51,23 @@
</layer>
<layer name="mwdbii" backend="vector" role="polyline">
- <vector name="pcoast" feature="coast">
+ <vector name="pcoast">
<sourcefile> mwdbii/PCOAST.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="pdiffborder" feature="border">
+ <vector name="pdiffborder" feature="borders">
<sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="pusa48" feature="border">
+ <vector name="pusa48" feature="borders">
<sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
<pen color="#555753" />
</vector>
- <vector name="international dateline" feature="border">
+ <vector name="international dateline" feature="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
</vector>
- <vector name="rivers" feature="river">
+ <vector name="rivers" feature="waterbodies">
<sourcefile> mwdbii/RIVER.PNT </sourcefile>
<pen color="#637bff" />
</vector>
diff --git a/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp \
b/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp index \
9c34f97..a27576c 100644
--- a/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/dgml/DgmlVectorTagHandler.cpp
@@ -55,6 +55,7 @@ GeoNode* DgmlVectorTagHandler::parse(GeoParser& parser) const
&& parentItem.nodeAs<GeoSceneLayer>()->backend() == dgmlValue_vector ) {
vector = new GeoSceneGeodata( name );
+ vector->setProperty( feature );
vector->setColorize( feature );
parentItem.nodeAs<GeoSceneLayer>()->addDataset( vector );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic