[Merkaartor] [PATCH 0/2] gpsd and Layer::get()

[David Favro]

Hi, here are a couple of patches for basic bug-fixes.

The first allows merkaartor to compile and work with the latest (development)
gpsd, which will keep it from breaking when it is released; the second fixes a
bug in Layer that manifests during load of .mdc files, perhaps elsewhere as
well.

Interestingly, to get the new version of libgps working with merkaartor, I had
to send some patches upstream to them (those have already been merged, so this
patch works with their current head).  See
http://permalink.gmane.org/gmane.comp.hardware.gps.gpsd.devel/7700 .

I am aware that the preferred method to submit patches to this project is to
create a merge request in gitorious, and I will do so if you insist, but I
wonder if it's too much trouble to just pull from my public git repo at
git://git.meta-dynamic.com/merkaartor.git ?  This is a repo that I set up
specifically for this purpose, it doesn't contain my dev branches but just a
"for-upstream" branch that contains the changes that I would like you to merge.
Alternatively I can send patches to the mailing-list (as I have here), or even
use gitorious, but what is the advantage of gitorious?  My only objection is to
their terms of service, which seem a little asymmetric in forcing me to
indemnify them while they do not indemnify me.

I tried to keep the code relatively consistent with the style of the surrounding
code.

Sorry that I haven't used the bug-tracking system or mailing-list but with these
kind of bugs, the whole work is in figuring out what's wrong -- at that point,
the fix itself is often not difficult.  As a coder (and a user who wants to get
back to mapping), I would prefer to just fix it.

That said, I've got some other patches nearly ready that are a little more like
functionality changes, so maybe I should get something out there for discussion
on those.

Am I correct in assuming that the current status is 0.16 is stable, 0.17 is
feature-frozen, and 0.18 is development?  If so, wouldn't it make sense to make
some more branches on the repo, like maybe a "devel" branch for new features
(i.e. 0.18), then 0.17 fixes would go into master; or alternatively create a
0.17 branch for the translations and bug-fixes for the release, and then
new-feature development would go onto master.

Cheers,
David Favro