From 46de0b076d9734c1826f2b64639d558d36a2f733 Mon Sep 17 00:00:00 2001
From: Brandon Liu <bdon@users.noreply.github.com>
Date: Wed, 6 Mar 2024 15:45:27 +0800
Subject: [PATCH] ol-pmtiles 0.4.0 (#374)

* fix double ol source tile load events [#373]
* bump pmtiles dependency to 3.x
* bump examples to ol 9.x
* fix package.json publint
---
 openlayers/examples/raster.html   |  6 +++---
 openlayers/examples/vector.html   |  6 +++---
 openlayers/package-lock.json      | 22 ++++++++++++++++++----
 openlayers/package.json           | 14 ++++++++------
 openlayers/src/index.js           |  1 -
 openlayers/src/script_includes.js |  1 -
 6 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/openlayers/examples/raster.html b/openlayers/examples/raster.html
index 1ff987b..f9a2e29 100644
--- a/openlayers/examples/raster.html
+++ b/openlayers/examples/raster.html
@@ -2,9 +2,9 @@
     <head>
         <title>PMTiles OpenLayers Raster Example</title>
         <meta charset="utf-8"/>
-        <script src="https://cdn.jsdelivr.net/npm/ol@v7.3.0/dist/ol.js"></script>
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v7.3.0/ol.css">
-        <script src="https://unpkg.com/ol-pmtiles@0.3.0/dist/olpmtiles.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/ol@v9.0.0/dist/ol.js"></script>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v9.0.0/ol.css">
+        <script src="https://unpkg.com/ol-pmtiles@0.4.0/dist/olpmtiles.js"></script>
         <style>
             body, #map {
                 height:100vh;
diff --git a/openlayers/examples/vector.html b/openlayers/examples/vector.html
index 8896a04..d2924f2 100644
--- a/openlayers/examples/vector.html
+++ b/openlayers/examples/vector.html
@@ -2,9 +2,9 @@
     <head>
         <title>PMTiles OpenLayers Vector Example</title>
         <meta charset="utf-8"/>
-        <script src="https://cdn.jsdelivr.net/npm/ol@v7.3.0/dist/ol.js"></script>
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v7.3.0/ol.css">
-        <script src="https://unpkg.com/ol-pmtiles@0.3.0/dist/olpmtiles.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/ol@v9.0.0/dist/ol.js"></script>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v9.0.0/ol.css">
+        <script src="https://unpkg.com/ol-pmtiles@0.4.0/dist/olpmtiles.js"></script>
         <style>
             body, #map {
                 height:100vh;
diff --git a/openlayers/package-lock.json b/openlayers/package-lock.json
index 52d582f..e375e48 100644
--- a/openlayers/package-lock.json
+++ b/openlayers/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.3.0",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "pmtiles": "2.11.0"
+        "pmtiles": "^3.0.4"
       },
       "devDependencies": {
         "esbuild": "^0.15.11"
@@ -99,6 +99,19 @@
       "integrity": "sha512-AhVAm6SQ+zgxIiOzwVdUcDmKlu/qU39FiYD2UD6kQQaVenrn0dGZewIghWAENGQsvC+1avLCuT+T2/3Gsp/W3w==",
       "peer": true
     },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.14",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
+      "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg=="
+    },
+    "node_modules/@types/leaflet": {
+      "version": "1.9.8",
+      "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.8.tgz",
+      "integrity": "sha512-EXdsL4EhoUtGm2GC2ZYtXn+Fzc6pluVgagvo2VC1RHWToLGlTRwVYoDpqS/7QXa01rmDyBjJk3Catpf60VMkwg==",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
     "node_modules/csscolorparser": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz",
@@ -591,10 +604,11 @@
       }
     },
     "node_modules/pmtiles": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-2.11.0.tgz",
-      "integrity": "sha512-dU9SzzaqmCGpdEuTnIba6bDHT6j09ZJFIXxwGpvkiEnce3ZnBB1VKt6+EOmJGueriweaZLAMTUmKVElU2CBe0g==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-3.0.4.tgz",
+      "integrity": "sha512-dqxfYM/b0Y59JEk55piird5gqcRwq9o3yLBV2/l7ecfMPbCt+ccVxtPf5Ox8h/amCyRov+WgnbLLFGp8D5E8Gw==",
       "dependencies": {
+        "@types/leaflet": "^1.9.8",
         "fflate": "^0.8.0"
       }
     },
diff --git a/openlayers/package.json b/openlayers/package.json
index 7f846a9..397b1f0 100644
--- a/openlayers/package.json
+++ b/openlayers/package.json
@@ -1,12 +1,14 @@
 {
   "name": "ol-pmtiles",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "PMTiles sources for OpenLayers",
   "type": "module",
-  "main": "src/index.js",
+  "exports": [
+    "./src/index.js"
+  ],
   "files": [
-    "dist/olpmtiles.js",
-    "src/index.js"
+    "./dist/olpmtiles.js",
+    "./src/index.js"
   ],
   "repository": {
     "type": "git",
@@ -26,12 +28,12 @@
     "prettier-check": "prettier --check *.js"
   },
   "dependencies": {
-    "pmtiles": "2.11.0"
+    "pmtiles": "^3.0.4"
   },
   "devDependencies": {
     "esbuild": "^0.15.11"
   },
   "peerDependencies": {
-    "ol": ">=7.3.0"
+    "ol": ">=9.0.0"
   }
 }
diff --git a/openlayers/src/index.js b/openlayers/src/index.js
index d079eed..4a529b7 100644
--- a/openlayers/src/index.js
+++ b/openlayers/src/index.js
@@ -53,7 +53,6 @@ export class PMTilesVectorSource extends VectorTile {
     const y = +result[4];
 
     tile.setLoader((extent, resolution, projection) => {
-      tile.setState(TileState.LOADING);
       this.pmtiles_
         .getZxy(z, x, y)
         .then((tile_result) => {
diff --git a/openlayers/src/script_includes.js b/openlayers/src/script_includes.js
index e011f43..0a60a91 100644
--- a/openlayers/src/script_includes.js
+++ b/openlayers/src/script_includes.js
@@ -59,7 +59,6 @@ export class PMTilesVectorSource extends ol.source.VectorTile {
     const y = +result[4];
 
     tile.setLoader((extent, resolution, projection) => {
-      tile.setState(1);
       this.pmtiles_
         .getZxy(z, x, y)
         .then((tile_result) => {
