Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addon/components/modals/place-details.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="flex">
<div class="w-48 mb-6 mr-6">
<LeafletMap class="w-full h-48 mb-2 rounded-md shadow-md" @lat={{@options.place.latitude}} @lng={{@options.place.longitude}} @zoom={{12}} as |layers|>
<layers.tile @url={{leaflet-tile-url}} />
<layers.tile @url={{(leaflet-tile-url)}} />

<layers.marker @location={{@options.place.coordinates}} />
</LeafletMap>
Expand Down
2 changes: 1 addition & 1 deletion addon/components/modals/point-map.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
<div class="fleetbase-leaflet-map-container">
<LeafletMap class="map-height-base" @lat={{@options.latitude}} @lng={{@options.longitude}} @zoom={{12}} as |layers|>
<layers.tile @url={{leaflet-tile-url}} />
<layers.tile @url={{(leaflet-tile-url)}} />

<layers.marker @icon={{@options.icon}} @location={{point-to-coordinates @options.location}} @riseOnHover={{true}} as |marker|>
<marker.popup @maxWidth="500" @minWidth="180">
Expand Down
2 changes: 1 addition & 1 deletion addon/components/place/details.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
@zoomControl={{false}}
as |layers|
>
<layers.tile @url={{leaflet-tile-url}} />
<layers.tile @url={{(leaflet-tile-url)}} />
<layers.marker
@id={{@resource.id}}
@icon={{icon iconUrl=(or @resource.avatar_url "/engines-dist/images/building-marker.png") iconSize=(array 40 40)}}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/service-area/details.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@zoomControl={{false}}
as |layers|
>
<layers.tile @url={{leaflet-tile-url}} />
<layers.tile @url={{(leaflet-tile-url)}} />
<layers.polygon
@id={{@resource.id}}
@record={{@resource}}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/zone/details.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@zoomControl={{false}}
as |layers|
>
<layers.tile @url={{leaflet-tile-url}} />
<layers.tile @url={{(leaflet-tile-url)}} />
<layers.polygon
@id={{@resource.id}}
@record={{@resource}}
Expand Down
7 changes: 6 additions & 1 deletion addon/helpers/leaflet-tile-url.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ import { inject as service } from '@ember/service';
* Resolves the Leaflet tile URL from Fleet-Ops map settings.
*
* Usage:
* <layers.tile @url={{leaflet-tile-url}} />
* <layers.tile @url={{(leaflet-tile-url)}} />
* <layers.tile @url={{leaflet-tile-url theme="dark"}} />
*
* With no arguments it must be invoked in parentheses. A bare
* `@url={{leaflet-tile-url}}` passes the helper by name, which Glimmer refuses
* with "A resolved helper cannot be passed as a named argument" and the whole
* template fails to render.
*
* Recomputes automatically when map settings load or change.
*/
export default class LeafletTileUrlHelper extends Helper {
Expand Down
Loading