X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=index.html.in;h=ab31db2bd5065e9b2b37bba4b3b5a8a28ce12ca1;hb=81b8107ecfaa35cc4d638321ce21df88efbff1b9;hp=a8bb47dedf0d40c46884887f6c31ac3440975a5a;hpb=aaa5c0c89b500430b3bcdc4da4714a0c9b9da737;p=charm-bypass.git

diff --git a/index.html.in b/index.html.in
index a8bb47d..ab31db2 100644
--- a/index.html.in
+++ b/index.html.in
@@ -102,7 +102,7 @@
       }
 
       #bus {
-        animation: busroll 23s linear infinite;
+        animation: busroll 15s linear infinite;
       }
 
 
@@ -113,7 +113,7 @@
       }
 
       #tram {
-        animation: tramroll 17s linear infinite;
+        animation: tramroll 15s linear infinite;
       }
 
 
@@ -124,7 +124,7 @@
       }
 
       #train {
-        animation: trainroll 11s linear infinite;
+        animation: trainroll 10s linear infinite;
       }
 
 
@@ -135,7 +135,7 @@
       }
 
       #clouds {
-        animation: cloudsfloat 40s linear infinite;
+        animation: cloudsfloat 25s linear infinite;
       }
 
       @keyframes cloudscopyfloat {
@@ -144,7 +144,7 @@
       }
 
       #cloudscopy {
-        animation: cloudscopyfloat 40s linear infinite;
+        animation: cloudscopyfloat 25s linear infinite;
       }
 
 
@@ -156,7 +156,7 @@
 
       #trees {
         /* The trees move a little faster than the clouds */
-        animation: treespass 30s linear infinite;
+        animation: treespass 16s linear infinite;
       }
 
       @keyframes treescopypass {
@@ -166,7 +166,7 @@
 
       #treescopy {
         /* The trees move a little faster than the clouds */
-        animation: treescopypass 30s linear infinite;
+        animation: treescopypass 16s linear infinite;
       }
 
 
@@ -179,7 +179,7 @@
       #city {
         /* The city moves faster than the clouds but slower
          * than the trees */
-        animation: cityscroll 35s linear infinite;
+        animation: cityscroll 20s linear infinite;
       }
 
       @keyframes citycopyscroll {
@@ -190,7 +190,7 @@
       #citycopy {
         /* The city moves faster than the clouds but slower
          * than the trees */
-        animation: citycopyscroll 35s linear infinite;
+        animation: citycopyscroll 20s linear infinite;
       }
     </style>
   </head>
@@ -200,23 +200,15 @@
       <h1>CharmBypass</h1>
       <p><strong>got that <em>transit equity</em></strong></p>
 
-      <ol>
-        <li>
-          <a href="https://michael.orlitzky.com/articles/charmbypass_pt._1%3A_introducing_charmbypass.xhtml">
-            Introduction
-          </a>
-        </li>
-      </ol>
-
       <form>
         <fieldset>
           <legend>Local Bus, Light Rail, or Metro</legend>
           <div>
             <label for="code1">
-              Daily security code (optional):
+              Daily security code (<a href="https://michael.orlitzky.com/articles/charmbypass_pt._1%3A_introduction.xhtml#daily-security-code">optional</a>):
             </label>
             <input id="code1"
-                   name="code"
+                   name="code" value=""
                    type="text"
                    size="2"
                    minlength="2"
@@ -235,10 +227,10 @@
 
           <div>
             <label for="code2">
-              Daily security code (optional):
+              Daily security code (<a href="https://michael.orlitzky.com/articles/charmbypass_pt._1%3A_introduction.xhtml#daily-security-code">optional</a>):
             </label>
             <input id="code2"
-                   name="code"
+                   name="code" value=""
                    type="text"
                    size="2"
                    minlength="2"
@@ -299,10 +291,10 @@
 
           <div>
             <label for="code3">
-              Daily security code (optional):
+              Daily security code (<a href="https://michael.orlitzky.com/articles/charmbypass_pt._1%3A_introduction.xhtml#daily-security-code">optional</a>):
             </label>
             <input id="code3"
-                   name="code"
+                   name="code" value=""
                    type="text"
                    size="2"
                    minlength="2"
@@ -314,116 +306,158 @@
           <div>
             <input type="radio" required checked
                    name="origin"
-                   id="origin1"
+                   id="origin_BAL"
                    value="BAL" />
