yakra · yakra · Jun 14, 2020 · Jun 11, 2020 · Jun 12, 2020 · Jun 12, 2020
diff --git a/devel/manual/hwydata.php b/devel/manual/hwydata.php
@@ -111,7 +111,7 @@
  avoid "near miss points" which enables links to intersecting
  routes and improves the quality of the <a href="/graphs">graph
  data</a> used
- by <a href="http://courses.teresco.org/metal/">METAL</a>, TM's
+ by <a href="https://courses.teresco.org/metal/">METAL</a>, TM's
 	academic offshoot.</li>
  <li> Do not use commercial mapping sources, such as Google Maps, Yahoo Maps, or Bing Maps.</li>
  </ul>

diff --git a/devel/manual/maintenance.php b/devel/manual/maintenance.php
@@ -37,7 +37,7 @@
  lists. In those situations, changes must be logged in
  the <a href="https://github.com/TravelMapping/HighwayData/blob/master/updates.csv">updates
  list</a>, which is
- available <a href="http://travelmapping.net/devel/updates.php">on
+ available <a href="/devel/updates.php">on
  the updates page</a> to help users keep their list files accurate.
 </p>
 
@@ -51,7 +51,7 @@
 Waypoint P1 is mislabeled but at the correct location. It should be NewP1 instead. <br />
 <br />
 Check
-the <a href="http://travelmapping.net/logs/pointsinuse.log">points in
+the <a href="/logs/pointsinuse.log">points in
 use log</a>. <br />
 <br />
 If the label is not in use: <br />
@@ -164,7 +164,7 @@ function, and delete the old waypoints that are not in use. Add the new
 <br />
 Q: Can I delete unused hidden points with a visible companion point? <br />
 A: If you have verified that a hidden point isn't in use (we
-have <a href="http://travelmapping.net/logs/unusedaltlabels.log">a log
+have <a href="/logs/unusedaltlabels.log">a log
  file for that</a>) and that there 
 is a visible point at the same location, then you can delete the unused 
 hidden point. Just make sure you don't accidentally remove a shaping 

diff --git a/devel/manual/wayptlabels.php b/devel/manual/wayptlabels.php
@@ -641,27 +641,32 @@
  </tr>
  <tr valign="top">
  <td><a name="over2"></a><a style="text-decoration:none" href="#over2">&#x1f517</a></td>
- <td>US25:<br />
- US90_A<br />
+ <td>US90_A<br />
  US90_B<br />
  US90_C</p>
  <br />
- US95:<br />
  NV57_Ren<br />
  NV57_Tah<br />
  NV88_PitS<br />
- NV88_PitN<br /></td>
+ NV88_PitN<br />
+ ME161_FtKS<br />
+ ME161_FtKN<br /></td>
  <td>If more than two points for the same non-exit-numbered cross 
  road are needed, there are two options which can be used in combination 
  with or ignoring the previous options for pairs of identical labels.<br />
  1. Use alphabetical suffixes _A, _B, _C, etc.<br />
- 2. Choose 3-letter suffixes for a nearby towns if they are fairly close. The 3-letter suffix should be the <em>first</em>
- 3 letters of the town name. Add a suffix with an underscore and those 3
- letters. If you need the same town twice, add a 4th letter that is a 
+ 2. Choose 3-letter suffixes for nearby towns if they are fairly close. The 3-letter suffix should be the <em>first</em>
+ 3 letters of the town name. or a desired 3-letter abbreviation if the name consists
+ of more than one word. Add a suffix with an underscore and those 3 letters.
+ <ul>
+ <li>Standard town prefixes like "Bad", "Le", "Saint", "San", "Sankt" can be omitted or abbreviated.</li>
+ <li>If you need the same town twice, add a 4th letter that is a 
  direction letter (_PitS and _PitN for southern and northern junctions 
- near Pittston). If the town suffixes are not useful, are confusing, or 
- require further elaboration (3+ junctions with same town), use the 
- alphabetical suffixes instead. </td>
+ near Pittston or _FtKN and _FtKS for southern and northern junctions near Fort Kent).</li>
+ <li>If the town suffixes are not useful, are confusing,
+ require further elaboration (3+ junctions with same town),
+ or no towns are nearby, use the county name or alphabetical suffixes instead.</li>
+ </ul></td>
  </tr>
  <tr valign="top">
  <td><a name="differentnames"></a><a style="text-decoration:none" href="#differentnames">&#x1f517</a></td>

