raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-26 05:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into HEAD

Browse Source
This commit is contained in:
Continuous Integration
2017-02-08 16:53:53 +11:00
parent 9235727d45 92981e4fcd
commit a2d01b5144
11 changed files with 73 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/products/products.js.coffee
View File

@@ -1 +1 @@
angular.module("admin.products", [])
angular.module("admin.products", ["admin.utils"])

2
app/assets/javascripts/darkswarm/directives/map_osm_tiles.js.coffee
View File

@@ -15,7 +15,7 @@ Darkswarm.directive 'mapOsmTiles', ($timeout) ->
if x < 0
x = tilesPerGlobe + x
# Wrap y (latitude) in a like manner if you want to enable vertical infinite scroll
'http://tile.openstreetmap.org/' + zoom + '/' + x + '/' + coord.y + '.png'
'https://a.tile.openstreetmap.org/' + zoom + '/' + x + '/' + coord.y + '.png'
tileSize: new google.maps.Size(256, 256)
name: 'OpenStreetMap'
maxZoom: 18