v2.6.0

PaulLeCam · Nov 18, 2019 · 43e2aaf · 43e2aaf
1 parent 55309c2
commit 43e2aaf
Show file tree

Hide file tree

Showing 18 changed files with 2,275 additions and 2,562 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-in-v2.md b/.github/ISSUE_TEMPLATE/bug-in-v2.md
@@ -3,7 +3,7 @@ name: Bug report
 about: Report a bug
 ---
 
-## Bug report in v2
+## Bug report
 
 **Before** opening an issue, make sure to read the [contributing guide](https://github.com/PaulLeCam/react-leaflet/blob/master/CONTRIBUTING.md) and understand this is a bug tracker, not a support platform.
 
@@ -12,8 +12,8 @@ Please make sure to check the following boxes before submitting an issue.\
 
 - [ ] All peer dependencies are installed: React, ReactDOM and Leaflet.
 - [ ] Using a supported version of React and ReactDOM (v16.8.0 minimum).
-- [ ] Using the supported version of Leaflet (v1.5.x) and its corresponding CSS file is loaded.
-- [ ] Using the [latest version of React-Leaflet](https://github.com/PaulLeCam/react-leaflet/releases) - **not v1.x**.
+- [ ] Using the supported version of Leaflet (v1.6.0 minimum) and its corresponding CSS file is loaded.
+- [ ] Using the [latest version of React-Leaflet](https://github.com/PaulLeCam/react-leaflet/releases).
 - [ ] The issue has not already been reported.
 - [ ] Make sure you have followed the [quick start guide](http://leafletjs.com/examples/quick-start.html) for Leaflet.
 - [ ] Make sure you have fully read the [documentation](https://react-leaflet.js.org/docs/en/intro.html) and that you understand the [limitations](https://react-leaflet.js.org/docs/en/intro.html#limitations).

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## v2.6.0 (2019-11-18)
+
+- Updated Leaflet dependency to v1.6.
+- Added support for `doubleClickZoom` option's `center` setting to the `Map` component ([PR #633](https://github.com/PaulLeCam/react-leaflet/pull/633) by _DerGuteMoritz_).
+- Added `markersInheritOptions` prop to `GeoJSON` component.
+- [website] Updated `react-leaflet-bing` plugin ([PR #634](https://github.com/PaulLeCam/react-leaflet/pull/634) by _Charmatzis_).
+- [website] Updated `react-leaflet-google` plugin ([PR #635](https://github.com/PaulLeCam/react-leaflet/pull/635) by _Charmatzis_).
+- [website] Added `react-leaflet-curve` plugin ([PR #636](https://github.com/PaulLeCam/react-leaflet/pull/636) by _Shadowman4205_).
+
 ## v2.5.0 (2019-10-19)
 
 - Added `SVGOverlay` component ([PR #630](https://github.com/PaulLeCam/react-leaflet/pull/630) by _fenech_).

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -1,5 +1,9 @@
 # Upgrading
 
+## v2.6
+
+This release requires [Leaflet v1.6](https://leafletjs.com/2019/11/17/leaflet-1.6.0.html) as peer dependency.
+
 ## v2.3
 
 This release requires [Leaflet v1.5](https://leafletjs.com/2019/05/08/leaflet-1.5.0.html) and [React v16.8](https://reactjs.org/blog/2019/02/06/react-v16.8.0.html) as peer dependencies.

diff --git a/docs/plugins.md b/docs/plugins.md
@@ -18,6 +18,7 @@ open pull requests to update this list!
 | [`react-leaflet-choropleth`](https://www.npmjs.com/package/react-leaflet-choropleth)                             | unknown            |
 | [`react-leaflet-cluster-layer`](https://www.npmjs.com/package/react-leaflet-cluster-layer)                       | unknown            |
 | [`react-leaflet-control`](https://www.npmjs.com/package/react-leaflet-control)                                   | **yes**            |
+| [`react-leaflet-curve`](https://www.npmjs.com/package/react-leaflet-curve)                                       | **yes**            |
 | [`react-leaflet-d3`](https://www.npmjs.com/package/react-leaflet-d3)                                             | **yes**            |
 | [`react-leaflet-d3-svg-overlay`](https://www.npmjs.com/package/react-leaflet-d3-svg-overlay)                     | **yes**            |
 | [`react-leaflet-deflate`](https://www.npmjs.com/package/react-leaflet-deflate)                                   | **yes**            |
@@ -34,8 +35,8 @@ open pull requests to update this list!
 | [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control)             | unknown            |
 | [`react-leaflet-geojson-cluster`](https://www.npmjs.com/package/react-leaflet-geojson-cluster)                   | unknown            |
 | [`react-leaflet-geojson-patterns`](https://www.npmjs.com/package/react-leaflet-geojson-patterns)                 | **yes**            |
-| [`react-leaflet-google-v2`](https://www.npmjs.com/package/react-leaflet-google-v2)                               | **yes**            |
 | [`react-leaflet-google-layer`](https://www.npmjs.com/package/react-leaflet-google-layer)                         | **yes**            |
+| [`react-leaflet-google-v2`](https://www.npmjs.com/package/react-leaflet-google-v2)                               | **yes**            |
 | [`react-leaflet-heatmap-layer`](https://www.npmjs.com/package/react-leaflet-heatmap-layer)                       | **yes**            |
 | [`react-leaflet-locate-control`](https://www.npmjs.com/package/react-leaflet-locate-control)                     | **no**             |
 | [`react-leaflet-magnifying-glass`](https://www.npmjs.com/package/react-leaflet-magnifying-glass)                 | **yes**            |
@@ -56,4 +57,3 @@ open pull requests to update this list!
 | [`react-leaflet-zoom-display`](https://www.npmjs.com/package/react-leaflet-zoom-display)                         | unknown            |
 | [`react-leaflet-zoom-indicator`](https://www.npmjs.com/package/react-leaflet-zoom-indicator)                     | unknown            |
 | [`react-mapbox-components`](https://www.npmjs.com/package/react-mapbox-components)                               | unknown            |
-| [`react-leaflet-curve`](https://www.npmjs.com/package/react-leaflet-curve)                                       | **yes**             |
diff --git a/example/components/bounds.js b/example/components/bounds.js
@@ -3,8 +3,14 @@
 import React, { Component } from 'react'
 import { Map, TileLayer, Rectangle } from '../../src'
 
-const outer = [[50.505, -29.09], [52.505, 29.09]]
-const inner = [[49.505, -2.09], [53.505, 2.09]]
+const outer = [
+  [50.505, -29.09],
+  [52.505, 29.09],
+]
+const inner = [
+  [49.505, -2.09],
+  [53.505, 2.09],
+]
 
 type State = {
   bounds: Array<[number, number]>,

diff --git a/example/components/layers-control.js b/example/components/layers-control.js
@@ -15,7 +15,10 @@ import {
 const { BaseLayer, Overlay } = LayersControl
 
 const center = [51.505, -0.09]
-const rectangle = [[51.49, -0.08], [51.5, -0.06]]
+const rectangle = [
+  [51.49, -0.08],
+  [51.5, -0.06],
+]
 
 export default class LayersControlExample extends Component<{}> {
   render() {

diff --git a/example/components/other-layers.js b/example/components/other-layers.js
@@ -12,7 +12,10 @@ import {
 } from '../../src'
 
 const center = [51.505, -0.09]
-const rectangle = [[51.49, -0.08], [51.5, -0.06]]
+const rectangle = [
+  [51.49, -0.08],
+  [51.5, -0.06],
+]
 
 export default class OtherLayersExample extends Component<{}> {
   render() {

diff --git a/example/components/pane.js b/example/components/pane.js
@@ -3,8 +3,14 @@
 import React, { Component } from 'react'
 import { Map, Pane, Rectangle, TileLayer } from '../../src'
 
-const outer = [[50.505, -29.09], [52.505, 29.09]]
-const inner = [[49.505, -2.09], [53.505, 2.09]]
+const outer = [
+  [50.505, -29.09],
+  [52.505, 29.09],
+]
+const inner = [
+  [49.505, -2.09],
+  [53.505, 2.09],
+]
 
 export default class PaneExample extends Component<{}, { render: boolean }> {
   state = {

diff --git a/example/components/svg-overlay.js b/example/components/svg-overlay.js
@@ -5,7 +5,10 @@ import React, { Component } from 'react'
 import { Map, SVGOverlay, TileLayer } from '../../src'
 
 const center = [51.505, -0.09]
-const rectangle = [[51.49, -0.08], [51.5, -0.06]]
+const rectangle = [
+  [51.49, -0.08],
+  [51.5, -0.06],
+]
 
 export default class SVGOverlayExample extends Component<{}> {
   render() {

diff --git a/example/components/tooltip.js b/example/components/tooltip.js
@@ -16,11 +16,22 @@ import {
 const center = [51.505, -0.09]
 
 const multiPolygon = [
-  [[51.51, -0.12], [51.51, -0.13], [51.53, -0.13]],
-  [[51.51, -0.05], [51.51, -0.07], [51.53, -0.07]],
+  [
+    [51.51, -0.12],
+    [51.51, -0.13],
+    [51.53, -0.13],
+  ],
+  [
+    [51.51, -0.05],
+    [51.51, -0.07],
+    [51.53, -0.07],
+  ],
 ]
 
-const rectangle = [[51.49, -0.08], [51.5, -0.06]]
+const rectangle = [
+  [51.49, -0.08],
+  [51.5, -0.06],
+]
 
 export default class TooltipExample extends Component<{}, { clicked: number }> {
   state = {

diff --git a/example/components/vector-layers.js b/example/components/vector-layers.js
@@ -14,21 +14,48 @@ import {
 
 const center = [51.505, -0.09]
 
-const polyline = [[51.505, -0.09], [51.51, -0.1], [51.51, -0.12]]
+const polyline = [
+  [51.505, -0.09],
+  [51.51, -0.1],
+  [51.51, -0.12],
+]
 
 const multiPolyline = [
-  [[51.5, -0.1], [51.5, -0.12], [51.52, -0.12]],
-  [[51.5, -0.05], [51.5, -0.06], [51.52, -0.06]],
+  [
+    [51.5, -0.1],
+    [51.5, -0.12],
+    [51.52, -0.12],
+  ],
+  [
+    [51.5, -0.05],
+    [51.5, -0.06],
+    [51.52, -0.06],
+  ],
 ]
 
-const polygon = [[51.515, -0.09], [51.52, -0.1], [51.52, -0.12]]
+const polygon = [
+  [51.515, -0.09],
+  [51.52, -0.1],
+  [51.52, -0.12],
+]
 
 const multiPolygon = [
-  [[51.51, -0.12], [51.51, -0.13], [51.53, -0.13]],
-  [[51.51, -0.05], [51.51, -0.07], [51.53, -0.07]],
+  [
+    [51.51, -0.12],
+    [51.51, -0.13],
+    [51.53, -0.13],
+  ],
+  [
+    [51.51, -0.05],
+    [51.51, -0.07],
+    [51.53, -0.07],
+  ],
 ]
 
-const rectangle = [[51.49, -0.08], [51.5, -0.06]]
+const rectangle = [
+  [51.49, -0.08],
+  [51.5, -0.06],
+]
 
 export default class VectorLayersExample extends Component<{}> {
   render() {

diff --git a/example/components/video-overlay.js b/example/components/video-overlay.js
@@ -23,7 +23,10 @@ export default class VideoOverlayExample extends Component<
           url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
         />
         <VideoOverlay
-          bounds={[[32, -130], [13, -100]]}
+          bounds={[
+            [32, -130],
+            [13, -100],
+          ]}
           play={this.state.play}
           url="https://www.mapbox.com/bites/00188/patricia_nasa.webm"
         />

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-leaflet",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "React components for Leaflet maps",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -49,60 +49,60 @@
     "src/*"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.6.3",
+    "@babel/runtime": "^7.7.2",
     "fast-deep-equal": "^2.0.1",
-    "hoist-non-react-statics": "^3.3.0",
+    "hoist-non-react-statics": "^3.3.1",
     "warning": "^4.0.3"
   },
   "peerDependencies": {
-    "leaflet": "^1.5.1",
+    "leaflet": "^1.6.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.6.4",
-    "@babel/core": "^7.6.4",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/cli": "^7.7.0",
+    "@babel/core": "^7.7.2",
+    "@babel/plugin-proposal-class-properties": "^7.7.0",
     "@babel/plugin-proposal-export-default-from": "^7.5.2",
     "@babel/plugin-transform-proto-to-assign": "^7.5.5",
     "@babel/plugin-transform-runtime": "^7.6.2",
     "@babel/plugin-transform-strict-mode": "^7.2.0",
-    "@babel/preset-env": "^7.6.3",
+    "@babel/preset-env": "^7.7.1",
     "@babel/preset-flow": "^7.0.0",
-    "@babel/preset-react": "^7.6.3",
+    "@babel/preset-react": "^7.7.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
     "babel-loader": "^8.0.6",
     "babel-plugin-dev-expression": "^0.2.2",
     "cross-env": "^6.0.3",
-    "eslint": "^6.5.1",
-    "eslint-config-prettier": "^6.4.0",
-    "eslint-plugin-flowtype": "^4.3.0",
+    "eslint": "^6.6.0",
+    "eslint-config-prettier": "^6.6.0",
+    "eslint-plugin-flowtype": "^4.4.1",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-react": "^7.16.0",
     "file-loader": "^4.2.0",
-    "flow-bin": "^0.109.0",
+    "flow-bin": "^0.112.0",
     "flow-copy-source": "^2.0.8",
-    "flow-typed": "^2.6.1",
+    "flow-typed": "^2.6.2",
     "jest": "^24.9.0",
-    "leaflet": "^1.5.1",
-    "prettier": "^1.18.2",
-    "prettier-eslint": "^9.0.0",
-    "react": "^16.10.2",
-    "react-dom": "^16.10.2",
+    "leaflet": "^1.6.0",
+    "prettier": "^1.19.1",
+    "prettier-eslint": "^9.0.1",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
     "rimraf": "^3.0.0",
-    "rollup": "^1.25.0",
+    "rollup": "^1.27.1",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-uglify": "^6.0.3",
     "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.9",
-    "webpack-dev-server": "^3.8.2"
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-server": "^3.9.0"
   },
   "jest": {
     "collectCoverage": true

diff --git a/src/GeoJSON.js b/src/GeoJSON.js
@@ -17,6 +17,7 @@ type Props = {
   onEachFeature?: (feature: GeoJSONdata, layer: Layer) => void,
   filter?: (feature: GeoJSONdata) => boolean,
   coordsToLatLng?: (coords: GeoJSONdata) => LatLng,
+  markersInheritOptions?: boolean,
 } & PathProps
 
 class GeoJSON extends Path<LeafletElement, Props> {

diff --git a/website/package.json b/website/package.json
@@ -12,9 +12,9 @@
     "crowdin-download": "crowdin --config ../crowdin.yaml download -b master"
   },
   "dependencies": {
-    "highlight.js": "^9.15.10"
+    "highlight.js": "^9.16.2"
   },
   "devDependencies": {
-    "docusaurus": "~1.13.0"
+    "docusaurus": "~1.14.0"
   }
 }
diff --git a/website/versioned_docs/version-v2/plugins.md b/website/versioned_docs/version-v2/plugins.md
@@ -14,11 +14,12 @@ open pull requests to update this list!
 | [`leaflet-drift-marker`](https://www.npmjs.com/package/leaflet-drift-marker)                                     | **yes**            |
 | [`leaflet-react-track-player`](https://www.npmjs.com/package/leaflet-react-track-player)                         | unknown            |
 | [`react-leaflet-ant-path`](https://www.npmjs.com/package/react-leaflet-ant-path)                                 | unknown            |
-| [`react-leaflet-bing`](https://www.npmjs.com/package/react-leaflet-bing)                                         | **yes**            |
+| [`react-leaflet-bing-v2`](https://www.npmjs.com/package/react-leaflet-bing-v2)                                   | **yes**            |
 | [`react-leaflet-box-zoom`](https://www.npmjs.com/package/react-leaflet-box-zoom)                                 | **yes**            |
 | [`react-leaflet-choropleth`](https://www.npmjs.com/package/react-leaflet-choropleth)                             | unknown            |
 | [`react-leaflet-cluster-layer`](https://www.npmjs.com/package/react-leaflet-cluster-layer)                       | unknown            |
 | [`react-leaflet-control`](https://www.npmjs.com/package/react-leaflet-control)                                   | **yes**            |
+| [`react-leaflet-curve`](https://www.npmjs.com/package/react-leaflet-curve)                                       | **yes**            |
 | [`react-leaflet-d3`](https://www.npmjs.com/package/react-leaflet-d3)                                             | **yes**            |
 | [`react-leaflet-d3-svg-overlay`](https://www.npmjs.com/package/react-leaflet-d3-svg-overlay)                     | **yes**            |
 | [`react-leaflet-deflate`](https://www.npmjs.com/package/react-leaflet-deflate)                                   | **yes**            |
@@ -35,8 +36,8 @@ open pull requests to update this list!
 | [`react-leaflet-fullscreen-control`](https://www.npmjs.com/package/react-leaflet-fullscreen-control)             | unknown            |
 | [`react-leaflet-geojson-cluster`](https://www.npmjs.com/package/react-leaflet-geojson-cluster)                   | unknown            |
 | [`react-leaflet-geojson-patterns`](https://www.npmjs.com/package/react-leaflet-geojson-patterns)                 | **yes**            |
-| [`react-leaflet-google`](https://www.npmjs.com/package/react-leaflet-google)                                     | **yes**            |
 | [`react-leaflet-google-layer`](https://www.npmjs.com/package/react-leaflet-google-layer)                         | **yes**            |
+| [`react-leaflet-google-v2`](https://www.npmjs.com/package/react-leaflet-google-v2)                               | **yes**            |
 | [`react-leaflet-heatmap-layer`](https://www.npmjs.com/package/react-leaflet-heatmap-layer)                       | **yes**            |
 | [`react-leaflet-locate-control`](https://www.npmjs.com/package/react-leaflet-locate-control)                     | **no**             |
 | [`react-leaflet-magnifying-glass`](https://www.npmjs.com/package/react-leaflet-magnifying-glass)                 | **yes**            |