[osm-gps-map] 66/153: Imported Upstream version 0.7.1
Ross Gammon
ross-guest at moszumanska.debian.org
Tue May 13 19:59:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
ross-guest pushed a commit to branch master
in repository osm-gps-map.
commit 9e418077036d1af9c87c57fcec7c8c3597f98b19
Author: David Paleino <dapal at debian.org>
Date: Fri Jun 25 07:21:15 2010 +0200
Imported Upstream version 0.7.1
---
.gitignore | 2 -
ChangeLog | 0
NEWS | 6 +
configure.ac | 4 +-
examples/Makefile.am | 2 +-
examples/mapviewer.c | 17 +-
examples/mapviewer.js | 16 +-
examples/mapviewer.py | 7 +-
python/COPYING | 675 ++++++++++++++++++++++++++++++++-
python/README | 24 +-
python/configure.ac | 4 +-
python/osmgpsmap.defs | 6 +-
python/osmgpsmap.override | 4 +-
python/setup.py | 2 +-
src/Makefile.am | 6 +-
src/converter.c | 2 +-
src/osd-utils.c | 2 -
src/osm-gps-map-source.c | 4 +-
src/osm-gps-map-track.c | 7 +-
src/osm-gps-map-track.h | 2 +-
src/osm-gps-map-widget.c | 130 ++++++-
src/{osm-gps-map-types.h => private.h} | 10 +-
22 files changed, 847 insertions(+), 85 deletions(-)
diff --git a/.gitignore b/.gitignore
index d1b5eb8..be4196d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,6 @@ libtool
ltmain.sh
missing
osmgpsmap.pc
-python/COPYING
-python/INSTALL
python/autom4te.cache/
python/build/
python/configure
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
diff --git a/NEWS b/NEWS
index 47c2135..1ebbf02 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Changes in 0.7.1
+======================
+ * Don't install mapviewer binary
+ * Bug fixes
+ * Doc updates
+
Changes in 0.7.0
======================
* Map auto center threshold is now adjustable via the auto-center-threshold
diff --git a/configure.ac b/configure.ac
index b79955c..8eda90e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.62])
AC_INIT([osm-gps-map],
- [0.7.0],
+ [0.7.1],
[http://github.com/nzjrs/osm-gps-map/issues],
[osm-gps-map])
AM_INIT_AUTOMAKE([1.10])
@@ -48,7 +48,7 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
# - If binary compatibility has been broken (eg removed or changed interfaces)
# change to C+1:0:0
# - If the interface is the same as the previous version, change to C:R+1:A
-LT_VERSION_INFO=2:0:0
+LT_VERSION_INFO=2:1:0
AC_SUBST(LT_VERSION_INFO)
GTK_DOC_CHECK([1.12])
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5fc0bf5..919c25f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -15,7 +15,7 @@ OSMGPSMAP_LIBS = \
$(SOUP24_LIBS)
## Demo Application
-bin_PROGRAMS = mapviewer
+noinst_PROGRAMS = mapviewer
mapviewer_SOURCES = \
mapviewer.c
diff --git a/examples/mapviewer.c b/examples/mapviewer.c
index fe4c80c..f615eaa 100644
--- a/examples/mapviewer.c
+++ b/examples/mapviewer.c
@@ -26,13 +26,13 @@
#include "osm-gps-map.h"
static OsmGpsMapSource_t opt_map_provider = OSM_GPS_MAP_SOURCE_OPENSTREETMAP;
-static gboolean opt_default_cache = FALSE;
+static gboolean opt_friendly_cache = FALSE;
static gboolean opt_no_cache = FALSE;
static gboolean opt_debug = FALSE;
static char *opt_cache_base_dir = NULL;
static GOptionEntry entries[] =
{
- { "default-cache", 'D', 0, G_OPTION_ARG_NONE, &opt_default_cache, "Store maps using default cache style (md5)", NULL },
+ { "friendly-cache", 'f', 0, G_OPTION_ARG_NONE, &opt_friendly_cache, "Store maps using friendly cache style (source name)", NULL },
{ "no-cache", 'n', 0, G_OPTION_ARG_NONE, &opt_no_cache, "Disable cache", NULL },
{ "cache-basedir", 'b', 0, G_OPTION_ARG_FILENAME, &opt_cache_base_dir, "Cache basedir", NULL },
{ "debug", 'd', 0, G_OPTION_ARG_NONE, &opt_debug, "Enable debugging", NULL },
@@ -71,8 +71,7 @@ on_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_d
g_random_double_range(0,360));
}
if (event->button == 3) {
- OsmGpsMapPoint *pt = g_boxed_copy(OSM_TYPE_GPS_MAP_POINT, &coord);
- osm_gps_map_track_add_point(othertrack, pt);
+ osm_gps_map_track_add_point(othertrack, &coord);
}
}
@@ -229,7 +228,6 @@ main (int argc, char **argv)
OsmGpsMapLayer *osd;
OsmGpsMapTrack *rightclicktrack;
const char *repo_uri;
- const char *friendly_name;
char *cachedir, *cachebasedir;
GError *error = NULL;
GOptionContext *context;
@@ -254,25 +252,24 @@ main (int argc, char **argv)
return 2;
}
- friendly_name = osm_gps_map_source_get_friendly_name(opt_map_provider);
cachebasedir = osm_gps_map_get_default_cache_directory();
if (opt_cache_base_dir && g_file_test(opt_cache_base_dir, G_FILE_TEST_IS_DIR)) {
cachedir = g_strdup(OSM_GPS_MAP_CACHE_AUTO);
cachebasedir = g_strdup(opt_cache_base_dir);
- } else if (opt_default_cache) {
- cachedir = g_strdup(OSM_GPS_MAP_CACHE_AUTO);
+ } else if (opt_friendly_cache) {
+ cachedir = g_strdup(OSM_GPS_MAP_CACHE_FRIENDLY);
} else if (opt_no_cache) {
cachedir = g_strdup(OSM_GPS_MAP_CACHE_DISABLED);
} else {
- cachedir = g_build_filename(cachebasedir,friendly_name,NULL);
+ cachedir = g_strdup(OSM_GPS_MAP_CACHE_AUTO);
}
if (opt_debug)
gdk_window_set_debug_updates(TRUE);
g_debug("Map Cache Dir: %s", cachedir);
- g_debug("Map Provider: %s (%d)", friendly_name, opt_map_provider);
+ g_debug("Map Provider: %s (%d)", osm_gps_map_source_get_friendly_name(opt_map_provider), opt_map_provider);
map = g_object_new (OSM_TYPE_GPS_MAP,
"map-source",opt_map_provider,
diff --git a/examples/mapviewer.js b/examples/mapviewer.js
index 3ee688b..71958b4 100755
--- a/examples/mapviewer.js
+++ b/examples/mapviewer.js
@@ -1,5 +1,9 @@
#!/usr/bin/seed
+// You probbably need to tell GObject introspection where to find the bindings
+// export LD_LIBRARY_PATH=../src/.libs/
+// export GI_TYPELIB_PATH=../src/
+
const Gtk = imports.gi.Gtk;
const Osm = imports.gi.OsmGpsMap;
@@ -9,11 +13,13 @@ var win = new Gtk.Window({ type: Gtk.WindowType.TOPLEVEL });
win.set_border_width(10);
win.set_default_size(400,400);
-// Fuck you GNOME
-// GJS makes me do this
-//win.connect("delete-event", Gtk.main_quit);
-// Seed makes me do this
-win.signal.delete_event.connect(Gtk.main_quit);
+// ARRRGGGHHHHH GNOME
+if (0)
+ // GJS makes me do this
+ win.connect("delete-event", Gtk.main_quit);
+else
+ // Seed makes me do this
+ win.signal.delete_event.connect(Gtk.main_quit);
var map = new Osm.OsmGpsMap()
var osd = new Osm.Osd()
diff --git a/examples/mapviewer.py b/examples/mapviewer.py
index ecfea18..24110b6 100755
--- a/examples/mapviewer.py
+++ b/examples/mapviewer.py
@@ -176,7 +176,6 @@ Enter an repository URL to fetch map tiles from in the box below. Special metach
repo_uri=uri,
image_format=format
)
- self.osm.connect('button_release_event', self.map_clicked)
except Exception, e:
print "ERROR:", e
self.osm = osm.GpsMap()
@@ -208,6 +207,7 @@ Enter an repository URL to fetch map tiles from in the box below. Special metach
)
def map_clicked(self, osm, event):
+ lat,lon = self.osm.get_event_location(event).get_degrees()
if event.button == 1:
self.latlon_entry.set_text(
'Map Centre: latitude %s longitude %s' % (
@@ -216,9 +216,10 @@ Enter an repository URL to fetch map tiles from in the box below. Special metach
)
)
elif event.button == 2:
- p = self.osm.get_event_location(event)
- lat,lon = p.get_degrees()
self.osm.gps_add(lat, lon, heading=osmgpsmap.INVALID);
+ elif event.button == 3:
+ pb = gtk.gdk.pixbuf_new_from_file_at_size ("poi.png", 24,24)
+ self.osm.image_add(lat,lon,pb)
if __name__ == "__main__":
u = UI()
diff --git a/python/COPYING b/python/COPYING
deleted file mode 120000
index 6168a39..0000000
--- a/python/COPYING
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.11/COPYING
\ No newline at end of file
diff --git a/python/COPYING b/python/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/python/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/python/README b/python/README
index 4959c7b..38c1c20 100644
--- a/python/README
+++ b/python/README
@@ -1,23 +1 @@
-How to Build Windows Installers
-0) Make sure that mingw32 is selected as the compiler. Create (or edit) a .cfg file for distutils (distutils.cfg)
-
- eg: C:\Python25\Lib\distutils\distutils.cfg with this content:
-
- [build]
- compiler=mingw32
-
-
-1) Make sure Python is in path
-
- $ echo $PATH
- .:/usr/local/bin:/mingw/bin:/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/Program Files/Altium Designer 6/System:/c/Program Files/TortoiseSVN/bin:/c/gtk/bin:/c/Python25
-
-2) Make sure the pygobject/pygtk headers and libs can be found
-
- $ export PKG_CONFIG_PATH=/c/Python25/Lib/pkgconfig/
- $ pkg-config.exe --libs pygobject-2.0
- @FFI_LIBS@ -Lc:/Python25/lib -Lc:/gtk/lib -lgobject-2.0 -lglib-2.0 -lint
-
-3) Build the windows installer
-
- $ python setup.py bdist_wininst
+Python bindings for osm-gps-map
diff --git a/python/configure.ac b/python/configure.ac
index e55c7d7..fc4d345 100644
--- a/python/configure.ac
+++ b/python/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.62])
AC_INIT([python-osmgpsmap],
- [0.7.0],
+ [0.7.1],
[http://github.com/nzjrs/osm-gps-map/issues],
[python-osmgpsmap])
AM_INIT_AUTOMAKE([1.10])
@@ -54,7 +54,7 @@ if test -f ../src/libosmgpsmap.la; then
OSMGPSMAP_CFLAGS="-I\$(top_srcdir)/../src/"
OSMGPSMAP_LIBS="\$(top_builddir)/../src/libosmgpsmap.la"
else
- PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap = 0.7.0)
+ PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap = 0.7.1)
fi
AC_OUTPUT([Makefile])
diff --git a/python/osmgpsmap.defs b/python/osmgpsmap.defs
index 989fdb3..4ffc4a2 100644
--- a/python/osmgpsmap.defs
+++ b/python/osmgpsmap.defs
@@ -285,7 +285,6 @@
(of-object "OsmGpsMap")
(c-name "osm_gps_map_image_add")
(return-type "OsmGpsMapImage*")
- (caller-owns-return #t)
(parameters
'("float" "latitude")
'("float" "longitude")
@@ -297,7 +296,6 @@
(of-object "OsmGpsMap")
(c-name "osm_gps_map_image_add_with_alignment")
(return-type "OsmGpsMapImage*")
- (caller-owns-return #t)
(parameters
'("float" "latitude")
'("float" "longitude")
@@ -501,7 +499,7 @@
(c-name "osm_gps_map_track_add_point")
(return-type "none")
(parameters
- '("OsmGpsMapPoint*" "point")
+ '("const-OsmGpsMapPoint*" "point")
)
)
@@ -631,7 +629,7 @@
)
)
-(define-function osm_gps_map_source_is_valid
+(define-function source_is_valid
(c-name "osm_gps_map_source_is_valid")
(return-type "gboolean")
(parameters
diff --git a/python/osmgpsmap.override b/python/osmgpsmap.override
index 65a9e3f..6840373 100644
--- a/python/osmgpsmap.override
+++ b/python/osmgpsmap.override
@@ -87,12 +87,12 @@ override osm_gps_map_convert_geographic_to_screen
static PyObject *
_wrap_osm_gps_map_convert_geographic_to_screen(PyGObject *self, PyObject *args, PyObject *kwargs)
{
- static char *kwlist[] = { "pt", "pixel_x", "pixel_y", NULL };
+ static char *kwlist[] = { "pt", NULL };
int pixel_x, pixel_y;
PyObject *py_pt;
OsmGpsMapPoint *pt = NULL;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"Oii:Osm.GpsMap.convert_geographic_to_screen", kwlist, &py_pt, &pixel_x, &pixel_y))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:Osm.GpsMap.convert_geographic_to_screen", kwlist, &py_pt))
return NULL;
if (pyg_boxed_check(py_pt, OSM_TYPE_GPS_MAP_POINT))
pt = pyg_boxed_get(py_pt, OsmGpsMapPoint);
diff --git a/python/setup.py b/python/setup.py
index 438aa48..d0efba1 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -17,7 +17,7 @@ def get_lib_dirs(pkg):
def get_libs(pkg):
return pkg_config_parse(pkg,'--libs-only-l')
-VERSION = "0.7.0"
+VERSION = "0.7.1"
_osmgpsmap = Extension(name = 'osmgpsmap',
sources= ['osmgpsmapmodule.c','osmgpsmap.c'],
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c6f465..370aee5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ libosmgpsmap_la_LIBADD = \
sources_private_h = \
converter.h \
osd-utils.h \
- osm-gps-map-types.h
+ private.h
sources_public_h = \
osm-gps-map.h \
@@ -89,10 +89,10 @@ OsmGpsMap_1_0_gir_FILES = $(introspection_sources)
INTROSPECTION_GIRS += OsmGpsMap-1.0.gir
girdir = $(datadir)/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
+gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
diff --git a/src/converter.c b/src/converter.c
index 6c14772..97a442b 100644
--- a/src/converter.c
+++ b/src/converter.c
@@ -21,7 +21,7 @@
#include <math.h>
#include <stdio.h>
-#include "osm-gps-map-types.h"
+#include "private.h"
#include "converter.h"
diff --git a/src/osd-utils.c b/src/osd-utils.c
index 7a083bf..ec54445 100644
--- a/src/osd-utils.c
+++ b/src/osd-utils.c
@@ -328,8 +328,6 @@ osd_check_zoom(gint x, gint y, guint w, guint h, guint gps_w) {
if( x > 0 && x < w && y > 0 && y < h) {
gint r = h/2; /* radius of curved ends of zoom pad */
- g_warning("IN ZOOM: x:%d y:%d r:%d", x, y, r);
-
/* within circle around (-) label */
if( osm_gps_map_in_circle(x, y, r, r, r))
return OSD_OUT;
diff --git a/src/osm-gps-map-source.c b/src/osm-gps-map-source.c
index dacc024..d40a8b4 100644
--- a/src/osm-gps-map-source.c
+++ b/src/osm-gps-map-source.c
@@ -1,5 +1,5 @@
+#include "private.h"
#include "osm-gps-map-source.h"
-#include "osm-gps-map-types.h"
const char*
osm_gps_map_source_get_friendly_name(OsmGpsMapSource_t source)
@@ -79,7 +79,7 @@ osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
return "http://mt#R.google.com/vt/lyrs=h@126&hl=en&x=#X&s=&y=#Y&z=#Z";
case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
- return "http://khm#R.google.com/kh/v=61&x=#X&y=#Y&z=#Z";
+ return "http://khm#R.google.com/kh/v=63&x=#X&y=#Y&z=#Z";
case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
return "http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";
case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
diff --git a/src/osm-gps-map-track.c b/src/osm-gps-map-track.c
index 74a642e..24de92c 100644
--- a/src/osm-gps-map-track.c
+++ b/src/osm-gps-map-track.c
@@ -207,13 +207,14 @@ osm_gps_map_track_init (OsmGpsMapTrack *self)
}
void
-osm_gps_map_track_add_point (OsmGpsMapTrack *track, OsmGpsMapPoint *point)
+osm_gps_map_track_add_point (OsmGpsMapTrack *track, const OsmGpsMapPoint *point)
{
g_return_if_fail (OSM_IS_GPS_MAP_TRACK (track));
OsmGpsMapTrackPrivate *priv = track->priv;
- priv->track = g_slist_append (priv->track, point);
- g_signal_emit (track, signals[POINT_ADDED], 0, point);
+ OsmGpsMapPoint *p = g_boxed_copy (OSM_TYPE_GPS_MAP_POINT, point);
+ priv->track = g_slist_append (priv->track, p);
+ g_signal_emit (track, signals[POINT_ADDED], 0, p);
}
GSList *
diff --git a/src/osm-gps-map-track.h b/src/osm-gps-map-track.h
index b31645f..4ee36a0 100644
--- a/src/osm-gps-map-track.h
+++ b/src/osm-gps-map-track.h
@@ -37,7 +37,7 @@ struct _OsmGpsMapTrackClass
GType osm_gps_map_track_get_type (void) G_GNUC_CONST;
OsmGpsMapTrack * osm_gps_map_track_new (void);
-void osm_gps_map_track_add_point (OsmGpsMapTrack *track, OsmGpsMapPoint *point);
+void osm_gps_map_track_add_point (OsmGpsMapTrack *track, const OsmGpsMapPoint *point);
GSList * osm_gps_map_track_get_points (OsmGpsMapTrack *track);
void osm_gps_map_track_get_color (OsmGpsMapTrack *track, GdkColor *color);
diff --git a/src/osm-gps-map-widget.c b/src/osm-gps-map-widget.c
index f88147f..6d294bc 100644
--- a/src/osm-gps-map-widget.c
+++ b/src/osm-gps-map-widget.c
@@ -22,6 +22,103 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * SECTION:osm-gps-map
+ * @short_description: map display widget
+ * @stability: Stable
+ * @include: osm-gps-map.h
+ *
+ * #OsmGpsMap is a widget for displaying a map, optionally overlaid with a
+ * track(s) of GPS co-ordinates, images, points of interest or on screen display
+ * controls. #OsmGpsMap downloads (and caches for offline use) map data from a
+ * number of websites, including
+ * <ulink url="http://www.openstreetmap.org"><citetitle>OpenStreetMap</citetitle></ulink>
+ *
+ * <example>
+ * <title>Showing a map</title>
+ * <programlisting>
+ * int main (int argc, char **argv)
+ * {
+ * g_thread_init(NULL);
+ * gtk_init (&argc, &argv);
+ *
+ * GtkWidget *map = osm_gps_map_new ();
+ * GtkWidget *w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ * gtk_container_add (GTK_CONTAINER(w), map);
+ * gtk_widget_show_all (w);
+ *
+ * gtk_main ();
+ * return 0;
+ * }
+ * </programlisting>
+ * </example>
+ *
+ * #OsmGpsMap allows great flexibility in customizing how the map tiles are
+ * cached, see #OsmGpsMap:tile-cache-base and #OsmGpsMap:tile-cache for more
+ * information.
+ *
+ * A number of different map sources are supported, see #OsmGpsMapSource_t. The
+ * default source, %OSM_GPS_MAP_SOURCE_OPENSTREETMAP always works. Other sources,
+ * particular those from proprietary providers may work occasionally, and then
+ * cease to work. To check if a source is supported for the given version of
+ * this library, call osm_gps_map_source_is_valid().
+ *
+ * <example>
+ * <title>Map with custom source and cache dir</title>
+ * <programlisting>
+ * int main (int argc, char **argv)
+ * {
+ * g_thread_init(NULL);
+ * gtk_init (&argc, &argv);
+ * OsmGpsMapSource_t source = OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE;
+ *
+ * if ( !osm_gps_map_source_is_valid(source) )
+ * return 1;
+ *
+ * GtkWidget *map = g_object_new (OSM_TYPE_GPS_MAP,
+ * "map-source", source,
+ * "tile-cache", "/tmp/",
+ * NULL);
+ * GtkWidget *w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ * gtk_container_add (GTK_CONTAINER(w), map);
+ * gtk_widget_show_all (w);
+ *
+ * gtk_main ();
+ * return 0;
+ * }
+ * </programlisting>
+ * </example>
+ *
+ * Finally, if you wish to use a custom map source not supported by #OsmGpsMap,
+ * such as a custom map created with
+ * <ulink url="http://www.cloudmade.com"><citetitle>CloudMade</citetitle></ulink>
+ * then you can also pass a specially formatted string to #OsmGpsMap:repo-uri.
+ *
+ * <example>
+ * <title>Map using custom CloudMade map and on screen display</title>
+ * <programlisting>
+ * int main (int argc, char **argv)
+ * {
+ * g_thread_init(NULL);
+ * gtk_init (&argc, &argv);
+ * const gchar *cloudmate = "http://a.tile.cloudmade.com/YOUR_API_KEY/1/256/#Z/#X/#Y.png";
+ *
+ * GtkWidget *map = g_object_new (OSM_TYPE_GPS_MAP,
+ * "repo-uri", cloudmate,
+ * NULL);
+ * OsmGpsMapOsd *osd = osm_gps_map_osd_new ();
+ * GtkWidget *w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ * osm_gps_map_layer_add (OSM_GPS_MAP(map), OSM_GPS_MAP_LAYER(osd));
+ * gtk_container_add (GTK_CONTAINER(w), map);
+ * gtk_widget_show_all (w);
+ *
+ * gtk_main ();
+ * return 0;
+ * }
+ * </programlisting>
+ * </example>
+ **/
+
#include "config.h"
#include <fcntl.h>
@@ -39,8 +136,8 @@
#include <cairo.h>
#include "converter.h"
+#include "private.h"
#include "osm-gps-map-source.h"
-#include "osm-gps-map-types.h"
#include "osm-gps-map-widget.h"
#include "osm-gps-map-compat.h"
@@ -151,8 +248,6 @@ struct _OsmGpsMapPrivate
guint is_google : 1;
};
-#define OSM_GPS_MAP_PRIVATE(o) (OSM_GPS_MAP (o)->priv)
-
typedef struct
{
GdkPixbuf *pixbuf;
@@ -1145,6 +1240,10 @@ osm_gps_map_map_redraw (OsmGpsMap *map)
priv->idle_map_redraw = 0;
+ /* dont't redraw if we have not been shown yet */
+ if (!priv->pixmap)
+ return FALSE;
+
/* don't redraw the entire map while the OSD is doing */
/* some animation or the like. This is to keep the animation */
/* fluid */
@@ -1221,7 +1320,7 @@ static void
center_coord_update(OsmGpsMap *map) {
GtkWidget *widget = GTK_WIDGET(map);
- OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(map);
+ OsmGpsMapPrivate *priv = map->priv;
GtkAllocation allocation;
gtk_widget_get_allocation(widget, &allocation);
@@ -1859,7 +1958,7 @@ static gboolean
osm_gps_map_button_release (GtkWidget *widget, GdkEventButton *event)
{
OsmGpsMap *map = OSM_GPS_MAP(widget);
- OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
+ OsmGpsMapPrivate *priv = map->priv;
if(!priv->is_button_down)
return FALSE;
@@ -1903,7 +2002,8 @@ osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion *event)
{
int x, y;
GdkModifierType state;
- OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
+ OsmGpsMap *map = OSM_GPS_MAP(widget);
+ OsmGpsMapPrivate *priv = map->priv;
if(!priv->is_button_down)
return FALSE;
@@ -1953,8 +2053,9 @@ static gboolean
osm_gps_map_configure (GtkWidget *widget, GdkEventConfigure *event)
{
GtkAllocation allocation;
- OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
GdkWindow *window;
+ OsmGpsMap *map = OSM_GPS_MAP(widget);
+ OsmGpsMapPrivate *priv = map->priv;
/* create pixmap */
if (priv->pixmap)
@@ -2289,7 +2390,14 @@ osm_gps_map_class_init (OsmGpsMapClass *klass)
* the map with #OsmGpsMap:tile-cache set to #OSM_GPS_MAP_CACHE_AUTO or
* #OSM_GPS_MAP_CACHE_FRIENDLY
*
- * The string is interpreted as a local path, i.e. /path/to/cache
+ * The string is interpreted as a local path, i.e. /path/to/cache. If NULL
+ * is supplied, map tiles are cached starting in the users cache directory,
+ * (as outlined in the
+ * <ulink url="http://www.freedesktop.org/wiki/Specifications/basedir-spec">
+ * <citetitle>XDG Base Directory Specification</citetitle></ulink>). To get the
+ * base directory where map tiles will be cached call
+ * osm_gps_map_get_default_cache_directory()
+ *
**/
g_object_class_install_property (object_class,
PROP_TILE_CACHE_BASE_DIR,
@@ -2874,7 +2982,6 @@ osm_gps_map_gps_get_track (OsmGpsMap *map)
void
osm_gps_map_gps_add (OsmGpsMap *map, float latitude, float longitude, float heading)
{
- OsmGpsMapPoint *point;
OsmGpsMapPrivate *priv;
g_return_if_fail (OSM_IS_GPS_MAP (map));
@@ -2888,9 +2995,10 @@ osm_gps_map_gps_add (OsmGpsMap *map, float latitude, float longitude, float head
/* If trip marker add to list of gps points */
if (priv->trip_history_record_enabled) {
- point = osm_gps_map_point_new_degrees(latitude, longitude);
+ OsmGpsMapPoint point;
+ osm_gps_map_point_set_degrees (&point, latitude, longitude);
/* this will cause a redraw to be scheduled */
- osm_gps_map_track_add_point (priv->gps_track, point);
+ osm_gps_map_track_add_point (priv->gps_track, &point);
} else {
osm_gps_map_map_redraw_idle (map);
maybe_autocenter_map (map);
diff --git a/src/osm-gps-map-types.h b/src/private.h
similarity index 94%
rename from src/osm-gps-map-types.h
rename to src/private.h
index a9b13a3..49e25e3 100644
--- a/src/osm-gps-map-types.h
+++ b/src/private.h
@@ -1,7 +1,5 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
-/* vim:set et sw=4 ts=4 cino=t0,(0: */
/*
- * osm-gps-map-types.h
+ * private.h
* Copyright (C) Marcus Bauer 2008 <marcus.bauer at gmail.com>
* Copyright (C) John Stowers 2009 <john.stowers at gmail.com>
*
@@ -21,8 +19,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _OSM_GPS_MAP_TYPES_H_
-#define _OSM_GPS_MAP_TYPES_H_
+#ifndef _PRIVATE_H_
+#define _PRIVATE_H_
#include <glib.h>
#include <gdk/gdk.h>
@@ -97,4 +95,4 @@ int g_strcmp0(const char *str1, const char *str2)
#define gtk_widget_set_window(widget, _window) ((widget)->window = _window)
#endif /* GTK+ < 2.18.0 */
-#endif /* _OSM_GPS_MAP_TYPES_H_ */
+#endif /* _PRIVATE_H_ */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-gps-map.git
More information about the Pkg-grass-devel
mailing list