diff --git a/devel/tools.php b/devel/tools.php
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
 <!-- jQuery -->
-<script type="application/javascript" src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
+<script type="application/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 <!-- TableSorter -->
 <script type="application/javascript" src="/lib/jquery.tablesorter.min.js"></script>
 <?php require $_SERVER['DOCUMENT_ROOT']."/lib/tmphpfuncs.php" ?>
@@ -58,7 +58,7 @@
 <div class="text">
 <ul>
 <li><a href="/wptedit/">TM's update of CHM's WPT file Editor</a> (Goal: develop our own new version)</li>
-<li><a href="http://courses.teresco.org/metal/hdx/">Highway Data Examiner</a> (HDX) to view graph and near-miss data</li>
+<li><a href="https://courses.teresco.org/metal/hdx/">Highway Data Examiner</a> (HDX) to view graph and near-miss data</li>
 </ul>
 </div>
 

diff --git a/devel/updates.php b/devel/updates.php
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
 <link rel="shortcut icon" type="image/png" href="/favicon.png">
 <!-- jQuery -->
-<script type="application/javascript" src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
+<script type="application/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 <!-- TableSorter -->
 <script type="application/javascript" src="/lib/jquery.tablesorter.min.js"></script>
 <?php require $_SERVER['DOCUMENT_ROOT']."/lib/tmphpfuncs.php" ?>

