[cairo-commit] roadster/include layers.h, 1.1.1.1, 1.2 scenemanager.h, 1.1.1.1, 1.2 util.h, 1.1.1.1, 1.2

[Ian McIntosh]

Committed by: ian

Update of /cvs/cairo/roadster/include
In directory gabe:/tmp/cvs-serv30300/include

Modified Files:
	layers.h scenemanager.h util.h 
Log Message:
roadster.glade: Removed sidebar search, put search field in toolbar.
search_road.c: Added room for city, state, zip to search results.
layers.h: Added LAYER_MISC_AREA for schools, hospitals, etc.  Added "bold" setting for layer font style.
scenemanager.c: Added beginning of a scenemanager to handle font layout.
import.c: Don't disable database indexes during import (may be causing flaky behavior)
import_tiger.c: Fixed 'nan' import bug.  Fixed bug in polygon stitching. Added check for county boundaries (currently unused).  Added check for LAYER_MISC_AREA type.  Added support for LAYER_RIVER.
layers.c: Added LAYER_MISC_AREA style.  Added font styles to all layers.
mainwindow.c: Changed cairo include path from <cairo/cairo.h> to <cairo.h>
map.c: Added #define to hack around Cairo line cap bug.  Tweaked zoom level.  Added support for label styles.


Index: layers.h
===================================================================
RCS file: /cvs/cairo/roadster/include/layers.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- layers.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ layers.h	22 Feb 2005 04:47:24 -0000	1.2
@@ -20,7 +20,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
+
 #ifndef _LAYERS_H
 #define _LAYERS_H
 
@@ -38,17 +38,18 @@
 #define LAYER_MAJORSTREET		(2)
 #define LAYER_MINORHIGHWAY		(3)
 #define LAYER_MINORHIGHWAY_RAMP	(4)
-#define LAYER_MAJORHIGHWAY		(5)
-#define LAYER_MAJORHIGHWAY_RAMP	(6)
+#define LAYER_MAJORHIGHWAY		(5)	// used?
+#define LAYER_MAJORHIGHWAY_RAMP	(6)	// used?
 #define LAYER_RAILROAD			(7)
 #define LAYER_PARK				(8)
 #define LAYER_RIVER				(9)
 #define LAYER_LAKE				(10)
+#define LAYER_MISC_AREA			(11)
 
-#define NUM_LAYERS 				(10)
+#define NUM_LAYERS 				(11)
 	
 #define LAYER_FIRST				(1)
-#define LAYER_LAST				(10)
+#define LAYER_LAST				(11)
 
 typedef struct color {
 	gfloat m_fRed;
@@ -83,6 +84,7 @@
 
 typedef struct textlabelstyle {
 	gdouble m_afFontSizeAtZoomLevel[MAX_ZOOM_LEVEL];
+	gint m_abBoldAtZoomLevel[MAX_ZOOM_LEVEL];	// 0s or 1s
 	gint m_abHaloAtZoomLevel[MAX_ZOOM_LEVEL];	// 0s or 1s
 	color_t m_clrColor;
 	// font family...

Index: scenemanager.h
===================================================================
RCS file: /cvs/cairo/roadster/include/scenemanager.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- scenemanager.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ scenemanager.h	22 Feb 2005 04:47:24 -0000	1.2
@@ -20,3 +20,5 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
+void scenemanager_init();

Index: util.h
===================================================================
RCS file: /cvs/cairo/roadster/include/util.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- util.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ util.h	22 Feb 2005 04:47:24 -0000	1.2
@@ -20,7 +20,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
+
 #ifndef _UTIL_H_
 #define _UTIL_H_