[Marble-devel] Review Request 108687: Introduce GeoDataDocument::baseUrl

[Dennis Nienhüser]

> On Feb. 3, 2013, 10:07 a.m., Thibaut Gridel wrote:
> > Looks good and solves the relative url issue in an elegant way.
> > Are exotic cases from relative file names in FileLoader impacted?

No, the changes only affect documents that set a base uri explicitly (which is only .kmz for now).


> On Feb. 3, 2013, 10:07 a.m., Thibaut Gridel wrote:
> > src/lib/geodata/data/GeoDataDocument.h, line 96
> > <http://git.reviewboard.kde.org/r/108687/diff/1/?file=111254#file111254line96>
> >
> >     Can you add some comments so we understand its intent?

Added a reference to RFC 3986 now (like the Google KML documentation does)


> On Feb. 3, 2013, 10:07 a.m., Thibaut Gridel wrote:
> > src/lib/geodata/data/GeoDataObject.cpp, line 113
> > <http://git.reviewboard.kde.org/r/108687/diff/1/?file=111257#file111257line113>
> >
> >     Maybe for clarity the variable can be renamed documentRoot and take either the baseUrl or the documentFile.absolutePath directly?

Renamed it documentRoot. The intent for the baseUrl => fileName was to keep old code running as is (without introducing baseUrl everywhere where fileName is used atm).


- Dennis


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/108687/#review26567
-----------------------------------------------------------


On Jan. 31, 2013, 7:21 p.m., Dennis Nienhüser wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/108687/
> -----------------------------------------------------------
> 
> (Updated Jan. 31, 2013, 7:21 p.m.)
> 
> 
> Review request for Marble and Thibaut Gridel.
> 
> 
> Description
> -------
> 
> Adds GeoDataDocument::baseUrl used by the kml/kmz plugin and resolvePath(). This way both .kmz and .kml files correctly load relative resources.
> 
> 
> Diffs
> -----
> 
>   src/lib/geodata/data/GeoDataDocument.h 46c9339 
>   src/lib/geodata/data/GeoDataDocument.cpp 3537094 
>   src/lib/geodata/data/GeoDataDocument_p.h 41f4b15 
>   src/lib/geodata/data/GeoDataObject.cpp abc10f4 
>   src/plugins/runner/kml/KmlRunner.cpp ef07219 
> 
> Diff: http://git.reviewboard.kde.org/r/108687/diff/
> 
> 
> Testing
> -------
> 
> http://kml-samples.googlecode.com/svn-history/r212/trunk/kml/Region/GroundOverlay/usa-ca-sf.kmz
> - Download and open usa-ca-sf.kmz in Marble
> - Unzip usa-ca-sf.kmz and load its doc.kml in Marble
> 
> 
> Thanks,
> 
> Dennis Nienhüser
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20130203/d06b05e0/attachment.html>