diff --git a/devel_new/datacheck.php b/devel_new/datacheck.php
@@ -57,9 +57,21 @@ function writeTable($db, $fpVal, $joins) {
  if (strcmp($row['label3'],"") != 0) {
  echo ",".$row['label3'];
  }
-	if ((strcmp($row['code'],"VISIBLE_DISTANCE") == 0) ||
+	if ((strcmp($row['code'],"BUS_WITH_I") == 0) ||
+ (strcmp($row['code'],"INVALID_FINAL_CHAR") == 0) ||
+ (strcmp($row['code'],"INVALID_FIRST_CHAR") == 0) ||
+ (strcmp($row['code'],"LABEL_LOOKS_HIDDEN") == 0) ||
+ (strcmp($row['code'],"LABEL_PARENS") == 0) ||
+ (strcmp($row['code'],"LABEL_SELFREF") == 0) ||
+ (strcmp($row['code'],"LABEL_SLASHES") == 0) ||
+ (strcmp($row['code'],"LABEL_UNDERSCORES") == 0) ||
+ (strcmp($row['code'],"LACKS_GENERIC") == 0) ||
  (strcmp($row['code'],"LONG_SEGMENT") == 0) ||
- (strcmp($row['code'],"SHARP_ANGLE") == 0)) {
+ (strcmp($row['code'],"LONG_UNDERSCORE") == 0) ||
+ (strcmp($row['code'],"NONTERMINAL_UNDERSCORE") == 0) ||
+ (strcmp($row['code'],"US_BANNER") == 0) ||
+ (strcmp($row['code'],"VISIBLE_HIDDEN_COLOC") == 0) ||
+ (strcmp($row['code'],"VISIBLE_DISTANCE") == 0)) {
  echo "</td><td>".$row['code']."</td><td>";
 	}
  else {

diff --git a/devel_new/devel.php b/devel_new/devel.php
@@ -7,7 +7,7 @@
 <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
 
 <!-- jQuery -->
-<script type="application/javascript" src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
+<script type="application/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 <!-- TableSorter -->
 <script type="application/javascript" src="/lib/jquery.tablesorter.min.js"></script>
 <?php require $_SERVER['DOCUMENT_ROOT']."/lib/tmphpfuncs.php" ?>
@@ -83,7 +83,7 @@
  <i>TM's update of CHM's WPT file Editor; Goal: develop our own new version</i>
  </li>
  <br/>
- <li><a href="http://courses.teresco.org/metal/hdx/">Highway Data Examiner</a> (HDX)
+ <li><a href="https://courses.teresco.org/metal/hdx/">Highway Data Examiner</a> (HDX)
  <br/>
  View graph and near-miss data
  </li>

diff --git a/devel_new/logs.php b/devel_new/logs.php
@@ -7,7 +7,7 @@
 <link rel="stylesheet" type="text/css" href="/css/travelMapping.css" />
 
 <!-- jQuery -->
-<script type="application/javascript" src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
+<script type="application/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 <!-- TableSorter -->
 <script type="application/javascript" src="/lib/jquery.tablesorter.min.js"></script>
 <?php require $_SERVER['DOCUMENT_ROOT']."/lib/tmphpfuncs.php" ?>

diff --git a/devel_new/manual/maintenance.php b/devel_new/manual/maintenance.php
@@ -36,17 +36,17 @@
 <ul>
  <li><a name="maintainer"></a><a style="text-decoration:none" href="#maintainer">&#x1f517</a>
  Regions are maintained by our volunteer highway data managers.
- Please refer to the <a href="http://forum.travelmapping.net/index.php?topic=42">forum</a> to see who is responsible for what region.</li>
+ Please refer to the <a href="https://forum.travelmapping.net/index.php?topic=42">forum</a> to see who is responsible for what region.</li>
  <li><a name="reporter"></a><a style="text-decoration:none" href="#reporter">&#x1f517</a>
- Everyone can report required changes on the <a href="http://forum.travelmapping.net/index.php?topic=20">forum</a>.
- The responsible highway data manager should frequently check the <a href="http://forum.travelmapping.net/index.php?board=3">board</a> for open issues.</li>
+ Everyone can report required changes on the <a href="https://forum.travelmapping.net/index.php?topic=20">forum</a>.
+ The responsible highway data manager should frequently check the <a href="https://forum.travelmapping.net/index.php?board=3">board</a> for open issues.</li>
  <li><a name="check"></a><a style="text-decoration:none" href="#check">&#x1f517</a>
  In addition, the highway data manager should check official sources or forums proactive to get info about relevant changes.</li>
  </br>
  <li><a name="break"></a><a style="text-decoration:none" href="#break">&#x1f517</a>
  Care must be taken to ensure that changes do not "break" a user's list file.</li>
  <ul>
- <li>If a <a href="http://travelmapping.net/logs/pointsinuse.log">waypoint label is in use by current TM users</a> we should
+ <li>If a <a href="/logs/pointsinuse.log">waypoint label is in use by current TM users</a> we should
  <a href="#labelwrong">add alternative labels</a> if possible.</li>
  <li>If a <a href="../logs/listnamesinuse.log">.list name label is in use by current TM users</a> we should
  <a href="syshwylist.php#caltroute">add alternative route names</a> if possible.</li>
@@ -83,7 +83,7 @@
  <br />
  Example: Waypoint <code>P1</code> is mislabeled but at the correct location. It should be <code>NewP1</code> instead. <br />
  <br />
- Check the <a href="http://travelmapping.net/logs/pointsinuse.log">points in use log</a> manually or
+ Check the <a href="/logs/pointsinuse.log">points in use log</a> manually or
  load the corresponding line to the wpt file into the <a href="/wptedit/">Waypoint File Editor</a>.<br />
  If there is no entry for the .wpt file at all, no label of the route is in use.<br/>
  <br />
@@ -226,7 +226,7 @@ function, and delete the old waypoints that are not in use. Add the new
 <li><a name="delaltlabels"></a><a style="text-decoration:none" href="#delaltlabels">&#x1f517</a>
 Q: Can I delete unused hidden points with a visible companion point? <br /> <br />
 A: If you have verified that a hidden point isn't in use (we
-have <a href="http://travelmapping.net/logs/unusedaltlabels.log">a log
+have <a href="/logs/unusedaltlabels.log">a log
  file for that</a>) and that there 
 is a visible point at the same location, then you can delete the unused 
 hidden point. Just make sure you don't accidentally remove a shaping 
@@ -243,7 +243,7 @@ function, and delete the old waypoints that are not in use. Add the new
 Format for reporting newsworthy changes</p>
 
 <div class="text">Newsworthy changes must must be logged in the <a href="https://github.com/TravelMapping/HighwayData/blob/master/updates.csv">updates list</a>,
-which is available <a href="http://travelmapping.net/devel/updates.php">on the updates page</a> to help users keep their list files accurate.
+which is available <a href="/devel/updates.php">on the updates page</a> to help users keep their list files accurate.
 The list is ordered by regions. Add a new line at the beginning of the right region.
 Don't let the changes get lost in the forum or elsewhere!</br>
 </br>