Skip to content

Commit 8808790

Browse files
miles-grant-ibigroupmiles-grant-ibigroup
authored
Merge pull request #472 from ibi-group/otp2-tile-overlay
OTP2 Tile Overlay
2 parents a05328d + 5213879 commit 8808790

File tree

53 files changed

+463
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+463
-445
lines changed

Diff for: ‎.storybook/preview.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { withReactIntl } from "storybook-react-intl/dist/cjs/withReactIntl";
44
import locationFieldHandlers from "../packages/location-field/src/mocks/handlers";
55
import itineraryBodyHandlers from "../packages/itinerary-body/src/__mocks__/handlers";
66
import geocoderHandlers from "../packages/geocoder/src/test-fixtures/handlers";
7+
import tileLayerHandlers from '../packages/otp2-tile-overlay/src/mocks/handlers'
78

89
import { reactIntl } from './react-intl.js';
910

@@ -12,7 +13,8 @@ if (typeof global.process === "undefined") {
1213
const worker = setupWorker(
1314
...locationFieldHandlers,
1415
...itineraryBodyHandlers,
15-
...geocoderHandlers
16+
...geocoderHandlers,
17+
...tileLayerHandlers
1618
);
1719
worker.start({ onUnhandledRequest: "bypass" });
1820
}

Diff for: ‎.storybook/react-intl.js

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const packages = [
2020
"itinerary-body",
2121
"location-field",
2222
"printable-itinerary",
23+
"map-popup",
2324
"stops-overlay",
2425
"transit-vehicle-overlay",
2526
"trip-details",

Diff for: ‎jest.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ module.exports = {
2424
],
2525
moduleNameMapper: {
2626
"\\.(s?css|less)$": "identity-obj-proxy",
27+
"\\.(pbf)$": "<rootDir>/__mocks__/file-mock.js",
2728
"\\.(svg)$": "<rootDir>/__mocks__/file-mock.js"
2829
},
2930
testPathIgnorePatterns: ["<rootDir>/packages/(?:.+?)/(esm|lib)/"],

Diff for: ‎packages/core-utils/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"private": false,
1414
"dependencies": {
1515
"@mapbox/polyline": "^1.1.0",
16-
"@opentripplanner/geocoder": "^1.3.2",
16+
"@opentripplanner/geocoder": "^1.3.4",
1717
"@styled-icons/foundation": "^10.34.0",
1818
"@turf/along": "^6.0.1",
1919
"bowser": "^2.7.0",
@@ -30,6 +30,6 @@
3030
},
3131
"devDependencies": {
3232
"@types/chroma-js": "^2.1.4",
33-
"@opentripplanner/types": "^4.0.2"
33+
"@opentripplanner/types": "^4.0.4"
3434
}
3535
}

