raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-20 04:59:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

If no enterprises have been geocoded yet make sure Open Street Map still displays correctly.

Browse Source 
Before it would display a gray/blank div instead of map because the map latitude, longitude couldn't be calculated without geocoded enterprises. This adds a setting so the default coordinates can be set even if no geocoded enterprises present.
This commit is contained in:
Cillian O'Ruanaidh
2020-06-26 15:45:58 +01:00
parent 5929b9c1e5
commit c40697cf61
4 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
View File

@@ -61,28 +61,47 @@ Darkswarm.directive 'ofnOpenStreetMap', ($window, Enterprises, EnterpriseModal,
displayMap = ->
setMapDimensions()
averageLatitude = averageAngle("latitude")
averageLongitude = averageAngle("longitude")
zoomLevel = 6
map = L.map('open-street-map')
L.tileLayer.provider(openStreetMapProviderName, openStreetMapProviderOptions).addTo(map)
map.setView([averageLatitude, averageLongitude], zoomLevel)
map.setView([initialLatitude(), initialLongitude()], zoomLevel)
displayEnterprises = ->
for enterprise in Enterprises.enterprises
if enterprise.latitude? && enterprise.longitude?
marker = buildMarker(enterprise, { lat: enterprise.latitude, lng: enterprise.longitude }, enterprise.name).addTo(map)
enterpriseNames.push(enterpriseName(enterprise))
markers.push(marker)
for enterprise in geocodedEnterprises()
marker = buildMarker(enterprise, { lat: enterprise.latitude, lng: enterprise.longitude }, enterprise.name).addTo(map)
enterpriseNames.push(enterpriseName(enterprise))
markers.push(marker)
disableSearchField = () =>
$('#open-street-map--search input').prop("disabled", true)
displaySearchField = () ->
new Autocomplete('#open-street-map--search',
onSubmit: goToEnterprise
search: searchEnterprises
)
overwriteInlinePositionRelativeToPositionSearchField = ->
$('#open-street-map--search').css("position", "absolute")
overwriteInlinePositionRelativeToPositionSearchField()
overwriteInlinePositionRelativeToAbsoluteOnSearchField()
if geocodedEnterprises().length == 0
disableSearchField()
geocodedEnterprises = () ->
Enterprises.enterprises.filter (enterprise) ->
enterprise.latitude? && enterprise.longitude?
initialLatitude = () ->
if geocodedEnterprises().length > 0
averageAngle("latitude")
else
openStreetMapConfig.open_street_map_default_latitude || -37.4713077
initialLongitude = () ->
if geocodedEnterprises().length > 0
averageAngle("longitude")
else
openStreetMapConfig.open_street_map_default_longitude || 144.7851531
overwriteInlinePositionRelativeToAbsoluteOnSearchField = ->
$('#open-street-map--search').css("position", "absolute")
searchEnterprises = (input) ->
if input.length < 1