Merge pull request #6888 from mkllnk/use-google-tiles-with-google-maps

Use Google's map tiles with Google Maps

app/assets/javascripts/darkswarm/directives/map_osm_tiles.js.coffee

@@ -1,21 +0,0 @@
-Darkswarm.directive 'mapOsmTiles', ($timeout) ->
-  restrict: 'E'
-  require: '^uiGmapGoogleMap'
-  scope: {}
-  link: (scope, elem, attrs, ctrl) ->
-    $timeout =>
-      map = ctrl.getMap()
-
-      map.mapTypes.set 'OSM', new google.maps.ImageMapType
-        getTileUrl: (coord, zoom) ->
-          # "Wrap" x (logitude) at 180th meridian properly
-          # NB: Don't touch coord.x because coord param is by reference, and changing its x property breaks something in Google's lib
-          tilesPerGlobe = 1 << zoom
-          x = coord.x % tilesPerGlobe
-          if x < 0
-            x = tilesPerGlobe + x
-          # Wrap y (latitude) in a like manner if you want to enable vertical infinite scroll
-          'https://a.tile.openstreetmap.org/' + zoom + '/' + x + '/' + coord.y + '.png'
-        tileSize: new google.maps.Size(256, 256)
-        name: 'OpenStreetMap'
-        maxZoom: 18

app/assets/javascripts/darkswarm/services/map_configuration.js.erb.coffee

@@ -8,7 +8,6 @@ Darkswarm.factory "MapConfiguration", ->
       zoom: 12
       additional_options:
         # mapTypeId: 'satellite'
-        mapTypeId: 'OSM'
         mapTypeControl: false
         streetViewControl: false
       styles: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]},{"featureType":"road","elementType": "labels.icon","stylers":[{"visibility":"off"}]}]

app/assets/stylesheets/darkswarm/map.scss

@@ -64,32 +64,3 @@
     }
   }
 }
-
-.map-footer {
-  position: fixed;
-  z-index: 2;
-  width: 100%;
-  height: 23px;
-  left: 80px;
-  right: 0;
-  bottom: 6px;
-  margin: 0;
-  padding: 6px;
-  font-size: 14px;
-  font-weight: bold;
-  text-shadow: 2px 2px #aaa;
-  color: #fff;
-
-  a, a:hover, a:active, a:focus {
-    color: #fff;
-  }
-
-  @media all and (max-width: 1025px) {
-    left: 0px;
-  }
-}
-
-.tabs-content .map-footer {
-  position: relative;
-  bottom: 30px;
-}

app/views/shared/_map.html.haml

@@ -10,10 +10,6 @@
     %map{"ng-controller" => "MapCtrl"}
       %ui-gmap-google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom",
                           styles: "map.styles", draggable: "true"}
-        %map-osm-tiles
         %map-search
         %ui-gmap-markers{models: "OfnMap.enterprises", fit: "true",
                          coords: "'self'", icon: "'icon'", click: "'reveal'"}
-
-  .map-footer
-    %a{:href => "http://www.openstreetmap.org/copyright"} © OpenStreetMap contributors