fix some issues with COOP data plotting

http://mesonet.agron.iastate.edu/GIS/apps/coop/plot.phtml
akrherz · Aug 26, 2015 · 43b6c3a · 43b6c3a
1 parent adeac36
commit 43b6c3a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/data/gis/base26915.map b/data/gis/base26915.map
@@ -898,8 +898,6 @@ LAYER
   END
   LABELCACHE ON
   CLASS
-   LABEL
-   END
    SYMBOL 1
    COLOR 255 0 0
    SIZE 5
@@ -949,8 +947,6 @@ LAYER
     LABEL
       COLOR  255 255 0
       OUTLINECOLOR  0 0 0
-      #SHADOWCOLOR 0 0 0
-      #SHADOWSIZE 1 1
       SIZE 14
       MINSIZE 4
       MAXSIZE 18
@@ -967,9 +963,6 @@ LAYER
     COLOR -1 -1 -1
     LABEL
       COLOR 0 0 0
-#      OUTLINECOLOR 0 0 0
-#      SHADOWCOLOR 0 0 0
-#      SHADOWSIZE 1 1
       SIZE 7
       MINSIZE 4
       MAXSIZE 18
@@ -990,8 +983,6 @@ LAYER
       MAXSIZE 18
       TYPE TRUETYPE
       FONT 'liberation'
-      #TYPE BITMAP
-      #SIZE LARGE
       ANTIALIAS TRUE
       BUFFER 2
       FORCE TRUE
@@ -1004,7 +995,7 @@ LAYER
   NAME cityname
   STATUS ON
   TYPE POINT
-  LABELCACHE OFF
+  LABELCACHE ON
   PROJECTION
     "init=epsg:4326"
   END

diff --git a/htdocs/GIS/apps/coop/plot.phtml b/htdocs/GIS/apps/coop/plot.phtml
@@ -98,11 +98,13 @@ $img = $map->prepareImage();
 $counties->draw($img);
 $states->draw($img);
 
-$c = iemdb("coop");
-
 if ($source == "qc")
 {
-	$sql = sprintf("SELECT * from alldata WHERE day = '%s' and %s is not null", adodb_date("Y-m-d", $ts), $var );
+	$c = iemdb("coop");
+	$sql = sprintf("SELECT * from alldata_ia "
+			."WHERE day = '%s' and %s is not null"
+			." and substr(station, 3, 1) != 'C' and station != 'IA0000'",
+			adodb_date("Y-m-d", $ts), $var );
 	$cutstring1 = 2;
 	$cutstring2 = 4;
 } else {
@@ -140,7 +142,7 @@ foreach($vals as $key => $value){
 	if ($showlabels){
 		$pt = ms_newPointObj();
 		$pt->setXY($cities[$ukey]['lon'], $cities[$ukey]['lat'], 0);
-		$pt->draw($map, $ponly, $img, 0, '' );
+		$pt->draw($map, $ponly, $img, 0);
 
 		$pt = ms_newPointObj();
 		$pt->setXY($cities[$ukey]['lon'], $cities[$ukey]['lat'], 0);
@@ -153,7 +155,6 @@ foreach($vals as $key => $value){
 	if ($value == 0.0001) $value = "T";
 	$pt->draw($map, $snet, $img, 2, $value);
 }
-$map->drawLabelCache($img);
 
 if ($i == 0)
 	plotNoData($map, $img);
@@ -192,7 +193,7 @@ $t->content = <<<EOF
 choice.
 
 <form method="GET" name="myform">
-<table cellpadding="2" border="1" cellspacing="0">
+<table class="table table-bordered">
  <tr>
    <th>Select Datasource:</th>
    <th>Select Parameter:</th>