"organize precedence of utmviewer commands, suppress output of multi-frame objects in a mapserv document"

[<joh...@ie...>]

Patch:    vhclmaps-000321-johnston-014
For:      vhclmaps-0.7.4
Author:   joh...@us...
Subject:  organize precedence of utmviewer commands, suppress output of multi-frame objects in a mapserv document
Requires: ivtools-000321-johnston-033

This is an intermediate patch to vhclmaps-0.7.4.  To apply, cd to the
top-level directory of the vhclmaps source tree (the directory with src
and config subdirs), and apply like this:

	patch -p0 <ThisFile

Summary of Changes:

- suppress output of multi-frame objects in a mapserv document.

- reorganize inclusion of commands into a utmviewer command
interpreter to ensure MapPointsFunc is what the point command resolves
to, and GrDotFunc is what "." resolves to.

Index: MapUnidraw/maproute.c
diff -c MapUnidraw/maproute.c:1.2 MapUnidraw/maproute.c:1.3
*** MapUnidraw/maproute.c:1.2	Mon Feb 28 17:27:53 2000
--- src/MapUnidraw/maproute.c	Tue Mar 21 12:03:11 2000
***************
*** 1,4 ****
--- 1,5 ----
  /*
+  * Copyright 2000 IET Inc.
   * Copyright 1997 Vectaport Inc.
   *
   * Permission to use, copy, modify, distribute, and sell this software and
Index: MapUnidraw/mapscripts.c
diff -c MapUnidraw/mapscripts.c:1.2 MapUnidraw/mapscripts.c:1.3
*** MapUnidraw/mapscripts.c:1.2	Sat Mar 18 02:24:03 2000
--- src/MapUnidraw/mapscripts.c	Tue Mar 21 12:03:12 2000
***************
*** 1,4 ****
--- 1,5 ----
  /*
+  * Copyright 2000 IET Inc.
   * Copyright 1995-1997 Vectaport Inc.
   *
   * Permission to use, copy, modify, distribute, and sell this software and
***************
*** 38,43 ****
--- 39,46 ----
  #include <Map/mapprim.h>
  #include <Map/mapproject.h>
  
+ #include <FrameUnidraw/frameclasses.h>
+ 
  #include <OverlayUnidraw/paramlist.h>
  #include <OverlayUnidraw/ovclasses.h>
  #include <OverlayUnidraw/ovfile.h>
***************
*** 543,548 ****
--- 546,553 ----
  	ExternView* ev = GetView(i);
          if (exporttype != OvIdrawType)
  	    Indent(out);
+ 	if (ev->IsA(FRAME_SCRIPT)) 
+ 	  ((FrameScript*)ev)->suppress_frame();
          status = ev->Definition(out);
  	Next(i);
  	if (!Done(i)) out << ",\n";
Index: UtmUnidraw/utmeditor.c
diff -c UtmUnidraw/utmeditor.c:1.3 UtmUnidraw/utmeditor.c:1.4
*** UtmUnidraw/utmeditor.c:1.3	Sat Mar 18 02:24:08 2000
--- src/UtmUnidraw/utmeditor.c	Tue Mar 21 12:03:21 2000
***************
*** 30,35 ****
--- 30,36 ----
  #include <MapUnidraw/mapcreator.h>
  #include <MapUnidraw/mapviewer.h>
  #include <MapUnidraw/mapviewstate.h>
+ #include <ComUnidraw/grdotfunc.h>
  #include <Unidraw/catalog.h>
  #include <Unidraw/iterator.h>
  #include <Unidraw/unidraw.h>
***************
*** 130,142 ****
      comterp->add_command("mapviewstate", new MapViewStateFunc(comterp, this));
      comterp->add_command("utmtoscreen", new UtmToScreenFunc(comterp, this));
  
-     MapservHandler::AddCommands(comterp);
      ComEditor::AddCommands(comterp);
  
! #if 0
!     // override more generic "points" func.  -- now in mapserv
!     comterp->add_command("points", new MapPointsFunc(comterp, this));
! #endif
  }
  
  
--- 131,141 ----
      comterp->add_command("mapviewstate", new MapViewStateFunc(comterp, this));
      comterp->add_command("utmtoscreen", new UtmToScreenFunc(comterp, this));
  
      ComEditor::AddCommands(comterp);
+     MapservHandler::AddCommands(comterp);
  
!     // override more generic dot func
!     comterp->add_command("dot", new GrDotFunc(comterp));
  }
  
  
*** /dev/null	 Tue Mar 21 12:03:47 PST 2000
--- patches/vhclmaps-000321-johnston-014
*************** patches/vhclmaps-000321-johnston-014
*** 0 ****
--- 1 ----
+ vhclmaps-000321-johnston-014