summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Rahn <[email protected]>2015-04-02 23:14:06 +0200
committerTorsten Rahn <[email protected]>2015-04-02 23:14:06 +0200
commit0b0629f9c821660cb60d5c218bb477da0faf9abe (patch)
tree92538e7021907c67fe9e506de4e8c6ea9a08edef
parentff2e6ee3a3de0be70f45648d28edd1ce1b904e55 (diff)
Convert all local map themes to usage of the naturalearth
pn2 files. As a result the mwdbii dataset is only needed to display aspects of the external map themes. Also the only PNT file which is still in use for the local map themes is the DATELINE.PNT file.
-rw-r--r--data/maps/earth/bluemarble/bluemarble.dgml39
-rw-r--r--data/maps/earth/plain/plain.dgml2
-rw-r--r--data/maps/earth/precip-dec/precip-dec.dgml43
-rw-r--r--data/maps/earth/precip-july/precip-july.dgml43
-rw-r--r--data/maps/earth/schagen1689/schagen1689.dgml21
-rw-r--r--data/maps/earth/temp-dec/temp-dec.dgml43
-rw-r--r--data/maps/earth/temp-july/temp-july.dgml43
7 files changed, 119 insertions, 115 deletions
diff --git a/data/maps/earth/bluemarble/bluemarble.dgml b/data/maps/earth/bluemarble/bluemarble.dgml
index 60165b3..b31db52 100644
--- a/data/maps/earth/bluemarble/bluemarble.dgml
+++ b/data/maps/earth/bluemarble/bluemarble.dgml
@@ -53,27 +53,30 @@
<blending name="SunLightBlending" />
</texture>
</layer>
-
- <layer name="mwdbii" backend="vector" role="polyline">
- <vector name="pdiffborder" feature="borders">
- <sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
- <pen color="#ffe300" />
- </vector>
- <vector name="pusa48" feature="borders">
- <sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
- <pen color="#ffe300" />
- </vector>
- <vector name="international dateline" feature="borders">
+ <layer name="naturalearth" backend="geodata">
+ <geodata name="border" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_boundary_lines_land.pn2 </sourcefile>
+ <pen color="#ffe300" width="1.0" />
+ </geodata>
+ <geodata name="maritimeindicators" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_boundary_lines_maritime_indicator.pn2 </sourcefile>
+ <pen color="#ffe300" width="1.0" />
+ </geodata>
+ <geodata name="breakawaydisputed" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2 </sourcefile>
+ <pen color="#cccbca" width="1"/>
+ <brush color="#cccbca" alpha="0.5" />
+ </geodata>
+ <geodata name="admin1" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_1_states_provinces_lines.pn2 </sourcefile>
+ <pen color="#ffe300" style="dashdotline" />
+ </geodata>
+ <geodata name="international dateline" property="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
- </vector>
-<!--
- <vector name="rivers" feature="waterbodies">
- <sourcefile> mwdbii/RIVER.PNT </sourcefile>
- <pen color="#637bff" />
- </vector>
--->
+ </geodata>
</layer>
+
<layer name="standardplaces" backend="geodata">
<geodata name="cityplacemarks">
<sourcefile>cityplacemarks.cache</sourcefile>
diff --git a/data/maps/earth/plain/plain.dgml b/data/maps/earth/plain/plain.dgml
index cd3a385..4b5c20c 100644
--- a/data/maps/earth/plain/plain.dgml
+++ b/data/maps/earth/plain/plain.dgml
@@ -38,7 +38,7 @@
<pen color="transparent" style="nopen"/>
<brush color="#f2efe9" />
</geodata>
- <geodata name="lake" property="waterbodies" colorize="sea">
+ <geodata name="lake" property="waterbodies">
<sourcefile> naturalearth/ne_50m_lakes.pn2 </sourcefile>
<brush color="#99b3cc" />
<pen color="transparent" style="nopen"/>
diff --git a/data/maps/earth/precip-dec/precip-dec.dgml b/data/maps/earth/precip-dec/precip-dec.dgml
index 3185d02..b9b503c 100644
--- a/data/maps/earth/precip-dec/precip-dec.dgml
+++ b/data/maps/earth/precip-dec/precip-dec.dgml
@@ -48,31 +48,32 @@
<palette type="land">precipcolors.leg</palette>
</filter>
</layer>
-
- <layer name="mwdbii" backend="vector">
- <vector name="pcoast">
- <sourcefile> mwdbii/PCOAST.PNT </sourcefile>
- <pen color="#555753" />
- <brush color="transparent" />
- </vector>
- <vector name="pdiffborder" feature="borders">
- <sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
- <pen color="#555753" />
- </vector>
- <vector name="pusa48" feature="borders">
- <sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
- <pen color="#555753" />
- </vector>
- <vector name="international dateline" feature="borders">
+ <layer name="naturalearth" backend="geodata">
+ <geodata name="coast">
+ <sourcefile> naturalearth/ne_50m_land.pn2 </sourcefile>
+ <pen color="#555753"/>
+ </geodata>
+ <geodata name="lake" property="waterbodies">
+ <sourcefile> naturalearth/ne_50m_lakes.pn2 </sourcefile>
+ <pen color="#555753"/>
+ </geodata>
+ <geodata name="border" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_boundary_lines_land.pn2 </sourcefile>
+ <pen color="#555753" width="1" />
+ </geodata>
+ <geodata name="breakawaydisputed" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2 </sourcefile>
+ <pen color="#555753" width="1" style="dotline"/>
+ </geodata>
+ <geodata name="international dateline" property="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
- </vector>
- <vector name="rivers" feature="waterbodies">
- <sourcefile> mwdbii/RIVER.PNT </sourcefile>
+ </geodata>
+ <geodata name="rivers" property="waterbodies">
+ <sourcefile> naturalearth/ne_50m_rivers_lake_centerlines.pn2 </sourcefile>
<pen color="#637bff" />
- </vector>
+ </geodata>
</layer>
-
<layer name="standardplaces" backend="geodata">
<geodata name="cityplacemarks">
<sourcefile>cityplacemarks.cache</sourcefile>
diff --git a/data/maps/earth/precip-july/precip-july.dgml b/data/maps/earth/precip-july/precip-july.dgml
index f400aaa..6e35139 100644
--- a/data/maps/earth/precip-july/precip-july.dgml
+++ b/data/maps/earth/precip-july/precip-july.dgml
@@ -48,31 +48,32 @@
<palette type="land">precipcolors.leg</palette>
</filter>
</layer>
-
- <layer name="mwdbii" backend="vector">
- <vector name="pcoast">
- <sourcefile> mwdbii/PCOAST.PNT </sourcefile>
- <pen color="#555753" />
- <brush color="transparent" />
- </vector>
- <vector name="pdiffborder" feature="borders">
- <sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
- <pen color="#555753" />
- </vector>
- <vector name="pusa48" feature="borders">
- <sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
- <pen color="#555753" />
- </vector>
- <vector name="international dateline" feature="borders">
+ <layer name="naturalearth" backend="geodata">
+ <geodata name="coast">
+ <sourcefile> naturalearth/ne_50m_land.pn2 </sourcefile>
+ <pen color="#555753"/>
+ </geodata>
+ <geodata name="lake" property="waterbodies">
+ <sourcefile> naturalearth/ne_50m_lakes.pn2 </sourcefile>
+ <pen color="#555753"/>
+ </geodata>
+ <geodata name="border" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_boundary_lines_land.pn2 </sourcefile>
+ <pen color="#555753" width="1" />
+ </geodata>
+ <geodata name="breakawaydisputed" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2 </sourcefile>
+ <pen color="#555753" width="1" style="dotline"/>
+ </geodata>
+ <geodata name="international dateline" property="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
- </vector>
- <vector name="rivers" feature="waterbodies">
- <sourcefile> mwdbii/RIVER.PNT </sourcefile>
+ </geodata>
+ <geodata name="rivers" property="waterbodies">
+ <sourcefile> naturalearth/ne_50m_rivers_lake_centerlines.pn2 </sourcefile>
<pen color="#637bff" />
- </vector>
+ </geodata>
</layer>
-
<layer name="standardplaces" backend="geodata">
<geodata name="cityplacemarks">
<sourcefile>cityplacemarks.cache</sourcefile>
diff --git a/data/maps/earth/schagen1689/schagen1689.dgml b/data/maps/earth/schagen1689/schagen1689.dgml
index 4fceb0e..848e4fd 100644
--- a/data/maps/earth/schagen1689/schagen1689.dgml
+++ b/data/maps/earth/schagen1689/schagen1689.dgml
@@ -46,19 +46,16 @@
<blending name="SunLightBlending" />
</texture>
</layer>
-
- <layer name="mwdbii" backend="vector">
- <vector name="pcoast" feature="coastlines">
- <sourcefile> mwdbii/PCOAST.PNT </sourcefile>
- <pen color="#ffff00" />
- <brush color="transparent" />
- </vector>
- <vector name="rivers" feature="waterbodies">
- <sourcefile> mwdbii/RIVER.PNT </sourcefile>
- <pen color="#ffffff" />
- </vector>
+ <layer name="naturalearth" backend="geodata">
+ <geodata name="coast" property="coastlines">
+ <sourcefile> naturalearth/ne_50m_land.pn2 </sourcefile>
+ <pen color="#ffff00" width="1.5"/>
+ </geodata>
+ <geodata name="lake" property="coastlines">
+ <sourcefile> naturalearth/ne_50m_lakes.pn2 </sourcefile>
+ <pen color="#ffff00" width="1.5"/>
+ </geodata>
</layer>
-
<layer name="standardplaces" backend="geodata">
<geodata name="cityplacemarks">
<sourcefile>cityplacemarks.cache</sourcefile>
diff --git a/data/maps/earth/temp-dec/temp-dec.dgml b/data/maps/earth/temp-dec/temp-dec.dgml
index 21f081c..0f87077 100644
--- a/data/maps/earth/temp-dec/temp-dec.dgml
+++ b/data/maps/earth/temp-dec/temp-dec.dgml
@@ -48,31 +48,32 @@
<palette type="land">tempcolors.leg</palette>
</filter>
</layer>
-
- <layer name="mwdbii" backend="vector">
- <vector name="pcoast">
- <sourcefile> mwdbii/PCOAST.PNT </sourcefile>
- <pen color="#555753" />
- <brush color="transparent" />
- </vector>
- <vector name="pdiffborder" feature="borders">
- <sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
- <pen color="#555753" />
- </vector>
- <vector name="pusa48" feature="borders">
- <sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
- <pen color="#555753" />
- </vector>
- <vector name="international dateline" feature="borders">
+ <layer name="naturalearth" backend="geodata">
+ <geodata name="coast">
+ <sourcefile> naturalearth/ne_50m_land.pn2 </sourcefile>
+ <pen color="#555753"/>
+ </geodata>
+ <geodata name="lake" property="waterbodies">
+ <sourcefile> naturalearth/ne_50m_lakes.pn2 </sourcefile>
+ <pen color="#555753"/>
+ </geodata>
+ <geodata name="border" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_boundary_lines_land.pn2 </sourcefile>
+ <pen color="#555753" width="1" />
+ </geodata>
+ <geodata name="breakawaydisputed" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2 </sourcefile>
+ <pen color="#555753" width="1" style="dotline"/>
+ </geodata>
+ <geodata name="international dateline" property="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
- </vector>
- <vector name="rivers" feature="waterbodies">
- <sourcefile> mwdbii/RIVER.PNT </sourcefile>
+ </geodata>
+ <geodata name="rivers" property="waterbodies">
+ <sourcefile> naturalearth/ne_50m_rivers_lake_centerlines.pn2 </sourcefile>
<pen color="#637bff" />
- </vector>
+ </geodata>
</layer>
-
<layer name="standardplaces" backend="geodata">
<geodata name="cityplacemarks">
<sourcefile>cityplacemarks.cache</sourcefile>
diff --git a/data/maps/earth/temp-july/temp-july.dgml b/data/maps/earth/temp-july/temp-july.dgml
index 42caa4f..bc5e209 100644
--- a/data/maps/earth/temp-july/temp-july.dgml
+++ b/data/maps/earth/temp-july/temp-july.dgml
@@ -49,31 +49,32 @@
<palette type="land">tempcolors.leg</palette>
</filter>
</layer>
-
- <layer name="mwdbii" backend="vector">
- <vector name="pcoast">
- <sourcefile> mwdbii/PCOAST.PNT </sourcefile>
- <pen color="#555753" />
- <brush color="transparent" />
- </vector>
- <vector name="pdiffborder" feature="borders">
- <sourcefile> mwdbii/PDIFFBORDER.PNT </sourcefile>
- <pen color="#555753" />
- </vector>
- <vector name="pusa48" feature="borders">
- <sourcefile> mwdbii/PUSA48.DIFF.PNT </sourcefile>
- <pen color="#555753" />
- </vector>
- <vector name="international dateline" feature="borders">
+ <layer name="naturalearth" backend="geodata">
+ <geodata name="coast">
+ <sourcefile> naturalearth/ne_50m_land.pn2 </sourcefile>
+ <pen color="#555753"/>
+ </geodata>
+ <geodata name="lake" property="waterbodies">
+ <sourcefile> naturalearth/ne_50m_lakes.pn2 </sourcefile>
+ <pen color="#555753"/>
+ </geodata>
+ <geodata name="border" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_boundary_lines_land.pn2 </sourcefile>
+ <pen color="#555753" width="1" />
+ </geodata>
+ <geodata name="breakawaydisputed" property="borders">
+ <sourcefile> naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2 </sourcefile>
+ <pen color="#555753" width="1" style="dotline"/>
+ </geodata>
+ <geodata name="international dateline" property="borders">
<sourcefile> mwdbii/DATELINE.PNT </sourcefile>
<pen color="#000000" />
- </vector>
- <vector name="rivers" feature="waterbodies">
- <sourcefile> mwdbii/RIVER.PNT </sourcefile>
+ </geodata>
+ <geodata name="rivers" property="waterbodies">
+ <sourcefile> naturalearth/ne_50m_rivers_lake_centerlines.pn2 </sourcefile>
<pen color="#637bff" />
- </vector>
+ </geodata>
</layer>
-
<layer name="standardplaces" backend="geodata">
<geodata name="cityplacemarks">
<sourcefile>cityplacemarks.cache</sourcefile>