WYcounties = ShapeTable('County')
+WYcounties.name = 'WYCounties'
WYcounties.filter(lambda x : x['state'] == "WY")
WYcounties.editAreaName = ['state','countyname']
WYcounties.groupName = 'WYCounties'
@@ -128,6 +129,7 @@ existing edit areas
You can modify the following characteristics of the map definition:
If you want to change the name of the database table used for edit area generation, you will
need to remove the existing definition and create a completely new map definition.
+CWAzones.name = "MyCWAZones" ++Note: this name is only used in text formatter definitions in the mapNameForCombinations setting.
CWAzones = ShapeTable('zone')
+CWAzones.name = CWA + '_zones'
CWAzones.editAreaName = ['state','zone']
The ifpServer can automatically generate edit areas based on the
@@ -144,6 +138,7 @@ and creates an edit area with that name. The example below uses the simple
format for the editAreaName, in which only one attribute is specified.
CWAzones = ShapeTable('zone')
+CWAzones.name = CWA + '_zones'
CWAzones.editAreaName = 'zone'
Examples of the names of the edit areas generated from the above @@ -197,6 +192,7 @@ form for the editAreaName, in which two attributes are specified.
CWAzones = ShapeTable('zone')
+CWAzones.name = CWA + '_zones'
CWAzones.editAreaName = ['state','zone']
Examples of the names of the edit areas generated from the above @@ -332,6 +328,7 @@ def cwaEAN(atts): return s #return the complete edit area name CWAcounties = ShapeTable('county') +CWAcounties.name = CWA + '_counties' CWAcounties.editAreaName = cwaEAN The "atts" dictionary looks simlilar to the following: @@ -357,6 +354,7 @@ the generated edit areas will be placed in the edit area group called 'Zones'.
CWAzones = ShapeTable('zone')
+CWAzones.name = CWA + '_zones'
CWAzones.editAreaName = 'zone'
CWAzones.groupName = 'Zones'
@@ -377,6 +375,7 @@ Map Background Database.
CWAzones = ShapeTable('Zone')
+CWAzones.name = CWA + '_zones'
CWAzones.filter(lambda x : x['cwa'] == CWA)
CWAzones.editAreaName = cwazones
@@ -388,6 +387,7 @@ def cwaZoneFilt(x):
return x['cwa'] == CWA
CWAzones = ShapeTable('zone')
+CWAzones.name = CWA + '_zones'
CWAzones.filter(cwaZoneFilt)
CWAzones.editAreaName = cwazones
@@ -403,6 +403,7 @@ def exampleFilt(x):
return x['countyname'] in myCounties and x['st'] == "OH" and x['cwa'] = 'CLE'
OHcounties = ShapeTable('county')
+OHcounties.name = 'ExampleOHCounties'
OHcounties.filter(exampleFilt)
OHcounties.editAreaName = 'countyname'
@@ -413,6 +414,7 @@ Areas case except that the user has specified a group name. All
of the generated edit areas will be placed in the edit area group called 'Zones'.
CWAzones = ShapeTable('zone')
+CWAzones.name = CWA + '_zones'
CWAzones.filter(lambda x : x['cwa'] == CWA)
CWAzones.editAreaName = ['state','zone']
CWAzones.groupName = 'Zones'
diff --git a/edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py b/edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
index e5e6a1544b..e9adf4e100 100644
--- a/edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
+++ b/edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
@@ -44,6 +44,7 @@ CWA = siteConfig.GFESUITE_SITEID
#
#MapNameVariable = ShapeTable('the name of the map table')
#MapNameVariable.filter( -- - - - - filter string - - - - - - )
+#MapNameVariable.name = 'the display name of the map'
#MapNameVariable.editAreaName = 'attribute in ShapeTable to be used to name
# 'editArea'
#MapNameVariable.groupName = 'name of the edit area group'
@@ -202,86 +203,102 @@ def offshoreZoneFilter(atts):
# CWA Counties
CWAcounties = ShapeTable('county')
CWAcounties.filter(lambda x : x['cwa'][0:3] == CWA or x['cwa'][3:6] == CWA)
+CWAcounties.name = 'Counties_' + CWA
CWAcounties.editAreaName = ['state','countyname']
CWAcounties.groupName = 'Counties'
# FIPS for my counties - only include first WFO indicated in CWA field
FIPS = ShapeTable('county')
+FIPS.name = 'FIPS_' + CWA
FIPS.filter(lambda x : x['cwa'][0:3] == CWA)
FIPS.editAreaName = fips
FIPS.groupName = 'FIPS_' + CWA
# Unfiltered Counties
Counties = ShapeTable('county')
+Counties.name = 'Counties'
Counties.editAreaName = fips
Counties.groupName = 'FIPS'
# CWA Zones
CWAzones = ShapeTable('zone')
CWAzones.filter(publicZoneFilter)
+CWAzones.name = 'Zones_' + CWA
CWAzones.editAreaName = cwazones
CWAzones.groupName = 'Zones_' + CWA
# Unfiltered Zones
Zones = ShapeTable('zone')
+Zones.name = 'Zones'
Zones.editAreaName = cwazones
Zones.groupName = 'Zones'
# Fire Wx Zones
FWCWAzones = ShapeTable('firewxzones')
FWCWAzones.filter(firewxZoneFilter)
+FWCWAzones.name = 'FireWxZones_' + CWA
FWCWAzones.editAreaName = fwxzones
FWCWAzones.groupName = 'FireWxZones_' + CWA
# Unfiltered Fire Wx Zones
FWZones = ShapeTable('firewxzones')
+FWZones.name = 'FireWxZones'
FWZones.editAreaName = fwxzones
FWZones.groupName = 'FireWxZones'
# CWAs for all
cwas = ShapeTable('cwa')
+cwas.name = 'CWA_all'
cwas.editAreaName = 'wfo'
cwas.groupName = 'WFOs'
# ISC areas for all
isc = ShapeTable('isc')
+isc.name = 'ISC_all'
isc.editAreaName = ['ISC','wfo']
isc.groupName = 'ISC'
# Fire Wx AOR for all
fwaor = ShapeTable('firewxaor')
+fwaor.name = 'FireWxAOR'
fwaor.editAreaName = ['FireWxAOR', 'cwa']
fwaor.groupName = 'FireWxAOR'
# Marine Zones for CWA
CWAmzones = ShapeTable('marinezones')
CWAmzones.filter(marineZoneFilter)
+CWAmzones.name = 'Marine_Zones_' + CWA
CWAmzones.editAreaName = marineZ
CWAmzones.groupName = 'MZones_' + CWA
# Marine Zones (unfiltered)
Mzones = ShapeTable('marinezones')
+Mzones.name = "Marine_Zones"
Mzones.editAreaName = marineZ
Mzones.groupName = 'MZones'
# States (unfiltered)
States = ShapeTable('states')
+States.name = "States"
States.editAreaName = 'name'
States.groupName = 'States'
# RFC maps
rfc = ShapeTable('rfc')
+rfc.name = "RFC"
rfc.editAreaName = ['ISC','site_id']
rfc.groupName = 'ISC'
# Offshore Marine Zones - unfiltered
offshore = ShapeTable('offshore')
+offshore.name = "Offshore_Marine_Zones"
offshore.editAreaName = offshoreZ
offshore.groupName = 'OffShoreMZones'
# Offshore Marine Zones - filtered by CWA
offshoreCWA = ShapeTable('offshore')
offshoreCWA.filter(offshoreZoneFilter)
+offshoreCWA.name = "Offshore_Marine_Zones_" + CWA
offshoreCWA.editAreaName = offshoreZ
offshoreCWA.groupName = 'OffShoreMZones_' + CWA
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
index 620232530c..807eb9225a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
@@ -93,6 +93,8 @@ public class DbShapeSource {
private boolean filtered = false;
+ private String displayName;
+
private boolean hasEditAreaName = false;
private String groupName;
@@ -357,6 +359,14 @@ public class DbShapeSource {
return this.featureCollection.size();
}
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String name) {
+ this.displayName = name;
+ }
+
public String getGroupName() {
return groupName;
}
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
index fd8ab32424..b0c3a1b81c 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
@@ -392,7 +392,10 @@ public class MapManager {
String error = "********* EDIT AREA GENERATION ERROR - MakeReferenceData *********\n"
+ "Error in generating edit areas, map #"
+ i
- + " Basename: " + m.getTableName();
+ + " Name: "
+ + m.getDisplayName()
+ + " Basename: "
+ + m.getTableName();
statusHandler.error(error, e);
_mapErrors.add(error);
} finally {
@@ -484,7 +487,7 @@ public class MapManager {
return;
}
- statusHandler.debug("creating: " + mapDef.getTableName());
+ statusHandler.debug("creating: " + mapDef.getDisplayName());
List data = createReferenceData(mapDef);
if (data.size() == 0) {
return;
@@ -896,13 +899,13 @@ public class MapManager {
} catch (Exception e) {
String error = "********* EDIT AREA GENERATION ERROR - Create Reference Data *********\n"
+ "Error in generating edit areas from maps for map "
- + mapDef.getTableName();
+ + mapDef.getDisplayName();
statusHandler.error(error, e);
_mapErrors.add(error);
}
statusHandler.debug("EAs: " + created);
- editAreaMap.put(mapDef.getTableName(), created);
+ editAreaMap.put(mapDef.getDisplayName(), created);
return data;
}
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
index ef76a5c050..4456a147a6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
@@ -38,6 +38,7 @@ from com.raytheon.edex.plugin.gfe.reference import DbShapeSource
class ShapeTable(JUtil.JavaWrapperClass):
def __init__(self, identifier):
self.identifier = identifier
+ self.name = None
self.editAreaName = None
self.groupName = None
self.javaObj = DbShapeSource(identifier)
@@ -63,6 +64,7 @@ class ShapeTable(JUtil.JavaWrapperClass):
return ""
def toJavaObj(self):
+ self.javaObj.setDisplayName(self.name)
self.javaObj.setGroupName(self.groupName)
if self.editAreaName is not None:
self.javaObj.setHasEditAreaName(True);