Commits

powersurge360 committed c9372a1 Merge with conflicts

Merge branch 'master' of ssh://bitbucket.org/powersurge360/groupgo

Conflicts:
groupGo/apps/organizations/templates/organizations/map.html

Comments (0)

Files changed (2)

groupGo/apps/organizations/templates/organizations/map.html

 {% endblock %}
 
 {% block more_content %}
-<div id="splash" class="section splash" style="display:none">
+<div id="splash" class="section splash">
 	<div class="container splash">
 		<img src="{{ STATIC_URL }}img/g-logo.gif">
 	</div>

groupGo/staticfiles/js/app/router.js

                 return;
             }
 
-            this.mapIsSetup = true;
+            var styles = [
+                {
+                  stylers: [
+                    { hue: "#00ffe6" },
+                    { saturation: -20 }
+                  ]
+                },{
+                  featureType: "road",
+                  elementType: "geometry",
+                  stylers: [
+                    { lightness: 100 },
+                    { visibility: "simplified" }
+                  ]
+                },{
+                  featureType: "road",
+                  elementType: "labels",
+                  stylers: [
+                    { visibility: "off" }
+                  ]
+                },{
+                    "featureType": "road",
+                    "stylers": [
+                      { "visibility": "on" },
+                      { "invert_lightness": true },
+                      { "hue": "#3bff00" },
+                      { "lightness": 80 }
+                    ]
+                }
+              ];
+
+            // Create a new StyledMapType object, passing it the array of styles,
+            // as well as the name to be displayed on the map type control.
+            var styledMap = new google.maps.StyledMapType(styles,
+            {name: "Styled Map"});
 
             var mapOptions = {
                 "zoom": 10,
                 "zoomControl": false,
                 "streetViewControl": false,
                 "panControl": false,
-                "mapTypeControl": false
+                "mapTypeControl": false,
+                "styles": styles
             };
 
             this.map = new gmaps.Map($("#map-canvas")[0], mapOptions);
+
+            //Associate the styled map with the MapTypeId and set it to display.
+            this.map.mapTypes.set('map_style', styledMap);
+            this.map.setMapTypeId('map_style');
         }
     });