Differential D830

Fix srtm2 (ele profile) download. Avoid fko=>mko redirects.
ClosedPublic
Actions

Authored by nienhueser on Jan 17 2016, 9:44 AM.

Details

Reviewers

rahn

Group Reviewers

Marble

Commits

R34:b89e5fcee3c7: Fix srtm2 (ele profile) download. Avoid fko=>mko redirects.

Summary

Fixed:

After moving from files.kde.org to maps.kde.org the elevation profile data in the srtm2 map theme failed to download.
After moving to maps.kde.org all queries to tiles on files.kde.org caused another http lookup to process the redirect.

Old DGML files keep working, but there is more flexibility now: MarbleServerLayout can be used and still override the server URL and the path. I wonder however if this kind of flexibility is useful?

Diff Detail

Severity	Location	Code	Message
Error	data/maps/earth/bluemarble/bluemarble.dgml:10	Cppcheck	syntaxError
Error	data/maps/earth/srtm2/srtm2.dgml:1	Cppcheck	syntaxError

Repository

R34 Marble

Branch

master

Lint

Lint Errors

Excuse: no cpp files

Severity	Location	Code	Message
Error	data/maps/earth/srtm2/srtm2.dgml:1	Cppcheck	syntaxError

Unit

No Unit Test Coverage

nienhueser updated this revision to Diff 1988.Jan 17 2016, 9:44 AM

nienhueser retitled this revision from to Fix srtm2 (ele profile) download. Avoid fko=>mko redirects..

nienhueser updated this object.

nienhueser edited the test plan for this revision. (Show Details)

nienhueser added reviewers: Marble, rahn.

nienhueser added a project: Marble.

nienhueser added a subscriber: Marble.

Improve backward compatibility: If no server is set, use old-style URL

This means that no changes are required to DGML files to keep them working,
but still the redirect from files.kde.org to maps.kde.org goes away.

nienhueser updated this object.Jan 17 2016, 10:11 AM

Remove redundant downloadUrl parameter in dgml files

Closed by commit R34:b89e5fcee3c7: Fix srtm2 (ele profile) download. Avoid fko=>mko redirects. (authored by nienhueser). · Explain WhyJan 17 2016, 2:55 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			data/maps/earth/bluemarble/bluemarble.dgml (1 line)
M			data/maps/earth/srtm2/srtm2.dgml (1 line)
M			src/lib/marble/ServerLayout.h (5 lines)
M			src/lib/marble/ServerLayout.cpp (8 lines)
M			src/lib/marble/geodata/scene/GeoSceneTileDataset.cpp (10 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1988	31f7b98		Jan 17 2016, 9:44 AM	★	★
Diff 2	1989	31f7b98	Improve backward compatibility: If no server is set, use old-style URL	Jan 17 2016, 10:05 AM	★	★
Diff 3	1990	31f7b98	Remove redundant downloadUrl parameter in dgml files	Jan 17 2016, 2:52 PM	★	★
Diff 4	1991	31f7b98	Commit rMARBLEb89e5fcee3c7db3fbd7883fb12b2a214e44a3e2b	Jan 17 2016, 2:55 PM	★	★