Skip to content
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

World Map update (Lesotho, Palestine) #10352

Merged
merged 4 commits into from Nov 14, 2016
Merged

World Map update (Lesotho, Palestine) #10352

merged 4 commits into from Nov 14, 2016

Conversation

polyfloyd
Copy link
Contributor

@polyfloyd polyfloyd commented Jul 31, 2016

This update fixes the appearance of some countries in the UserCountryMap plugin.

The ISO3 codes for Gaza, West Bank and South Sudan have been updated so the number of visits are correctly displayed.
Additionally, Gaza and the West Bank have been merged into a single Palestine.

The enclaved country of Lesotho is still covered by South Africa, but will now be visible when visits have been recorded.

This change merges Gaza and the West Bank into Palestine and makes sure
that visit numbers are displayed on the world and continental map
levels.
Fixes Lesotho being hidden by moving it above South Africa. This only
works when visits from Lesotho have been recorded.
@sgiehl
Copy link
Member

sgiehl commented Aug 2, 2016

Did you fix/update the SVGs manually? We used to had a script for that, but it doesn't work anymore...

@polyfloyd
Copy link
Contributor Author

Yes, I updated them manually.

Also, where can I find this script? Maybe I'm able to figure out why it doesn't work.

@sgiehl
Copy link
Member

sgiehl commented Aug 3, 2016

It's an old python script (https://github.com/piwik/piwik-map-generator). The used map data has changed. Tried to get it working with the new ones, but my knowledge about python, shapefiles and geodata is limited.

@polyfloyd
Copy link
Contributor Author

The map generator seems to have been neglected for some time. The effort required for updating it will definitely exceed the cost of just manually fixing the small issues which currently exist in the map.

@sgiehl
Copy link
Member

sgiehl commented Aug 5, 2016 via email

@mattab mattab added the Needs Review PRs that need a code review label Aug 23, 2016
@mattab mattab added this to the 3.0.0 milestone Aug 23, 2016
@tsteur
Copy link
Member

tsteur commented Aug 30, 2016

FYI: we would need to have this PR against the "3.x-dev" branch instead of "master" as we only merge critical bugfixes and security fixes into "master" as Piwik 2 is in LTS mode. I will close this but would be highly appreciated if you could issue the PR again. @sgiehl have you had a look at the maps already?

@tsteur tsteur closed this Aug 30, 2016
@polyfloyd polyfloyd changed the base branch from master to 3.x-dev August 31, 2016 11:07
@polyfloyd
Copy link
Contributor Author

So uh, does changing the base of this PR work or do you prefer me opening a new PR?

@sgiehl sgiehl reopened this Sep 3, 2016
@sgiehl
Copy link
Member

sgiehl commented Sep 3, 2016

@polyfloyd Switching the base should be enough.
@tsteur hadn't have enough time to have a closer look. Need to generate some fake visits for the countries that were changed, in order to check if everything is displayed correct then. Not sure when I will find some time for this, as there are some more important things on my to do...

@mattab
Copy link
Member

mattab commented Sep 23, 2016

@sgiehl Could you take a quick look at this PR and whether we can merge it in beta1/beta2?

@mattab mattab modified the milestones: 3.0.0-b2, 3.0.0 Sep 23, 2016
@mattab mattab modified the milestones: 3.0.0-b2, 3.0.0-b3 Oct 30, 2016
@sgiehl
Copy link
Member

sgiehl commented Oct 31, 2016

Had a closer look at the changes. For me the changes look ok. But I'm not sure if the other occurrences of GAZ needs to be replaces with PSE in all other svgs, as well.

@polyfloyd
Copy link
Contributor Author

IIRC those other GAZ'es are present in images where Gaza is outside of the SVG viewport, e.g. North and South America.

@sgiehl
Copy link
Member

sgiehl commented Nov 1, 2016

Ok. but wouldn't it be more consistent to change it everywhere?

@polyfloyd
Copy link
Contributor Author

Good point. Although it seems that the remaining GAZ and WEB's were parts of Palestine that are displayed in the views of neighbouring countries. That's worth fixing.

@sgiehl
Copy link
Member

sgiehl commented Nov 2, 2016

ok fine. guess that should be good to merge then

@mattab mattab changed the title Usercountry update World Map update (Lesotho, Palestine) Nov 14, 2016
@mattab mattab merged commit a57fef5 into matomo-org:3.x-dev Nov 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants