From 81843c3d8d0771bf00d0f26034a13aa515465c78 Mon Sep 17 00:00:00 2001 From: activityworkshop Date: Sun, 22 Jan 2017 21:19:46 +0100 Subject: [PATCH] Version 18.6, December 2016 --- README.md | 4 ++-- tim/prune/GpsPrune.java | 4 ++-- tim/prune/function/CheckVersionScreen.java | 2 +- tim/prune/function/srtm/DownloadSrtmFunction.java | 2 +- tim/prune/function/srtm/LookupSrtmFunction.java | 3 ++- tim/prune/function/srtm/TileFinder.java | 2 +- tim/prune/lang/prune-texts_es.properties | 9 ++++++--- tim/prune/lang/prune-texts_fr.properties | 14 ++++++++++++-- tim/prune/readme.txt | 13 +++++++++---- 9 files changed, 36 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index f4d9cde..27af085 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # GpsPrune GpsPrune is a map-based application for viewing, editing and converting coordinate data from GPS systems. -It's a cross-platform java application, and its home page is at http://gpsprune.activityworkshop.net . +It's a cross-platform java application, and its home page is at https://gpsprune.activityworkshop.net . -Here on github you'll find all the sources from version 1 to the current version 18.5, and in the wiki at https://github.com/activityworkshop/GpsPrune/wiki there's the beginning of a translation effort for anyone to contribute. +Here on github you'll find all the sources from version 1 to the current version 18.6, and in the wiki at https://github.com/activityworkshop/GpsPrune/wiki there's the beginning of a translation effort for anyone to contribute. Currently just the Spanish translations are online, to see whether it's a workable idea or not. Please help with this if you can. diff --git a/tim/prune/GpsPrune.java b/tim/prune/GpsPrune.java index ad71987..492a457 100644 --- a/tim/prune/GpsPrune.java +++ b/tim/prune/GpsPrune.java @@ -36,9 +36,9 @@ import tim.prune.gui.profile.ProfileChart; public class GpsPrune { /** Version number of application, used in about screen and for version check */ - public static final String VERSION_NUMBER = "18.5"; + public static final String VERSION_NUMBER = "18.6"; /** Build number, just used for about screen */ - public static final String BUILD_NUMBER = "342"; + public static final String BUILD_NUMBER = "343"; /** Static reference to App object */ private static App APP = null; diff --git a/tim/prune/function/CheckVersionScreen.java b/tim/prune/function/CheckVersionScreen.java index 1d3192a..8c2394e 100644 --- a/tim/prune/function/CheckVersionScreen.java +++ b/tim/prune/function/CheckVersionScreen.java @@ -42,7 +42,7 @@ public class CheckVersionScreen extends GenericFunction */ public void begin() { - final String filePathStart = "http://activityworkshop.net/software/gpsprune/gpsprune_versioncheck_"; + final String filePathStart = "https://activityworkshop.net/software/gpsprune/gpsprune_versioncheck_"; final String filePathEnd = ".txt"; String latestVer = null; String nextVersion = null; diff --git a/tim/prune/function/srtm/DownloadSrtmFunction.java b/tim/prune/function/srtm/DownloadSrtmFunction.java index d0d92bb..0350ce3 100644 --- a/tim/prune/function/srtm/DownloadSrtmFunction.java +++ b/tim/prune/function/srtm/DownloadSrtmFunction.java @@ -204,7 +204,7 @@ public class DownloadSrtmFunction extends GenericFunction implements Runnable if (srtmDir.exists() && srtmDir.isDirectory() && srtmDir.canRead()) { File srtmFile = new File(srtmDir, new File(inUrl.getFile()).getName()); - if (!srtmFile.exists() || !srtmFile.canRead() || srtmFile.length() <= 1) { + if (!srtmFile.exists() || !srtmFile.canRead() || srtmFile.length() <= 400) { return srtmFile; } } diff --git a/tim/prune/function/srtm/LookupSrtmFunction.java b/tim/prune/function/srtm/LookupSrtmFunction.java index 011dff6..1599744 100644 --- a/tim/prune/function/srtm/LookupSrtmFunction.java +++ b/tim/prune/function/srtm/LookupSrtmFunction.java @@ -304,7 +304,8 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable if (srtmDir.exists() && srtmDir.isDirectory() && srtmDir.canRead()) { File srtmFile = new File(srtmDir, new File(inUrl.getFile()).getName()); - if (srtmFile.exists() && srtmFile.isFile() && srtmFile.canRead()) + if (srtmFile.exists() && srtmFile.isFile() && srtmFile.canRead() + && srtmFile.length() > 400) { // System.out.println("Lookup: Using file " + srtmFile.getAbsolutePath()); // File found, use this one diff --git a/tim/prune/function/srtm/TileFinder.java b/tim/prune/function/srtm/TileFinder.java index afcc28f..60a9479 100644 --- a/tim/prune/function/srtm/TileFinder.java +++ b/tim/prune/function/srtm/TileFinder.java @@ -13,7 +13,7 @@ import java.util.ArrayList; public abstract class TileFinder { /** URL prefix for all tiles */ - private static final String URL_PREFIX = "http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/"; + private static final String URL_PREFIX = "https://dds.cr.usgs.gov/srtm/version2_1/SRTM3/"; /** Directory names for each continent */ private static final String[] CONTINENTS = {"", "Eurasia", "North_America", "Australia", "Islands", "South_America", "Africa"}; diff --git a/tim/prune/lang/prune-texts_es.properties b/tim/prune/lang/prune-texts_es.properties index d8c19aa..53554dd 100644 --- a/tim/prune/lang/prune-texts_es.properties +++ b/tim/prune/lang/prune-texts_es.properties @@ -87,6 +87,7 @@ function.exportsvg=Exportar SVG function.exportimage=Exportar imagen function.editwaypointname=Editar nombre de waypoint function.compress=Comprimir track +function.marklifts=Marcar telef\u00e9ricos function.deleterange=Eliminar rango function.croptrack=Truncar track function.interpolate=Interpolar puntos @@ -591,8 +592,8 @@ dialog.weather.humidity=Humedad dialog.deletebydate.nodate=Sin marcas de tiempo dialog.deletebydate.column.keep=Mantener dialog.deletebydate.column.delete=Eliminar -dialog.setaltitudetolerance.text.metres=Limite (en metros) por debajo de cual pequeñas subidas o bajadas serán ignoradas -dialog.setaltitudetolerance.text.feet=Limite (en pies) por debajo de cual pequeñas subidas o bajadas serán ignoradas +dialog.setaltitudetolerance.text.metres=Limite (en metros) por debajo de cual peque\u00f1as subidas o bajadas ser\u00e1n ignoradas +dialog.setaltitudetolerance.text.feet=Limite (en pies) por debajo de cual peque\u00f1as subidas o bajadas ser\u00e1n ignoradas dialog.autoplay.duration=Duraci\u00f3n (seg) dialog.autoplay.usetimestamps=Usar informaci\u00f3n de tiempo dialog.autoplay.rewind=Rebobinar @@ -616,7 +617,9 @@ confirm.addtimeoffset=A\u00f1adido margen de tiempo confirm.addaltitudeoffset=A\u00f1adido margen de altitud confirm.rearrangewaypoints=Waypoints reorganizados confirm.rearrangephotos=Fotos reacomodadas -confirm.cutandmove=Mover Selecci\u00f3n +confirm.splitsegments=%d escisiones fueron hechas +confirm.sewsegments=%d conexiones fueron hechas +confirm.cutandmove=Mover selecci\u00f3n confirm.interpolate=Puntos insertados confirm.convertnamestotimes=Nombres de "waypoint" convertidos confirm.saveexif.ok=Guardado %d fotos diff --git a/tim/prune/lang/prune-texts_fr.properties b/tim/prune/lang/prune-texts_fr.properties index 2618ea7..064c6e9 100644 --- a/tim/prune/lang/prune-texts_fr.properties +++ b/tim/prune/lang/prune-texts_fr.properties @@ -106,6 +106,7 @@ function.estimatetime=Temps estim\u00e9 function.learnestimationparams=Apprentissage de l'estimation function.setmapbg=D\u00e9finir le fond de carte function.setpaths=D\u00e9finir les chemins des programmes +function.autoplay=Jouer la trace function.selectsegment=S\u00e9lectionner le segment courant function.splitsegments=S\u00e9pare les segments function.sewsegments=R\u00e9unis les segments @@ -207,6 +208,8 @@ dialog.gpsbabel.filter.discard.unknownfix=Point a une fix inconnue dialog.gpsbabel.filter.simplify.intro=Effacer les points jusque dialog.gpsbabel.filter.simplify.maxpoints=Nombre de points < dialog.gpsbabel.filter.simplify.maxerror=ou erreur < +dialog.gpsbabel.filter.simplify.crosstrack=d\u00e9viation +dialog.gpsbabel.filter.simplify.length=changement de longeur dialog.gpsbabel.filter.distance.distance=Si la distance < dialog.gpsbabel.filter.distance.time=et difference de temps < dialog.gpsbabel.filter.interpolate.distance=Si la distance > @@ -250,6 +253,7 @@ dialog.3d.warningtracksize=Cette trace poss\u00e8de un grand nombre de points, J dialog.3d.useterrain=Montrer terrain dialog.3d.terraingridsize=Taille de la grille dialog.exportpov.baseimage=Image de la carte +dialog.exportpov.cannotmakebaseimage=Impossible d'enregistrer la image dialog.baseimage.title=Image de la carte dialog.baseimage.useimage=Utiliser image dialog.baseimage.mapsource=Source de cartes @@ -341,8 +345,11 @@ dialog.estimatetime.results.actualtime=Dur\u00e9e en fait dialog.estimatetime.error.noaltitudes=L'\u00e9tendue s\u00e9lectionn\u00e9e de contient pas d'altitudes dialog.learnestimationparams.averageerror=Erreur en moyenne dialog.learnestimationparams.combinedresults=R\u00e9sultats combin\u00e9es -dialog.learnestimationparams.weight.current=actuel -dialog.learnestimationparams.weight.calculated=calcul\u00e9 +dialog.learnestimationparams.weight.100pccurrent=Conserver les valeurs actuelles +dialog.learnestimationparams.weight.current=actuelles +dialog.learnestimationparams.weight.calculated=calcul\u00e9es +dialog.learnestimationparams.weight.50pc=Moyenne d'actuelles et calcul\u00e9es +dialog.learnestimationparams.weight.100pccalculated=Accepter les valeurs calcul\u00e9es dialog.setmapbg.intro=S\u00e9lectionnez une source de cartes, ou ajoutez-en une nouvelle dialog.addmapsource.title=Ajouter une nouvelle source de cartes dialog.addmapsource.sourcename=Nom de la source @@ -574,6 +581,7 @@ dialog.weather.wind=Vent dialog.weather.temp=Temp dialog.weather.humidity=Humidit\u00e9 dialog.weather.creditnotice=Ces donn\u00e9es sont fournies par openweathermap.org. Consultez la page pour plus de d\u00e9tails. +dialog.deletebydate.onlyonedate=Tous les points sont \u00e0 la m\u00eame date. dialog.deletebydate.nodate=Sans horodatage dialog.deletebydate.column.keep=Garder dialog.deletebydate.column.delete=Supprimer @@ -602,6 +610,8 @@ confirm.addtimeoffset=D\u00e9calage ajout\u00e9 confirm.addaltitudeoffset=D\u00e9calage d'altitude ajout\u00e9 confirm.rearrangewaypoints=Waypoints r\u00e9arrang\u00e9s confirm.rearrangephotos=Photos r\u00e9arrang\u00e9es +confirm.splitsegments=%d s\u00e9parations ont \u00e9t\u00e9 effectu\u00e9es +confirm.sewsegments=%d r\u00e9unifications ont \u00e9t\u00e9 effectu\u00e9es confirm.cutandmove=S\u00e9lection d\u00e9plac\u00e9e confirm.interpolate=Points ajout\u00e9s confirm.convertnamestotimes=Noms de waypoints convertis diff --git a/tim/prune/readme.txt b/tim/prune/readme.txt index afde04b..c8120c1 100644 --- a/tim/prune/readme.txt +++ b/tim/prune/readme.txt @@ -1,9 +1,9 @@ -GpsPrune version 18.5 +GpsPrune version 18.6 ===================== GpsPrune is an application for viewing, editing and managing coordinate data from GPS systems, including format conversion, charting, 3d visualisation, audio and photo correlation, and online resource lookup. -Full details can be found at http://gpsprune.activityworkshop.net/ +Full details can be found at https://gpsprune.activityworkshop.net/ GpsPrune is copyright 2006-2016 activityworkshop.net and distributed under the terms of the Gnu GPL version 2. You may freely use the software, and may help others to freely use it too. For further information @@ -17,7 +17,7 @@ Running ======= To run GpsPrune from the jar file, simply call it from a command prompt or shell: - java -jar gpsprune_18.5.jar + java -jar gpsprune_18.6.jar If the jar file is saved in a different directory, you will need to include the path. Depending on your system settings, you may be able to click or double-click on the jar file @@ -25,9 +25,14 @@ in a file manager window to execute it. A shortcut, menu item, alias, desktop i or other link can of course be made should you wish. To specify a language other than the default, use an additional parameter, eg: - java -jar gpsprune_18.5.jar --lang=DE + java -jar gpsprune_18.6.jar --lang=DE +New with version 18.6 +===================== +The following fix was made since version 18.5: + - Change of URL for SRTM tiles, and recognise when downloaded file is too small to be valid + New with version 18.5 ===================== The following fixes and additions were made since version 18.4: -- 2.43.0