From 88ede8601488f5ee8200f8d7a732fc0fadf5c0c6 Mon Sep 17 00:00:00 2001 From: Xiaoji Chen Date: Fri, 13 Dec 2024 11:30:24 -0800 Subject: [PATCH 1/7] Update license info (#2447) --- LICENSE | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 028aef4df..155928579 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/README.md b/README.md index bbe0212bf..6584bb63c 100644 --- a/README.md +++ b/README.md @@ -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 From 08d4f52d5dc0a01e156caf10c7135931f773e458 Mon Sep 17 00:00:00 2001 From: Ivad Yves HABIMANA <54445417+Yvad60@users.noreply.github.com> Date: Fri, 13 Dec 2024 21:48:05 +0200 Subject: [PATCH 2/7] Update fullscreen-control source code link (#2363) * Update fullscreen-control source code link --------- Co-authored-by: Chris Gervang --- docs/api-reference/fullscreen-control.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-reference/fullscreen-control.md b/docs/api-reference/fullscreen-control.md index 2f7137819..ae3257115 100644 --- a/docs/api-reference/fullscreen-control.md +++ b/docs/api-reference/fullscreen-control.md @@ -56,7 +56,7 @@ function App() { ### Reactive Properties -#### `style`: CSSProperties {#style} +#### `style`: CSSProperties {#style} CSS style override that applies to the control's container. @@ -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'` @@ -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) From 92706b745257745748d77e2e0a22a1578c05331c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20St=C3=BCckler?= Date: Fri, 13 Dec 2024 21:50:35 +0100 Subject: [PATCH 3/7] Update get-started.md (#2428) docs: remove save flag from npm install commands Co-authored-by: Chris Gervang --- docs/get-started/get-started.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/get-started/get-started.md b/docs/get-started/get-started.md index ce2a06f58..241421e3c 100644 --- a/docs/get-started/get-started.md +++ b/docs/get-started/get-started.md @@ -13,14 +13,14 @@ import TabItem from '@theme/TabItem'; ```bash -npm install --save react-map-gl mapbox-gl @types/mapbox-gl +npm install react-map-gl mapbox-gl @types/mapbox-gl ``` ```bash -npm install --save react-map-gl maplibre-gl +npm install react-map-gl maplibre-gl ``` @@ -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`: @@ -144,4 +144,4 @@ import 'my-map-gl-fork/path/to/style-sheet.css'; function App() { return ; } -``` \ No newline at end of file +``` From cec69700992ca9c4f66586904bf91eed657246f7 Mon Sep 17 00:00:00 2001 From: John-George Sample Date: Fri, 13 Dec 2024 17:07:08 -0500 Subject: [PATCH 4/7] Docs: Include `properties` in FeatureCollection example (#2425) * inlude `properties` in example for TS --------- Co-authored-by: Chris Gervang --- docs/get-started/adding-custom-data.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/get-started/adding-custom-data.md b/docs/get-started/adding-custom-data.md index b3f5d2758..c9e214862 100644 --- a/docs/get-started/adding-custom-data.md +++ b/docs/get-started/adding-custom-data.md @@ -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'} + } ] }; From 0512e192da9324db5b68c21417c12d426f454be0 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sat, 14 Dec 2024 01:02:31 +0100 Subject: [PATCH 5/7] Docs: Fix Maplibre type links, Add Mapbox-Maplibre Links (#2357) * Docs: Fix Maplibre type links, Add Mapbox-Maplibre Links * Docs: Re-add internal link * Update URLs in types.md --------- Co-authored-by: Chris Gervang --- docs/api-reference/types.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/api-reference/types.md b/docs/api-reference/types.md index 1ce037357..9965e8616 100644 --- a/docs/api-reference/types.md +++ b/docs/api-reference/types.md @@ -128,27 +128,27 @@ An object with the following fields: #### LngLat -A [mapboxgl.LngLat](https://docs.mapbox.com/mapbox-gl-js/api/geography/#lnglat) object. +A `LngLat` object ([Mapbox](https://docs.mapbox.com/mapbox-gl-js/api/geography/#lnglat) | [Maplibre](https://maplibre.org/maplibre-gl-js/docs/API/classes/LngLat/)). #### LngLatLike -A [LngLat](#lnglat) object, an array of two numbers representing longitude and latitude, or an object with `lng` and `lat` or `lon` and `lat` properties. +A [`LngLat`](#lnglat) object, an array of two numbers representing longitude and latitude, or an object with `lng` and `lat` or `lon` and `lat` properties. ([Mapbox](https://docs.mapbox.com/mapbox-gl-js/api/geography/#lnglatlike) | [Maplibre](https://maplibre.org/maplibre-gl-js/docs/API/type-aliases/LngLatLike/)) #### LngLatBounds -A [mapboxgl.LngLatBounds](https://docs.mapbox.com/mapbox-gl-js/api/geography/#lnglatbounds) object. +A `LngLatBounds` object ([Mapbox](https://docs.mapbox.com/mapbox-gl-js/api/geography/#lnglatbounds) | [Maplibre](https://maplibre.org/maplibre-gl-js/docs/API/classes/LngLatBounds/)). #### LngLatBoundsLike -A [LngLatBounds](#lnglatbounds) object, an array of [LngLatLike](#lnglatlike) objects in [sw, ne] order, or an array of numbers in [west, south, east, north] order. +A [`LngLatBounds`](#lnglatbounds) object, an array of [`LngLatLike`](#lnglatlike) objects in [sw, ne] order, or an array of numbers in [west, south, east, north] order. ([Mapbox](https://docs.mapbox.com/mapbox-gl-js/api/geography/#lnglatboundslike) | [Maplibre](https://maplibre.org/maplibre-gl-js/docs/API/type-aliases/LngLatBoundsLike/)) #### Point -A [mapboxgl.Point](https://github.com/mapbox/point-geometry) object. +A `Point` object. ([Mapbox](https://docs.mapbox.com/mapbox-gl-js/api/geography/#point) | [Maplibre](https://github.com/mapbox/point-geometry)) #### PointLike -A [Point](#point) or an array of two numbers representing x and y screen coordinates in pixels. +A [Point](#point) or an array of two numbers representing x and y screen coordinates in pixels ([Mapbox](https://docs.mapbox.com/mapbox-gl-js/api/geography/#pointlike) | [Maplibre](https://maplibre.org/maplibre-gl-js/docs/API/type-aliases/PointLike/)). #### MapGeoJSONFeature From 24fbddd3e109eaa5016ad06a06586c3e239b60b7 Mon Sep 17 00:00:00 2001 From: Vineet J Karni <42497152+vineetjk@users.noreply.github.com> Date: Sat, 14 Dec 2024 05:43:42 +0530 Subject: [PATCH 6/7] Bugfix: In geojson example redirection to data source (#2335) * fix: #2334 * lint --------- Co-authored-by: Chris Gervang Co-authored-by: Chris Gervang --- examples/geojson/src/control-panel.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/geojson/src/control-panel.tsx b/examples/geojson/src/control-panel.tsx index d31fc0bdd..e8d65f280 100644 --- a/examples/geojson/src/control-panel.tsx +++ b/examples/geojson/src/control-panel.tsx @@ -11,7 +11,10 @@ function ControlPanel(props) { see details.

- Data source: US Census Bureau + Data source:{' '} + + US Census Bureau +