From e75c4fc371cc481dbd3aceeb2fd46a644fde47a9 Mon Sep 17 00:00:00 2001 From: Maxime Bouveron Date: Wed, 31 Jan 2024 14:08:00 +0100 Subject: [PATCH 1/2] Change mapbox imports to maplibre --- package-lock.json | 26 +++++++++---------- package.json | 3 +-- .../Map/InteractiveMap/InteractiveMap.js | 2 +- .../Map/InteractiveMap/InteractiveMap.test.js | 2 +- .../Map/Map/CustomMarkers/customMarker.js | 2 +- src/terra-front/modules/Map/Map/Map.js | 4 +-- src/terra-front/modules/Map/Map/Map.test.js | 2 +- .../components/ReportControl/ReportControl.js | 2 +- src/terra-front/modules/Map/Map/withMap.js | 4 +-- .../modules/Map/Map/withMap.test.js | 2 +- .../modules/Map/helpers/mapDebug.js | 2 +- .../modules/Map/helpers/mapDebug.test.js | 2 +- 12 files changed, 26 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index b2eaa0888..6b4f04e54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14868,10 +14868,19 @@ "object-visit": "^1.0.0" } }, - "mapbox-gl": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.0.tgz", - "integrity": "sha512-g8zlzuJxYJqbOPXT19/UBYpVrcefBQ06F/Cbj0fyEfFnFesDcU3cFTxd75/FZ6Upx2ZEjCsD61CHxrcxZidVpA==", + "mapbox-gl-inspect": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.1.tgz", + "integrity": "sha512-qkcT8lcYQy2x8wn+BUb6a6YXCEIHeGKHlt01/FSf58yYEmeufuihtbCjN9of2JDQm2XeRGdDEksAH7if7tPyyg==", + "requires": { + "lodash.isequal": "^4.4.0", + "randomcolor": "^0.4.4" + } + }, + "maplibre-gl": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-1.14.0.tgz", + "integrity": "sha512-pqr/nsoZHx1rUY2Bpp0EFVcFVgrVOLkDDh2DhZcLVZVHYXdFOH/LyKUoLZda/3/CDTmlZy9ldJeZN8O0g1Ocpg==", "requires": { "@mapbox/geojson-rewind": "^0.5.0", "@mapbox/geojson-types": "^1.0.2", @@ -14905,15 +14914,6 @@ } } }, - "mapbox-gl-inspect": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.1.tgz", - "integrity": "sha512-qkcT8lcYQy2x8wn+BUb6a6YXCEIHeGKHlt01/FSf58yYEmeufuihtbCjN9of2JDQm2XeRGdDEksAH7if7tPyyg==", - "requires": { - "lodash.isequal": "^4.4.0", - "randomcolor": "^0.4.4" - } - }, "marked": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz", diff --git a/package.json b/package.json index 8da89ed8d..fd5acb7b7 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "i18next-browser-languagedetector": "^3.0.3", "i18next-xhr-backend": "^3.1.2", "jspdf": "^1.5.3", - "mapbox-gl": "^1.13.0", "mapbox-gl-inspect": "^1.3.1", + "maplibre-gl": "^1.14.0", "marked": "^0.7.0", "memoize-one": "^5.0.4", "memoizee": "^0.4.14", @@ -101,7 +101,6 @@ "!src/App.js", "!src/config/i18n.js", "!src/**/index.js", - "!src/terra-front/**/stories/**/*.js", "!src/terra-front/**/*.stories.js" ], diff --git a/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.js b/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.js index ddf738128..65185926c 100644 --- a/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.js +++ b/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.js @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; -import mapBoxGl from 'mapbox-gl'; +import mapBoxGl from 'maplibre-gl'; import debounce from 'lodash.debounce'; import centroid from '@turf/centroid'; import uuid from 'uuid/v4'; diff --git a/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.test.js b/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.test.js index f9e6677c7..43c6a3361 100644 --- a/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.test.js +++ b/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.test.js @@ -3,7 +3,7 @@ import React from 'react'; import renderer from 'react-test-renderer'; import ReactDOM from 'react-dom'; -import mapboxGl from 'mapbox-gl'; +import mapboxGl from 'maplibre-gl'; import centroid from '@turf/centroid'; import { setInteractions, fitZoom } from '../services/mapUtils'; diff --git a/src/terra-front/modules/Map/Map/CustomMarkers/customMarker.js b/src/terra-front/modules/Map/Map/CustomMarkers/customMarker.js index c34593ff1..86e145931 100644 --- a/src/terra-front/modules/Map/Map/CustomMarkers/customMarker.js +++ b/src/terra-front/modules/Map/Map/CustomMarkers/customMarker.js @@ -1,4 +1,4 @@ -import { Marker } from 'mapbox-gl'; +import { Marker } from 'maplibre-gl'; import { getLayerOpacity } from '../../services/mapUtils'; import piechart from './piechartMarker'; diff --git a/src/terra-front/modules/Map/Map/Map.js b/src/terra-front/modules/Map/Map/Map.js index eb1d76541..c8d199869 100644 --- a/src/terra-front/modules/Map/Map/Map.js +++ b/src/terra-front/modules/Map/Map/Map.js @@ -1,7 +1,7 @@ import React from 'react'; -import mapBoxGl from 'mapbox-gl'; +import mapBoxGl from 'maplibre-gl'; import PropTypes from 'prop-types'; -import 'mapbox-gl/dist/mapbox-gl.css'; +import 'maplibre-gl/dist/maplibre-gl.css'; import MapboxDraw from '@mapbox/mapbox-gl-draw'; import { detailedDiff } from 'deep-object-diff'; diff --git a/src/terra-front/modules/Map/Map/Map.test.js b/src/terra-front/modules/Map/Map/Map.test.js index e12f63bf6..79f965bea 100644 --- a/src/terra-front/modules/Map/Map/Map.test.js +++ b/src/terra-front/modules/Map/Map/Map.test.js @@ -3,7 +3,7 @@ import React from 'react'; import renderer from 'react-test-renderer'; import { shallow } from 'enzyme'; -import mapboxgl from 'mapbox-gl'; +import mapboxgl from 'maplibre-gl'; import { MapComponent as Map } from './Map'; import { updateCluster } from '../services/cluster'; diff --git a/src/terra-front/modules/Map/Map/components/ReportControl/ReportControl.js b/src/terra-front/modules/Map/Map/components/ReportControl/ReportControl.js index 2bab65fff..99a6d6563 100644 --- a/src/terra-front/modules/Map/Map/components/ReportControl/ReportControl.js +++ b/src/terra-front/modules/Map/Map/components/ReportControl/ReportControl.js @@ -1,6 +1,6 @@ import React from 'react'; import { Icon, Position, Toaster } from '@blueprintjs/core'; -import { Marker } from 'mapbox-gl'; +import { Marker } from 'maplibre-gl'; import { parse, stringify } from 'query-string'; import AbstractControl from '../../../helpers/AbstractMapControl'; import Tooltip from '../../../../../components/Tooltip'; diff --git a/src/terra-front/modules/Map/Map/withMap.js b/src/terra-front/modules/Map/Map/withMap.js index efd43dfbb..34fc29d5f 100644 --- a/src/terra-front/modules/Map/Map/withMap.js +++ b/src/terra-front/modules/Map/Map/withMap.js @@ -2,10 +2,10 @@ import React from 'react'; import PropTypes from 'prop-types'; -import mapBoxGl from 'mapbox-gl'; +import mapBoxGl from 'maplibre-gl'; import { addMapDebug } from '../helpers/mapDebug'; -import 'mapbox-gl/dist/mapbox-gl.css'; +import 'maplibre-gl/dist/maplibre-gl.css'; export const DEFAULT_LAYER_TYPES_WEIGHT = { background: 100, diff --git a/src/terra-front/modules/Map/Map/withMap.test.js b/src/terra-front/modules/Map/Map/withMap.test.js index 726a8af8b..b5eeb6da2 100644 --- a/src/terra-front/modules/Map/Map/withMap.test.js +++ b/src/terra-front/modules/Map/Map/withMap.test.js @@ -1,7 +1,7 @@ import React from 'react'; import renderer from 'react-test-renderer'; import { shallow } from 'enzyme'; -import mapboxgl from 'mapbox-gl'; +import mapboxgl from 'maplibre-gl'; import { withMap } from './withMap'; diff --git a/src/terra-front/modules/Map/helpers/mapDebug.js b/src/terra-front/modules/Map/helpers/mapDebug.js index 939844c5c..99dcb9647 100644 --- a/src/terra-front/modules/Map/helpers/mapDebug.js +++ b/src/terra-front/modules/Map/helpers/mapDebug.js @@ -1,4 +1,4 @@ -import mapBoxGl from 'mapbox-gl'; +import mapBoxGl from 'maplibre-gl'; import MapboxInspect from 'mapbox-gl-inspect'; import renderInspectPopup from 'mapbox-gl-inspect/lib/renderPopup'; import 'mapbox-gl-inspect/dist/mapbox-gl-inspect.css'; diff --git a/src/terra-front/modules/Map/helpers/mapDebug.test.js b/src/terra-front/modules/Map/helpers/mapDebug.test.js index 52ba2e96d..a1b99ca71 100644 --- a/src/terra-front/modules/Map/helpers/mapDebug.test.js +++ b/src/terra-front/modules/Map/helpers/mapDebug.test.js @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import mapBoxGl from 'mapbox-gl'; +import mapBoxGl from 'maplibre-gl'; import MapboxInspect from 'mapbox-gl-inspect'; import renderInspectPopup from 'mapbox-gl-inspect/lib/renderPopup'; import { addMapDebug } from './mapDebug'; From 00603d36989b23f52be9239e37ce27f01fa96ef8 Mon Sep 17 00:00:00 2001 From: Maxime Bouveron Date: Thu, 1 Feb 2024 16:49:04 +0100 Subject: [PATCH 2/2] Fix tests --- src/terra-front/index.test.js | 2 +- .../modules/Map/InteractiveMap/InteractiveMap.test.js | 2 +- src/terra-front/modules/Map/Map/Map.test.js | 2 +- .../Map/Map/components/ReportControl/ReportControl.test.js | 2 +- src/terra-front/modules/Map/Map/withMap.test.js | 2 +- src/terra-front/modules/Map/helpers/mapDebug.test.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/terra-front/index.test.js b/src/terra-front/index.test.js index ceac01223..7485b5b0b 100644 --- a/src/terra-front/index.test.js +++ b/src/terra-front/index.test.js @@ -1,6 +1,6 @@ import * as lib from '.'; -jest.mock('mapbox-gl', () => ({})); +jest.mock('maplibre-gl', () => ({})); it('should export each modules', () => { expect(lib.Api).toBeDefined(); diff --git a/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.test.js b/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.test.js index 43c6a3361..150fe30ba 100644 --- a/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.test.js +++ b/src/terra-front/modules/Map/InteractiveMap/InteractiveMap.test.js @@ -20,7 +20,7 @@ import { import BackgroundStyles from './components/BackgroundStyles'; jest.mock('@turf/bbox', () => jest.fn()); -jest.mock('mapbox-gl', () => { +jest.mock('maplibre-gl', () => { const Popup = jest.fn(function Popup () { this.listeners = []; // eslint-disable-next-line no-underscore-dangle diff --git a/src/terra-front/modules/Map/Map/Map.test.js b/src/terra-front/modules/Map/Map/Map.test.js index 79f965bea..457871d9e 100644 --- a/src/terra-front/modules/Map/Map/Map.test.js +++ b/src/terra-front/modules/Map/Map/Map.test.js @@ -14,7 +14,7 @@ const props = { accessToken: 'pk.eyJ1IjoibWFraW5hY29ycHVzIiwiYSI6ImNqY3E4ZTNwcTFta3ozMm80d2xzY29wM2MifQ.Nwl_FHrWAIQ46s_lY0KNiQ', }; -jest.mock('mapbox-gl', () => { +jest.mock('maplibre-gl', () => { const off = jest.fn(); const map = { addControl: jest.fn(() => {}), diff --git a/src/terra-front/modules/Map/Map/components/ReportControl/ReportControl.test.js b/src/terra-front/modules/Map/Map/components/ReportControl/ReportControl.test.js index 7d97fa7d2..ac55d6628 100644 --- a/src/terra-front/modules/Map/Map/components/ReportControl/ReportControl.test.js +++ b/src/terra-front/modules/Map/Map/components/ReportControl/ReportControl.test.js @@ -8,7 +8,7 @@ jest.mock('react-dom', () => ({ render: jest.fn(), })); -jest.mock('mapbox-gl', () => ({ +jest.mock('maplibre-gl', () => ({ Marker: () => ({}), })); diff --git a/src/terra-front/modules/Map/Map/withMap.test.js b/src/terra-front/modules/Map/Map/withMap.test.js index b5eeb6da2..344fe481f 100644 --- a/src/terra-front/modules/Map/Map/withMap.test.js +++ b/src/terra-front/modules/Map/Map/withMap.test.js @@ -6,7 +6,7 @@ import mapboxgl from 'maplibre-gl'; import { withMap } from './withMap'; -jest.mock('mapbox-gl', () => { +jest.mock('maplibre-gl', () => { const addedLayers = []; const map = { once: jest.fn((e, fn) => fn()), diff --git a/src/terra-front/modules/Map/helpers/mapDebug.test.js b/src/terra-front/modules/Map/helpers/mapDebug.test.js index a1b99ca71..dd3d2d56e 100644 --- a/src/terra-front/modules/Map/helpers/mapDebug.test.js +++ b/src/terra-front/modules/Map/helpers/mapDebug.test.js @@ -4,7 +4,7 @@ import MapboxInspect from 'mapbox-gl-inspect'; import renderInspectPopup from 'mapbox-gl-inspect/lib/renderPopup'; import { addMapDebug } from './mapDebug'; -jest.mock('mapbox-gl', () => { +jest.mock('maplibre-gl', () => { const mockedPopup = { on: jest.fn() }; return {