Change TileMapServiceImageryProvider to use UrlTemplateImageryProvider #3460
Conversation
# Conflicts: # CHANGES.md
| @@ -201,16 +193,7 @@ define([ | |||
| */ | |||
| this.enablePickFeatures = defaultValue(options.enablePickFeatures, true); | |||
There was a problem hiding this comment.
This should just be true here, since options may be a promise and not have enablePickFeatures property. Then in reinitialize we should do this.enablePickFeatures = defaultValue(options.enablePickFeatures, this.enablePickFeatures); so that it keeps whatever the setting was if it's omitted from the reinitialize options.
# Conflicts: # CHANGES.md
|
@mramato ready |
| this._pickFeaturesUrlParts = urlTemplateToParts(this._pickFeaturesUrl, pickFeaturesTags); | ||
|
|
||
| this._readyPromise = when.resolve(true); | ||
| this._readyPromise = this.reinitialize(options); |
There was a problem hiding this comment.
this.reinitialize should assign _readyPromise itself, rather than assigning it here. Otherwise, when someone calls reinitialize later, _readyPromise will not be set.
|
Just that one last comment. @kring I know you reviewed this in the original PR, but do you want to take a final look? If not, no big deal. @TiffanyLu, thanks again for doing the brunt of the work here and thanks @hpinkos for finishing it up. |
|
Sure, I should be able to take a look tomorrow. |
|
Awesome, thanks. @hpinkos if the other changes we discussed offline regarding joinURLs are ready soon, just PR them into this branch. |
|
Add a test for TMS to verify query parameters are preserved. |
|
@mramato done |
|
This all looks good to me! |
# Conflicts: # CHANGES.md
|
Thanks @kring. Thanks again @hpinkos and @TiffanyLu |
Change TileMapServiceImageryProvider to use UrlTemplateImageryProvider
| } | ||
|
|
||
| function requestMetadata() { | ||
| var resourceUrl = url + 'tilemapresource.xml'; |
There was a problem hiding this comment.
@hpinkos We missed a spot during review (and apparently it's not covered by tests). This needs to use joinUrls too. Can you open a new PR with the fix and a test please. Thanks.
Finishing up #3150
Part of #2814
UrlTemplateImageryProvider.reinitialize