-            <label for="origin1">Baltimore/Penn (Penn Line)</label>
+            <label for="origin_BAL">Baltimore/Penn (Penn Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="origin"
-                   id="origin2"
+                   id="origin_BCA"
                    value="BCA" />
-            <label for="origin2">Baltimore/Camden (Camden Line)</label>
+            <label for="origin_BCA">Baltimore/Camden (Camden Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="origin"
-                   id="origin3"
+                   id="origin_BWE"
                    value="BWE" />
-            <label for="origin3">Bowie State (Penn Line)</label>
+            <label for="origin_BWE">Bowie State (Penn Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="origin"
-                   id="origin4"
+                   id="origin_BWI"
                    value="BWI" />
-            <label for="origin4">BWI Airport (Penn Line)</label>
+            <label for="origin_BWI">BWI Airport (Penn Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="origin"
-                   id="origin5"
+                   id="origin_CPK"
                    value="CPK" />
-            <label for="origin5">College Park (Camden Line)</label>
+            <label for="origin_CPK">College Park (Camden Line)</label>
+          </div>
+          <div>
+            <input type="radio" required
+                   name="origin"
+                   id="origin_FRC"
+                   value="FRC" />
+            <label for="origin_FRC">Frederick (Brunswick Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="origin"
-                   id="origin6"
+                   id="origin_HAE"
+                   value="HAE" />
+            <label for="origin_HAE">Halethorpe (Penn Line)</label>
+          </div>
+          <div>
+            <input type="radio" required
+                   name="origin"
+                   id="origin_NCR"
+                   value="NCR" />
+            <label for="origin_NCR">New Carrollton (Penn Line)</label>
+          </div>
+          <div>
+            <input type="radio" required
+                   name="origin"
+                   id="origin_SEB"
                    value="SEB" />
-            <label for="origin6">Seabrook (Penn Line)</label>
+            <label for="origin_SEB">Seabrook (Penn Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="origin"
-                   id="origin7"
+                   id="origin_WAS"
                    value="WAS" />
-            <label for="origin7">Washington D.C.</label>
+            <label for="origin_WAS">Washington D.C.</label>
           </div>
           <div>
             <input type="radio" required
                    name="origin"
-                   id="origin8"
+                   id="origin_WBL"
                    value="WBL" />
-            <label for="origin8">West Baltimore (Penn Line)</label>
+            <label for="origin_WBL">West Baltimore (Penn Line)</label>
           </div>
 
           <p>Destination:</p>
           <div>
             <input type="radio" required
                    name="destination"
-                   id="destination1"
+                   id="destination_BAL"
                    value="BAL" />
-            <label for="destination1">Baltimore/Penn (Penn Line)</label>
+            <label for="destination_BAL">Baltimore/Penn (Penn Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="destination"
-                   id="destination2"
+                   id="destination_BCA"
                    value="BCA" />
-            <label for="destination2">Baltimore/Camden (Camden Line)</label>
+            <label for="destination_BCA">Baltimore/Camden (Camden Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="destination"
-                   id="destination3"
+                   id="destination_BWE"
                    value="BWE" />
-            <label for="destination3">Bowie State (Penn Line)</label>
+            <label for="destination_BWE">Bowie State (Penn Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="destination"
-                   id="destination4"
+                   id="destination_BWI"
                    value="BWI" />
-            <label for="destination4">BWI Airport (Penn Line)</label>
+            <label for="destination_BWI">BWI Airport (Penn Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="destination"
-                   id="destination5"
+                   id="destination_CPK"
                    value="CPK" />
-            <label for="destination5">College Park (Camden Line)</label>
+            <label for="destination_CPK">College Park (Camden Line)</label>
           </div>
           <div>
             <input type="radio" required
                    name="destination"
-                   id="destination6"
+                   id="destination_FRC"
+                   value="FRC" />
+            <label for="destination_FRC">Frederick (Brunswick Line)</label>
+          </div>
+          <div>
+            <input type="radio" required
+                   name="destination"
+                   id="destination_HAE"
+                   value="HAE" />
+            <label for="destination_HAE">Halethorpe (Penn Line)</label>
+          </div>
+          <div>
+            <input type="radio" required
+                   name="destination"
+                   id="destination_NCR"
+                   value="NCR" />
+            <label for="destination_NCR">New Carrollton (Penn Line)</label>
+          </div>
+          <div>
+            <input type="radio" required
+                   name="destination"
+                   id="destination_SEB"
                    value="SEB" />
-            <label for="destination6">Seabrook (Penn Line)</label>
+            <label for="destination_SEB">Seabrook (Penn Line)</label>
           </div>
           <div>
             <input type="radio" required checked
                    name="destination"
-                   id="destination7"
+                   id="destination_WAS"
                    value="WAS" />
-            <label for="destination7">Washington D.C.</label>
+            <label for="destination_WAS">Washington D.C.</label>
           </div>
           <div>
             <input type="radio" required
                    name="destination"
-                   id="destination8"
+                   id="destination_WBL"
                    value="WBL" />
-            <label for="destination8">West Baltimore (Penn Line)</label>
+            <label for="destination_WBL">West Baltimore (Penn Line)</label>
           </div>
 
           <p id="marc-form-errors">OK</p>
@@ -436,6 +470,22 @@
                  value="Generate Ticket" />
         </fieldset>
       </form>
+
+      <p>
+        About CharmBypass:
+      </p>
+      <ol>
+        <li>
+          <a href="https://michael.orlitzky.com/articles/charmbypass_pt._1%3A_introduction.xhtml">
+            Introduction
+          </a>
+        </li>
+        <li>
+          <a href="https://michael.orlitzky.com/articles/charmbypass_pt._2%3A_analysis.xhtml">
+            Analysis
+          </a>
+        </li>
+      </ol>
     </div>
 
     @SVGDATA@
@@ -723,18 +773,32 @@
         const zone_map = {
           BAL_BWE: 2,
           BAL_BWI: 1,
+          BAL_HAE: 1,
+          BAL_NCR: 3,
           BAL_SEB: 3,
           BAL_WAS: 4,
           BAL_WBL: 1,
           BCA_CPK: 3,
           BCA_WAS: 4,
           BWE_BWI: 1,
+          BWE_HAE: 1,
+          BWE_NCR: 1,
           BWE_SEB: 1,
           BWE_WAS: 2,
           BWE_WBL: 2,
+          BWI_HAE: 1,
+          BWI_NCR: 2,
           BWI_SEB: 2,
           BWI_WAS: 3,
           BWI_WBL: 1,
+          FRC_WAS: 4,
+          HAE_NCR: 2,
+          HAE_SEB: 2,
+          HAE_WAS: 3,
+          HAE_WBL: 1,
+          NCR_SEB: 1,
+          NCR_WAS: 1,
+          NCR_WBL: 3,
           SEB_WAS: 1,
           SEB_WBL: 3,
           WAS_WBL: 4