Skip to content

Don't transform the scale specified by the user #4385

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

Merged
merged 1 commit into from
Nov 6, 2015

Conversation

oterral
Copy link
Contributor

@oterral oterral commented Nov 6, 2015

This PR fixes a regression introduced by this one #4302 . The default mulitplier scale should be used only when the user hasn't specified a scale and when the defualt image is used.

@bartvde
Copy link
Member

bartvde commented Nov 6, 2015

@oterral any chance of adding a unit test? TIA

@oterral
Copy link
Contributor Author

oterral commented Nov 6, 2015

I'd love it. But can't compile on my mac I have an error:

/Users/kogisiwi/Documents/00_GIT/oterral-ol3/node_modules/metalsmith/lib/index.js:190
Metalsmith.prototype.build = unyield(function*(){
                                             ^
SyntaxError: Unexpected token *
    at Module._compile (module.js:439:25)
    at Object.Module._extensions..js (module.js:474:10)
    at Module.load (module.js:356:32)
    at Function.Module._load (module.js:312:12)

@bartvde
Copy link
Member

bartvde commented Nov 6, 2015

try with node 4.2.2

@tsauerwein
Copy link
Member

See #4356 (comment)

curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.29.0/install.sh | bash
nvm install 4
nvm alias default stable

@oterral
Copy link
Contributor Author

oterral commented Nov 6, 2015

Thanks guys you're awesome !!! Test is coming.

@oterral
Copy link
Contributor Author

oterral commented Nov 6, 2015

Tests done but build failed caused by #4384

bartvde added a commit that referenced this pull request Nov 6, 2015
Don't transform the scale specified by the user
@bartvde bartvde merged commit fadf63c into openlayers:master Nov 6, 2015
@bartvde
Copy link
Member

bartvde commented Nov 6, 2015

thanks @oterral

@oterral oterral deleted the scaledflt branch November 9, 2015 07:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants