D5396: Mismatch in parsed GeoDataDocument and GeoSceneGeodata in

[Abhinav Gangwar]

abhgangwar created this revision.

REVISION SUMMARY
In method MarbleModelPrivate::assignFillColors(const QString &filePath):

If the inner loop, which is iterating over the GeoSceneGeodata set in a layer, finds valid GeoSceneGeodata in the layer, the variable data becomes nonnull. If the data is nonnull, it causes the outer loop to exit even when the source file of GeoSceneData and path of parsed file don't match ( the condition data->sourceFile() == filePath in inner loop ). This results in applying wrong GeoSceneGeodata to a GeoDataDocument.

REPOSITORY
R34 Marble

REVISION DETAIL
https://phabricator.kde.org/D5396

AFFECTED FILES
src/lib/marble/MarbleModel.cpp

To: abhgangwar, nienhueser, rahn
Cc: marble-devel

[Abhinav Gangwar]

abhgangwar updated this revision to Diff 13552.
abhgangwar added a comment.


Yes, that's a better solution. Updated the diff.

REPOSITORY
R34 Marble

CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D5396?vs=13318&id=13552

REVISION DETAIL
https://phabricator.kde.org/D5396

AFFECTED FILES
src/lib/marble/MarbleModel.cpp

To: abhgangwar, nienhueser, rahn
Cc: shentey, marble-devel

[Abhinav Gangwar]

abhgangwar updated this revision to Diff 13867.
abhgangwar added a comment.


Updated the patch as earthwings and shentey suggested.

REPOSITORY
R34 Marble

CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D5396?vs=13552&id=13867

REVISION DETAIL
https://phabricator.kde.org/D5396

AFFECTED FILES
src/lib/marble/MarbleModel.cpp

To: abhgangwar, nienhueser, rahn
Cc: shentey, marble-devel