Add additional vehicle information and photos

catenarytransit · Jan 6, 2024 · fc79e76 · fc79e76
1 parent 926f848
commit fc79e76
Show file tree

Hide file tree

Showing 19 changed files with 81 additions and 19 deletions.
diff --git a/src/data/fleet/f-mts~rt~onebusaway.json b/src/data/fleet/f-mts~rt~onebusaway.json
@@ -58,6 +58,8 @@
         "model": "Low-Floor",
         "year": 2013,
         "regex": "^23[0-9]{2}$",
+        "image": "/vehicles/mts/2322.webp",
+        "credit": "Myra F for Catenary",
         "home": "SBD/ECD"
     },
     {
@@ -74,6 +76,8 @@
         "model": "Low-Floor",
         "year": 2014,
         "regex": "^24[0-9]{2}$",
+        "image": "/vehicles/mts/2411.webp",
+        "credit": "Myra F for Catenary",
         "home": "SBD"
     },
     {
@@ -82,6 +86,8 @@
         "model": "Low-Floor",
         "year": 2015,
         "regex": "^20[0-9]{2}$",
+        "image": "/vehicles/mts/2008.jpg",
+        "credit": "Samuel Sharp for Catenary",
         "home": "SBD"
     },
     {
@@ -90,6 +96,8 @@
         "model": "Low-Floor",
         "year": 2015,
         "regex": "^82[0-9]{2}$",
+        "image": "/vehicles/mts/8210.webp",
+        "credit": "Myra F for Catenary",
         "home": "ECD"
     },
     {
@@ -98,14 +106,16 @@
         "model": "AeroElite 320",
         "year": 2016,
         "regex": "^31[0-9]{2}$",
+        "image": "/vehicles/mts/3108.jpg",
+        "credit": "Samuel Sharp for Catenary",
         "home": "CPD"
     },
     {
         "type": "Standard MTS Bus",
         "manufacturer": "Gillig",
         "model": "Low-Floor",
         "year": 2016,
-        "regex": "^83[0-9]{2}$",
+        "regex": "^831[0-9]$|^832[0-9]$|^833[0-9]$|^834[0-9]$",
         "home": "ECD"
     },
     {
@@ -114,6 +124,8 @@
         "model": "Low-Floor",
         "year": 2017,
         "regex": "^21[0-9]{2}$",
+        "image": "/vehicles/mts/2133.webp",
+        "credit": "Myra F for Catenary",
         "home": "SBD"
     },
     {
@@ -129,7 +141,19 @@
         "manufacturer": "New Flyer",
         "model": "XN60",
         "year": 2017,
-        "regex": "^75[0-9]{2}$",
+        "regex": "^750[0-9]$|^751[0-9]$|^752[0-9]$|^753[0-9]$|^754[0-9]$",
+        "image": "/vehicles/mts/7505.jpg",
+        "credit": "Samuel Sharp for Catenary",
+        "home": "SBD"
+    },
+    {
+        "type": "Articulated Bus - Rapid Electric",
+        "manufacturer": "New Flyer",
+        "model": "XE60",
+        "year": 2023,
+        "regex": "^755[0-9]$|^756[0-9]$",
+        "image": "/vehicles/mts/7553.jpg",
+        "credit": "Samuel Sharp for Catenary",
         "home": "SBD"
     },
     {
@@ -162,6 +186,18 @@
         "model": "Low-Floor",
         "year": 2022,
         "regex": "^22[0-9]{2}$",
+        "image": "/vehicles/mts/2236.webp",
+        "credit": "Myra F for Catenary",
+        "home": "SBD"
+    },
+    {
+        "type": "Standard MTS Bus",
+        "manufacturer": "Gillig",
+        "model": "Low-Floor",
+        "year": 2021,
+        "regex": "^26[0-9]{2}$",
+        "image": "/vehicles/mts/2624.jpg",
+        "credit": "Samuel Sharp for Catenary",
         "home": "SBD"
     },
     {
@@ -226,6 +262,8 @@
         "model": "Low-Floor",
         "year": 2020,
         "regex": "^16[0-9]{2}$",
+        "image": "/vehicles/mts/1603.webp",
+        "credit": "Myra F for Catenary",
         "home": "IAD"
     },
     {
@@ -234,6 +272,8 @@
         "model": "Low-Floor",
         "year": 2020,
         "regex": "^17[0-9]{2}$",
+        "image": "/vehicles/mts/1701.jpg",
+        "credit": "Samuel Sharp for Catenary",
         "home": "IAD/KMD"
     },
     {
@@ -242,6 +282,8 @@
         "model": "XN60",
         "year": 2020,
         "regex": "^18[0-9]{2}$",
+        "image": "/vehicles/mts/1819.jpg",
+        "credit": "Samuel Sharp for Catenary",
         "home": "IAD"
     },
     {
@@ -251,6 +293,7 @@
         "year": 2019,
         "regex": "^15[0-9]{2}$",
         "image": "https://www.sdmts.com/sites/default/files/attachments/zeb1.jpg",
+        "credit": "MTS photo",
         "home": "ANY"
     },
     {
@@ -284,6 +327,7 @@
         "year": 2014,
         "regex": "^9[0-9]{2}$",
         "image": "https://www.sdmts.com/sites/default/files/attachments/DTW15%20%2839%29.jpg",
+        "credit": "MTS photo",
         "home": "KMD"
     },
     {
@@ -293,6 +337,7 @@
         "year": 2013,
         "regex": "^12[0-9]{2}$",
         "image": "https://www.sdmts.com/sites/default/files/attachments/DTW15%20%2857%29.jpg",
+        "credit": "MTS photo",
         "home": "IAD"
     },
     {
@@ -301,6 +346,8 @@
         "model": "XN60",
         "year": 2013,
         "regex": "^11[0-9]{2}$",
+        "image": "/vehicles/mts/1110.jpg",
+        "credit": "Samuel Sharp for Catenary",
         "home": "KMD"
     },
     {
@@ -309,15 +356,18 @@
         "model": "Low-Floor",
         "year": 2013,
         "regex": "^8[0-9]{2}$",
-        "home": "IAD",
-        "image": "https://www.sdmts.com/sites/default/files/attachments/DTW15%20%2844%29.jpg"
+        "image": "https://www.sdmts.com/sites/default/files/attachments/DTW15%20%2844%29.jpg",
+        "credit": "MTS photo",
+        "home": "IAD"
     },
     {
         "type": "Standard MTS Bus",
         "manufacturer": "New Flyer",
         "model": "C40LFR",
         "year": 2012,
         "regex": "^7[0-9]{2}$",
+        "image": "/vehicles/mts/729.jpg",
+        "credit": "Samuel Sharp for Catenary",
         "home": "IAD"
     },
     {
@@ -326,6 +376,8 @@
         "model": "C40LFR",
         "year": 2011,
         "regex": "^6[0-9]{2}$",
+        "image": "/vehicles/mts/612.jpg",
+        "credit": "Samuel Sharp for Catenary",
         "home": "IAD"
     },
     {

diff --git a/src/i18n/strings.js b/src/i18n/strings.js
@@ -18,7 +18,8 @@ const i18n = {
         language: 'Language',
         mapstyle: 'Map style',
         styledefault: 'Default',
-        styleclassic: 'Classic',
+        styleocean: 'Bright Ocean',
+        stylesea: 'Deep Sea',
         stylearchi: 'Archi',
         stylesat: 'Satellite',
         styleminimal: 'Minimal',
@@ -69,7 +70,8 @@ const i18n = {
         language: 'Langue',
         mapstyle: 'Style de carte',
         styledefault: 'Défaut',
-        styleclassic: 'Classique',
+        styleocean: 'Bright Ocean',
+        stylesea: 'Deep Sea',
         stylearchi: 'Archi',
         stylesat: 'Satellite',
         styleminimal: 'Minimal',
@@ -120,7 +122,8 @@ const i18n = {
         language: 'Idioma',
         mapstyle: 'Estilo de mapa',
         styledefault: 'Defecto',
-        styleclassic: 'Clásico',
+        styleocean: 'Bright Ocean',
+        stylesea: 'Deep Sea',
         stylearchi: 'Archi',
         stylesat: 'Satélite',
         styleminimal: 'Minimal',
@@ -171,7 +174,8 @@ const i18n = {
         language: 'Sprache',
         mapstyle: 'Kartenstil',
         styledefault: 'Standard',
-        styleclassic: 'Klassisch',
+        styleocean: 'Bright Ocean',
+        stylesea: 'Deep Sea',
         stylearchi: 'Archi',
         stylesat: 'Satellit',
         styleminimal: 'Minimal',
@@ -222,7 +226,8 @@ const i18n = {
         language: '언어',
         mapstyle: '지도 스타일',
         styledefault: '기본',
-        styleclassic: '클래식',
+        styleocean: 'Bright Ocean',
+        stylesea: 'Deep Sea',
         stylearchi: 'Archi',
         stylesat: '위성',
         styleminimal: '최소한의',
@@ -274,7 +279,8 @@ const i18n = {
         language: '語言',
         mapstyle: '地圖樣式',
         styledefault: '預設',
-        styleclassic: '經典',
+        styleocean: 'Bright Ocean',
+        stylesea: 'Deep Sea',
         stylearchi: 'Archi',
         stylesat: '衛星',
         styleminimal: '最小',
@@ -325,7 +331,8 @@ const i18n = {
         language: '语言',
         mapstyle: '地图样式',
         styledefault: '预设',
-        styleclassic: '经典',
+        styleocean: 'Bright Ocean',
+        stylesea: 'Deep Sea',
         stylearchi: 'Archi',
         stylesat: '卫星',
         styleminimal: '最小',

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -1094,17 +1094,18 @@
 		//get url param "sat"
 
 		let style = darkMode
-			? 'mapbox://styles/kylerschin/clqogkdiy00bs01obh352h32o'
-			: 'mapbox://styles/kylerschin/clqomei1n006h01raaylca7ty';
+					? 'mapbox://styles/kylerschin/clm2i6cmg00fw01of2vp5h9p5'
+					: 'mapbox://styles/kylerschin/cllpbma0e002h01r6afyzcmd8';
 
 		if (browser) {
 			if (window.localStorage.mapStyle == 'sat') {
 				style = 'mapbox://styles/kylerschin/clncqfm5p00b601recvp14ipu';
 			}
-			if (window.localStorage.mapStyle == 'classic') {
-				style = darkMode
-					? 'mapbox://styles/kylerschin/clm2i6cmg00fw01of2vp5h9p5'
-					: 'mapbox://styles/kylerschin/cllpbma0e002h01r6afyzcmd8';
+			if (window.localStorage.mapStyle == 'brightocean') {
+				style = 'mapbox://styles/kylerschin/clqomei1n006h01raaylca7ty';
+			}
+			if (window.localStorage.mapStyle == 'deepsea') {
+				style = 'mapbox://styles/kylerschin/clqogkdiy00bs01obh352h32o';
 			}
 			if (window.localStorage.mapStyle == 'archi') {
 				style = 'mapbox://styles/kylerschin/clqpdas5u00c801r8anbdf6xl';
@@ -2329,7 +2330,8 @@ on:keydown={() => {
 				>
 					<option value="none">--</option>
 					<option value="default">{strings.styledefault}</option>
-					<option value="classic">{strings.styleclassic}</option>
+					<option value="brightocean">{strings.styleocean}</option>
+					<option value="deepsea">{strings.stylesea}</option>
 					{#if browser}
 						{#if window.location.search.includes('sat')}
 							<option value="sat">{strings.stylesat}</option>
@@ -2422,7 +2424,7 @@ on:keydown={() => {
 				<br />
 			{/if}
 			{#if selectedVehicle.properties.agency == 'f-mts~rt~onebusaway'}
-				{#each mtsFleetData as { type, manufacturer, model, year, regex, home, image }}
+				{#each mtsFleetData as { type, manufacturer, model, year, regex, home, image, credit }}
 					{#if (new RegExp(regex)).test(selectedVehicle.properties.vehicleIdLabel || '')}
 						<b>Type</b> {type}
 						<br />
@@ -2432,6 +2434,7 @@ on:keydown={() => {
 						<br /><br />
 						{#if image}
 							<img src={image} alt={model} style:width="100%">
+							<i>{credit}</i>
 						{/if}
 					{/if}
 				{/each}

diff --git a/static/vehicles/mts/1110.jpg b/static/vehicles/mts/1110.jpg
diff --git a/static/vehicles/mts/1603.webp b/static/vehicles/mts/1603.webp
diff --git a/static/vehicles/mts/1701.jpg b/static/vehicles/mts/1701.jpg
diff --git a/static/vehicles/mts/1819.jpg b/static/vehicles/mts/1819.jpg
diff --git a/static/vehicles/mts/2008.jpg b/static/vehicles/mts/2008.jpg
diff --git a/static/vehicles/mts/2133.webp b/static/vehicles/mts/2133.webp
diff --git a/static/vehicles/mts/2236.webp b/static/vehicles/mts/2236.webp
diff --git a/static/vehicles/mts/2322.webp b/static/vehicles/mts/2322.webp
diff --git a/static/vehicles/mts/2411.webp b/static/vehicles/mts/2411.webp
diff --git a/static/vehicles/mts/2624.jpg b/static/vehicles/mts/2624.jpg
diff --git a/static/vehicles/mts/3108.jpg b/static/vehicles/mts/3108.jpg
diff --git a/static/vehicles/mts/612.jpg b/static/vehicles/mts/612.jpg
diff --git a/static/vehicles/mts/729.jpg b/static/vehicles/mts/729.jpg
diff --git a/static/vehicles/mts/7505.jpg b/static/vehicles/mts/7505.jpg
diff --git a/static/vehicles/mts/7553.jpg b/static/vehicles/mts/7553.jpg
diff --git a/static/vehicles/mts/8210.webp b/static/vehicles/mts/8210.webp