Skip to content

Commit

Permalink
Detect pmtiles urls using URL parsing [#147] (#148)
Browse files Browse the repository at this point in the history 
* Detect pmtiles urls using URL parsing [#147]

* fixes case where pmtiles URL has params at end.

* js 3.1.1
  • Loading branch information
@bdon
bdon authored Apr 4, 2024
1 parent 7f4a3c1 commit e638dff
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 17 deletions.
2 changes: 1 addition & 1 deletion benchmark/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="pixelmatch.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
html {
Expand Down
2 changes: 1 addition & 1 deletion examples/comparison.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/maplibre-gl.css" crossorigin="anonymous">
<script src="https://unpkg.com/[email protected]/dist/maplibre-gl.js" crossorigin="anonymous"></script>
<script src="https://unpkg.com/@maplibre/[email protected]/leaflet-maplibre-gl.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<style>
#parent {
display:flex;
Expand Down
2 changes: 1 addition & 1 deletion examples/fonts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"/>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="https://unpkg.com/[email protected]/leaflet-hash.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->

<link href="https://fonts.googleapis.com/css2?family=Inter:[email protected]&family=Work+Sans:[email protected]&family=Petrona:[email protected]&family=Raleway:[email protected]" rel="stylesheet">
Expand Down
2 changes: 1 addition & 1 deletion examples/inset.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
#map {
Expand Down
2 changes: 1 addition & 1 deletion examples/labels.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"/>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="https://unpkg.com/[email protected]/leaflet-hash.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
body, #map {
Expand Down
2 changes: 1 addition & 1 deletion examples/leaflet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"/>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="https://unpkg.com/[email protected]/leaflet-hash.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
body, #map {
Expand Down
2 changes: 1 addition & 1 deletion examples/multi_source.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"/>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="https://unpkg.com/[email protected]/leaflet-hash.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
body, #map {
Expand Down
2 changes: 1 addition & 1 deletion examples/pmtiles.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"/>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
body, #map {
Expand Down
2 changes: 1 addition & 1 deletion examples/pmtiles_headers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"/>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="https://unpkg.com/[email protected]/dist/pmtiles.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
body, #map {
Expand Down
2 changes: 1 addition & 1 deletion examples/sandwich.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"/>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="https://unpkg.com/[email protected]/leaflet-hash.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
body, #map {
Expand Down
2 changes: 1 addition & 1 deletion examples/sprites.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"/>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<script src="https://unpkg.com/[email protected]/leaflet-hash.js"></script>
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
body, #map {
Expand Down
2 changes: 1 addition & 1 deletion examples/static.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://unpkg.com/[email protected].0/dist/protomaps-leaflet.min.js"></script>
<script src="https://unpkg.com/[email protected].1/dist/protomaps-leaflet.min.js"></script>
<!-- <script src="../dist/protomaps-leaflet.js"></script> -->
<style>
#map {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "protomaps-leaflet",
"version": "3.1.0",
"version": "3.1.1",
"files": [
"dist",
"src"
Expand Down
5 changes: 4 additions & 1 deletion src/view.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,10 @@ export const sourcesToViews = (options: SourceOptions) => {
const maxDataZoom = o.maxDataZoom || 15;
let source: TileSource;
if (typeof o.url === "string") {
if (o.url.endsWith(".pmtiles")) {
if (
o.url.startsWith("http") &&
new URL(o.url).pathname.endsWith(".pmtiles")
) {
source = new PmtilesSource(o.url, true);
} else {
source = new ZxySource(o.url, true);
Expand Down
7 changes: 6 additions & 1 deletion test/view.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from "assert";
import { test } from "node:test";
import Point from "@mapbox/point-geometry";
import { TileCache } from "../src/tilecache";
import { PmtilesSource, TileCache } from "../src/tilecache";
import { View, sourcesToViews, wrap } from "../src/view";
import { StubSource } from "./test_helpers";

Expand Down Expand Up @@ -102,3 +102,8 @@ test("sources to views", async () => {
});
assert.equal(v.get("source1").levelDiff, 1);
});

test("sources to views with pmtiles parameters", async () => {
const v = sourcesToViews({ url: "http://example.com/foo.pmtiles?k=v" });
assert.ok(v.get("").tileCache.source instanceof PmtilesSource);
});

0 comments on commit e638dff

Please sign in to comment.