diff --git a/productMods/images/visualization/mapofscience/labels/black/bio.png b/productMods/images/visualization/mapofscience/labels/black/bio.png new file mode 100644 index 00000000..475871db Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/bio.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/biotech.png b/productMods/images/visualization/mapofscience/labels/black/biotech.png new file mode 100644 index 00000000..4271eb2c Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/biotech.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/brain.png b/productMods/images/visualization/mapofscience/labels/black/brain.png new file mode 100644 index 00000000..ae5904d6 Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/brain.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/chem.png b/productMods/images/visualization/mapofscience/labels/black/chem.png new file mode 100644 index 00000000..fec98f74 Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/chem.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/chemeng.png b/productMods/images/visualization/mapofscience/labels/black/chemeng.png new file mode 100644 index 00000000..4cd2676e Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/chemeng.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/earthsci.png b/productMods/images/visualization/mapofscience/labels/black/earthsci.png new file mode 100644 index 00000000..1ed5ec5c Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/earthsci.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/eecs.png b/productMods/images/visualization/mapofscience/labels/black/eecs.png new file mode 100644 index 00000000..f7faa28c Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/eecs.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/health.png b/productMods/images/visualization/mapofscience/labels/black/health.png new file mode 100644 index 00000000..98d51b97 Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/health.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/human.png b/productMods/images/visualization/mapofscience/labels/black/human.png new file mode 100644 index 00000000..026f2a12 Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/human.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/infect.png b/productMods/images/visualization/mapofscience/labels/black/infect.png new file mode 100644 index 00000000..06ef9b88 Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/infect.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/mathphys.png b/productMods/images/visualization/mapofscience/labels/black/mathphys.png new file mode 100644 index 00000000..2a5a5aab Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/mathphys.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/medspec.png b/productMods/images/visualization/mapofscience/labels/black/medspec.png new file mode 100644 index 00000000..c3ef7d4a Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/medspec.png differ diff --git a/productMods/images/visualization/mapofscience/labels/black/socsci.png b/productMods/images/visualization/mapofscience/labels/black/socsci.png new file mode 100644 index 00000000..5ac88e6c Binary files /dev/null and b/productMods/images/visualization/mapofscience/labels/black/socsci.png differ diff --git a/productMods/js/visualization/mapofscience/ComparisonScimapWidget.js b/productMods/js/visualization/mapofscience/ComparisonScimapWidget.js index b1b56210..c699fa0c 100644 --- a/productMods/js/visualization/mapofscience/ComparisonScimapWidget.js +++ b/productMods/js/visualization/mapofscience/ComparisonScimapWidget.js @@ -81,7 +81,7 @@ var ComparisonScimapWidget = Class.extend({ /* create */ if (me.disciplineLabelsControl == null) { - me.labelsMarkerManager = new DisciplineLabelsMarkerManager(map); + me.labelsMarkerManager = new DisciplineLabelsMarkerManager(map, getDisciplineBlackLabelImageURL); me.disciplineLabelsControl = new CheckBoxPanel({ map: map, checked: true, diff --git a/productMods/js/visualization/mapofscience/CustomScimaps.js b/productMods/js/visualization/mapofscience/CustomScimaps.js index d6e2e19e..6ae6ed7e 100644 --- a/productMods/js/visualization/mapofscience/CustomScimaps.js +++ b/productMods/js/visualization/mapofscience/CustomScimaps.js @@ -10,6 +10,10 @@ function getDisciplineLabelImageURL(key) { return disciplineLabelImageUrlPrefix + DISCIPLINES[key].image; } +function getDisciplineBlackLabelImageURL(key) { + return disciplineBlackLabelImageUrlPrefix + DISCIPLINES[key].image; +} + function createScimapType(map, mapName) { var sciMapTypeOptions = { getTileUrl: function(coord, zoom) { diff --git a/productMods/js/visualization/mapofscience/MarkerManager.js b/productMods/js/visualization/mapofscience/MarkerManager.js index 34d983f0..b282082f 100644 --- a/productMods/js/visualization/mapofscience/MarkerManager.js +++ b/productMods/js/visualization/mapofscience/MarkerManager.js @@ -58,9 +58,13 @@ var MarkerManager = Class.extend({ * Customized Discipline labels MarkerManager for Science map purpose. It is an abstract class */ var DisciplineLabelsMarkerManager = MarkerManager.extend({ - init: function(map) { + init: function(map, getLabelURL) { this._super(); this.map = map; + this.getLabelURL = getDisciplineLabelImageURL; + if (getLabelURL != null) { + this.getLabelURL = getLabelURL; + } this.initMarkers(map); }, initMarkers: function(map) { @@ -69,7 +73,7 @@ var DisciplineLabelsMarkerManager = MarkerManager.extend({ var opts = { map: map, position: createNoWrapLatLng(discipline.labelLatitude, discipline.labelLongitude), - icon: getDisciplineLabelImageURL(id), + icon: me.getLabelURL(id), clickable: false }; me.addMarker(id, new Marker(opts)); diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl index e310d532..c332b2d5 100644 --- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl +++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl @@ -45,6 +45,7 @@ var entityUnmappedJournalsCSVURLPrefix = "${urls.base}${dataVisualizationURLRoot var imageFolderPrefix = "${urls.images}/visualization/"; var mapOfScienceImageFolderPrefix = imageFolderPrefix + "mapofscience/"; var disciplineLabelImageUrlPrefix = mapOfScienceImageFolderPrefix + "labels/"; +var disciplineBlackLabelImageUrlPrefix = disciplineLabelImageUrlPrefix + "black/"; var infoIconUrl = "${urls.images}/iconInfo.png"; var drillDownIconUrl = "${urls.images}/visualization/drill_down_icon.png";