Commit 271c7221 authored by Bernd Zeimetz's avatar Bernd Zeimetz

Imported Upstream version 1.1

parent 96e56c75
This diff is collapsed.
......@@ -38,8 +38,8 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/viking.spec.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
TODO config.guess config.rpath config.sub depcomp install-sh \
missing mkinstalldirs
TODO config.guess config.sub depcomp install-sh missing \
mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/expat.m4 \
$(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/libcurl.m4 \
......@@ -149,7 +149,6 @@ DATADIRNAME = @DATADIRNAME@
DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper
......@@ -205,6 +204,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
......
Viking 1.1 (2011-02-08)
New features since 1.0
* [DOC] Add MapQuest Nominating search service in examples
* Adjust colour of last auto track colour to not clash with default create track colour.
* Add menu icons for the maps layer menu.
* Make the selection list in Merge With Other Tracks sorted alphabetically.
* Add sort list by name function. Will be useful for track and waypoint list ordering.
* [DOC] Mark ready for 1.1 release. Update help manual version to 0.2.
* [DOC] Add layer information for Aggregates, Coords and GeoRefs in help.
* [DOC] Add Maps layer help information.
* [DOC] Add overall layer information and promote each layer to be a top level section in help.
* [DOC] Add DEM layer help information.
* [DOC] Mention waypoint properties in help information.
* [DOC] Update GPS layer help information.
* [DOC] Update track operations help information.
* [DOC] Update waypoint operations help information.
* [DOC] Update Tools help section
* [DOC] Update TrackWaypoint layer menu help Information
* Improve positioning of the menu separator on waypoint menus.
* Add GeoRef layer tooltip to show the file name in use.
* Add GPS Layer tooltip to say the protocol (aka device manufacturer) type.
* TrackWaypoint Layer tooltip featuring summaries for tracks and waypoints.
* Add maps layer tooltip to show the map name(type).
* Add DEM layer tooltip to show the number of DEM files in use.
* Add Track and waypoint sublayer tooltip information.
* Add treeview use and display of layers tooltip.
* Add Layer Tooltip callback definition
* Add sublayer tooltip callback definition.
* When getting data via the GPS layer automatically set the view to see it, unless the realtime tracking mode is on.
* On acquiring data from sources (inc. GPS) automatically set the view to see it. Except for GeoCaches; as it's likely you're requesting data for the current area, so no point in trying to change the view.
* On opening GPX files automatically view all the data.
* Add 'View All Tracks' option to the panel Layer menu options, which sets the view (center & zoom) to see all the tracks of that layer.
* Add 'View Waypoints' option to the TrackWaypoint layer menu options, which sets the view (center & zoom) to see all the Waypoints.
* Add 'View Track' option to the Track sublayer menu options, which sets the view (center & zoom) to see the track.
* Add 'View Layer' option to the TrackWaypoint Layer menu options, which sets the view (center & zoom) to see the entire layer.
* Add the ability to 'autozoom' to view an area specified by maximum and minimum lat/longs for a TrackWaypoint layer.
* Create a new 'Show' submenu entry
* Improve curl usage as should call cleanup on application exit.
* Add copyright and license properties for NASA BlueMarble data.
* Add background thread loading of DEM files.
* Add Track->Goto Highest and Lowest points features.
* Add Track->Goto Maximum Speed feature.
* Rework Track->Goto menu options.
* Add support for the TMS interface provided by SPOTMaps
* Add license related properties
* Add copyright property
* Improve key binding for Mercator Mode -> ctrl+m
* Add documentation for generic TMS map source
* Improve key bindings for ModeLatLon.
* Add OSM WMS Server
* Add support for WMS-C
* Add support for more standard TMS
* Move-up download methods
* Add LatLon projection
* Better safety checking code
* Add support for Locosys devices via GPSBabel's navilink device protocol.
* Add support for DeLorme devices via GPSBabel's delbin device protocol.
* Add the ability to insert a trackpoint into a track via the Edit Trackpoint dialog.
* Add internal function to insert a trackpoint after the currently selected trackpoint.
* Add license notice to new file
* Enable individual track to GPX export via the Track sublayer menu.
* Set default action on dialogs.
* Add a perl script to auto generate basic Viking .vik files for directories containing images.
* Enable control of the visibility of the menubar [including keyboard shortcut - F4]. Also enable panic key 'Escape' to restore menubar if hidden and no tool uses it.
* Enable control of the visibility of the toolbar [including keyboard shortcut - F3].
* Make use of the vikwindow toolbar variable.
* Enable control of the visibility of the statusbar [including keyboard shortcut - F12].
Fixes since 1.0
* Prevent Gtk-CRITICAL assertion when the application is closed with a Track Property window on display.
* Prevent Gtk-CRITICAL assertion when the application is closed whilst loading DEMs.
* Fix trackpoint edit altitude sensitivity to be re-enabled after it has been disabled.
* Fix incorrect cut/copy of sublayers when accessed via the layers panel buttons.
* Fix the List Dialog so that it does not become taller than the screen when there are lots of entries.
* Fix some compiler warnings in viktrwlayer.c when configured to build with --disable-alphabetized-trw
* Fix Resource leak detected by cppcheck 1.46
* Fix compiler warning in curl_download.c
* Fix compiler warning in vikmapslayer.c
* Fix compiler warning in vikwindow.c - use correct const typing.
* Fix compiler warnings - correct Widget / Window type.
* Fix memory leak when generating image file
* Fix: Improve XML reading error reporting
* Fix compiler warnings in osm.c
* Fix compiler warning in vikmapslayer.c
* Fix Waypoint & Track visibility issues.
* Fix SF#3104028: Default Color Background is incorrectly saved as black into a new .vik file.
Viking 1.0 (2010-11-14)
New features since 0.9.96
* Add minimal translator-credits in About dialog
* Add documenters to About dialog
Fixes since 0.9.96
* Improve copyright holders
* Prevent crashes when downloading Expedia Maps.
* Fix extend track using magic scissors.
* Fix autodownloading while panning
* Fix Debian #599048: Segmentation fault when using gpsbabel
* Fix dem_gradient_colors allocation.
* Fix compiler warnings in preferences.c
Viking 0.9.96 (2010-10-11)
New features since 0.9.95
* Use ETag to detect fresh tiles on servers
* Add new menu entry in GPS Layer to delete the realtime information.
* Ensure GPS realtime information deleted when GPS Layer -->Empty All is called.
* Prevent zoom factor string displaying unnecessary .0s when it's a whole number.
* Improve Track Properties speed profile display for low speed difference (e.g. walking) tracks.
* Use speed units in display of Track/Waypoint layer draw by velocity config values, but maintain units as metres per second when read from/saved to files.
* Add keyboard accelerators for as many as possible View Menu entries.
* Simplify zoom status when xmpp and ympp are equal
* Use height units in the altitude readout for the cursor position on the status bar.
* Use height units in display of DEM min / max elevation values, but maintain units as metres when read from/saved to files.
Fixes since 0.9.95
* Fix many memory leaks
* DEM layer properties tidy up.
* Prevent getting stuck in a near infinite loop when using Coord layer, UTM mode and zoomed out to see the whole world.
* Prevent lock up in attempt to download maps along a track in UTM mode.
* Launchpad Bug #445374: Prevent crash when downloading maps along a track, with Terraserver maps when in Mercator mode.
* Add explicit linking against libz and libm
* Fix SF#3009431: Prevent Crash in Real Time Tracking GPS Mode & Autodownload Maps.
* Fix display of rounded speed units scale markers in the speed profile.
* Fix cycle map URL
* Fix compiler warnings
* Fix Track Draw by Velocity mode, so that individual track points are coloured (as was the intention).
* Fix bug where older file was removed when network not present
* Fix: warning 'draw-mode' message does not display
* Fix incorrect limitation on source map id
Viking 0.9.95 (2010-09-07)
New features since 0.9.94
* Add some function short cut key definitions to control showing of the center mark and scale viewport features.
* [DOC] Replace Google with OSM capability in man pages.
* When manually creating a track, automatically give it a default name.
* [DOC] Add contributors from the Wiki(s) history.
* Better dialog name when searching for a waypoint.
* Change max cache time to 1 week.
Fixes since 0.9.94
* Prevent "Gtk-WARNING **: GtkSpinButton: setting an adjustment with non-zero page size is deprecated" messages.
* Invalid number of arguments in call to a_http_download_get_u
* Prevent crash when cut of a GPS track/waypoint layer is attempted via the layers buttons.
* Prevent DEM layer colour indexing going negative and can crash on gradient view.
* Fix DEM layer to show default sea level.
* Fix track background thickness being able to set back to zero.
* Fix internal tile locking
* Fix top layer not drawn after made invisible and then back to being visible.
* Fix impaired (drawcentermark setting bodged) vik file if saved with the top layer visibility turned off.
* Fix syntax errors in help manual
* Fix map drag and drop to show the correct whole map
* Fix "Go to UTM" dialog title.
* Fix first opening of a file which has spaces (or other interesting characters) via the recent files menu.
* Fix unnamed_tracks / unnamed_waypoints misuse.
Viking 0.9.94 (2010-06-10)
New features since 0.9.93
* Add knots as a speed unit option.
......
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
[m4_warning([this file was generated for autoconf 2.65.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......@@ -270,8 +270,9 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# AC_DEFUN([AC_PROG_INTLTOOL], ...)
# nls.m4 serial 3 (gettext-0.15)
dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -289,20 +290,21 @@ dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
AC_PREREQ(2.50)
AC_PREREQ([2.50])
AC_DEFUN([AM_NLS],
[
AC_MSG_CHECKING([whether NLS is requested])
dnl Default is enabled NLS
AC_ARG_ENABLE(nls,
AC_ARG_ENABLE([nls],
[ --disable-nls do not use Native Language Support],
USE_NLS=$enableval, USE_NLS=yes)
AC_MSG_RESULT($USE_NLS)
AC_SUBST(USE_NLS)
AC_MSG_RESULT([$USE_NLS])
AC_SUBST([USE_NLS])
])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
......@@ -330,7 +332,10 @@ AC_DEFUN([AM_NLS],
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
......@@ -343,7 +348,6 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
......@@ -352,34 +356,31 @@ fi[]dnl
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
#
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
# this or PKG_CHECK_MODULES is called, or make sure to call
# PKG_CHECK_EXISTS manually
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
# only at the first occurence in configure.ac, so if the first place
# it's called might be skipped (such as if it is within an "if", you
# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
m4_ifval([$2], [$2], [:])
m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
if test -n "$$1"; then
pkg_cv_[]$1="$$1"
else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
fi
else
pkg_failed=untried
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
......@@ -421,16 +422,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
......@@ -438,25 +440,24 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
_PKG_TEXT
])],
[AC_MSG_RESULT([no])
$4])
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
$3
fi[]dnl
])# PKG_CHECK_MODULES
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(viking, 0.9.94)
AC_INIT(viking, 1.1)
AM_INIT_AUTOMAKE()
dnl AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_HEADERS([src/config.h])
......@@ -42,6 +42,8 @@ AC_TYPE_MODE_T
AC_FUNC_STAT
AC_FUNC_STRTOD
AC_CHECK_FUNCS([floor gethostbyname memset mkdtemp pow realpath socket sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])
AC_CHECK_LIB(m, tan)
AC_CHECK_LIB(z, inflate)
# Expat
AM_WITH_EXPAT
......@@ -75,21 +77,28 @@ dnl | User Manual |---------------------------------------
dnl -------------
GNOME_DOC_INIT
###############
# Depecations #
###############
dnl ---------------------------------------------------------------------------
dnl - Use deprecated options (default enabled for devs, disabled in releases)
dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(deprecations,
[AC_HELP_STRING([--enable-deprecations],
[warn about deprecated usages [default=no]])],,
[enable_deprecations=no])
[warn about deprecated usages [default=no]])],
[ac_cv_enable_deprecations=$enableval],
[ac_cv_enable_deprecations=no])
AC_CACHE_CHECK([whether to enable deprecated features],
[ac_cv_enable_deprecations], [ac_cv_enable_deprecations=no])
if test "x$enable_deprecations" = "xyes"; then
if test "x$ac_cv_enable_deprecations" = "xyes"; then
DISABLE_DEPRECATED_CFLAGS="\
-DG_DISABLE_SINGLE_INCLUDES \
-DGSEAL_ENABLE \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED"
AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGTK_DISABLE_SINGLE_INCLUDES \
-DGTK_DISABLE_DEPRECATED"
CPPFLAGS="$CPPFLAGS $DISABLE_DEPRECATED_CFLAGS"
fi
# Options
......@@ -199,6 +208,19 @@ case $ac_cv_enable_geocaches in
esac
AM_CONDITIONAL([GEOCACHES], [test x$ac_cv_enable_geocaches = xyes])
AC_ARG_ENABLE(spotmaps, AC_HELP_STRING([--enable-spotmaps],
[enable SPOTMaps map (default is enable).]),
[ac_cv_enable_spotmaps=$enableval],
[ac_cv_enable_spotmaps=yes])
AC_CACHE_CHECK([whether to enable SPOTMaps map],
[ac_cv_enable_spotmaps], [ac_cv_enable_spotmaps=yes])
case $ac_cv_enable_spotmaps in
yes)
AC_DEFINE(VIK_CONFIG_SPOTMAPS, [], [SPOTMAPS STUFF])
;;
esac
AM_CONDITIONAL([SPOTMAPS], [test x$ac_cv_enable_spotmaps = xyes])
AC_ARG_ENABLE(dem24k, AC_HELP_STRING([--enable-dem24k],
[enable USGS 24k DEM (default is disable) download source. Requires dem24k.pl script in path.]),
......@@ -290,6 +312,7 @@ dnl man pages processing
DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
AC_SUBST(DB2MAN_XSL)
AC_PATH_PROG(XP,xsltproc)
AM_CONDITIONAL([HAVE_XSLTPROC],[test "x$XP" != "x"])
AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"])
dnl This will cause the automake generated makefiles to pass the
......@@ -319,9 +342,10 @@ echo "-------------------------------------------"
echo "Alphabetized track & waypoints : $ac_cv_enable_alpha_trw"
echo "Google Maps : $ac_cv_enable_google"
echo "Terraserver Maps : $ac_cv_enable_terraserver"
#echo "Expedia Maps : $ac_cv_enable_expedia"
echo "Expedia Maps : $ac_cv_enable_expedia"
echo "Open Street Map : $ac_cv_enable_openstreetmap"
echo "BlueMarble : $ac_cv_enable_bluemarble"
echo "SPOTMaps : $ac_cv_enable_spotmaps"
echo "Geonames : $ac_cv_enable_geonames"
#echo "Geocaches Acquire : $ac_cv_enable_geocaches"
echo "USGS 24k DEM : $ac_cv_enable_dem24k"
......
This diff is collapsed.
......@@ -135,7 +135,6 @@ DATADIRNAME = @DATADIRNAME@
DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
......@@ -189,6 +188,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
......
......@@ -69,7 +69,6 @@ DATADIRNAME = @DATADIRNAME@
DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
......@@ -123,6 +122,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
......
......@@ -69,7 +69,6 @@ DATADIRNAME = @DATADIRNAME@
DB2MAN_XSL = @DB2MAN_XSL@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
ECHO_C = @ECHO_C@
......@@ -123,6 +122,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
......
......@@ -22,4 +22,12 @@
<property name="lat-path">/searchresults/place@lat</property>
<property name="lon-path">/searchresults/place@lon</property>
</object>
<object class="VikGotoXmlTool">
<property name="label">Mapquest Nominatim</property>
<property name="url-format">http://open.mapquestapi.com/nominatim/v1/search?format=xml&amp;limit=1&amp;q=%s</property>
<property name="lat-path">/searchresults/place</property>
<property name="lat-attr">lat</property>
<property name="lon-path">/searchresults/place</property>
<property name="lon-attr">lon</property>
</object>
</objects>
<objects>
<!-- Built in -->
<object class="VikSlippyMapSource">
<property name="label">OpenStreetMap (Osmarender)</property>
<property name="hostname">tah.openstreetmap.org</property>
<property name="url">/Tiles/tile/%d/%d/%d.png</property>
<property name="id">12</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<!-- Built in -->
<object class="VikSlippyMapSource">
<property name="label">OpenStreetMap (Mapnik)</property>
<property name="hostname">tile.openstreetmap.org</property>
<property name="url">/%d/%d/%d.png</property>
<property name="id">13</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<!-- Built in -->
<object class="VikSlippyMapSource">
<property name="label">OpenStreetMap (Maplint)</property>
<property name="hostname">tah.openstreetmap.org</property>
<property name="url">/Tiles/maplint.php/%d/%d/%d.png</property>
<property name="id">14</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<!-- Built in -->
<object class="VikSlippyMapSource">
<property name="label">OpenStreetMap (Cycle)</property>
<property name="hostname">b.tile.opencyclemap.org</property>
<property name="url">/cycle/%d/%d/%d.png</property>
<property name="id">17</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<!-- No more active
<object class="VikSlippyMapSource">
<property name="label">Letuffe/hiking</property>
<property name="hostname">beta.letuffe.org</property>
<property name="url">/tiles/renderer.py/hiking/%d/%d/%d.png</property>
<property name="id">20</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
-->
<object class="VikWmscMapSource">
<property name="id">18</property>
<property name="label">OpenStreetMap (WMS)</property>
<property name="hostname">full.wms.geofabrik.de</property>
<property name="url">/std/demo_key?LAYERS=osm-full&amp;FORMAT=image/png&amp;SERVICE=WMS&amp;VERSION=1.1.1&amp;REQUEST=GetMap&amp;STYLES=&amp;EXCEPTIONS=&amp;SRS=EPSG:4326&amp;BBOX=%s,%s,%s,%s&amp;WIDTH=256&amp;HEIGHT=256</property>
<property name="check-file-server-time">FALSE</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<object class="VikTmsMapSource">
<property name="id">50</property>
<property name="label">SPOTMaps</property>
<property name="hostname">spotmaps.youmapps.org</property>
<property name="url">/spotmaps4osm/1.0.0/spotmaps4osm/%d/%d/%d.jpg</property>
<property name="check-file-server-time">FALSE</property>
<property name="copyright">© Cnes/Spot Image</property>
<property name="license">CC-by-SA 2.0 / ODBl</property>
<property name="license-url">http://www.youmapps.org/licenses/EULA-OSM-en.html</property>
</object>
<object class="VikSlippyMapSource">
<property name="label">Letuffe/hiking</property>
<property name="hostname">beta.letuffe.org</property>
<property name="url">/tiles/renderer.py/hiking/%d/%d/%d.png</property>
<property name="id">100</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<object class="VikSlippyMapSource">
<property name="label">Public Transport Map </property>
<property name="hostname">tile.xn--pnvkarte-m4a.de</property>
<property name="url">/tilegen/%0d/%d/%d.png</property>
<property name="id">101</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<object class="VikSlippyMapSource">
<property name="label">Cyclemap (Cloudmade)</property>
<property name="hostname">a.andy.sandbox.cloudmade.com</property>
<property name="url">/tiles/cycle/%d/%d/%d.png</property>
<property name="id">102</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<object class="VikSlippyMapSource">
<property name="label">Bridle Map</property>
<property name="hostname">opentiles.com</property>
<property name="url">/nop/tiles/%d/%d/%d.png</property>
<property name="id">103</property>
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<object class="VikSlippyMapSource">
<property name="label">Yahoo Street</property>
......
......@@ -75,7 +75,7 @@ and docbook-xsl in your Build-Depends control field.
<para>
Viking is a free/open source program to manage GPS data. You can
import and plot tracks and waypoints, show Google maps and/or
import and plot tracks and waypoints, show OpenStreetMap (OSM) maps and/or
Terraserver maps under it, add coordinate lines, make new tracks
and waypoints, hide different things, etc. It is written in C
with the GTK+ 2 toolkit, available for Linux, other POSIX
......
......@@ -44,7 +44,7 @@ and docbook-xsl in your Build-Depends control field.
<!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
]>
<refentry>
<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<address>
&dhemail;
......@@ -102,7 +102,7 @@ and docbook-xsl in your Build-Depends control field.
<para>
Viking is a free/open source program to manage GPS data. You can
import and plot tracks and waypoints, show Google maps and/or
import and plot tracks and waypoints, show OpenStreetMap (OSM) maps and/or
Terraserver maps under it, add coordinate lines, make new tracks
and waypoints, hide different things, etc. It is written in C
with the GTK+ 2 toolkit, available for Linux, other POSIX
......@@ -181,8 +181,27 @@ and docbook-xsl in your Build-Depends control field.
<title>Map Source</title>
<para>It is possible to add new map's sources. The file is <filename>~/.viking/maps.xml</filename>.</para>
<para>An example of the file in the distribution <filename>doc/examples/maps.xml</filename>.</para>
<para>Currently, there is a single object class available: VikSlippyMapSource. Such feature allows to declare any map's source working like OpenStreetMap.</para>
<para>The related properties are:
<para>The VikSlippyMapSource allows to declare any map's source working like OpenStreetMap. It supports the following properties:
<variablelist>
<varlistentry>
<term>id</term>
<listitem><para>this is an integer and should be unique as it used to identify the map source</para></listitem>
</varlistentry>
<varlistentry>
<term>label</term>
<listitem><para>the text displayed in the map's source selection dialog</para></listitem>
</varlistentry>
<varlistentry>
<term>hostname</term>
<listitem><para>the server's hostname (eg. "tile.openstreetmap.org")</para></listitem>
</varlistentry>
<varlistentry>
<term>url</term>
<listitem><para>the parametrized address of the tile, in the spirit of C printf format, with 3 "%d" fields for X, Y and Z (zoom level) (eg. "/%d/%d/%d.png")</para></listitem>
</varlistentry>
</variablelist>
</para>
<para>The VikTmsMapSource allows to declare any TMS service. It supports the following properties:
<variablelist>
<varlistentry>
<term>id</term>
......@@ -202,6 +221,26 @@ and docbook-xsl in your Build-Depends control field.
</varlistentry>
</variablelist>
</para>
<para>The VikWmscMapSource allows to declare any WMS or WMS-C service. It supports the following properties:
<variablelist>
<varlistentry>
<term>id</term>
<listitem><para>this is an integer and should be unique as it used to identify the map source</para></listitem>
</varlistentry>
<varlistentry>
<term>label</term>
<listitem><para>the text displayed in the map's source selection dialog</para></listitem>
</varlistentry>
<varlistentry>
<term>hostname</term>
<listitem><para>the server's hostname (eg. "tile.openstreetmap.org")</para></listitem>
</varlistentry>
<varlistentry>
<term>url</term>