Merge branch 'master' into rename-repo-url

markerclustererplus/markerclustererplus-tests.ts

@@ -1,7 +1,7 @@
 /// <reference path="../googlemaps/google.maps.d.ts" />
 /// <reference path="markerclustererplus.d.ts" />
 
-module MarkerClusterApp {
+namespace MarkerClusterApp {
     export function simple_test() {
         var center = new google.maps.LatLng(37.4419, -122.1419);
         var map = new google.maps.Map(document.getElementById('map'), {
@@ -9,7 +9,7 @@ module MarkerClusterApp {
             center: center,
             mapTypeId: google.maps.MapTypeId.ROADMAP
         });
-        
+
         var markers: google.maps.Marker[] = [];
         for (var i = 0; i < 100; i++) {
             var dataPhoto = data.photos[i];
@@ -25,7 +25,7 @@ module MarkerClusterApp {
     }
 
     // Dummy data from http://cdn.rawgit.com/mahnunchik/markerclustererplus/master/src/data.json
-    var data = { 
+    var data = {
         "count": 10785236,
         "photos": [{"photo_id": 27932, "photo_title": "Atardecer en Embalse", "photo_url": "http://www.panoramio.com/photo/27932", "photo_file_url": "http://mw2.google.com/mw-panoramio/photos/medium/27932.jpg", "longitude": -64.404945, "latitude": -32.202924, "width": 500, "height": 375, "upload_date": "25 June 2006", "owner_id": 4483, "owner_name": "Miguel Coranti", "owner_url": "http://www.panoramio.com/user/4483"}
     ,