234a9d4243c22fb9a4ef20a3c5ba1788f31a428d
angie
  Mon Aug 19 08:41:37 2013 -0700
Code review feedback from Kate.  refs #11525
diff --git src/hg/hgTracks/bamTrack.c src/hg/hgTracks/bamTrack.c
index 3bf6cb8..b0be159 100644
--- src/hg/hgTracks/bamTrack.c
+++ src/hg/hgTracks/bamTrack.c
@@ -741,49 +741,51 @@
 }
 
 void bamLinkedFeaturesDraw(struct track *tg, int seqStart, int seqEnd,
         struct hvGfx *hvg, int xOff, int yOff, int width,
         MgFont *font, Color color, enum trackVisibility vis)
 /* Draw linked features items. */
 {
 linkedFeaturesDraw(tg, seqStart, seqEnd, hvg, xOff, yOff, width,
         font, color, vis);
 
 if(tg->customInt)
     doMapBoxPerRow(tg, seqStart, seqEnd, hvg, xOff, yOff, width,
             font, color, vis);
 }
 
+#define BAM_DEFAULT_SHOW_DIFF_BASES_MAX_ZOOM "100"
+
 static void addBamBaseAndIndelSettings(struct trackDb *tdb)
 /* Unless already set in trackDb, add settings to enable
  * base-level differences and indel display. */
 {
 struct hash *settings = tdb->settingsHash;
 if (!hashLookup(settings, BASE_COLOR_USE_SEQUENCE))
     hashAdd(settings, BASE_COLOR_USE_SEQUENCE, cloneString("lfExtra"));
 if (!hashLookup(settings, BASE_COLOR_DEFAULT))
-    hashAdd(settings, BASE_COLOR_DEFAULT, cloneString("diffBases"));
+    hashAdd(settings, BASE_COLOR_DEFAULT, cloneString(BASE_COLOR_DRAW_DIFF_BASES));
 if (!hashLookup(settings, SHOW_DIFF_BASES_ALL_SCALES))
     hashAdd(settings, SHOW_DIFF_BASES_ALL_SCALES, cloneString("."));
 if (!hashLookup(settings, INDEL_DOUBLE_INSERT))
     hashAdd(settings, INDEL_DOUBLE_INSERT, cloneString("on"));
 if (!hashLookup(settings, INDEL_QUERY_INSERT))
     hashAdd(settings, INDEL_QUERY_INSERT, cloneString("on"));
 if (!hashLookup(settings, INDEL_POLY_A))
     hashAdd(settings, INDEL_POLY_A, cloneString("on"));
 if (!hashLookup(settings, "showDiffBasesMaxZoom"))
-    hashAdd(settings, "showDiffBasesMaxZoom", cloneString("100"));
+    hashAdd(settings, "showDiffBasesMaxZoom", cloneString(BAM_DEFAULT_SHOW_DIFF_BASES_MAX_ZOOM));
 }
 
 void bamMethods(struct track *track)
 /* Methods for BAM alignment files. */
 {
 #if (defined USE_BAM && defined KNETFILE_HOOKS)
 knetUdcInstall();
 #endif//def USE_BAM && KNETFILE_HOOKS
 
 track->canPack = TRUE;
 boolean isPaired = cartUsualBooleanClosestToHome(cart, track->tdb, FALSE,
 			 BAM_PAIR_ENDS_BY_NAME,
 			 (trackDbSettingClosestToHome(track->tdb, BAM_PAIR_ENDS_BY_NAME) != NULL));
 char *tdbShowNames = trackDbSetting(track->tdb, BAM_SHOW_NAMES);
 boolean showNames = cartUsualBooleanClosestToHome(cart, track->tdb, FALSE,