-
Notifications
You must be signed in to change notification settings - Fork 360
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Experiment to cleanup Terria start, and init sources #6366
Open
nf-s
wants to merge
12
commits into
main
Choose a base branch
from
terria-cleanup
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
without fixing this, it affects Stories loading for example (i.e. they might be slow to load due to GeoJSON files) |
How does this interact with plugin lifecycle? |
The last tag just before prettier v2 was run
The tag immediately after prettier v2 was run in main
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cleanup Terria start, and init sources
Fixes #6354
Main purpose of this PR is to simplify
Terria.ts
,Terria.start
andInitSources
.Previously
loadInitSources
was getting called multiple times - at different stages ofstart
andTerriaMap/index.js
.Now
loadInitSources
must be called explicitly afterTerria.start()
I have also split up
Terria.ts
intoTerriaConfig.ts
TerriaConfig
,ConfigParameters
,StartOptions
,Analytics
,HomeCameraInit
InitSource.ts
now handles all adding of init sources - none of these new functions call
loadInitSources
setupInitializationUrls
->addInitSourcesFromConfig
interpretStartData
->addInitSourcesFromStartData
updateApplicationUrl
->addInitSourcesFromUrl
generateInitializationUrl
->generateInitializationUrl
(private function)interpretHash
->interpretHash
(private function)As I have removed the following functions in
Terria
:updateFromStartData
- instead useaddInitSourcesFromStartData
and then callterria.loadInitSources
updateApplicationUrl
- instead useaddInitSourcesFromUrl
and then callterria.loadInitSources
InitData.ts
now handles all applying of init data
terria.applyInitData
->applyInitData
terria.loadModelStratum
->loadModelStratum
(private function)terria.pushAndLoadMapItems
->pushAndLoadMapItems
(private function)PickedFeatures.ts
loadPickedFeatures
->loadPickedFeaturesFromJson
inPickedFeatures.ts
Changes required to
index.js
inTerriaMap
See PR TerriaJS/TerriaMap#603 for new load procedure:
terria.start
(await)terria.loadInitSources
(async)render
https://github.com/TerriaJS/TerriaMap/blob/218633b1171b87f2f3c0520480c7a7ce24fabcb7/index.js#L62-L85
I have removed all Magda config functionality from
Terria
- this will need to be re-implemented inTerriaMap
Removed code is here https://gist.github.com/nf-s/4381b585fb2115a6e4d35dbcf77909c5
Other changes
updateApplicationOnMessageFromParentWindow
updateApplicationOnHashChange
andupdateApplicationOnMessageFromParentWindow
are now called inTerria.start
disableUpdateApplicationOnHashChange
anddisableUpdateApplicationOnMessageFromParentWindow
toStartOptions
getConfig
to TerriaStartOptions
- this can be used to override fetching of Terria config throughStartOptions.configUrl
Terria.start
will now await Internationalization initQuestions
Plugins
updateApplicationOnHashChange
andupdateApplicationOnMessageFromParentWindow
window
object?Test links
Start data with huge GeoJSON file
Checklist
doc/
.