Compare commits
3 Commits
17d2a6f799
...
6de5c5f3db
| Author | SHA1 | Date | |
|---|---|---|---|
| 6de5c5f3db | |||
| 93abc6c5e3 | |||
| 91dfb04f76 |
Binary file not shown.
|
After Width: | Height: | Size: 4.1 KiB |
@@ -0,0 +1,23 @@
|
|||||||
|
node_modules
|
||||||
|
|
||||||
|
# Output
|
||||||
|
.output
|
||||||
|
.vercel
|
||||||
|
.netlify
|
||||||
|
.wrangler
|
||||||
|
/.svelte-kit
|
||||||
|
/build
|
||||||
|
|
||||||
|
# OS
|
||||||
|
.DS_Store
|
||||||
|
Thumbs.db
|
||||||
|
|
||||||
|
# Env
|
||||||
|
.env
|
||||||
|
.env.*
|
||||||
|
!.env.example
|
||||||
|
!.env.test
|
||||||
|
|
||||||
|
# Vite
|
||||||
|
vite.config.js.timestamp-*
|
||||||
|
vite.config.ts.timestamp-*
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
engine-strict=true
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# Package Managers
|
||||||
|
package-lock.json
|
||||||
|
pnpm-lock.yaml
|
||||||
|
yarn.lock
|
||||||
|
bun.lock
|
||||||
|
bun.lockb
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"useTabs": true,
|
||||||
|
"singleQuote": true,
|
||||||
|
"trailingComma": "none",
|
||||||
|
"printWidth": 100,
|
||||||
|
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
|
||||||
|
"overrides": [
|
||||||
|
{
|
||||||
|
"files": "*.svelte",
|
||||||
|
"options": {
|
||||||
|
"parser": "svelte"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
# sv
|
||||||
|
|
||||||
|
Everything you need to build a Svelte project, powered by [`sv`](https://github.com/sveltejs/cli).
|
||||||
|
|
||||||
|
## Creating a project
|
||||||
|
|
||||||
|
If you're seeing this, you've probably already done this step. Congrats!
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# create a new project in the current directory
|
||||||
|
npx sv create
|
||||||
|
|
||||||
|
# create a new project in my-app
|
||||||
|
npx sv create my-app
|
||||||
|
```
|
||||||
|
|
||||||
|
## Developing
|
||||||
|
|
||||||
|
Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run dev
|
||||||
|
|
||||||
|
# or start the server and open the app in a new browser tab
|
||||||
|
npm run dev -- --open
|
||||||
|
```
|
||||||
|
|
||||||
|
## Building
|
||||||
|
|
||||||
|
To create a production version of your app:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run build
|
||||||
|
```
|
||||||
|
|
||||||
|
You can preview the production build with `npm run preview`.
|
||||||
|
|
||||||
|
> To deploy your app, you may need to install an [adapter](https://svelte.dev/docs/kit/adapters) for your target environment.
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{ #await vehiclesPromise then vehicles }
|
||||||
|
{ #each vehicles.positions as position, i }
|
||||||
|
{ #if!isNaN(position.position.latitude) || isNaN(position.position.longitude) }
|
||||||
|
<Marker
|
||||||
|
lnglat={ [position.position.longitude, position.position.latitude] }
|
||||||
|
class="grid h-8 w-8 place-items-center rounded-full border border-gray-200 bg-red-300 text-black shadow-2xl focus:outline-2 focus:outline-black"
|
||||||
|
>
|
||||||
|
<span>
|
||||||
|
{ position.trip.route_id }
|
||||||
|
</span>
|
||||||
|
</Marker>
|
||||||
|
{/if }
|
||||||
|
{/each }
|
||||||
|
{/await }
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import prettier from 'eslint-config-prettier';
|
||||||
|
import js from '@eslint/js';
|
||||||
|
import { includeIgnoreFile } from '@eslint/compat';
|
||||||
|
import svelte from 'eslint-plugin-svelte';
|
||||||
|
import globals from 'globals';
|
||||||
|
import { fileURLToPath } from 'node:url';
|
||||||
|
import ts from 'typescript-eslint';
|
||||||
|
import svelteConfig from './svelte.config.js';
|
||||||
|
|
||||||
|
const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url));
|
||||||
|
|
||||||
|
export default ts.config(
|
||||||
|
includeIgnoreFile(gitignorePath),
|
||||||
|
js.configs.recommended,
|
||||||
|
...ts.configs.recommended,
|
||||||
|
...svelte.configs.recommended,
|
||||||
|
prettier,
|
||||||
|
...svelte.configs.prettier,
|
||||||
|
{
|
||||||
|
languageOptions: {
|
||||||
|
globals: { ...globals.browser, ...globals.node }
|
||||||
|
},
|
||||||
|
rules: { 'no-undef': 'off' }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
files: ['**/*.svelte', '**/*.svelte.ts', '**/*.svelte.js'],
|
||||||
|
languageOptions: {
|
||||||
|
parserOptions: {
|
||||||
|
projectService: true,
|
||||||
|
extraFileExtensions: ['.svelte'],
|
||||||
|
parser: ts.parser,
|
||||||
|
svelteConfig
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
{
|
||||||
|
"name": "explorer",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.0.1",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite dev",
|
||||||
|
"build": "vite build",
|
||||||
|
"preview": "vite preview",
|
||||||
|
"prepare": "svelte-kit sync || echo ''",
|
||||||
|
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||||
|
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||||
|
"format": "prettier --write .",
|
||||||
|
"lint": "prettier --check . && eslint ."
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@eslint/compat": "^1.2.5",
|
||||||
|
"@eslint/js": "^9.18.0",
|
||||||
|
"@sveltejs/adapter-auto": "^6.0.0",
|
||||||
|
"@sveltejs/kit": "^2.16.0",
|
||||||
|
"@sveltejs/vite-plugin-svelte": "^5.0.0",
|
||||||
|
"@tailwindcss/vite": "^4.0.0",
|
||||||
|
"eslint": "^9.18.0",
|
||||||
|
"eslint-config-prettier": "^10.0.1",
|
||||||
|
"eslint-plugin-svelte": "^3.0.0",
|
||||||
|
"globals": "^16.0.0",
|
||||||
|
"prettier": "^3.4.2",
|
||||||
|
"prettier-plugin-svelte": "^3.3.3",
|
||||||
|
"prettier-plugin-tailwindcss": "^0.6.11",
|
||||||
|
"svelte": "^5.0.0",
|
||||||
|
"svelte-check": "^4.0.0",
|
||||||
|
"tailwindcss": "^4.0.0",
|
||||||
|
"typescript": "^5.0.0",
|
||||||
|
"typescript-eslint": "^8.20.0",
|
||||||
|
"vite": "^6.2.6"
|
||||||
|
},
|
||||||
|
"pnpm": {
|
||||||
|
"onlyBuiltDependencies": [
|
||||||
|
"esbuild"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"svelte-maplibre-gl": "^0.1.6"
|
||||||
|
}
|
||||||
|
}
|
||||||
Generated
+3025
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1 @@
|
|||||||
|
@import 'tailwindcss';
|
||||||
Vendored
+13
@@ -0,0 +1,13 @@
|
|||||||
|
// See https://svelte.dev/docs/kit/types#app.d.ts
|
||||||
|
// for information about these interfaces
|
||||||
|
declare global {
|
||||||
|
namespace App {
|
||||||
|
// interface Error {}
|
||||||
|
// interface Locals {}
|
||||||
|
// interface PageData {}
|
||||||
|
// interface PageState {}
|
||||||
|
// interface Platform {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {};
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
|
%sveltekit.head%
|
||||||
|
</head>
|
||||||
|
<body data-sveltekit-preload-data="hover">
|
||||||
|
<div style="display: contents">%sveltekit.body%</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
// place files you want to import through the `$lib` alias in this folder.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import '../app.css';
|
||||||
|
|
||||||
|
let { children } = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{@render children()}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export const ssr = false;
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import {
|
||||||
|
MapLibre,
|
||||||
|
NavigationControl,
|
||||||
|
ScaleControl,
|
||||||
|
GlobeControl,
|
||||||
|
GeoJSONSource,
|
||||||
|
SymbolLayer,
|
||||||
|
FillLayer,
|
||||||
|
Image,
|
||||||
|
Marker
|
||||||
|
} from 'svelte-maplibre-gl';
|
||||||
|
|
||||||
|
const size = 64;
|
||||||
|
const data = new Uint8Array(size * size * 4);
|
||||||
|
|
||||||
|
interface Trip {
|
||||||
|
trip_id: string;
|
||||||
|
route_id: string;
|
||||||
|
direction_id: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Vehicle {
|
||||||
|
id: string;
|
||||||
|
label: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Position {
|
||||||
|
latitude: number;
|
||||||
|
longitude: number;
|
||||||
|
bearing: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface VehiclePosition {
|
||||||
|
trip: Trip;
|
||||||
|
vehicle: Vehicle;
|
||||||
|
position: Position;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface VehiclePositionResponse {
|
||||||
|
vehicle_positions: [VehiclePosition];
|
||||||
|
}
|
||||||
|
|
||||||
|
interface GeoJsonGeometry {
|
||||||
|
type: string;
|
||||||
|
coordinates: [number, number];
|
||||||
|
}
|
||||||
|
|
||||||
|
class GeoJsonFeature {
|
||||||
|
type: string;
|
||||||
|
geometry: GeoJsonGeometry;
|
||||||
|
properties: Record<string, any>;
|
||||||
|
}
|
||||||
|
|
||||||
|
class GeoJsonFeatureSource {
|
||||||
|
type: string = 'FeatureCollection';
|
||||||
|
features: GeoJsonFeature[] = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getBusIcon() {
|
||||||
|
const img = new window.Image();
|
||||||
|
img.src = '/bus_small.webp';
|
||||||
|
await img.decode();
|
||||||
|
|
||||||
|
//img.crossOrigin = 'Anonymous'; // Needed if loading from a different origin
|
||||||
|
|
||||||
|
const canvas = document.createElement('canvas');
|
||||||
|
canvas.width = img.width;
|
||||||
|
canvas.height = img.height;
|
||||||
|
const ctx = canvas.getContext('2d');
|
||||||
|
let pixelData = null;
|
||||||
|
if (ctx) {
|
||||||
|
ctx.drawImage(img, 0, 0);
|
||||||
|
const imageData = ctx.getImageData(0, 0, img.width, img.height);
|
||||||
|
pixelData = imageData.data; // This is a Uint8ClampedArray of RGBA values
|
||||||
|
// Now pixelData contains raw bytes: [R, G, B, A, R, G, B, A, ...]
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
data: pixelData,
|
||||||
|
height: img.height,
|
||||||
|
width: img.width
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getVehicles() {
|
||||||
|
const response = await fetch('/runboard/rtd/positions/latest');
|
||||||
|
const vehicles = (await response.json()) as VehiclePositionResponse;
|
||||||
|
return vehicles;
|
||||||
|
}
|
||||||
|
|
||||||
|
function vehiclesAsGeoJSON(vehicles: VehiclePositionResponse): GeoJsonFeatureSource {
|
||||||
|
let geojsonfeaturesource = new GeoJsonFeatureSource();
|
||||||
|
|
||||||
|
for (const vehicle of vehicles.vehicle_positions) {
|
||||||
|
geojsonfeaturesource.features.push({
|
||||||
|
type: 'Feature',
|
||||||
|
geometry: {
|
||||||
|
type: 'Point',
|
||||||
|
coordinates: [vehicle.position.longitude, vehicle.position.latitude]
|
||||||
|
},
|
||||||
|
properties: {
|
||||||
|
route: vehicle.trip.route_id
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return geojsonfeaturesource;
|
||||||
|
}
|
||||||
|
|
||||||
|
let vehiclesPromise = getVehicles();
|
||||||
|
let busPromise = getBusIcon();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<MapLibre
|
||||||
|
class="h-[55vh] min-h-[300px]"
|
||||||
|
style="https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json"
|
||||||
|
zoom={4}
|
||||||
|
center={{ lat: 40, lng: -105 }}
|
||||||
|
>
|
||||||
|
{console.log(getBusIcon())}
|
||||||
|
|
||||||
|
{#await busPromise then bus}
|
||||||
|
<Image id="bus" image={{ width: bus.width, height: bus.height, data: bus.data }} />
|
||||||
|
{#await vehiclesPromise then vehicles}
|
||||||
|
<GeoJSONSource data={vehiclesAsGeoJSON(vehicles)}>
|
||||||
|
<SymbolLayer layout={{ 'icon-image': 'bus' }} />
|
||||||
|
</GeoJSONSource>
|
||||||
|
{/await}
|
||||||
|
{/await}
|
||||||
|
</MapLibre>
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 848 B |
Binary file not shown.
|
After Width: | Height: | Size: 4.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 564 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
@@ -0,0 +1,18 @@
|
|||||||
|
import adapter from '@sveltejs/adapter-auto';
|
||||||
|
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
|
||||||
|
|
||||||
|
/** @type {import('@sveltejs/kit').Config} */
|
||||||
|
const config = {
|
||||||
|
// Consult https://svelte.dev/docs/kit/integrations
|
||||||
|
// for more information about preprocessors
|
||||||
|
preprocess: vitePreprocess(),
|
||||||
|
|
||||||
|
kit: {
|
||||||
|
// adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list.
|
||||||
|
// If your environment is not supported, or you settled on a specific environment, switch out the adapter.
|
||||||
|
// See https://svelte.dev/docs/kit/adapters for more information about adapters.
|
||||||
|
adapter: adapter()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export default config;
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"extends": "./.svelte-kit/tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"allowJs": true,
|
||||||
|
"checkJs": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"sourceMap": true,
|
||||||
|
"strict": true,
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"strictPropertyInitialization": false
|
||||||
|
}
|
||||||
|
// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
|
||||||
|
// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
|
||||||
|
//
|
||||||
|
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
|
||||||
|
// from the referenced tsconfig.json - TypeScript does not merge them in
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import tailwindcss from '@tailwindcss/vite';
|
||||||
|
import { sveltekit } from '@sveltejs/kit/vite';
|
||||||
|
import { defineConfig } from 'vite';
|
||||||
|
|
||||||
|
export default defineConfig(
|
||||||
|
{
|
||||||
|
server: {
|
||||||
|
proxy: {
|
||||||
|
'/runboard': 'http://localhost:9684',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
plugins: [tailwindcss(), sveltekit()],
|
||||||
|
}
|
||||||
|
);
|
||||||
@@ -41,9 +41,12 @@ async fn main() -> Result<()> {
|
|||||||
|
|
||||||
// build our application with a single route
|
// build our application with a single route
|
||||||
let app = Router::new()
|
let app = Router::new()
|
||||||
.route("/", get(|| async { "Hello, World!" }))
|
.route("/runboard", get(|| async { "Hello, World!" }))
|
||||||
.route("/status", get(status::get_status))
|
.route("/runboard/status", get(status::get_status))
|
||||||
.route("/{agency}/positions/latest", get(latest::get_latest))
|
.route(
|
||||||
|
"/runboard/{agency}/positions/latest",
|
||||||
|
get(latest::get_latest),
|
||||||
|
)
|
||||||
.with_state(app_state);
|
.with_state(app_state);
|
||||||
|
|
||||||
axum::serve(listener, app).await.unwrap();
|
axum::serve(listener, app).await.unwrap();
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ use crate::transit_realtime;
|
|||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
struct VehiclePositionRedisEntry {
|
struct VehiclePositionRedisEntry {
|
||||||
positions: Vec<transit_realtime::VehiclePosition>,
|
vehicle_positions: Vec<transit_realtime::VehiclePosition>,
|
||||||
// TODO: add ingestion time
|
// TODO: add ingestion time
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,12 +33,12 @@ pub async fn process_vehicle_position(
|
|||||||
let vehicle_position = transit_realtime::FeedMessage::decode(proto_bytes)?;
|
let vehicle_position = transit_realtime::FeedMessage::decode(proto_bytes)?;
|
||||||
|
|
||||||
let mut redis_entry = VehiclePositionRedisEntry {
|
let mut redis_entry = VehiclePositionRedisEntry {
|
||||||
positions: Vec::new(),
|
vehicle_positions: Vec::new(),
|
||||||
};
|
};
|
||||||
|
|
||||||
for entity in vehicle_position.entity {
|
for entity in vehicle_position.entity {
|
||||||
if let Some(pos) = entity.vehicle {
|
if let Some(pos) = entity.vehicle {
|
||||||
redis_entry.positions.push(pos);
|
redis_entry.vehicle_positions.push(pos);
|
||||||
} else {
|
} else {
|
||||||
println!("VehiclePosition endpoint returning non VehiclePosition entity");
|
println!("VehiclePosition endpoint returning non VehiclePosition entity");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user