Add options.query to CZML in order to append tokens to URL/URI #5419
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
ottaviohartman
force-pushed
the
czml_query
branch
from
ff898e7 to
c2bb133
Compare
|
Once somebody reviews this, I'll finish up the |
mramato
reviewed
Jun 5, 2017
Source/DataSources/CzmlDataSource.js
Outdated
| @@ -217,7 +221,16 @@ define([ | |||
| function unwrapUriInterval(czmlInterval, sourceUri) { | |||
| var result = defaultValue(czmlInterval.uri, czmlInterval); | |||
| if (defined(sourceUri)) { | |||
| result = getAbsoluteUri(result, getAbsoluteUri(sourceUri)); | |||
| var uriComponents = sourceUri.split('?'); | |||
There was a problem hiding this comment.
I don't think we want to get the parameters from the sourceUri. We need to thread the query object through all of the calls so that we can use it here instead.
mramato
reviewed
Jun 5, 2017
| @@ -1973,6 +1995,7 @@ define([ | |||
| * @param {String|Object} czml A url or CZML object to be processed. | |||
| * @param {Object} [options] An object with the following properties: | |||
| * @param {String} [options.sourceUri] Overrides the url to use for resolving relative links. | |||
| * @param {Object} [options.query] Key-value pairs which are appended to all URIs in the CZML. | |||
There was a problem hiding this comment.
CzmlDataSource.prototype.load and CzmlDataSource.prototype.process most likely need similar updates to their documentation.
ottaviohartman
force-pushed
the
czml_query
branch
from
c2bb133 to
007deab
Compare
|
updated |
|
Looks great @omh1280! At some point in the future we might want to look into cleaning up the parameter craziness going on in CzmlDataSource (but definitely outside the current scope). I updated CHANGES, please remember to do this for any API changes or significant bug fixes. Thanks! |
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.
For #5408
How does it look? The
queryis appended tosourceUri. InunwrapUriInterval(which is the only function that looks atsourceUri), it is appended ontoczmlIntervalorczmlInterval.uri.I've also updated three unit tests which had mismatched parameters to
process.Ottavio