rename rebaseline_server JSON constants to be more consistent

gm/rebaseline_server/static/constants.js

Index: gm/rebaseline_server/static/constants.js
diff --git a/gm/rebaseline_server/static/constants.js b/gm/rebaseline_server/static/constants.js
index 55dddbf74927cb254bca38168258e557428c7151..ecca98eae85897e39b0df26e1833aeed7fb8c0e2 100644
--- a/gm/rebaseline_server/static/constants.js
+++ b/gm/rebaseline_server/static/constants.js
@@ -9,7 +9,6 @@ var module = angular.module(
 module.constant('constants', (function() {
   return {
     // NOTE: Keep these in sync with ../column.py
-    KEY__EXTRACOLUMNHEADERS: 'extraColumnHeaders',
     KEY__EXTRACOLUMNHEADERS__HEADER_TEXT: 'headerText',

[epoger, 2014/05/12 19:17:08]

This file provides the best overview of the CL as a whole.  All
renames/rearrangements of constants are reflected here.

     KEY__EXTRACOLUMNHEADERS__HEADER_URL: 'headerUrl',
     KEY__EXTRACOLUMNHEADERS__IS_FILTERABLE: 'isFilterable',
@@ -17,23 +16,26 @@ module.constant('constants', (function() {
     KEY__EXTRACOLUMNHEADERS__VALUES_AND_COUNTS: 'valuesAndCounts',
 
     // NOTE: Keep these in sync with ../imagediffdb.py
-    KEY__DIFFERENCE_DATA__MAX_DIFF_PER_CHANNEL: 'maxDiffPerChannel',
-    KEY__DIFFERENCE_DATA__NUM_DIFF_PIXELS: 'numDifferingPixels',
-    KEY__DIFFERENCE_DATA__PERCENT_DIFF_PIXELS: 'percentDifferingPixels',
-    KEY__DIFFERENCE_DATA__PERCEPTUAL_DIFF: 'perceptualDifference',
-    KEY__DIFFERENCE_DATA__WEIGHTED_DIFF: 'weightedDiffMeasure',
+    KEY__DIFFERENCES__MAX_DIFF_PER_CHANNEL: 'maxDiffPerChannel',
+    KEY__DIFFERENCES__NUM_DIFF_PIXELS: 'numDifferingPixels',
+    KEY__DIFFERENCES__PERCENT_DIFF_PIXELS: 'percentDifferingPixels',
+    KEY__DIFFERENCES__PERCEPTUAL_DIFF: 'perceptualDifference',
+    KEY__DIFFERENCES__WEIGHTED_DIFF: 'weightedDiffMeasure',
 
     // NOTE: Keep these in sync with ../imagepair.py
-    KEY__DIFFERENCE_DATA: 'differenceData',
-    KEY__EXPECTATIONS_DATA: 'expectations',
-    KEY__EXTRA_COLUMN_VALUES: 'extraColumns',
-    KEY__IMAGE_A_URL: 'imageAUrl',
-    KEY__IMAGE_B_URL: 'imageBUrl',
-    KEY__IS_DIFFERENT: 'isDifferent',
+    KEY__IMAGEPAIRS__DIFFERENCES: 'differenceData',
+    KEY__IMAGEPAIRS__EXPECTATIONS: 'expectations',
+    KEY__IMAGEPAIRS__EXTRACOLUMNS: 'extraColumns',
+    KEY__IMAGEPAIRS__IMAGE_A_URL: 'imageAUrl',
+    KEY__IMAGEPAIRS__IMAGE_B_URL: 'imageBUrl',
+    KEY__IMAGEPAIRS__IS_DIFFERENT: 'isDifferent',
 
     // NOTE: Keep these in sync with ../imagepairset.py
-    KEY__IMAGEPAIRS: 'imagePairs',
-    KEY__IMAGESETS: 'imageSets',
+    KEY__ROOT__EXTRACOLUMNHEADERS: 'extraColumnHeaders',
+    KEY__ROOT__HEADER: 'header',
+    KEY__ROOT__IMAGEPAIRS: 'imagePairs',
+    KEY__ROOT__IMAGESETS: 'imageSets',
+    //
     KEY__IMAGESETS__FIELD__BASE_URL: 'baseUrl',
     KEY__IMAGESETS__FIELD__DESCRIPTION: 'description',
     KEY__IMAGESETS__SET__DIFFS: 'diffs',
@@ -42,15 +44,15 @@ module.constant('constants', (function() {
     KEY__IMAGESETS__SET__WHITEDIFFS: 'whiteDiffs',
 
     // NOTE: Keep these in sync with ../results.py
-    REBASELINE_SERVER_SCHEMA_VERSION_NUMBER: 3,
     KEY__EXPECTATIONS__BUGS: 'bugs',
     KEY__EXPECTATIONS__IGNOREFAILURE: 'ignore-failure',
     KEY__EXPECTATIONS__REVIEWED: 'reviewed-by-human',
-    KEY__EXTRACOLUMN__BUILDER: 'builder',
-    KEY__EXTRACOLUMN__CONFIG: 'config',
-    KEY__EXTRACOLUMN__RESULT_TYPE: 'resultType',
-    KEY__EXTRACOLUMN__TEST: 'test',
-    KEY__HEADER: 'header',
+    //
+    KEY__EXTRACOLUMNS__BUILDER: 'builder',
+    KEY__EXTRACOLUMNS__CONFIG: 'config',
+    KEY__EXTRACOLUMNS__RESULT_TYPE: 'resultType',
+    KEY__EXTRACOLUMNS__TEST: 'test',
+    //
     KEY__HEADER__DATAHASH: 'dataHash',
     KEY__HEADER__IS_EDITABLE: 'isEditable',
     KEY__HEADER__IS_EXPORTED: 'isExported',
@@ -61,7 +63,8 @@ module.constant('constants', (function() {
     KEY__HEADER__TIME_NEXT_UPDATE_AVAILABLE: 'timeNextUpdateAvailable',
     KEY__HEADER__TIME_UPDATED: 'timeUpdated',
     KEY__HEADER__TYPE: 'type',
-    KEY__NEW_IMAGE_URL: 'newImageUrl',
+    VALUE__HEADER__SCHEMA_VERSION: 3,
+    //
     KEY__RESULT_TYPE__FAILED: 'failed',
     KEY__RESULT_TYPE__FAILUREIGNORED: 'failure-ignored',
     KEY__RESULT_TYPE__NOCOMPARISON: 'no-comparison',