Make aws/cloudflare depend on pmtiles from npm [#455] (#515)

* Make aws/cloudflare depend on pmtiles from npm [#455]

This is clearer to developers than relying on the local code being built.

* update check_examples.py
* bump openlayers to v2 with upgrade of pmtiles to v4 [#455]
* update to 4.2.1
This commit is contained in:
Brandon Liu
2025-01-14 17:09:11 +08:00
committed by GitHub
parent d3740449d4
commit 61e60c69d2
12 changed files with 95 additions and 33 deletions

View File

@@ -13,6 +13,17 @@ for package in glob.glob("**/package.json",recursive=True):
name = j["name"]
version = j["version"]
for dependent in glob.glob("**/package.json",recursive=True):
if "node_modules" in dependent:
continue
with open(dependent,"r") as f:
j2 = json.loads(f.read())
if 'dependencies' in j2 and name in j2["dependencies"]:
dependent_version = j2["dependencies"]["pmtiles"]
if dependent_version != "^" + version:
print(dependent,"should be ^",version,"was",dependent_version)
fail = 1
for html in glob.glob("**/*.html",recursive=True):
if "node_modules" in html:
continue

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8"/>
<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@1.0.2/dist/olpmtiles.js"></script>
<script src="https://unpkg.com/ol-pmtiles@2.0.0/dist/olpmtiles.js"></script>
<style>
body, #map {
height:100vh;

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8"/>
<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@1.0.2/dist/olpmtiles.js"></script>
<script src="https://unpkg.com/ol-pmtiles@2.0.0/dist/olpmtiles.js"></script>
<style>
body, #map {
height:100vh;

View File

@@ -1,15 +1,15 @@
{
"name": "ol-pmtiles",
"version": "1.0.2",
"version": "2.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "ol-pmtiles",
"version": "1.0.2",
"version": "2.0.0",
"license": "BSD-3-Clause",
"dependencies": {
"pmtiles": "^3.1.0"
"pmtiles": "^4.2.1"
},
"devDependencies": {
"tsup": "^8.2.3",
@@ -768,19 +768,6 @@
"dev": true,
"license": "MIT"
},
"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/ansi-regex": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
@@ -1168,9 +1155,10 @@
}
},
"node_modules/fflate": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.0.tgz",
"integrity": "sha512-FAdS4qMuFjsJj6XHbBaZeXOgaypXp8iw/Tpyuq/w3XA41jjLHT8NPA+n7czH/DDhdncq0nAyDZmPeWXh2qmdIg=="
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
"integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
"license": "MIT"
},
"node_modules/fill-range": {
"version": "7.1.1",
@@ -1762,13 +1750,12 @@
}
},
"node_modules/pmtiles": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-3.1.0.tgz",
"integrity": "sha512-6JvgAQ8gElP1Ilg6ILM4KqleeKS+QcwpW8PXqhPWjRFmqF42yyUJ8sP3dZHQXm+G0HYXuw1kGlMTdVEs583pCQ==",
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-4.2.1.tgz",
"integrity": "sha512-Z73aph49f7KpU7JPb+zDWr+62wPv9jF3p+tvvL26/XeECnzUHnQ0nGopXGPYnq+OQXqyaXZPrsNdKxSD+2HlLA==",
"license": "BSD-3-Clause",
"dependencies": {
"@types/leaflet": "^1.9.8",
"fflate": "^0.8.0"
"fflate": "^0.8.2"
}
},
"node_modules/postcss-load-config": {

View File

@@ -1,6 +1,6 @@
{
"name": "ol-pmtiles",
"version": "1.0.2",
"version": "2.0.0",
"description": "PMTiles sources for OpenLayers",
"type": "module",
"main": "dist/cjs/index.cjs",
@@ -42,7 +42,7 @@
"prettier-check": "prettier --check *.js"
},
"dependencies": {
"pmtiles": "^3.1.0"
"pmtiles": "^4.2.1"
},
"devDependencies": {
"tsup": "^8.2.3",

View File

@@ -9,7 +9,8 @@
"version": "0.0.0",
"dependencies": {
"@aws-sdk/client-s3": "^3.637.0",
"@smithy/node-http-handler": "^3.1.4"
"@smithy/node-http-handler": "^3.1.4",
"pmtiles": "^4.2.1"
},
"devDependencies": {
"@biomejs/biome": "^1.5.3",
@@ -2571,6 +2572,12 @@
"fxparser": "src/cli/cli.js"
}
},
"node_modules/fflate": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
"integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
"license": "MIT"
},
"node_modules/fsevents": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -2610,6 +2617,15 @@
"js-yaml": "bin/js-yaml.js"
}
},
"node_modules/pmtiles": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-4.2.1.tgz",
"integrity": "sha512-Z73aph49f7KpU7JPb+zDWr+62wPv9jF3p+tvvL26/XeECnzUHnQ0nGopXGPYnq+OQXqyaXZPrsNdKxSD+2HlLA==",
"license": "BSD-3-Clause",
"dependencies": {
"fflate": "^0.8.2"
}
},
"node_modules/resolve-pkg-maps": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
@@ -4925,6 +4941,11 @@
"strnum": "^1.0.5"
}
},
"fflate": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
"integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A=="
},
"fsevents": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -4950,6 +4971,14 @@
"argparse": "^2.0.1"
}
},
"pmtiles": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-4.2.1.tgz",
"integrity": "sha512-Z73aph49f7KpU7JPb+zDWr+62wPv9jF3p+tvvL26/XeECnzUHnQ0nGopXGPYnq+OQXqyaXZPrsNdKxSD+2HlLA==",
"requires": {
"fflate": "^0.8.2"
}
},
"resolve-pkg-maps": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",

