Commit 953c9042 authored by Bernd Zeimetz's avatar Bernd Zeimetz

Imported Upstream version 1.4.2

parent a3f95c12
This diff is collapsed.
SUBDIRS = src test doc po help
# Optionally build documentation bits
if VIKING_DOC
DO_DOCS = "doc"
endif
SUBDIRS = src test data po win32 help $(DO_DOCS)
INTLTOOL = \
intltool-extract.in \
......@@ -10,10 +14,10 @@ full:
make
EXTRA_DIST = \
gnome-doc-utils.make \
ChangeLog.0 \
viking.spec \
$(INTLTOOL)
gnome-doc-utils.make \
ChangeLog.0 \
viking.spec \
$(INTLTOOL)
.PHONY: generate-changelog
generate-changelog:
......@@ -25,8 +29,10 @@ generate-changelog:
dist-hook: viking.spec generate-changelog
cp $(top_builddir)/viking.spec $(distdir)
MAINTAINERCLEANFILES = \
gnome-doc-utils.make
DISTCLEANFILES = \
gnome-doc-utils.make \
intltool-extract \
intltool-merge \
intltool-update
......@@ -35,3 +41,6 @@ ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper
# Ignore gtk theme cache files on distcheck
distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache'
This diff is collapsed.
Viking 1.4.2.0 (2013-07-26)
Bug Fix Release
* Fix menu use of named own Icons since the icons were renamed some time ago.
* [QA] Fix memory leak in drawing new tracks/routes.
* [QA] Fix memory leak on deleting TrackWaypoint layers.
* [QA] Fix large memory leak on viewing Track Properties.
* [QA] Fix incorrect iterator usage.
* [QA] Fix memory leaks on reading in Viking files.
* [QA] Fix memory leak in treeview tooltips and selection.
* [QA] Fix large memory leak when removing DEM layers.
* Fix some interpolated values of a trackpoint on insertion between points.
* Fix handling failed downloads with the My OSM Traces method.
* SF Bugs#101: Fix Acquire from Google Directions.
* Fix name search using Google.
* SF Bugs#100: Fix Crash on viewing Track Properties with extreme gradients.
* SF Bugs#97: Fix missing redownload settings of some maps in the example config
* SF Bugs#99: Increase limit for Map IDs
* Automated check for the latest version. ATM only on Windows systems.
* Enable getting Viking Version as a number from a string to enable comparisons.
* SF#3613971: Remove Geofabrik's OpenStreetMap WMS, as it is not for public use.
* Don't silently fail on attempting to split to a track.
* Fix background thread statusbar update instability.
* Fix location of gdk_threads_enter() to be before first window creation.
* Allow Bing Map source URL to be set via the configuration XML file.
* SF#3610708: Fix Failing to Load DEM files on Big Endian Systems.
* Fix incorrect setting to lowest zoom value when clicking away from the statusbar zoom menu.
* [QA] Improve create zoom menu to use G_N_ELEMENTS to know array bounds.
Viking 1.4.1.0 (2013-04-08)
Bug Fix Release + updated translations
* Import Launchpad translation updates [Mainly for large Czech update]
* Fix using .vik files with 'unusual' track or waypoint names
* Fix waypoint selection when the waypoint has an image but the images are not being displayed.
* Fix showing map timestamps on Windows on the map tile info dialog.
* SF#3608411: Part 2 - Avoid creating command window on Viking start-up.
* SF#3608411: Part 1 - Avoid warning about unbuffer on Windows Systems.
* SF#3608264: Improve Statusbar Location Info Maybe Truncated
* Prevent inputting empty names for layers and sublayers via the layers panel.
* SF#3608311: Fix crash caused by renaming blank sublayer names
* Be less strigent in loading Geotagged images without optional GPS tags
* Fix use of scaled tile image when tile image not present.
* Enable updating the treeview to allow setting a blank waypoint symbol.
* Improve the Waypoint tooltip to display the description if there is no comment.
* Fix datasource acquiring waypoints from geotag images.
* Updated geo-* scripts to version released on 2013/02/18
* Fix compilation with --enable-geocaches option.
* help/Makefile.am: explicitly list figures.
Viking 1.4.0.1 (2013-02-16)
Windows Only Release.
* Windows: Add .vik file extension association option in the installer
Viking 1.4 (2013-02-11)
New features since 1.3.2
* Support for GPX Route type including transfer to/from GPS Devices.
** Replaced 'Add Track' tool with 'Create Route' tool. (NB There still is the Create Track tool)
* Support for GPX 'Description' for tracks, waypoints and routes.
* Add ability to Acquire My OSM Traces and ability to choose any subset of the available traces.
* GPS Upload from a track.
* Enable giving a track a specific colour (drawn in default draw by track mode).
* Enable drawing all tracks in a specific colour (no longer is Black the only option).
* Allow option of drawing a direction arrow when drawing a track.
* Allow configuration of trackpoint size and direction arrow size.
* Display Waypoint Icons in the layers panel treeview.
* Restored Route Finding via Google Services. [Was disabled in 1.3.2 due to change in formats supported]
* Only display sublayer container when there are sublayers.
* Display map tile source and cached file information in a dialog for a position.
* Quick zoom level change from the statusbar by clicking on the zoom level to select another level.
* In the Zoom Tool mode: can select an area to zoom in on (via holding shift key + drag mouse).
* Mouse Zooming in/out maintains the position focus on the mouse pointer location.
** (Use the keys Ctrl+Shift and mouse zoom to maintain the centered map location).
* Improvements in Acquiring Wikipedia Points (allow more points, sortable columns, URL and feature type).
* Allow opening a URL on a waypoint which has a URL for a comment or description.
* Re-organized TrackWaypoint Layer menus to group functionality together better with New, View, Combine, Split, Delete, Acquire and Upload submenus.
* Gradient Graph view on the Track Properties.
* Allow same named TrackWaypoint sublayer items. i.e. can now have 2 (or more) waypoints with the same name.
* Add support of a Map type for a local On Disk OSM Tile Format.
* Revised Draw Track by Speed mode with a simple traffic light colouring scheme to represent slow/average/fast speeds.
* Enable deletion of track points with the same timestamp.
* Ability to merge segments of a track.
* Allow generation of large pixel sized images.
* Rework image generation to ask for file name first and then only allow supported map zoom levels.
* Allow control of waypoint text size on the viewport display.
* Allow control of GPX file saving track order (either Alphabetical or By Time via global preference).
* Keyboard shortcuts to create layers and enable some tools.
* Show the bearing and the step distance of the next point when creating a track or route.
* Improved feedback in reading erroneous files.
* Improved Help Manual.
* More translation texts including a Finnish version.
* Scripts to support the creation of the Windows Executable Installer.
* Add a python tool to convert the Viking tile cache into a MapBox MBTiles format file.
* Many internal improvements.
Fixes since 1.3.2
* Don't accidently overwrite GPX and KML files in the Viking file type.
* Use the default desktop font for waypoint viewport display text.
* Ensure when opening multiple .vik files they are each loaded into a new window.
* Show UTM location in statusbar when in UTM mode.
* Fix: crash when dealing with non-compressed DEM files
Viking 1.3.2 (2012-09-23)
Bug Fix Release including:
* Removed Route Finder Tool as Google Direction service interface has disabled the method Viking interfaced with it.
* Fix for Debian#685817: Statusbar Update From Thread Instability
* Fix SF#3564795: Crashing when attempting to create waypoints from EXIF images without enough GPS information.
* Fix drawing of next potential trackpoint on Windows Systems.
* Fix GPSBabel Dynamic Device List generation on Windows Systems.
* Fix crashing when displayed map copyright(s) is longer than the internal buffer.
* Fix crashing when deleting a GPS layer which has started a realtime tracking.
* Fix printing of DEBUG message since glib 2.32
Viking 1.3.1 (2012-06-26)
Bug Fix for Windows Systems Release:
* Fix crash in Show Picture functionality on Window's Systems.
Viking 1.3 (2012-04-22)
New features since 1.2.2
* Be consistent in that track and waypoint list dialogs are always sorted alphabetically.
......
......@@ -16,8 +16,8 @@ Git repo:
Installing Viking
=================
If you downloaded viking from Git, you have to:
$ autogen.sh
If you downloaded Viking from Git, you have to:
$ ./autogen.sh
Next, or if you downloaded a tarball, you have to:
$ ./configure
......@@ -26,7 +26,7 @@ Next, or if you downloaded a tarball, you have to:
Check output of "./configure --help" for configuration options.
In particular, it is possible to disable some features, like --disable-google in order to disable any Google stuff.
If you whish to install viking, you have to (as root):
If you wish to install Viking, you have to (as root):
# make install
For detailled explaination on install, see INSTALL file.
......
===============================
FOR HISTORICAL REFERENCE ONLY
===============================
This file hasn't been touched since early 2007 (other than this update!)
Most of the TODOs/ideas are now maintained in the Wiki and/or feature requests in the SourceForge tracker.
It also contains some historical implementation data for changes made in the 0.0.X series in 2003+2004,
before the public source code version tracking started (2005 onwards in svn and then git).
--------------------------------
FEATURE FREEZE!!!
--------------
BEFORE RELEASE:
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(viking, 1.3)
AM_INIT_AUTOMAKE()
AC_INIT(viking, 1.4.2)
AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
dnl AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_HEADERS([src/config.h])
GTK_DOC_CHECK(1.0)
......@@ -33,18 +33,19 @@ AC_SUBST(ACLOCAL_AMFLAGS)
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([malloc.h netdb.h netinet/in.h stdlib.h string.h sys/param.h sys/socket.h sys/types.h sys/wait.h unistd.h math.h utime.h])
AC_CHECK_HEADERS([malloc.h stdlib.h string.h sys/param.h sys/types.h unistd.h math.h utime.h X11/Xlib.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_MODE_T
# Checks for library functions.
# Checks for library functions or symbols
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_FUNCS([floor memset mkdtemp pow realpath sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])
AC_CHECK_LIB(m, tan)
AC_CHECK_LIB(z, inflate)
AC_CHECK_LIB(X11, XSetErrorHandler)
# Expat
AM_WITH_EXPAT
......@@ -64,7 +65,7 @@ dnl | Pkgconfig checks |---------------------------------------
dnl ------------------
PKG_CHECK_MODULES(PACKAGE, [
glib-2.0 >= 2.12
glib-2.0 >= 2.14
gthread-2.0 >= 2.2
gtk+-2.0 >= 2.12
gio-2.0 >= 2.12
......@@ -302,15 +303,15 @@ AC_DEFINE_UNQUOTED(VIK_CONFIG_SEARCH, ${VIK_CONFIG_SEARCH},
AC_ARG_WITH(mapcache,
[AC_HELP_STRING([--with-mapcache],
[specify the size of the map cache (default is 50331648)])],
[specify the size of the map cache in MB (default is 128)])],
[if test "x$withval" = "xno"; then
VIK_CONFIG_MAPCACHE_SIZE=0;
elif test "x$withval" = "xyes"; then
AC_MSG_ERROR([Please, set a value for size of the map cache])
AC_MSG_ERROR([Please, set a value for size of the map cache in MB])
else
VIK_CONFIG_MAPCACHE_SIZE=${withval}
fi],
[VIK_CONFIG_MAPCACHE_SIZE=50331648])
[VIK_CONFIG_MAPCACHE_SIZE=128])
AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPCACHE_SIZE, ${VIK_CONFIG_MAPCACHE_SIZE},
[Size of the map cache])
......@@ -341,18 +342,27 @@ dnl correct flags to aclocal.
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
AC_SUBST(ACLOCAL_AMFLAGS)
AM_CONDITIONAL([VIKING_DOC], test x${enable_gtk_doc} = xyes)
# Configuration
AC_CONFIG_FILES([Makefile
src/Makefile
src/icons/Makefile
po/Makefile.in
test/Makefile
help/Makefile
doc/Makefile
doc/examples/Makefile])
if test x$enable_gtk_doc = xyes; then
AC_CONFIG_FILES([doc/reference/Makefile])
fi
AC_CONFIG_FILES([
Makefile
src/Makefile
src/icons/Makefile
po/Makefile.in
data/Makefile
test/Makefile
help/Makefile
win32/Makefile
win32/installer/Makefile
win32/installer/pixmaps/Makefile
win32/installer/translations/Makefile])
AM_COND_IF([VIKING_DOC],
[AC_CONFIG_FILES([
doc/Makefile
doc/reference/Makefile
doc/examples/Makefile])])
AC_OUTPUT([
viking.spec
])
......@@ -364,7 +374,7 @@ echo "$PACKAGE $VERSION"
echo "-------------------------------------------"
echo "Alphabetized track & waypoints : $ac_cv_enable_alpha_trw"
echo "Bing Maps : $ac_cv_enable_bing"
echo "Google Maps : $ac_cv_enable_google"
echo "Google : $ac_cv_enable_google"
echo "Terraserver Maps : $ac_cv_enable_terraserver"
echo "Expedia Maps : $ac_cv_enable_expedia"
echo "Open Street Map : $ac_cv_enable_openstreetmap"
......@@ -377,6 +387,7 @@ echo "USGS 24k DEM : $ac_cv_enable_dem24k"
echo "Realtime GPS Tracking : $ac_cv_enable_realtimegpstracking"
echo "Size of map cache (in memory) : ${VIK_CONFIG_MAPCACHE_SIZE}"
echo "Age of tiles (in seconds) : ${VIK_CONFIG_DEFAULT_TILE_AGE}"
echo "Documentation (+HTML) : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html})"
echo "-------------------------------------------"
echo ""
echo "Configure finished, type 'make' to build."
......
pkgdata_DATA = maps.xml external_tools.xml goto_tools.xml
EXTRA_DIST = \
$(pkgdata_DATA)
This diff is collapsed.
......@@ -8,6 +8,7 @@
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
<property name="use-etag">TRUE</property>
</object>
<!-- Built in -->
<object class="VikSlippyMapSource">
......@@ -18,6 +19,7 @@
<property name="copyright">© OpenStreetMap contributors</property>
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
<property name="check-file-server-time">TRUE</property>
</object>
<object class="VikWmscMapSource">
<property name="id">18</property>
......@@ -29,6 +31,15 @@
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<object class="VikSlippyMapSource">
<property name="id">29</property>
<property name="label">CalTopo USGS 7.5" Topos</property>
<property name="hostname">s3-us-west-1.amazonaws.com</property>
<property name="url">/caltopo/topo/%d/%d/%d.png?v=1</property>
<property name="copyright">CalTopo Terms of Use</property>
<property name="license">CalTopo Terms of Use</property>
<property name="license-url">http://caltopo.com/</property>
</object>
<object class="VikTmsMapSource">
<property name="id">50</property>
<property name="label">SPOTMaps</property>
......@@ -75,4 +86,13 @@
<property name="license">CC-BY-SA</property>
<property name="license-url">http://www.openstreetmap.org/copyright</property>
</object>
<object class="VikSlippyMapSource">
<property name="label">OpenSeaMap</property>
<property name="hostname">tiles.openseamap.org</property>
<property name="url">/seamark/%d/%d/%d.png</property>
<property name="id">600</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>
</objects>
This diff is collapsed.
To quickly get started using Viking, follow these instructions.
1) Get some data from your GPS device. There are a couple ways to do this.
You can use gpspoint or you can use another program and translate it with
my version GPSBabel with gpspoint write support (or use the GPSBabel program
itself to download and translate at once.)
2) Open up viking and use File -> Open GPS Data to open the gpspoint file.
Viking will try to change its viewing area to the center of the layer (file)
but sometimes if you have waypoints and tracks which are very far apart you
won't see anything. If this is the case, expand the layer (on the Layers
Panel to the left), then expand "Waypoints", find a waypoint and right-click
on it and click "Goto".
3) Now add a map layer ( Layers -> New Map Layer ), choose a suitable cache
directory where you would like to store your tracks and click OK. Zoom to a
comfortable level (I suggest 4 mpp) by clicking the left and right mouse
buttons on the gray area where your tracks are. Now from the menu choose
Tools -> Map Download, Click where you would like to download a map.
Regardless of what tool you are using, the middle mouse button always pans.
4) You will notice the maps are being drawn on top of the tracks, which is
probably not what you want. Look at the Layers Panel to the left. Notice how
the layer named "Map" is ABOVE your TrackWaypoint layer that your GPS data is
in. This means that it will be drawn last, or on top of the other layers.
Select the Map layer from the list and click the down arrow button beneath
the list. Your tracks will now be drawn over the map.
----
TODO: some explanation of the layers, etc. is required.
A word on exporting TrackWaypoint layers as GPSMapper files.
(NOTE: You should always save your data as a gpspoint or Viking file also because Viking cannot open gpsmapper files)
The comment field for each track/waypoint you want to export to GPSMapper should be in the following format:
Name RGN## 0x####
- or -
Name RGN## 0x##
Where the first '##' is 10, 20, 40, or 80, and the second group of '#'s is the type of region.
See the GPSmapper ( http://gps.chrisb.org/ ) docs for more details.
By the way, if anyone knows of an open-source program to make compiled maps for (preferably Garmin,
but I would appreciate info on other brand) GPS receivers, please tell me!
SUBDIRS = examples
EXTRA_DIST = GETTING-STARTED GPSMAPPER \
viking.xml
CLEANFILES=
# man pages processing
# TODO conditional processing
# (availability of docbook stylesheet and xsltproc)
if GEN_MANPAGES
MANPAGES=viking.1
man_MANS = $(MANPAGES)
CLEANFILES+=$(MANPAGES)
endif
DB2MAN=@DB2MAN_XSL@
XP=@XP@ -''-nonet
%.1: %.xml
$(XP) -o $@ $(DB2MAN) $<
EXTRA_DIST = maps.xml external_tools.xml goto_tools.xml
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -5,6 +5,7 @@ de
el
en_GB
es
fi
fr
he
hu
......
This diff is collapsed.
......@@ -16,6 +16,8 @@ src/datasource_geotag.c
src/datasource_google.c
src/datasource_gps.c
src/datasource_osm.c
src/datasource_osm_my_traces.c
src/datasource_wikipedia.c
src/dem.c
src/download.c
src/file.c
......@@ -31,6 +33,7 @@ src/osm.c
src/osm-traces.c
src/preferences.c
src/uibuilder.c
src/vikaggregatelayer.c
src/vikdemlayer.c
src/vikfileentry.c
src/vikfilelist.c
......@@ -46,6 +49,8 @@ src/viktrwlayer.c
src/viktrwlayer_propwin.c
src/viktrwlayer_tpwin.c
src/viktrwlayer_geotag.c
src/vikstatus.c
src/vikwaypoint.c
src/vikwindow.c
src/viking.desktop.in
src/libjpeg/jpeg-data.c
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.