From 8e0546fba4b6196f690c1f03637d1864fef907ea Mon Sep 17 00:00:00 2001
From: Kevin Schaul <kevin.schaul@gmail.com>
Date: Wed, 12 Jul 2023 16:37:19 -0500
Subject: [PATCH] Get map rendering with maplibre

---
 package-lock.json              | 4 ++--
 src/components/MapMapboxGl.jsx | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 17d66bb1..52c00a9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "maputnik",
-  "version": "2.0.0",
+  "version": "2.0.0-pre.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "maputnik",
-      "version": "2.0.0",
+      "version": "2.0.0-pre.1",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.17.9",
diff --git a/src/components/MapMapboxGl.jsx b/src/components/MapMapboxGl.jsx
index 0015c76f..33ae99b1 100644
--- a/src/components/MapMapboxGl.jsx
+++ b/src/components/MapMapboxGl.jsx
@@ -75,7 +75,6 @@ export default class MapMapboxGl extends React.Component {
 
   constructor(props) {
     super(props)
-    MapboxGl.accessToken = tokens.mapbox
     this.state = {
       map: null,
       inspect: null,
@@ -86,8 +85,6 @@ export default class MapMapboxGl extends React.Component {
     if(!IS_SUPPORTED) return;
 
     if(!this.state.map) return
-    const metadata = props.mapStyle.metadata || {}
-    MapboxGl.accessToken = metadata['maputnik:mapbox_access_token'] || tokens.mapbox
 
     //Mapbox GL now does diffing natively so we don't need to calculate
     //the necessary operations ourselves!
@@ -149,7 +146,7 @@ export default class MapMapboxGl extends React.Component {
       maxZoom: 24
     }
 
-    const map = new MapboxGl.Map(mapOpts);
+    const map = new MapLibreGl.Map(mapOpts);
 
     const mapViewChange = () => {
       const center = map.getCenter();
@@ -165,13 +162,13 @@ export default class MapMapboxGl extends React.Component {
     const zoomControl = new ZoomControl;
     map.addControl(zoomControl, 'top-right');
 
-    const nav = new MapboxGl.NavigationControl({visualizePitch:true});
+    const nav = new MapLibreGl.NavigationControl({visualizePitch:true});
     map.addControl(nav, 'top-right');
 
     const tmpNode = document.createElement('div');
 
     const inspect = new MapboxInspect({
-      popup: new MapboxGl.Popup({
+      popup: new MapLibreGl.Popup({
         closeOnClick: false
       }),
       showMapPopup: true,