XASTIR

Update of /cvsroot/xastir/xastir/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21596/src

Modified Files:
	interface.c 
Log Message:
Adjust error messages to describe problem in current function.


Index: interface.c
===================================================================
RCS file: /cvsroot/xastir/xastir/src/interface.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -C2 -d -r1.239 -r1.240
*** interface.c	3 Nov 2005 20:15:47 -0000	1.239
--- interface.c	9 Nov 2005 14:03:21 -0000	1.240
***************
*** 8597,8601 ****
                  strlen(data_txt)) != (int)strlen(data_txt)) {
              fprintf(stderr,
!                 "UpdateTime: Writen error: %d\n",
                  errno);
          }
--- 8597,8601 ----
                  strlen(data_txt)) != (int)strlen(data_txt)) {
              fprintf(stderr,
!                 "my_aprs_data: Writen error: %d\n",
                  errno);
          }
***************
*** 8603,8607 ****
          if (writen(pipe_xastir_to_tcp_server, "\n", 1) != 1) {
              fprintf(stderr,
!                 "UpdateTime: Writen error: %d\n",
                  errno);
          }
--- 8603,8607 ----
          if (writen(pipe_xastir_to_tcp_server, "\n", 1) != 1) {
              fprintf(stderr,
!                 "my_aprs_data: Writen error: %d\n",
                  errno);
          }
***************
*** 9106,9110 ****
                  strlen(data_txt)) != (int)strlen(data_txt)) {
              fprintf(stderr,
!                 "UpdateTime: Writen error: %d\n",
                  errno);
          }
--- 9106,9110 ----
                  strlen(data_txt)) != (int)strlen(data_txt)) {
              fprintf(stderr,
!                 "output_my_data: Writen error: %d\n",
                  errno);
          }
***************
*** 9112,9116 ****
          if (writen(pipe_xastir_to_tcp_server, "\n", 1) != 1) {
              fprintf(stderr,
!                 "UpdateTime: Writen error: %d\n",
                  errno);
          }
--- 9112,9116 ----
          if (writen(pipe_xastir_to_tcp_server, "\n", 1) != 1) {
              fprintf(stderr,
!                 "output_my_data: Writen error: %d\n",
                  errno);
          }

Update of /cvsroot/xastir/xastir/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28199/config

Modified Files:
	Makefile.am 
Log Message:
Add old zone file dbf into Makefile list.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xastir/xastir/config/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Makefile.am	9 Nov 2005 05:44:09 -0000	1.24
--- Makefile.am	9 Nov 2005 05:57:46 -0000	1.25
***************
*** 32,35 ****
--- 32,36 ----
      nwsw_ddmmyy.dbfawk \
      nwsz_ddmmyy.dbfawk \
+     nwszoddmmyy.dbfawk \
      nwsfz_ddmmyy.dbfawk \
      predefined_EVENT.sys \

Update of /cvsroot/xastir/xastir/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24765

Modified Files:
	Makefile.am 
Added Files:
	nwsmzoddmmyy.dbfawk 
Log Message:
Add back in the old mz dbf definition.


--- NEW FILE: nwsmzoddmmyy.dbfawk ---
# $Id$
#
# Copyright (C) 2003-2005  The Xastir Group
#
# This dbfawk file is used to map arbitrary dbf data that accompanies
# a shapefile into Xastir canoncical values of:
#   key     - search key
#   lanes   - width of feature (usually a road but applies to rivers, etc. too)
#   color   - color to draw the road
#   name    - name of the road for labels
#   filled  - whether a polygon is drawn filled or not
#   fill_color - color to fill polygon with
#   pattern - line pattern for road, river, etc.
#   display_level - highest zoom level at which to display the feature
#   label_level - highest zoom level at which to display the label
#   symbol  - 3 char 'TIO': table, ID, overlay
#
# NOTE: This file format is modeled after awk but is nowhere near awk
#  compatible.
#
# This file is used to map NWS offshore marine zone area polygon shapefiles
# which are named ozddmmyy.dbf.  These are used for WX alerts.
# For the WX alert feature, the key is set to the ID code.

# BEGIN is called once per dbf file which contains multiple records.
BEGIN {
# dbfinfo is the "signature" of the dbf file listing the column names in order.
# dbfinfo should match the dbf file that we say this dbfawk file goes with.
dbfinfo="ID:WFO:NAME:WFO_AREA:LON:LAT";
# dbffields is which of the above fields we actually want to look at.
# Note that the order we list these is important since we are appending the
# word County or Parish depending on what state the county is in.
dbffields="ID:NAME"}

# BEGIN_RECORD is called once per dbf record which contains multiple fields.
# Use this rule to re-initialize variables between records.
BEGIN_RECORD {key="BOGUS"; lanes=2; fill_color=7; color=8; name=""; filled=0; fill_style=0; pattern=0; display_level=65536; label_level=512; label_color=20; font_size=2; symbol=""}

/^ID=(.*)$/ {key="$1"; next}
/^NAME=(.*)$/ {name="$1"; next}

Index: Makefile.am
===================================================================
RCS file: /cvsroot/xastir/xastir/config/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Makefile.am	20 Oct 2005 21:52:32 -0000	1.23
--- Makefile.am	9 Nov 2005 05:44:09 -0000	1.24
***************
*** 28,31 ****
--- 28,32 ----
      nwsc_ddmmyy.dbfawk \
      nwsmzddmmyy.dbfawk \
+     nwsmzoddmmyy.dbfawk \
      nwsozddmmyy.dbfawk \
      nwsw_ddmmyy.dbfawk \

Update of /cvsroot/xastir/xastir/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13553/src