View File

@@ -21,6 +21,7 @@
},
"dependencies": {
"@aws-sdk/client-s3": "^3.637.0",
"@smithy/node-http-handler": "^3.1.4"
"@smithy/node-http-handler": "^3.1.4",
"pmtiles": "^4.2.1"
}
}

View File

@@ -11,7 +11,7 @@ import {
ResolvedValueCache,
Source,
TileType,
} from "../../../js/src/index";
} from "pmtiles";
import { pmtiles_path, tile_path } from "../../shared/index";
import { createHash } from "crypto";

View File

@@ -7,6 +7,9 @@
"": {
"name": "pmtiles-cloudflare",
"version": "0.0.1",
"dependencies": {
"pmtiles": "^4.2.1"
},
"devDependencies": {
"@biomejs/biome": "^1.5.3",
"@cloudflare/workers-types": "^4.20230518.0",
@@ -1012,6 +1015,12 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/fflate": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
"integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
"license": "MIT"
},
"node_modules/fill-range": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -1314,6 +1323,15 @@
"url": "https://github.com/sponsors/jonschlinkert"
}
},
"node_modules/pmtiles": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-4.2.1.tgz",
"integrity": "sha512-Z73aph49f7KpU7JPb+zDWr+62wPv9jF3p+tvvL26/XeECnzUHnQ0nGopXGPYnq+OQXqyaXZPrsNdKxSD+2HlLA==",
"license": "BSD-3-Clause",
"dependencies": {
"fflate": "^0.8.2"
}
},
"node_modules/printable-characters": {
"version": "1.0.42",
"resolved": "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.42.tgz",
@@ -2595,6 +2613,11 @@
"integrity": "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==",
"dev": true
},
"fflate": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
"integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A=="
},
"fill-range": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -2794,6 +2817,14 @@
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"dev": true
},
"pmtiles": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/pmtiles/-/pmtiles-4.2.1.tgz",
"integrity": "sha512-Z73aph49f7KpU7JPb+zDWr+62wPv9jF3p+tvvL26/XeECnzUHnQ0nGopXGPYnq+OQXqyaXZPrsNdKxSD+2HlLA==",
"requires": {
"fflate": "^0.8.2"
}
},
"printable-characters": {
"version": "1.0.42",
"resolved": "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.42.tgz",

View File

@@ -17,5 +17,8 @@
"build": "wrangler deploy --outdir dist --dry-run",
"biome": "biome check --config-path=../../js/ src/index.ts --apply",
"biome-check": "biome check --config-path=../../js src/index.ts"
},
"dependencies": {
"pmtiles": "^4.2.1"
}
}

View File

@@ -6,7 +6,7 @@ import {
ResolvedValueCache,
Source,
TileType,
} from "../../../js/src/index";
} from "pmtiles";
import { pmtiles_path, tile_path } from "../../shared/index";
interface Env {