[cairo-commit] roadster/data layers.xml,1.10,1.11

[Ian McIntosh]

Committed by: ian

Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv17508/data

Modified Files:
	layers.xml 
Log Message:
	* src/animator.h:
	* src/animator.c: New files.  Animates from 0.0 to 1.0 in various ways.
	* src/main.c: Add init for animator.c.
	* src/mainwindow.c: Add smoothly animated recentering.  Add different "draw pretty" timeout values for different operations.
	* src/gpsclient.c: Disabled temporarily, since we're not using it.
	* src/map_draw_cairo.c: Set font once per layer.  Do crude bounding box test for all objects (prevents nasty Cairo/X swap-death).
	* src/map_draw_gdk.c: Do crude bounding box test for all objects (faster).
	* src/welcomewindow.c: Point to new 2004 TIGER data.
	* data/layers.xml: Style tweaks.


Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- layers.xml	10 Mar 2005 06:12:03 -0000	1.10
+++ layers.xml	18 Mar 2005 08:37:35 -0000	1.11
@@ -34,8 +34,8 @@
 <layer name="major-roads">
 	<sublayer>
 		<property name="width" level="5" value="8.0" />
-		<property name="width" level="6" value="8.0" />
-		<property name="width" level="7" value="11.0" />
+		<property name="width" level="6" value="11.0" />
+		<property name="width" level="7" value="13.0" />
 		<property name="width" level="8" value="15.0" />
 		<property name="width" level="9" value="24.0" />
 		<property name="width" level="10" value="35.0" />
@@ -47,8 +47,8 @@
 		<property name="width" level="3" value="1.8" />
 		<property name="width" level="4" value="2.5" />
 		<property name="width" level="5" value="6.0" />
-		<property name="width" level="6" value="6.0" />
-		<property name="width" level="7" value="9.0" />
+		<property name="width" level="6" value="9.0" />
+		<property name="width" level="7" value="11.0" />
 		<property name="width" level="8" value="13.0" />
 		<property name="width" level="9" value="21.0" />
 		<property name="width" level="10" value="32.0" />
@@ -58,8 +58,8 @@
 	</sublayer>
 	<label>
 		<property name="color" value="#00000000" />
-		<property name="font-size" level="6" value="8" />
-		<property name="font-size" level="7" value="10" />
+		<property name="font-size" level="6" value="12" />
+		<property name="font-size" level="7" value="12" />
 		<property name="font-size" level="8" value="12" />
 		<property name="font-size" level="9" value="20" />
 		<property name="font-size" level="10" value="34" />
@@ -72,9 +72,9 @@
 		<property name="width" level="3" value="4.0" />
 		<property name="width" level="4" value="5.0" />
 		<property name="width" level="5" value="8.0" />
-		<property name="width" level="6" value="9.0" />
-		<property name="width" level="7" value="10.0" />
-		<property name="width" level="8" value="11.0" />
+		<property name="width" level="6" value="13.0" />
+		<property name="width" level="7" value="15.0" />
+		<property name="width" level="8" value="15.0" />
 		<property name="width" level="9" value="27.0" />
 		<property name="width" level="10" value="35.0" />
 		<property name="color" value="#ad8e21ff" />
@@ -85,9 +85,9 @@
 		<property name="width" level="3" value="2.5" />
 		<property name="width" level="4" value="3.1" />
 		<property name="width" level="5" value="6.5" />
-		<property name="width" level="6" value="7.0" />
-		<property name="width" level="7" value="8.0" />
-		<property name="width" level="8" value="9.0" />
+		<property name="width" level="6" value="11.0" />
+		<property name="width" level="7" value="13.0" />
+		<property name="width" level="8" value="13.0" />
 		<property name="width" level="9" value="25.0" />
 		<property name="width" level="10" value="33.0" />
 		<property name="color" value="#f7df4aff" />
@@ -96,17 +96,18 @@
 	</sublayer>
 	<label>
 		<property name="color" value="#00000000" />
-		<property name="font-size" level="6" value="6" />
+		<property name="font-size" level="6" value="12" />
 		<property name="font-size" level="7" value="12" />
 		<property name="font-size" level="8" value="16" />
 		<property name="font-size" level="9" value="18" />
 		<property name="font-size" level="10" value="26" />
-		<property name="bold" level="7" value="yes" />
+		<property name="bold" level="6" value="yes" />
 	</label>
 </layer>
 
 <layer name="minor-highway-ramps">
 	<sublayer>
+		<property name="width" level="6" value="3.0" />
 		<property name="width" level="7" value="3.0" />
 		<property name="width" level="8" value="5.0" />
 		<property name="width" level="9" value="8.0" />
@@ -117,8 +118,8 @@
 	</sublayer>
 	<sublayer>
 		<property name="width" level="6" value="1.0" />
-		<property name="width" level="7" value="1.5" />
-		<property name="width" level="8" value="3.5" />
+		<property name="width" level="7" value="1.0" />
+		<property name="width" level="8" value="3.0" />
 		<property name="width" level="9" value="6.0" />
 		<property name="width" level="10" value="8.0" />
 		<property name="color" value="#f7df4aff" />