<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/118174/">https://git.reviewboard.kde.org/r/118174/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Marble, Dennis Nienhüser and Torsten Rahn.</div>
<div>By Abhinav Gangwar.</div>
<p style="color: grey;"><i>Updated May 17, 2014, 2:56 a.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The naturalearth.zip contains all pn2 files in new format. Please download these files and then test.</pre>
</td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
marble
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This patch contains the following cahnges:
1. Modified pn2 format, shp runner, pn2 runner and shp2pn2 tool so that we can parse mapcolor field from shapefile and store it in pn2 format.
2. Added support to parse new attribute colorMap in <brush> tag for .dgml files.
3. Modified GeoDataPolyStyle to add one more data member to store this mapcolor( or color index ) value.
4. Changed MarbleModel
4.1 not to parse the same sourcefile again on theme change in case the GeoSceneGeoData objects in two themes differ only by <brush> and
<pen>. Just the assign new style to already parsed file. ( so patch https://git.reviewboard.kde.org/r/117978/ can be ignored ).
4.2 Handle the case when <brush> has colorMap attribute and assign the placemarks appropriate style based on its color index( or mapcolor).
5. Added a new theme file political.dgml.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Works fine on my system.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>data/maps/earth/political/political-preview.png <span style="color: grey">(PRE-CREATION)</span></li>
<li>data/maps/earth/political/political.dgml <span style="color: grey">(PRE-CREATION)</span></li>
<li>data/naturalearth/ne_10m_admin_0_boundary_lines_land.pn2 <span style="color: grey">(7ab70bb)</span></li>
<li>data/naturalearth/ne_10m_rivers_lake_centerlines.pn2 <span style="color: grey">(3ffcf84)</span></li>
<li>data/naturalearth/ne_50m_admin_0_boundary_lines_land.pn2 <span style="color: grey">(25406b0)</span></li>
<li>data/naturalearth/ne_50m_admin_0_boundary_lines_maritime_indicator.pn2 <span style="color: grey">(58f9538)</span></li>
<li>data/naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2 <span style="color: grey">(c1e317b)</span></li>
<li>data/naturalearth/ne_50m_admin_0_countries.pn2 <span style="color: grey">(PRE-CREATION)</span></li>
<li>data/naturalearth/ne_50m_admin_0_pacific_groupings.pn2 <span style="color: grey">(33e2112)</span></li>
<li>data/naturalearth/ne_50m_admin_1_states_provinces_lines.pn2 <span style="color: grey">(637c2ea)</span></li>
<li>data/naturalearth/ne_50m_antarctic_ice_shelves_lines.pn2 <span style="color: grey">(83c859a)</span></li>
<li>data/naturalearth/ne_50m_antarctic_ice_shelves_polys.pn2 <span style="color: grey">(8201bbc)</span></li>
<li>data/naturalearth/ne_50m_coastline.pn2 <span style="color: grey">(91bddc9)</span></li>
<li>data/naturalearth/ne_50m_glaciated_areas.pn2 <span style="color: grey">(1c58348)</span></li>
<li>data/naturalearth/ne_50m_lakes.pn2 <span style="color: grey">(af0859c)</span></li>
<li>data/naturalearth/ne_50m_lakes_historic.pn2 <span style="color: grey">(d5272db)</span></li>
<li>data/naturalearth/ne_50m_land.pn2 <span style="color: grey">(ed343a3)</span></li>
<li>data/naturalearth/ne_50m_playas.pn2 <span style="color: grey">(5eeadc8)</span></li>
<li>data/naturalearth/ne_50m_rivers_lake_centerlines.pn2 <span style="color: grey">(5298ed6)</span></li>
<li>data/naturalearth/ne_50m_urban_areas.pn2 <span style="color: grey">(ad80107)</span></li>
<li>src/lib/marble/MarbleModel.h <span style="color: grey">(3470b0e)</span></li>
<li>src/lib/marble/MarbleModel.cpp <span style="color: grey">(83493c3)</span></li>
<li>src/lib/marble/geodata/data/GeoDataPolyStyle.h <span style="color: grey">(d38e07e)</span></li>
<li>src/lib/marble/geodata/data/GeoDataPolyStyle.cpp <span style="color: grey">(d7377c0)</span></li>
<li>src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.h <span style="color: grey">(9c66830)</span></li>
<li>src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.cpp <span style="color: grey">(b250dc1)</span></li>
<li>src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp <span style="color: grey">(8460c4c)</span></li>
<li>src/lib/marble/geodata/scene/GeoSceneGeodata.h <span style="color: grey">(7c9c462)</span></li>
<li>src/lib/marble/geodata/scene/GeoSceneGeodata.cpp <span style="color: grey">(6bd1885)</span></li>
<li>src/plugins/runner/pn2/Pn2Runner.cpp <span style="color: grey">(877abe1)</span></li>
<li>src/plugins/runner/shp/ShpRunner.cpp <span style="color: grey">(cad23e9)</span></li>
<li>tools/shp2pn2/shp2pn2.cpp <span style="color: grey">(4e0dc7b)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/118174/diff/" style="margin-left: 3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">File Attachments (updated)</h1>
<ul>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2014/05/16/770c3114-66d8-453a-8fd2-123ae36b115f__naturalearth.zip">naturalearth.zip</a></li>
</ul>
</td>
</tr>
</table>
</div>
</body>
</html>