[FOSS-GPS] Re: Integrating osm-gps-map into FoxtrotGPS (was:
Instance-IDs for osm-gps-map's `image' API)
Joshua Judson Rosen
rozzin at geekspace.com
Tue May 25 09:49:16 EDT 2010
Sander van Grieken <sander at 3v8.net> writes:
>
> It was on my wishlist too BTW, these POI class specific icons, but I
> don't want to start with new functionality before my branch gets
> merged to trunk. Can you please consider merging my branch soon?
At the very least, I'd like to work something out with John about the
zoom-decoupling before we convert to osm-gps-map; most of the other
issues that I have with osm-gps-map are things that could be worked
around if we needed to, and they're all things for which I think John
is willing to accept patches into osm-gps-map. We need to resolve
the zoom-decoupling issue, though--I expect that the related menu-items
have been renderered non-functional in your branch, though there are
a couple of other regressions that prevent me from actually seeing
(why is it trying to download maps to the root directory?).
Also:
> Everything is now integrated (so also the friends, POI and photo
> icons), quite a number of pre-existing bugs are fixed too, and the
> few things that are not yet possible with the current osm-gps-map
> (like line-drawing in distance mode) are annotated with TODOs in the
> code. The code has changed much, so any work based on trunk now will
> be difficult to merge later.
You actually have several orthogonal things going on in that branch,
which makes it difficult to merge: the biggest one is that you've
integrated osm-gps-map, but you've also done some redesign of the GUI,
renamed variables, renamed callbacks, moved functions to different
files, and made other stylistic changes to unrelated segments of code.
It looks like there was also an unnecessary merge-conflict created and
resolved unfavourably in at least main.c (there is a regression in the
"--gui=" command-line option, if I merge your branch).
Can you prepare a branch that has just the changes necessary to integrate
osm-gps-map, without superfluous changes like the ones listed above
(including not adding the osm-gps-map dpad & crosshair)?
Some of those changes may be interesting, but we'll approach them
separately.
A huge thank-you doing this work,
-rozzin.
--
"Don't be afraid to ask (λf.((λx.xx) (λr.f(rr))))."
More information about the FOSS-GPS
mailing list