Skip to content

Commit

Permalink
Merge pull request #5522 from gacarrillor/developersmap
Browse files Browse the repository at this point in the history
Developers Map: show more descriptive info
  • Loading branch information
NathanW2 authored Jan 10, 2018
2 parents df3f663 + 70cb249 commit 11030dd
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
10 changes: 5 additions & 5 deletions doc/contributors.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"Committer": "Yes",
"First Commit Message": "Initial revision",
"First Commit Date": "06-07-2002",
"GIT Nickname": "gsherman"
"GIT Nickname": "g-sherman"
},
"geometry": {
"type": "Point",
Expand Down Expand Up @@ -141,7 +141,7 @@
"Committer": "Yes",
"First Commit Message": "some dutch translations for git testing",
"First Commit Date": "4-9-2011",
"GIT Nickname": "duiv"
"GIT Nickname": "rduivenvoorde"
},
"geometry": {
"type": "Point",
Expand Down Expand Up @@ -277,7 +277,7 @@
"Committer": "Yes",
"First Commit Message": "some bugfixes",
"First Commit Date": "07-04-2004",
"GIT Nickname": "rabla,rblazek,blazek"
"GIT Nickname": "blazek"
},
"geometry": {
"type": "Point",
Expand Down Expand Up @@ -334,7 +334,7 @@
"type": "Point",
"coordinates": [
104.9110,
11.5582
11.5582
]
}
},
Expand Down Expand Up @@ -644,7 +644,7 @@
"Committer": "Yes",
"First Commit Message": "Patch to allow setting extents from cli on startup",
"First Commit Date": "03-06-2005",
"GIT Nickname": "wonder"
"GIT Nickname": "wonder-sk"
},
"geometry": {
"type": "Point",
Expand Down
15 changes: 12 additions & 3 deletions doc/developersmap.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,23 @@
<script>
var developersMapTiles = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
maxZooom: 18,
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
});

$.getJSON($('link[rel="points"]').attr("href"), function(data) {
var nameString = '';
var geojson = L.geoJson(data, {
onEachFeature: function (feature, layer) {
layer.bindPopup("<b>Name:</b> " + feature.properties.Name +
"<br><b>Committer:</b> " + feature.properties.Committer);
if (feature.properties['GIT Nickname'] !== undefined){
nameString = "<a href='https://github.com/" +
feature.properties['GIT Nickname'] + "' target='_blank' >" +
feature.properties.Name + "</a>";
} else {
nameString = feature.properties.Name;
}
layer.bindPopup(nameString + "<br>" +
(feature.properties.Committer == "Yes" ?
"Core committer" : "Core contributor" ));
}
});
var map = L.map('developers-map').fitBounds(geojson.getBounds());
Expand Down

0 comments on commit 11030dd

Please sign in to comment.