Modified Files:
	maps.c 
Log Message:
Add cancelled Alerts to list of mapped but don't draw on display.


Index: maps.c
===================================================================
RCS file: /cvsroot/xastir/xastir/src/maps.c,v
retrieving revision 1.451
retrieving revision 1.452
diff -C2 -d -r1.451 -r1.452
*** maps.c	20 Oct 2005 20:08:42 -0000	1.451
--- maps.c	9 Nov 2005 01:40:08 -0000	1.452
***************
*** 5930,5935 ****
  
              // Attempt to draw alert
!             if ( (temp->alert_level != 'C')             // Alert not cancelled
!                     && (temp->index != -1) ) {          // Shape found in shapefile
  
                  if (map_visible_lat_lon(temp->bottom_boundary, // Shape visible
--- 5930,5934 ----
  
              // Attempt to draw alert
!             if ( temp->index != -1 ) {          // Shape found in shapefile
  
                  if (map_visible_lat_lon(temp->bottom_boundary, // Shape visible
***************
*** 5939,5969 ****
                          temp->title) ) {    // Error text if failure
  
!                     mdf.draw_filled=1; 
!                     mdf.usgs_drg=0;
! 
!                     if (debug_level & 16)
!                         fprintf(stderr,"load_alert_maps: Calling draw_map\n");
!  
!                     draw_map (w,
!                         dir,
!                         temp->filename,
!                         temp,
!                         fill_color[level],
!                         DRAW_TO_PIXMAP_ALERTS,
!                         &mdf);  // draw filled
                      if (temp) temp->flags[on_screen] = 'Y';
                  }
                  else {
! 			if (debug_level & 16) fprintf(stderr,"load_alert_maps() Alert not visible\n");
!                         if (temp) temp->flags[on_screen] = 'N';
                  }
              }
              else {
!                 // Cancelled alert, can't find the shapefile, or not
!                 // in our viewport, don't draw it!
! 		if (debug_level & 16) fprintf(stderr,"load_alert_maps() Alert cancelled or shape not found\n");
!             }
!         }
!         temp = get_next_wx_alert(iterator);
      }
  #ifndef USING_LIBGC
--- 5938,5964 ----
                          temp->title) ) {    // Error text if failure
  
!                     if (temp->alert_level != 'C') {     // Alert not cancelled
!                         mdf.draw_filled=1;
!                         mdf.usgs_drg=0;
!   
!                         if (debug_level & 16)
!                           fprintf(stderr,"load_alert_maps: Calling draw_map\n");
!   
!                         draw_map (w, dir, temp->filename, temp,
!                                   fill_color[level], DRAW_TO_PIXMAP_ALERTS, &mdf);  // draw filled
!                     }
                      if (temp) temp->flags[on_screen] = 'Y';
                  }
                  else {
!                     if (debug_level & 16) fprintf(stderr,"load_alert_maps() Alert not visible\n");
!                     if (temp) temp->flags[on_screen] = 'N';
                  }
              }
              else {
!                   // Can't find the shapefile, or not in our viewport, don't draw it!
!                   if (debug_level & 16) fprintf(stderr,"load_alert_maps() Shape not found\n");
!               }
!           }
!           temp = get_next_wx_alert(iterator);
      }
  #ifndef USING_LIBGC

Update of /cvsroot/xastir/xastir/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10546/config

Added Files:
	nwszoddmmyy.dbfawk 
Log Message:
Add old Zone file match for older dbf structure.


--- NEW FILE: nwszoddmmyy.dbfawk ---
# $Id$
#
# Copyright (C) 2003-2005  The Xastir Group
#
# This dbfawk file is used to map arbitrary dbf data that accompanies
# a shapefile into Xastir canoncical values of:
#   key     - search key
#   lanes   - width of feature (usually a road but applies to rivers, etc. too)
#   color   - color to draw the road
#   name    - name of the road for labels
#   filled  - whether a polygon is drawn filled or not
#   fill_color - color to fill polygon with
#   pattern - line pattern for road, river, etc.
#   display_level - highest zoom level at which to display the feature
#   label_level - highest zoom level at which to display the label
#   symbol  - 3 char 'TIO': table, ID, overlay
#
# NOTE: This file format is modeled after awk but is nowhere near awk
#  compatible.
#
# This file is used to map NWS state zone area polygon shapefiles
# which are named z_ddmmyy.dbf.  These are used for WX alerts.
# For the WX alert feature, the key is set to the STATE_ZONE code,
# reformatted to match alert->title (e.g. KS033 is KS_Z033).

# BEGIN is called once per dbf file which contains multiple records.
BEGIN {
# dbfinfo is the "signature" of the dbf file listing the column names in order.
# dbfinfo should match the dbf file that we say this dbfawk file goes with.
dbfinfo="STATE:ZONE:CWA:NAME:STATE_ZONE:TIME_ZONE:FE_AREA:LON:LAT:SHORTNAME";
# dbffields is which of the above fields we actually want to look at.
# Note that the order we list these is important since we are appending the
# word County or Parish depending on what state the county is in.
dbffields="STATE_ZONE:NAME"}

# BEGIN_RECORD is called once per dbf record which contains multiple fields.
# Use this rule to re-initialize variables between records.
BEGIN_RECORD {key="BOGUS"; lanes=2; fill_color=7; color=8; name=""; filled=0; fill_style=0; pattern=0; display_level=65536; label_level=512; label_color=20; font_size=2; symbol=""}

/^STATE_ZONE=(..)(.*)$/ {key="$1_Z$2"; next}
/^NAME=(.*)$/ {name="$1"; next}