diff --git a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee index 20a2cba1d4..e67ce529a5 100644 --- a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee @@ -8,6 +8,7 @@ Darkswarm.directive 'mapSearch', ($timeout)-> $timeout => map = ctrl.getMap() + # Use OSM tiles server map.mapTypes.set 'OSM', new (google.maps.ImageMapType)( getTileUrl: (coord, zoom) -> # "Wrap" x (logitude) at 180th meridian properly @@ -36,7 +37,7 @@ Darkswarm.directive 'mapSearch', ($timeout)-> #map.setCenter place.geometry.location map.fitBounds place.geometry.viewport #map.fitBounds bounds - + # Bias the SearchBox results towards places that are within the bounds of the # current map's viewport. google.maps.event.addListener map, "bounds_changed", -> diff --git a/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee b/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee index 992872e2da..1979affeab 100644 --- a/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee +++ b/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee @@ -6,7 +6,7 @@ Darkswarm.factory "MapConfiguration", -> longitude: 144.7851531 zoom: 12 additional_options: - #mapTypeId: 'satellite' + # mapTypeId: 'satellite' mapTypeId: 'OSM' mapTypeControl: false streetViewControl: false diff --git a/app/assets/stylesheets/darkswarm/map.css.sass b/app/assets/stylesheets/darkswarm/map.css.sass index 8a63803816..4692bdc1b4 100644 --- a/app/assets/stylesheets/darkswarm/map.css.sass +++ b/app/assets/stylesheets/darkswarm/map.css.sass @@ -22,6 +22,7 @@ background: rgba(255,255,255,0.85) width: 50% margin-top: 1.2rem + margin-left: 1rem @media all and (max-width: 768px) width: 80% &:active, &:focus, &.active @@ -38,4 +39,4 @@ margin: 0 padding: 6px z-index: 2 - background: WHITE + background: #fff diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml index 30948b8724..97f4eb602d 100644 --- a/app/views/map/index.html.haml +++ b/app/views/map/index.html.haml @@ -12,5 +12,4 @@ .map-footer \© - %a{:href => "http://www.openstreetmap.org/copyright"} OpenStreetMap - contributors + %a{:href => "http://www.openstreetmap.org/copyright"} OpenStreetMap contributors