Merge pull request allenhwkim#1 from sebas-nicholls/sebas-nicholls-patch-bug-511

Fixed bug allenhwkim#511

Author: sebas-nicholls

services/attr2-map-options.js

@@ -40,14 +40,26 @@
       }
       return JSON.parse(jsonizeFilter(input));
     };
-
+    
     var getLatLng = function(input) {
       var output = input;
-      if (input[0].constructor == Array) { // [[1,2],[3,4]]
-        output = input.map(function(el) {
-          return new google.maps.LatLng(el[0], el[1]);
-        });
-      } else if(!isNaN(parseFloat(input[0])) && isFinite(input[0])) {
+      if (input[0].constructor == Array) { 
+        if ((input[0][0].constructor == Array && input[0][0].length == 2) || input[0][0].constructor == Object) {
+            var preoutput;
+            var outputArray = [];
+            for (var i = 0; i < input.length; i++) {
+                preoutput = input[i].map(function(el){
+                    return new google.maps.LatLng(el[0], el[1]);
+                });
+                outputArray.push(preoutput);
+            }
+            output = outputArray;
+        } else {
+            output = input.map(function(el) {
+                return new google.maps.LatLng(el[0], el[1]);
+            });
+        }
+      } else if (!isNaN(parseFloat(input[0])) && isFinite(input[0])) {
         output = new google.maps.LatLng(output[0], output[1]);
       }
       return output;
@@ -61,11 +73,16 @@
         try { // 2. JSON?
           var output = getJSON(input);
           if (output instanceof Array) {
-            // [{a:1}] : not lat/lng ones
             if (output[0].constructor == Object) {
               output = output;
-            } else { // [[1,2],[3,4]] or [1,2]
-              output = getLatLng(output);
+            } else if (output[0] instanceof Array) {
+              if (output[0][0].constructor == Object) {
+                output = output;
+              } else {
+                output = getLatLng(output);
+              }
+            } else {
+                output = getLatLng(output);
             }
           }
           // JSON is an object (not array or null)