Tweaked meter CD road naming to be more permissive

docs/ramp_meters.md

@@ -56,8 +56,8 @@ _passage_, _bypass_ and _merge_ detectors.
 There are special rules for meters on [CD roads]:
 * The meter's `roadway` must be the main road
 * The entrance [r_node] must be on the CD road
-* The name of the CD road must be the same as the main roadway, but with a " CD"
-  suffix
+* The name of the CD road must be the same as the main roadway, but contain
+  the word-token "CD"
 
 Advance warning beacons are flashing lights on a static sign, e.g. "PREPARE TO
 STOP WHEN FLASHING".  Typically, they are hard-wired to flash when the meter

src/us/mn/state/dot/tms/server/Corridor.java

@@ -94,7 +94,8 @@ public Iterator<String> getLinkedCDRoads() {
 	private boolean matchesCD(GeoLoc loc) {
 		Road xs = (loc != null) ? loc.getCrossStreet() : null;
 		String nm = (xs != null) ? xs.getName() : "";
-		return nm.startsWith(roadway.toString()) && nm.endsWith(" CD");
+		return nm.startsWith(roadway.toString())
+		    && nm.matches(".*\\bCD\\b.*");
 	}
 
 	/** Write out the corridor to an XML file */