litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-263: corrected counts on map display and updated us-states.rdf file to include relationship between states and the US.

Browse source
This commit is contained in:
tworrall 2013-08-23 16:27:10 -04:00
parent 706e0ae1c1
commit 621be26e73
6 changed files with 47 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
productMods/js/homePageMaps.js
View file

@ -9,6 +9,7 @@ $(document).ready(function(){
$.extend(this, urlsBase);
$.extend(this, i18nStrings);
$.extend(this, geoResearcherCount);
getGeoJsonForMaps();
@ -368,7 +369,7 @@ $(document).ready(function(){
function getResearcherCount(area) {
var researcherCount = 0;
var researcherCount = this.geoResearcherCount;
var areaCount = 0;
var text = "";
if ( area == "global" ) {
@ -383,7 +384,6 @@ $(document).ready(function(){
$.each(researchAreas.features, function() {
if ( this.properties.mapType == area ) {
researcherCount = researcherCount + this.properties.html ;
areaCount = areaCount + 1;
}
});
@ -391,10 +391,16 @@ $(document).ready(function(){
if ( areaCount == 1 && text == " states.") {
text = " " + i18nStrings.stateString;
}
if ( researcherCount == 1 ) {
researcherText = " " + i18nStrings.researcherString + " " + i18nStrings.inString;
}
else {
researcherText = " " + i18nStrings.researcherInString
}
$('div#researcherTotal').html("<font style='font-size:1.05em;color:#167093'>"
+ researcherCount.toString().replace(/(\d+)(\d{3})/, '$1'+','+'$2')
+ "</font> " + i18nStrings.researchersInString + " <font style='font-size:1.05em;color:#167093'>"
+ researcherCount
+ "</font> " + researcherText + " <font style='font-size:1.05em;color:#167093'>"
+ areaCount + "</font>" + text);
}
function appendLegendToLeafletContainer() {