Skip to content
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

Jump to bottom

Map initalization language param #161

Merged
merged 11 commits into from
May 21, 2024
Merged

Map initalization language param #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
deccc3d
server side locale handling
jaspk06 May 13, 2024
0208d2c
bump version
jaspk06 May 13, 2024
560e60f
bump version
jaspk06 May 13, 2024
1cb5d9c
add back transformRequest style url builder
jaspk06 May 13, 2024
ab20374
bump version
jaspk06 May 13, 2024
e796b50
`locale` -> `lanuage`
jaspk06 May 13, 2024
4a18558
bump version
jaspk06 May 13, 2024
9582f1c
Merge branch 'master' into jasonliu/maps-1070-programmatic-language-a…
jaspk06 May 13, 2024
12fbe46
Merge branch 'release-4.3' into jasonliu/maps-1070-programmatic-langu…
jaspk06 May 15, 2024
50f4f61
use Navigator
jaspk06 May 15, 2024
7e6431c
remove X-Radar-Device-Language
jaspk06 May 16, 2024
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
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Radar.initialize('prj_test_pk_...', { /* options */ });

Add the following script in your `html` file
```html
<script src="https://js.radar.com/v4.3.0-beta.0/radar.min.js"></script>
<script src="https://js.radar.com/v4.3.0-beta.5/radar.min.js"></script>
```

Then initialize the Radar SDK
Expand All @@ -73,8 +73,8 @@ To create a map, first initialize the Radar SDK with your publishable key. Then
```html
<html>
<head>
<link href="https://js.radar.com/v4.3.0-beta.0/radar.css" rel="stylesheet">
<script src="https://js.radar.com/v4.3.0-beta.0/radar.min.js"></script>
<link href="https://js.radar.com/v4.3.0-beta.5/radar.css" rel="stylesheet">
<script src="https://js.radar.com/v4.3.0-beta.5/radar.min.js"></script>
</head>

<body>
Expand All @@ -98,8 +98,8 @@ To create an autocomplete input, first initialize the Radar SDK with your publis
```html
<html>
<head>
<link href="https://js.radar.com/v4.3.0-beta.0/radar.css" rel="stylesheet">
<script src="https://js.radar.com/v4.3.0-beta.0/radar.min.js"></script>
<link href="https://js.radar.com/v4.3.0-beta.5/radar.css" rel="stylesheet">
<script src="https://js.radar.com/v4.3.0-beta.5/radar.min.js"></script>
</head>

<body>
Expand Down Expand Up @@ -130,8 +130,8 @@ To power [geofencing](https://radar.com/documentation/geofencing/overview) exper
```html
<html>
<head>
<link href="https://js.radar.com/v4.3.0-beta.0/radar.css" rel="stylesheet">
<script src="https://js.radar.com/v4.3.0-beta.0/radar.min.js"></script>
<link href="https://js.radar.com/v4.3.0-beta.5/radar.css" rel="stylesheet">
<script src="https://js.radar.com/v4.3.0-beta.5/radar.min.js"></script>
</head>

<body>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "radar-sdk-js",
"version": "4.3.0-beta.0",
"version": "4.3.0-beta.5",
"description": "Web Javascript SDK for Radar, location infrastructure for mobile and web apps.",
"homepage": "https://radar.com",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ export interface RadarSearchGeofencesResponse extends RadarResponse {
}

export interface RadarMapOptions extends Omit<maplibregl.MapOptions, 'transformRequest'> {
container: string | HTMLElement;
language?: string;
}

export interface RadarMarkerImage {
Expand Down
21 changes: 13 additions & 8 deletions src/ui/RadarMap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import RadarLogoControl from './RadarLogoControl';

import Config from '../config';
import Logger from '../logger';
import Navigator from '../navigator';

import type { RadarOptions, RadarMapOptions } from '../types';

Expand All @@ -30,9 +31,13 @@ const defaultFitMarkersOptions: maplibregl.FitBoundsOptions = {
padding: 50,
};

const createStyleURL = (options: RadarOptions, style: string = DEFAULT_STYLE) => (
`${options.host}/maps/styles/${style}?publishableKey=${options.publishableKey}`
);
const createStyleURL = (options: RadarOptions, mapOptions: RadarMapOptions) => {
let url = `${options.host}/maps/styles/${mapOptions.style}?publishableKey=${options.publishableKey}`
if (mapOptions.language) {
url += `&language=${mapOptions.language}`
}
return url
};

// check if style is a Radar style or a custom style
const isRadarStyle = (style: string) => {
Expand All @@ -50,14 +55,13 @@ const getStyle = (options: RadarOptions, mapOptions: RadarMapOptions) => {
const style = mapOptions.style;

if (!style || (typeof style === 'string' && isRadarStyle(style))) {
return createStyleURL(options, style);
return createStyleURL(options, mapOptions);
}

return mapOptions.style; // style object or URL
};

class RadarMap extends maplibregl.Map {
_customMarkerRawSvg: string | undefined;
_markers: RadarMarker[] = [];

constructor(mapOptions: RadarMapOptions) {
Expand All @@ -69,16 +73,17 @@ class RadarMap extends maplibregl.Map {

// configure maplibre options
const style = getStyle(config, mapOptions);
const maplibreOptions: maplibregl.MapOptions = Object.assign({},
const maplibreOptions: RadarMapOptions = Object.assign({},
defaultMaplibreOptions,
mapOptions,
{ style },
);
Logger.debug(`initialize map with options: ${JSON.stringify(maplibreOptions)}`);

maplibreOptions.transformRequest = (url, resourceType) => {
(maplibreOptions as maplibregl.MapOptions).transformRequest = (url, resourceType) => {
// this handles when a style is switched
if (resourceType === 'Style' && isRadarStyle(url)) {
url = createStyleURL(config, url);
url = createStyleURL(config, { ...maplibreOptions, style: url });
}

let headers = {
Expand Down
2 changes: 1 addition & 1 deletion src/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default '4.3.0-beta.0';
export default '4.3.0-beta.5';
Loading