Fixed wrong stops appearing and grouped them together. Also removed a…

…ll icons that show up as unable to load
ZarmDev · Sep 21, 2024 · ee3e79a · ee3e79a
1 parent 2fccf23
commit ee3e79a
Show file tree

Hide file tree

Showing 6 changed files with 1,019 additions and 1,538 deletions.
diff --git a/README.md b/README.md
@@ -3,18 +3,29 @@ The HTML file used in OpenTransitApp
 
 There are three versions.
 
+# Credits for all of the versions
+https://github.com/louh/mta-subway-bullets
+
+(Thanks louh!)
+
 ### The main version uses ONLINE openstreetmap data and the stops are more accurate in terms of location (recommended)
 
+**THE STOPS ARE WORKING HERE**
+
 Link: https://zarmdev.github.io/staticTransitApp/leaflet_map.html
 
 ### The other version uses a OFFLINE IMG, it works offline but is bad quality for close up details
 
+**THE STOPS ARE NOT ACCURATE HERE**
+
 Link: https://zarmdev.github.io/staticTransitApp/leaflet_img_map.html
 
 Attribution: https://commons.wikimedia.org/wiki/File:New_York_City_Greater_NY_US_street_map.svg
 
 ### The other version uses a OFFLINE SVG, takes a lot of performance but works offline
 
+**THE STOPS ARE NOT ACCURATE HERE**
+
 Link: https://zarmdev.github.io/staticTransitApp/leaflet_svg_map.html
 
 Attribution: https://commons.wikimedia.org/wiki/File:New_York_City_Greater_NY_US_street_map.svg
diff --git a/bundle.js b/bundle.js
diff --git a/generateIconFilePaths.js b/generateIconFilePaths.js
@@ -1,19 +1,18 @@
-
-const TI = ["1", "2", "3", "4", "5", "6", "7", "7d", "a", "b", "c", "d", "e", "f", "g", "h", "j", "l", "m", "n", "q", "r", "s", "sf", "sir", "sr", "w", "z"]
 // To generate a bunch of require statements
+const trainLinesWithIcons = ["1", "2", "3", "4", "5", "6", "6x", "7", "7x", "a", "b", "c", "d", "e", "f", "g", "h", "j", "l", "m", "n", "q", "r", "s", "sf", "sir", "sr", "t", "w", "z"]
 function forRequire() {
   var requireStatements = '';
-  for (var i = 0; i < TI.length; i++) {
-    requireStatements += `require('../../assets/images/svg/${TI[i]}.svg'), \n`
+  for (var i = 0; i < trainLinesWithIcons.length; i++) {
+    requireStatements += `require('../../assets/images/svg/${trainLinesWithIcons[i]}.svg'), \n`
   }
   var test = `[${requireStatements}]`
   console.log(test);
 }
 
 function forHTML() {
   var requireStatements = '';
-  for (var i = 0; i < TI.length; i++) {
-    requireStatements += `'./images/svg/${TI[i]}.svg', \n`
+  for (var i = 0; i < trainLinesWithIcons.length; i++) {
+    requireStatements += `'./images/svg/${trainLinesWithIcons[i]}.svg', \n`
   }
   var test = `[${requireStatements}]`
   console.log(test);

diff --git a/leaflet_map.html b/leaflet_map.html
@@ -66,36 +66,6 @@
             markerLayer.clearLayers();
         });
 
-        // Check if geolocation is supported
-        // if (navigator.geolocation) {
-        //     // Request the user's location
-        //     navigator.geolocation.getCurrentPosition(
-        //         function (position) {
-        //             // Success callback
-        //             var latitude = position.coords.latitude;
-        //             var longitude = position.coords.longitude;
-        //             console.log("Latitude: " + latitude + ", Longitude: " + longitude);
-
-        //             window.userLocation = [latitude, longitude]
-
-        //             // You can now use userLocation object as needed
-        //         },
-        //         function (error) {
-        //             // Error callback
-        //             console.error("Error Code = " + error.code + " - " + error.message);
-        //         }
-        //     );
-        // } else {
-        //     console.error("Geolocation is not supported by this browser.");
-        // }
-
-        setInterval(() => {
-            // testing.innerText = window.userLocation
-            // ns.innerText = window.iconFileLocations[0].slice(0, 100)
-            // if (window.userLocation != null && map != null) {
-            //     map.setView(window.userLocation, 26);
-            // }
-        }, 1000)
         async function test() {
             var trainLineShapes = await getTrainLineShapes(outputShapes());
             // var trainLineCoords = await getAllTrainStopCoordinates(outputStops());
@@ -104,6 +74,7 @@
             // const distance = 0.004;
             const distance = 0.01;
             var nearbyTrainLineCoords = await getNearbyStops(allTrainStopCoordinates, window.userLocation, distance);
+            console.log(nearbyTrainLineCoords)
             // const latSpan = "0.005";
             // const lonSpan = "0";
             // const nearbyBusStopCoords = await getNearbyBusStops(exampleLocation, latSpan, lonSpan, busInput.value);
@@ -149,8 +120,12 @@
                     if (trainLines) {
                         let splitTrainLines = trainLines.split('-');
                         let iconHTML = '';
-                        const trainLinesWithIcons = ["1", "2", "3", "4", "5", "6", "7", "7d", "a", "b", "c", "d", "e", "f", "g", "h", "j", "l", "m", "n", "q", "r", "s", "sf", "sir", "sr", "w", "z"].map((item) => { return item.toUpperCase() })
+                        const trainLinesWithIcons = ["1", "2", "3", "4", "5", "6", "6x", "7", "7x", "a", "b", "c", "d", "e", "f", "g", "h", "j", "l", "m", "n", "q", "r", "s", "sf", "sir", "sr", "t", "w", "z"].map((item) => { return item.toUpperCase() })
                         for (var j = 0; j < splitTrainLines.length; j++) {
+                            console.log(splitTrainLines[j])
+                            if (["FX", "6X", "7X"].includes(splitTrainLines[j])) {
+                                continue;
+                            }
                             // let filepath = './images/svg/' + splitTrainLines[j] + '.svg';
                             // Basically, window.iconFileLocations is ordered the same with trainLinesWithIcons so just get the index of the train line based on the train lines which are found in stops.txt
                             let filepath = window.iconFileLocations[trainLinesWithIcons.indexOf(splitTrainLines[j])]

diff --git a/scripts/examples.js b/scripts/examples.js
@@ -2,15 +2,17 @@ function getExampleLocation() {
     return [40.71775244918452, -73.9990371376651]
 }
 
+// Generate the array in generateIconFileLocations
 function getIconFileLocations() {
     return ['./images/svg/1.svg',
         './images/svg/2.svg',
         './images/svg/3.svg',
         './images/svg/4.svg',
         './images/svg/5.svg',
         './images/svg/6.svg',
+        './images/svg/6x.svg',
         './images/svg/7.svg',
-        './images/svg/7d.svg',
+        './images/svg/7x.svg',
         './images/svg/a.svg',
         './images/svg/b.svg',
         './images/svg/c.svg',
@@ -29,6 +31,7 @@ function getIconFileLocations() {
         './images/svg/sf.svg',
         './images/svg/sir.svg',
         './images/svg/sr.svg',
+        './images/svg/t.svg',
         './images/svg/w.svg',
         './images/svg/z.svg',
     ]