feat: use @opensystemslab/map web component (#597)

theopensystemslab · Aug 19, 2021 · 29b28bb · 29b28bb
1 parent af55d23
commit 29b28bb
Show file tree

Hide file tree

Showing 18 changed files with 7,548 additions and 9,572 deletions.
diff --git a/.github/workflows/pull-request-main.yml b/.github/workflows/pull-request-main.yml
@@ -75,7 +75,7 @@ jobs:
         working-directory: editor.planx.uk
         env:
           REACT_APP_ORDNANCE_SURVEY_KEY: ${{ secrets.ORDNANCE_SURVEY_KEY }}
-          REACT_APP_MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
+          REACT_APP_ORDNANCE_SURVEY_FEATURES_KEY: ${{ secrets.ORDNANCE_SURVEY_FEATURES_KEY }}
           REACT_APP_API_URL: https://api.editor.planx.dev
           REACT_APP_FEEDBACK_FISH_ID: 65f02de00b90d1
           REACT_APP_HASURA_URL: https://hasura.editor.planx.dev/v1/graphql

diff --git a/.github/workflows/push-main.yml b/.github/workflows/push-main.yml
@@ -55,7 +55,7 @@ jobs:
         working-directory: editor.planx.uk
         env:
           REACT_APP_ORDNANCE_SURVEY_KEY: ${{ secrets.ORDNANCE_SURVEY_KEY }}
-          REACT_APP_MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
+          REACT_APP_ORDNANCE_SURVEY_FEATURES_KEY: ${{ secrets.ORDNANCE_SURVEY_FEATURES_KEY }}
           REACT_APP_API_URL: https://api.editor.planx.dev
           REACT_APP_FEEDBACK_FISH_ID: 65f02de00b90d1
           REACT_APP_HASURA_URL: https://hasura.editor.planx.dev/v1/graphql

diff --git a/.github/workflows/push-production.yml b/.github/workflows/push-production.yml
@@ -55,7 +55,7 @@ jobs:
         working-directory: editor.planx.uk
         env:
           REACT_APP_ORDNANCE_SURVEY_KEY: ${{ secrets.ORDNANCE_SURVEY_KEY }}
-          REACT_APP_MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
+          REACT_APP_ORDNANCE_SURVEY_FEATURES_KEY: ${{ secrets.ORDNANCE_SURVEY_FEATURES_KEY }}
           REACT_APP_API_URL: https://api.editor.planx.uk
           REACT_APP_FEEDBACK_FISH_ID: 65f02de00b90d1
           REACT_APP_HASURA_URL: https://hasura.editor.planx.uk/v1/graphql

diff --git a/editor.planx.uk/.env b/editor.planx.uk/.env
@@ -1,7 +1,7 @@
 # used in dev/test/prod
 
-REACT_APP_MAPBOX_ACCESS_TOKEN=pk.eyJ1Ijoib3BlbnN5c3RlbXNsYWIiLCJhIjoiY2sybHJ6cnY2MGFkaTNjcHIwanV1eGRlbCJ9.xAHUuQo1RAnzwOlN90SGVQ
 REACT_APP_ORDNANCE_SURVEY_KEY=se00yjrqJx8ypuQZ84GGdvYrzOEXJzOU
+REACT_APP_ORDNANCE_SURVEY_FEATURES_KEY=qZghZEbd91m1gxJqYE9N5Cfj0LAB9s1F
 
 # used in dev/test, overwritten in .env.production
 

diff --git a/editor.planx.uk/.storybook/main.js b/editor.planx.uk/.storybook/main.js
@@ -5,8 +5,6 @@ module.exports = {
   addons: ["@storybook/addon-links", "@storybook/addon-essentials"],
   webpackFinal: async (config) => {
     config.resolve.plugins.push(new TsconfigPathsPlugin({}));
-    // Required for Mapbox
-    config.node = { fs: "empty" };
     return config;
   },
 };
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
@@ -14,7 +14,6 @@
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.56",
-    "@turf/area": "^6.0.1",
     "@types/sharedb": "^1.0.17",
     "array-move": "^3.0.1",
     "axios": "^0.19.2",
@@ -32,7 +31,6 @@
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.20",
     "luhn": "^2.4.1",
-    "mapbox-gl": "^1.13.0",
     "marked": "^1.2.7",
     "mathjs": "^9.3.0",
     "nanoid": "^3.1.16",
@@ -54,8 +52,6 @@
     "react-error-boundary": "^3.1.0",
     "react-feather": "^2.0.8",
     "react-html-parser": "^2.0.2",
-    "react-map-gl": "^6.1.4",
-    "react-map-gl-draw": "^0.22.2",
     "react-markdown": "^4.3.1",
     "react-navi": "^0.14.4",
     "react-navi-helmet-async": "^0.14.4",