<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Bas Couwenberg pushed to branch upstream
at <a href="https://salsa.debian.org/debian-gis-team/mkgmap-splitter">Debian GIS Project / mkgmap-splitter</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/commit/c57dee64190dce94567cc0b114fadca6af9b452d">c57dee64</a></strong>
<div>
<span>by Bas Couwenberg</span>
<i>at 2021-02-03T05:42:23+01:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">New upstream version 0.0.0+svn598</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#613a488895761df2591e8e8fec4fed4c297b3048">
resources/splitter-version.properties
</a>
</li>
<li class="file-stats">
<a href="#e4ae324ff792557f74293fe3ed53839153e074af">
src/uk/me/parabola/splitter/ProblemLists.java
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="613a488895761df2591e8e8fec4fed4c297b3048">
<a href="https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/commit/c57dee64190dce94567cc0b114fadca6af9b452d#613a488895761df2591e8e8fec4fed4c297b3048"><strong>resources/splitter-version.properties</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="1" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
1
</td>
<td class="diff-line-num new_line old" data-linenumber="1" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC1" class="line" lang="properties"><span class="py">svn.version</span><span class="p">:</span> <span class="s" style="color: #d14;">59<span class="idiff left right">7</span></span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="2" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
2
</td>
<td class="diff-line-num new_line old" data-linenumber="1" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC2" class="line" lang="properties"><span class="py">build.timestamp</span><span class="p">:</span> <span class="s" style="color: #d14;">202<span class="idiff left right">0-01-30T14:10:4</span>7+0000</span></span></pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="3" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
1
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1" class="line" lang="properties"><span class="py">svn.version</span><span class="p">:</span> <span class="s" style="color: #d14;">59<span class="idiff left right">8</span></span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="3" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="2" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
2
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC2" class="line" lang="properties"><span class="py">build.timestamp</span><span class="p">:</span> <span class="s" style="color: #d14;">202<span class="idiff left right">1-02-02T15:27:2</span>7+0000</span></span></pre>
</td>
</tr>
</table>
<br>
</li>
<li id="e4ae324ff792557f74293fe3ed53839153e074af">
<a href="https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/commit/c57dee64190dce94567cc0b114fadca6af9b452d#e4ae324ff792557f74293fe3ed53839153e074af"><strong>src/uk/me/parabola/splitter/ProblemLists.java</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="53" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="53" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -53,7 +53,7 @@ public class ProblemLists {</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="53" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
53
</td>
<td class="diff-line-num new_line" data-linenumber="53" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
53
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC53" class="line" lang="java"> <span class="kt" style="color: #458; font-weight: 600;">long</span> <span class="n" style="color: #333;">startProblemListGenerator</span> <span class="o" style="font-weight: 600;">=</span> <span class="nc" style="color: #458; font-weight: 600;">System</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">currentTimeMillis</span><span class="o" style="font-weight: 600;">();</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="54" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
54
</td>
<td class="diff-line-num new_line" data-linenumber="54" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
54
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC54" class="line" lang="java"> <span class="nc" style="color: #458; font-weight: 600;">ArrayList</span><span class="o" style="font-weight: 600;"><</span><span class="nc" style="color: #458; font-weight: 600;">Area</span><span class="o" style="font-weight: 600;">></span> <span class="n" style="color: #333;">distinctAreas</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">getNonOverlappingAreas</span><span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">realAreas</span><span class="o" style="font-weight: 600;">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="55" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
55
</td>
<td class="diff-line-num new_line" data-linenumber="55" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
55
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC55" class="line" lang="java"> <span class="k" style="font-weight: 600;">if</span> <span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">distinctAreas</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">size</span><span class="o" style="font-weight: 600;">()</span> <span class="o" style="font-weight: 600;">></span> <span class="n" style="color: #333;">realAreas</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">size</span><span class="o" style="font-weight: 600;">())</span> <span class="o" style="font-weight: 600;">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="56" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
56
</td>
<td class="diff-line-num new_line old" data-linenumber="56" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC56" class="line" lang="java"> <span class="nc" style="color: #458; font-weight: 600;">System</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">err</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">println</span><span class="o" style="font-weight: 600;">(</span><span class="s" style="color: #d14;">"Waring: The areas given in --split-file are overlapping."</span><span class="o" style="font-weight: 600;">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="57" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="56" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
56
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC56" class="line" lang="java"> <span class="nc" style="color: #458; font-weight: 600;">System</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">err</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">println</span><span class="o" style="font-weight: 600;">(</span><span class="s" style="color: #d14;">"War<span class="idiff left right">n</span>ing: The areas given in --split-file are overlapping."</span><span class="o" style="font-weight: 600;">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="57" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
57
</td>
<td class="diff-line-num new_line" data-linenumber="57" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
57
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC57" class="line" lang="java"> <span class="nc" style="color: #458; font-weight: 600;">Set</span><span class="o" style="font-weight: 600;"><</span><span class="nc" style="color: #458; font-weight: 600;">Integer</span><span class="o" style="font-weight: 600;">></span> <span class="n" style="color: #333;">overlappingTiles</span> <span class="o" style="font-weight: 600;">=</span> <span class="k" style="font-weight: 600;">new</span> <span class="nc" style="color: #458; font-weight: 600;">TreeSet</span><span class="o" style="font-weight: 600;"><>();</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="58" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
58
</td>
<td class="diff-line-num new_line" data-linenumber="58" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
58
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC58" class="line" lang="java"> <span class="k" style="font-weight: 600;">for</span> <span class="o" style="font-weight: 600;">(</span><span class="kt" style="color: #458; font-weight: 600;">int</span> <span class="n" style="color: #333;">i</span> <span class="o" style="font-weight: 600;">=</span> <span class="mi" style="color: #099;">0</span><span class="o" style="font-weight: 600;">;</span> <span class="n" style="color: #333;">i</span> <span class="o" style="font-weight: 600;"><</span> <span class="n" style="color: #333;">realAreas</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">size</span><span class="o" style="font-weight: 600;">();</span> <span class="n" style="color: #333;">i</span><span class="o" style="font-weight: 600;">++)</span> <span class="o" style="font-weight: 600;">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="59" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
59
</td>
<td class="diff-line-num new_line" data-linenumber="59" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
59
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC59" class="line" lang="java"> <span class="nc" style="color: #458; font-weight: 600;">Area</span> <span class="n" style="color: #333;">a1</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">realAreas</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">get</span><span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">i</span><span class="o" style="font-weight: 600;">);</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #666;">
—
<br>
<a href="https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/commit/c57dee64190dce94567cc0b114fadca6af9b452d">View it on GitLab</a>.
<br>
You're receiving this email because of your account on salsa.debian.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/commit/c57dee64190dce94567cc0b114fadca6af9b452d"}}</script>
</p>
</div>
</body>
</html>