Diff for: ‎packages/endpoints-overlay/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
"url": "https://github.com/opentripplanner/otp-ui/issues"
2020
},
2121
"dependencies": {
22-
"@opentripplanner/base-map": "^3.0.4",
22+
"@opentripplanner/base-map": "^3.0.8",
2323
"@opentripplanner/location-icon": "^1.4.0",
24-
"@opentripplanner/core-utils": "^7.0.5",
24+
"@opentripplanner/core-utils": "^8.0.0",
2525
"flat": "^5.0.2",
2626
"@styled-icons/fa-solid": "^10.34.0"
2727
},
2828
"devDependencies": {
2929
"@types/flat": "^5.0.2"
3030
},
3131
"peerDependencies": {
32-
"@opentripplanner/types": "^4.0.2",
32+
"@opentripplanner/types": "^4.0.4",
3333
"react": "^16.14.0",
3434
"react-dom": "^16.8.6",
3535
"react-intl": "^5.24.6",

Diff for: ‎packages/from-to-location-picker/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"flat": "^5.0.2"
1414
},
1515
"devDependencies": {
16-
"@opentripplanner/types": "^4.0.2"
16+
"@opentripplanner/types": "^4.0.4"
1717
},
1818
"peerDependencies": {
1919
"react": "^16.14.0",

Diff for: ‎packages/icons/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"license": "MIT",
1111
"private": false,
1212
"dependencies": {
13-
"@opentripplanner/core-utils": "^7.0.5",
13+
"@opentripplanner/core-utils": "^8.0.0",
1414
"prop-types": "^15.7.2"
1515
},
1616
"peerDependencies": {

Diff for: ‎packages/itinerary-body/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"license": "MIT",
1111
"private": false,
1212
"dependencies": {
13-
"@opentripplanner/core-utils": "^7.0.10",
13+
"@opentripplanner/core-utils": "^8.0.0",
1414
"@opentripplanner/humanize-distance": "^1.2.0",
15-
"@opentripplanner/icons": "^2.0.0",
15+
"@opentripplanner/icons": "^2.0.1",
1616
"@opentripplanner/location-icon": "^1.4.0",
1717
"@styled-icons/fa-solid": "^10.34.0",
1818
"@styled-icons/foundation": "^10.34.0",
@@ -23,7 +23,7 @@
2323
"react-animate-height": "^3.0.4"
2424
},
2525
"devDependencies": {
26-
"@opentripplanner/types": "^4.0.2",
26+
"@opentripplanner/types": "^4.0.4",
2727
"@types/flat": "^5.0.2"
2828
},
2929
"peerDependencies": {

Diff for: ‎packages/location-field/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"private": false,
1111
"dependencies": {
1212
"@conveyal/geocoder-arcgis-geojson": "^0.0.3",
13-
"@opentripplanner/core-utils": "^7.0.5",
14-
"@opentripplanner/geocoder": "1.3.3",
13+
"@opentripplanner/core-utils": "^8.0.0",
14+
"@opentripplanner/geocoder": "1.3.4",
1515
"@opentripplanner/humanize-distance": "^1.2.0",
1616
"@opentripplanner/location-icon": "^1.4.0",
1717
"@styled-icons/fa-solid": "^10.34.0",

Diff for: ‎packages/map-popup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"license": "MIT",
1212
"private": false,
1313
"dependencies": {
14-
"@opentripplanner/base-map": "^3.0.7",
14+
"@opentripplanner/base-map": "^3.0.8",
1515
"@opentripplanner/core-utils": "^8.0.0",
1616
"@opentripplanner/from-to-location-picker": "^2.1.5",
1717
"flat": "^5.0.2"

Diff for: ‎packages/otp2-tile-overlay/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## Usage
2+
3+
```
4+
TBD
5+
```

Diff for: ‎packages/otp2-tile-overlay/package.json

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "@opentripplanner/otp2-tile-overlay",
3+
"version": "1.0.0",
4+
"description": "Render data from OTP2's vector tile server",
5+
"main": "lib/index.js",
6+
"module": "esm/index.js",
7+
"types": "lib/index.d.ts",
8+
"repository": "https://github.com/opentripplanner/otp-ui.git",
9+
"license": "MIT",
10+
"private": false,
11+
"scripts": {
12+
"tsc": "tsc"
13+
},
14+
"peerDependencies": {
15+
"react": "^16.14.0",
16+
"react-map-gl": "^7.0.15"
17+
},
18+
"dependencies": {
19+
"@opentripplanner/map-popup": "^1.0.0"
20+
},
21+
"devDependencies": {
22+
"@opentripplanner/base-map": "^3.0.8",
23+
"@opentripplanner/types": "^4.0.4"
24+
}
25+
}

Diff for: ‎packages/otp2-tile-overlay/src/Otp2TileOverlay.story.tsx

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import React, { useState } from "react";
2+
import BaseMap from "@opentripplanner/base-map";
3+
import generateOTP2TileLayers from ".";
4+
5+
export default {
6+
title: "OTP2 Tile Layer"
7+
};
8+
9+
export const OtpTileLayer = (): JSX.Element => {
10+
const [endpoint, setEndpoint] = useState("https://fake-otp-server.com/otp");
11+
return (
12+
<>
13+
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
14+
<label>
15+
OTP2 Server with stops layer enabled
16+
<input
17+
onChange={e => setEndpoint(e.target.value)}
18+
placeholder="http://localhost:8001/otp"
19+
value={endpoint}
20+
/>
21+
</label>
22+
<pre style={{ display: "inline", paddingLeft: 5 }}>
23+
https://fake-otp-server.com/otp
24+
</pre>{" "}
25+
mocks downtown Philadelphia stop tile data. Check stops in the layer
26+
selector and zoom in on downtown Philadelphia (near city hall) to see some
27+
stops loaded from OTP tiles.
28+
<BaseMap center={[0, 0]} zoom={3} style={{ height: "80vh" }}>
29+
{generateOTP2TileLayers(
30+
[{ type: "stops" }],
31+
`${endpoint}/routers/default/vectorTiles`
32+
)}
33+
</BaseMap>
34+
</>
35+
);
36+
};
37+
38+
// Don't take a snapshot of an interactive component
39+
OtpTileLayer.parameters = {
40+
storyshots: { disable: true }
41+
};

0 commit comments

Comments
 (0)