tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] fixup formatting

Browse Source
This commit is contained in:
Ivo van Dongen
2016-10-21 11:53:13 +03:00
committed by John Firebaugh
parent da9864f25d
commit e31a2c1c11
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mbgl/style/style.cpp
View File

@@ -494,8 +494,8 @@ void Style::onSourceError(Source& source, std::exception_ptr error) {
void Style::onSourceDescriptionChanged(Source& source) {
observer->onSourceDescriptionChanged(source);
if (!source.baseImpl->loaded) {
source.baseImpl->loadDescription(fileSource);
}
source.baseImpl->loadDescription(fileSource);
}
}
void Style::onTileChanged(Source& source, const OverscaledTileID& tileID) {

22
test/style/source.test.cpp
View File

@@ -384,7 +384,7 @@ TEST(Source, RasterTileAttribution) {
TEST(Source, GeoJSonSourceUrlUpdate) {
SourceTest test;
test.fileSource.sourceResponse = [&] (const Resource& resource) {
EXPECT_EQ("url", resource.url);
Response response;
@@ -394,7 +394,7 @@ TEST(Source, GeoJSonSourceUrlUpdate) {
test.observer.sourceDescriptionChanged = [&] (Source&) {
//Should be called (test will hang if it doesn't)
test.end();
test.end();
};
test.observer.tileError = [&] (Source&, const OverscaledTileID&, std::exception_ptr) {
@@ -403,15 +403,15 @@ TEST(Source, GeoJSonSourceUrlUpdate) {
GeoJSONSource source("source");
source.baseImpl->setObserver(&test.observer);
//Load initial, so the source state will be loaded=true
source.baseImpl->loadDescription(test.fileSource);
//Schedule an update
test.loop.invoke([&] () {
//Update the url
source.setURL(std::string("http://source-url.ext"));
});
//Load initial, so the source state will be loaded=true
source.baseImpl->loadDescription(test.fileSource);
//Schedule an update
test.loop.invoke([&] () {
//Update the url
source.setURL(std::string("http://source-url.ext"));
});
test.run();
}