Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisgervang authored Dec 13, 2024
2 parents 7094946 + cec6970 commit 4cd3479
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 11 deletions.
13 changes: 13 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Security Policy

## Supported Versions

Security updates are applied only to the latest release.

## Reporting a Vulnerability

If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released.

Please disclose it at [security advisory](https://github.com/visgl/react-map-gl/security/advisories/new).

This project is maintained by a team of volunteers on a reasonable-effort basis. As such, please give us at least 90 days to work on a fix before public exposure.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2020 Urban Computing Foundation
Copyright Vis.gl contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ See [contribution guide](/CONTRIBUTING.md).

### Attributions

react-map-gl is part of vis.gl, an [Urban Computing Foundation](https://uc.foundation) project.
react-map-gl is part of vis.gl, an [OpenJS Foundation](https://openjsf.org) project.

Development is also supported by

Expand Down
8 changes: 4 additions & 4 deletions docs/api-reference/fullscreen-control.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function App() {

### Reactive Properties

#### `style`: CSSProperties {#style}
#### `style`: CSSProperties {#style}

CSS style override that applies to the control's container.

Expand All @@ -65,11 +65,11 @@ CSS style override that applies to the control's container.

The properties in this section are not reactive. They are only used when the component first mounts.

#### `containerId`: string {#containerid}
#### `containerId`: string {#containerid}

Id of the DOM element which should be made full screen. By default, the map container element will be made full screen.

#### `position`: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left' {#position}
#### `position`: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left' {#position}

Default: `'top-right'`

Expand All @@ -78,4 +78,4 @@ Placement of the control relative to the map.

## Source

[fullscreen-control.ts](https://github.com/visgl/react-map-gl/tree/7.0-release/src/components/fullscreen-control.ts)
[fullscreen-control.ts](https://github.com/visgl/react-map-gl/tree/7.1-release/src/components/fullscreen-control.tsx)
9 changes: 8 additions & 1 deletion docs/get-started/adding-custom-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ import type {FeatureCollection} from 'geojson';
const geojson: FeatureCollection = {
type: 'FeatureCollection',
features: [
{type: 'Feature', geometry: {type: 'Point', coordinates: [-122.4, 37.8]}}
{
type: 'Feature',
geometry: {
type: 'Point',
coordinates: [-122.4, 37.8]
},
properties: {title: '915 Front Street, San Francisco, California'}
}
]
};

Expand Down
8 changes: 4 additions & 4 deletions docs/get-started/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import TabItem from '@theme/TabItem';
<TabItem value="mapbox" label="Mapbox">

```bash
npm install --save react-map-gl mapbox-gl @types/mapbox-gl
npm install react-map-gl mapbox-gl @types/mapbox-gl
```

</TabItem>
<TabItem value="maplibre" label="Maplibre">

```bash
npm install --save react-map-gl maplibre-gl
npm install react-map-gl maplibre-gl
```

</TabItem>
Expand Down Expand Up @@ -129,7 +129,7 @@ import 'maplibre-gl/dist/maplibre-gl.css';
## Using with a Compatible Fork

```bash
npm install --save react-map-gl my-map-gl-fork
npm install react-map-gl my-map-gl-fork
```

Then override the `mapLib` prop of `Map`:
Expand All @@ -144,4 +144,4 @@ import 'my-map-gl-fork/path/to/style-sheet.css';
function App() {
return <Map mapLib={import('my-map-gl-fork')} />;
}
```
```

0 comments on commit 4cd3479

Please sign in to comment.