From 3429776385d082d64f9b9039d603de9c49aa7630 Mon Sep 17 00:00:00 2001
From: Kelvin Wong <netsgnut@gmail.com>
Date: Sat, 4 Jul 2015 11:33:58 +0800
Subject: [PATCH] Font preference is now passed to Pin and Marker

---
 src/Globe.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Globe.js b/src/Globe.js
index db49496..325dd52 100644
--- a/src/Globe.js
+++ b/src/Globe.js
@@ -382,7 +382,8 @@ Globe.prototype.addPin = function(lat, lon, text){
 
     var opts = {
         lineColor: this.pinColor,
-        topColor: this.pinColor
+        topColor: this.pinColor,
+        font: this.font
     }
 
     var altitude = 1.2;
@@ -457,7 +458,8 @@ Globe.prototype.addMarker = function(lat, lon, text, connected){
     var marker;
     var opts = {
         markerColor: this.markerColor,
-        lineColor: this.markerColor
+        lineColor: this.markerColor,
+        font: this.font
     };
 
     if(typeof connected == "boolean" && connected){