Skip to content

feat: provide your own mapbox library/geocoder #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: provide your own mapbox library/geocoder #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/lib/geocoder/Geocoder.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
export let customStylesheetUrl = false
export let geocoder

/**
* Allows you to provide the mapbox geocoder, in case it isn't possible to access it globally
*/
export let MapboxGeocoder = undefined

const dispatch = createEventDispatcher()
const fieldId = 'bsm-' + Math.random().toString(36).substring(6)

Expand All @@ -32,7 +37,8 @@
types: types.join(','),
placeholder,
customStylesheetUrl,
value
value,
MapboxGeocoder
}, options)

function init ({ detail }) {
Expand Down
11 changes: 7 additions & 4 deletions src/lib/geocoder/geocoder-action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import { bindEvents } from '../event-bindings.js'
export default function action (node, options = {}) {
let map

const resources = [
{ type: 'script', value: `//api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-geocoder/${options.version}/mapbox-gl-geocoder.min.js`, id: 'byk-gc-js' }
]
const resources = [];

if (!options.MapboxGeocoder) {
resources.push({ type: 'script', value: `//api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-geocoder/${options.version}/mapbox-gl-geocoder.min.js`, id: 'byk-gc-js' })
}

const customStylesheetUrl = options.customStylesheetUrl
if (customStylesheetUrl) {
Expand All @@ -29,7 +31,8 @@ export default function action (node, options = {}) {
}

function init (options, node) {
const geocoder = new window.MapboxGeocoder(options)
const MapboxGeocoder = options.MapboxGeocoder || window.MapboxGeocoder
const geocoder = new MapboxGeocoder(options)
geocoder.addTo(`#${node.id}`)
if (options.value) {
geocoder.setInput(options.value)
Expand Down
8 changes: 7 additions & 1 deletion src/lib/map/Map.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
export let customStylesheetUrl = false
export let style = 'mapbox://styles/mapbox/streets-v11'

/**
* Allows you to provide the mapbox library, in case it isn't possible to retrieve/access it globally
*/
export let mapboxLib = undefined;

const dispatch = createEventDispatcher()

setContext(contextKey, {
Expand All @@ -62,7 +67,8 @@
wheelZoomRate,
version,
customStylesheetUrl,
map
map,
mapboxLib,
}, options)

const queue = new EventQueue()
Expand Down
12 changes: 8 additions & 4 deletions src/lib/map/map-action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ export default function action (node, options = {}) {
let map

const resources = [
{ type: 'script', attr: 'src', value: `//api.mapbox.com/mapbox-gl-js/${options.version}/mapbox-gl.js`, id: 'byk-gl-js' },
{ type: 'link', attr: 'href', value: `//api.mapbox.com/mapbox-gl-js/${options.version}/mapbox-gl.css`, id: 'byk-gl-css' }
]

if (!options.mapboxLib) {
resources.push({ type: 'script', attr: 'src', value: `//api.mapbox.com/mapbox-gl-js/${options.version}/mapbox-gl.js`, id: 'byk-gl-js' })
}

const customStylesheetUrl = options.customStylesheetUrl
if (customStylesheetUrl) {
resources.push({ type: 'link', attr: 'href', value: customStylesheetUrl, id: 'byk-mcsu-css' })
Expand All @@ -28,10 +31,11 @@ export default function action (node, options = {}) {
}

function init (options, node) {
window.mapboxgl.accessToken = options.accessToken
const el = new window.mapboxgl.Map(options)
const mapbox = options.mapboxLib || window.mapboxgl
mapbox.accessToken = options.accessToken
const el = new mapbox.Map(options)

return bindEvents(el, handlers, window.mapboxgl, node)
return bindEvents(el, handlers, mapbox, node)
}

const handlers = {
Expand Down