search

WeAreFairphone / fprsmap

This is a Leaflet map of the local Fairphoners communities
https://map.fairphone.community
GNU General Public License v3.0
10 stars 7 forks source link

Introduce renamed functions/variables and clustering #25

Closed StefanBrand closed 7 years ago

StefanBrand commented 7 years ago

This PR includes the other PR I have made from the branch ´renaming´. I'm not sure how it will behave. :smile:

PS.: Here is a demo of the clustering: https://stefanbrand.github.io/fprsmap/ I have also tested it with two markers on different layers that were on the exact same location. Worked like a charm! :smiley:

Roboe commented 7 years ago

Awesome! Colors are based on density, I see? Could be great if we can change them to Fairphone pallete, but that's minor right now.

I'll review #24 before merge this, ;)

Roboe commented 7 years ago

I created the branch conflict, I'll solve it, hahaha (just a thorought git rebase -i)

Roboe commented 7 years ago

Do I have push permissions? :/ (or "Is the Allow edits from maintainers check enabled?")

Ok, yes, it was. I was pushing a branch that didn't exist to the remote (tmp-gh-pages)

Edit: What! Damn it, I force-pushed the rebased commits and GitHub closed automatically the PR because the old commits don't exist anymore? And then the commit is lost and I have not further push access to your repo? :confused: I'll merge it manually, then...

StefanBrand commented 7 years ago

Don't mess up! :wink:

Roboe commented 7 years ago

Hahaha, I'll never force-push to a non-owned PR again! Anyway, I fixed it manually (<3 the command line)

StefanBrand commented 7 years ago

Maybe it's not working perfectly yet, if they have just recently implemented the maintainer-thing.