From a6b15433c8c81e42df5135231f957f3ec451c093 Mon Sep 17 00:00:00 2001 From: Fred Massin Date: Thu, 26 Oct 2017 09:37:58 -0600 Subject: [PATCH 1/4] Tiles without extension The mapprojection package stores tiles without extension. This change allow to use these tiles in the ipgp gui's. --- libs/ipgp/gui/map/tile.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/ipgp/gui/map/tile.cpp b/libs/ipgp/gui/map/tile.cpp index 71fb8de..1f150b0 100644 --- a/libs/ipgp/gui/map/tile.cpp +++ b/libs/ipgp/gui/map/tile.cpp @@ -96,10 +96,13 @@ const int& Tile::z() const { // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> const QString Tile::path() const { + const QString noext = _path + suffix(); const QString png = _path + suffix() + ".png"; const QString jpg = _path + suffix() + ".jpg"; - if ( QFile::exists(png) ) + if ( QFile::exists(noext) ) + return noext; + else if ( QFile::exists(png) ) return png; else return jpg; From ab83719f3e5e912877c32cb7826c20707f503f85 Mon Sep 17 00:00:00 2001 From: Fred Massin Date: Tue, 12 Nov 2019 11:28:22 +0100 Subject: [PATCH 2/4] Update scwev.rst --- apps/gui/scwev/descriptions/scwev.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/gui/scwev/descriptions/scwev.rst b/apps/gui/scwev/descriptions/scwev.rst index 8e9cd6f..deac771 100644 --- a/apps/gui/scwev/descriptions/scwev.rst +++ b/apps/gui/scwev/descriptions/scwev.rst @@ -223,7 +223,8 @@ should specify the way they are stored. # - %3 = line (0- 2^zoom-1 in Mercator projection) # Each parameter can be used more than once. # @note It is not mandatory to specify the extension of the file, the - # algorithm will try and fetch PNG and JPG files + # algorithm will try and fetch PNG and JPG files (with and without + # extension). map.tilePattern = "%1/%2/%3" More information about tiles From 58bda442614a6f29eaecc571bfa9f29657b2b399 Mon Sep 17 00:00:00 2001 From: Fred Massin Date: Tue, 12 Nov 2019 11:30:12 +0100 Subject: [PATCH 3/4] Update scaemv.rst --- apps/gui/scaemv/descriptions/scaemv.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/gui/scaemv/descriptions/scaemv.rst b/apps/gui/scaemv/descriptions/scaemv.rst index 7ffab9a..d9e86e7 100644 --- a/apps/gui/scaemv/descriptions/scaemv.rst +++ b/apps/gui/scaemv/descriptions/scaemv.rst @@ -634,7 +634,8 @@ should specify the way they are stored. # - %3 = line (0- 2^zoom-1 in Mercator projection) # Each parameter can be used more than once. # @note It is not mandatory to specify the extension of the file, the - # algorithm will try and fetch PNG and JPG files + # algorithm will try and fetch PNG and JPG files (with and without + # extension). map.tilePattern = "%1/%2/%3" More information about tiles From 3979b6f2b38072ca9fa327509ef7af53928b7564 Mon Sep 17 00:00:00 2001 From: Fred Massin Date: Tue, 12 Nov 2019 11:32:23 +0100 Subject: [PATCH 4/4] Update Changelog --- apps/gui/scaemv/Changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/gui/scaemv/Changelog b/apps/gui/scaemv/Changelog index 2b05d10..6eefe40 100644 --- a/apps/gui/scaemv/Changelog +++ b/apps/gui/scaemv/Changelog @@ -1,2 +1,4 @@ +Version 0.1.1 + Adds support for map tiles without file extensions. Version 0.1.0 - Release date: 2013.12.20 \ No newline at end of file + Release date: 2013.12.20