revert: restore web-app/ and api/ changes

Reverts web-app and api/src/scripts/populate_db_gtfs.py to their
state before the transitfeeds removal commits.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: cka-y

api/src/scripts/populate_db_gtfs.py

@@ -249,7 +249,8 @@ def populate_db(self, session: "Session", fetch_url: bool = True):
             feed.feed_name = self.get_safe_value(row, "name", "")
             feed.note = self.get_safe_value(row, "note", "")
             producer_url = self.get_safe_value(row, "urls.direct_download", "")
-            feed.producer_url = producer_url
+            if "transitfeeds" not in producer_url:  # Avoid setting transitfeeds as producer_url
+                feed.producer_url = producer_url
             feed.authentication_type = str(int(float(self.get_safe_value(row, "urls.authentication_type", "0"))))
             feed.authentication_info_url = self.get_safe_value(row, "urls.authentication_info", "")
             feed.api_key_parameter_name = self.get_safe_value(row, "urls.api_key_parameter_name", "")

web-app/src/app/components/Header.tsx

@@ -13,6 +13,8 @@ import {
   Select,
   useTheme,
   Link,
+  Alert,
+  AlertTitle,
 } from '@mui/material';
 import MenuIcon from '@mui/icons-material/Menu';
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
@@ -26,7 +28,7 @@ import {
   gbfsMetricsNavItems,
 } from '../constants/Navigation';
 import type NavigationItem from '../interface/Navigation';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import { selectIsAuthenticated, selectUserEmail } from '../store/selectors';
 import LogoutConfirmModal from './LogoutConfirmModal';
@@ -44,9 +46,15 @@ import ThemeToggle from './ThemeToggle';
 import { useTranslation } from 'react-i18next';
 
 export default function DrawerAppBar(): React.ReactElement {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const hasTransitFeedsRedirectParam =
+    searchParams.get('utm_source') === 'transitfeeds';
   const theme = useTheme();
   const location = useLocation();
   const [mobileOpen, setMobileOpen] = React.useState(false);
+  const [hasTransitFeedsRedirect, setHasTransitFeedsRedirect] = React.useState(
+    hasTransitFeedsRedirectParam,
+  );
   const [openDialog, setOpenDialog] = React.useState(false);
   const [activeTab, setActiveTab] = React.useState('');
   const [navigationItems, setNavigationItems] = React.useState<
@@ -118,7 +126,7 @@ export default function DrawerAppBar(): React.ReactElement {
     <Box
       sx={{
         display: 'flex',
-        height: '64px',
+        height: hasTransitFeedsRedirect ? '115px' : '64px',
         mb: { xs: 2, md: 4 },
       }}
     >
@@ -399,6 +407,30 @@ export default function DrawerAppBar(): React.ReactElement {
             )}
           </Box>
         </Toolbar>
+        {hasTransitFeedsRedirect && (
+          <Alert
+            severity='warning'
+            onClose={() => {
+              setHasTransitFeedsRedirect(false);
+              if (hasTransitFeedsRedirectParam) {
+                searchParams.delete('utm_source');
+                setSearchParams(searchParams);
+              }
+            }}
+            sx={{ '.MuiAlert-message': { pb: { xs: 0, md: 1 } } }}
+          >
+            <AlertTitle>
+              You&apos;ve been redirected from TransitFeeds
+            </AlertTitle>
+            <Box
+              component={'span'}
+              sx={{ display: { xs: 'none', md: 'block' } }}
+            >
+              This page now lives on MobilityDatabase.org, where you&apos;ll
+              find the most up-to-date transit data.
+            </Box>
+          </Alert>
+        )}
       </AppBar>
 
       <nav>

web-app/src/app/screens/Feeds/index.tsx

@@ -80,6 +80,9 @@ export default function Feed(): React.ReactElement {
   const feedsData = useSelector(selectFeedsData);
   const feedStatus = useSelector(selectFeedsStatus);
 
+  const hasTransitFeedsRedirectParam =
+    searchParams.get('utm_source') === 'transitfeeds';
+
   // features i/o
   const areNoDataTypesSelected =
     !selectedFeedTypes.gtfs &&
@@ -177,6 +180,9 @@ export default function Feed(): React.ReactElement {
     if (isOfficialFeedSearch) {
       newSearchParams.set('official', 'true');
     }
+    if (searchParams.get('utm_source') === 'transitfeeds') {
+      newSearchParams.set('utm_source', 'transitfeeds');
+    }
     if (searchParams.toString() !== newSearchParams.toString()) {
       setSearchParams(newSearchParams, { replace: false });
     }
@@ -335,7 +341,7 @@ export default function Feed(): React.ReactElement {
           sx={stickyHeaderStyles({
             theme,
             isSticky,
-            headerBannerVisible: false,
+            headerBannerVisible: hasTransitFeedsRedirectParam,
           })}
         >
           <Container

web-app/src/app/services/feeds/utils.spec.ts

@@ -60,8 +60,11 @@ describe('Feeds Utils', () => {
     [true, 'http://whistler.mapstrat.com/current/gtfrealtime_TripUpdates.bin'],
     [true, 'http://gtfs.halifax.ca/realtime/Vehicle/VehiclePositions.pb'],
     [true, 'http://api.tampa.onebusaway.org:8088/trip-updates'],
-    [true, 'https://example.com/feeds/gtfs.zip'],
-    [false, '//example.com/feeds/'],
+    [
+      true,
+      'https://transitfeeds.com/p/via-metropolitan-transit/62/latest/download',
+    ],
+    [false, '//transitfeeds.com/p/'],
     [
       true,
       'https://ckan.pbh.gov.br/dataset/77764a7e-63fc-4111-ace3-fb7d3037953a/resource/f0fa78dc-74c3-49fa-8971-c310a76a07fa/download/gtfsfiles.zip',

web-app/src/app/utils/externalIds.spec.ts

@@ -52,7 +52,7 @@ describe('filterFeedExternalIdsToSourceMap', () => {
   it('externalIdSourceMap should contain expected keys', () => {
     // ensure the map includes the keys we depend on
     expect(Object.keys(externalIdSourceMap)).toEqual(
-      expect.arrayContaining(['jbda', 'tdg', 'ntd', 'tld']),
+      expect.arrayContaining(['jbda', 'tdg', 'ntd', 'transitfeeds', 'tld']),
     );
   });
 });

web-app/src/app/utils/externalIds.ts

@@ -23,6 +23,10 @@ export const externalIdSourceMap: Record<
     docsUrl:
       'https://www.transit.dot.gov/ntd/data-product/2023-annual-database-general-transit-feed-specification-gtfs-weblinks',
   },
+  transitfeeds: {
+    label: 'TransitFeeds',
+    translationKey: 'externalIds.tooltips.tfs',
+  },
   tld: {
     label: 'Transit.land',
     translationKey: 'externalIds.tooltips.tld',