v0.2.49..v0.2.50 changeset HootProperties.java

diff --git a/hoot-services/src/main/java/hoot/services/HootProperties.java b/hoot-services/src/main/java/hoot/services/HootProperties.java
index 18b1cf3..7454431 100644
--- a/hoot-services/src/main/java/hoot/services/HootProperties.java
+++ b/hoot-services/src/main/java/hoot/services/HootProperties.java
@@ -55,6 +55,7 @@ public final class HootProperties {
     public static final String DIFFERENTIAL_CONFLATION_PATH;
     public static final String HORIZONTAL_CONFLATION_PATH;
     public static final String NETWORK_CONFLATION_PATH;
+    public static final String IMPORT_OPTIONS;
     public static final String CONFIG_OPTIONS;
     public static final String DOC_NAME;
     public static final String RPT_STORE_PATH;
@@ -131,10 +132,13 @@ public final class HootProperties {
     public static final String PUBLIC_OSMAPI_CAPABILITIES_URL;
 
     public static final String PUBLIC_OVERPASS_URL;
+    public static final String PRIVATE_OVERPASS_URL;
+    public static final String PRIVATE_OVERPASS_CERT_PATH;
+    public static final String PRIVATE_OVERPASS_CERT_PHRASE;
     public static final String MAX_OVERPASS_FEATURE_COUNT;
 
-    public static final String GRAIL_RAILS_CODENAME;
-    public static final String GRAIL_OVERPASS_CODENAME;
+    public static final String GRAIL_RAILS_LABEL;
+    public static final String GRAIL_OVERPASS_LABEL;
 
     public static final String RAILSPORT_PUSH_URL;
     public static final String RAILSPORT_PULL_URL;
@@ -205,6 +209,7 @@ public final class HootProperties {
         DIFFERENTIAL_CONFLATION_PATH = getProperty("differentialConf");
         HORIZONTAL_CONFLATION_PATH = getProperty("horizontalConf");
         NETWORK_CONFLATION_PATH = getProperty("networkConf");
+        IMPORT_OPTIONS = getProperty("importOptions");
         CONFIG_OPTIONS = getProperty("configJsonPath");
         DOC_NAME = getProperty("documentName");
         JS_HEADER_SCRIPT_PATH = getProperty("dummyjsHeaderScriptPath");
@@ -225,8 +230,8 @@ public final class HootProperties {
         EXPORT_SIZE_THRESHOLD = getProperty("exportSizeThreshold");
         HTTP_TIMEOUT = getProperty("httpTimeout");
         MAX_OVERPASS_FEATURE_COUNT = getProperty("grailMaxFeatureCount");
-        GRAIL_RAILS_CODENAME =  getProperty("grailRailsCodename");
-        GRAIL_OVERPASS_CODENAME = getProperty("grailOverpassCodename");
+        GRAIL_RAILS_LABEL =  getProperty("grailRailsLabel");
+        GRAIL_OVERPASS_LABEL = getProperty("grailOverpassLabel");
         GRAIL_OVERPASS_QUERY = getProperty("grailOverpassQueryPath");
         GRAIL_OVERPASS_STATS_QUERY = getProperty("grailOverpassStatsQueryPath");
         MAP_QUERY_DIMENSIONS = getProperty("mapQueryDimensions");
@@ -309,6 +314,11 @@ public final class HootProperties {
         // The URL for the main Overpass server
         PUBLIC_OVERPASS_URL = "${PUBLIC_OVERPASS_URL}";
 
+        // The URL for the private Overpass server
+        PRIVATE_OVERPASS_URL = "${PRIVATE_OVERPASS_URL}";
+        PRIVATE_OVERPASS_CERT_PATH = "${PRIVATE_OVERPASS_CERT_PATH}";
+        PRIVATE_OVERPASS_CERT_PHRASE = "${PRIVATE_OVERPASS_CERT_PHRASE}";
+
         // The OSM Rails Port that we are going to pull and push data to.
         RAILSPORT_PROTOCOL = "${RAILSPORT_PROTOCOL}" + "://";
         RAILSPORT_HOST = "${RAILSPORT_HOST}";