RadarMapResource mute TDWR ad KCRI

This commit is contained in:
Michael James 2018-04-05 15:02:20 -06:00 committed by mjames-upc
parent c3d574547c
commit 891e9ab176
3 changed files with 33 additions and 27 deletions

View file

@ -6,7 +6,7 @@ Bundle-Version: 1.16.0.qualifier
Bundle-Activator: com.raytheon.viz.radar.Activator Bundle-Activator: com.raytheon.viz.radar.Activator
Bundle-Vendor: Raytheon Bundle-Vendor: Raytheon
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.raytheon.viz.radar, Export-Package: com.raytheon.viz.radar,
com.raytheon.viz.radar.interrogators, com.raytheon.viz.radar.interrogators,
com.raytheon.viz.radar.rsc, com.raytheon.viz.radar.rsc,

View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bundle xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType"> <bundle xmlns:ns2="group" xmlns:ns3="http://www.example.org/productType">
<displayList> <displayList>
<displays xsi:type="d2DMapRenderableDisplay" <displays xsi:type="d2DMapRenderableDisplay"
@ -25,8 +24,8 @@
<pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/> <pdProps minDisplayWidth="0" maxDisplayWidth="100000000"/>
</properties> </properties>
<resourceData xsi:type="lpiResourceData"> <resourceData xsi:type="lpiResourceData">
<filename>88D.lpi</filename> <filename>NEXRAD.lpi</filename>
<mapName>WSR-88D Station Locs</mapName> <mapName>NEXRAD Stations</mapName>
</resourceData> </resourceData>
</resource> </resource>
<resource> <resource>

View file

@ -32,6 +32,13 @@ import com.raytheon.viz.ui.EditorUtil;
import com.raytheon.viz.ui.editor.AbstractEditor; import com.raytheon.viz.ui.editor.AbstractEditor;
import com.raytheon.viz.ui.input.EditableManager; import com.raytheon.viz.ui.input.EditableManager;
/**
* NEXRAD Display Map Resource
*
* @author mjames
*
*/
public class RadarMapResource extends public class RadarMapResource extends
AbstractVizResource<RadarMapResourceData, MapDescriptor> implements AbstractVizResource<RadarMapResourceData, MapDescriptor> implements
RemoveListener { RemoveListener {
@ -129,10 +136,13 @@ public class RadarMapResource extends
} }
} }
/**
*
*/
private static void createMapEditor() { private static void createMapEditor() {
deleteRadarMapResource(); deleteRadarMapResource();
try { try {
mapEditor = (AbstractEditor) EditorUtil.getActiveEditor(); mapEditor = (AbstractEditor) EditorUtil.getActiveEditor();
} catch (Exception ve) { } catch (Exception ve) {
System.out System.out
.println("RadarMapResource Could not load initial editor: " .println("RadarMapResource Could not load initial editor: "
@ -198,8 +208,12 @@ public class RadarMapResource extends
return mapRsc; return mapRsc;
} }
/**
*
*/
private static void createRadarMapMarkers() { private static void createRadarMapMarkers() {
String query = "SELECT lat, lon, rda_id FROM radar_spatial where rda_id like 'K%' ;";
String query = "SELECT lat, lon, rda_id FROM radar_spatial where (rda_id not like 'T%' and rda_id <> 'KCRI');";
List<Object[]> rows = null; List<Object[]> rows = null;
try { try {
rows = DirectDbQuery.executeQuery(query, "metadata", rows = DirectDbQuery.executeQuery(query, "metadata",
@ -208,18 +222,21 @@ public class RadarMapResource extends
e.printStackTrace(); e.printStackTrace();
rows = new ArrayList<Object[]>(); rows = new ArrayList<Object[]>();
} }
for (int i = 0; i < rows.size(); i++) { for (int i = 0; i < rows.size(); i++) {
RadarStation pnt = new RadarStation(); RadarStation pnt = new RadarStation();
Object[] pntObject = rows.get(i); Object[] pntObject = rows.get(i);
pnt.setLat((Float) pntObject[0]); pnt.setLat((Float) pntObject[0]);
pnt.setLon((Float) pntObject[1]); pnt.setLon((Float) pntObject[1]);
pnt.setName((String) pntObject[2]); pnt.setName((String) pntObject[2]);
pnt.setRdaId((String) pntObject[2]); pnt.setRdaId((String) pntObject[2]);
mapRsc.addPoint(pnt); mapRsc.addPoint(pnt);
} }
} }
/**
*
*/
public static void deleteRadarMapResource() { public static void deleteRadarMapResource() {
System.out.println("RadarMapResource:deleteRadarMapResource "); System.out.println("RadarMapResource:deleteRadarMapResource ");
if (mapRsc != null) { if (mapRsc != null) {
@ -293,18 +310,8 @@ public class RadarMapResource extends
circle.basics.color = color; circle.basics.color = color;
circle.filled = false; circle.filled = false;
circles.add(circle); circles.add(circle);
} }
} }
/*
// generate symbol for picked stn to mark X
if (this.pickedPoint.getLon() != null) {
double lon, lat;
lon = this.pickedPoint.getLon();
lat = this.pickedPoint.getLat();
}
*/
} }
protected double getRadius() { protected double getRadius() {
@ -329,7 +336,7 @@ public class RadarMapResource extends
@Override @Override
public void project(CoordinateReferenceSystem mapData) throws VizException { public void project(CoordinateReferenceSystem mapData) throws VizException {
// System.out.println("RadarMapResource: project "); // TODO Auto-generated method stub
} }
private static RadarMapMouseHandler getMouseHandler() { private static RadarMapMouseHandler getMouseHandler() {