[cairo-commit] roadster/data layers.xml, 1.9, 1.10 roadster.glade, 1.12, 1.13

[Ian McIntosh]

Committed by: ian

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

Modified Files:
	layers.xml roadster.glade 
Log Message:
	* src/search_road.c:
	* src/import_tiger.c:
	* src/db.c: Removed Road_RoadName joiner table.  Roads can have only one name now (we never used this feature).
	* src/db.c: Removed warning for failed inserts (really should only avoid printing warnings for duplicates on unique keys).  Removed db_parse_point() that used MySQL's text format (no replacement yet but it's not used).  Removed some dead code.
	* src/mainwindow.c: Don't draw twice on zoom in/out.
	* src/map.c: Pulled font selection up a level, so it's done once per layer.  Added a demo of the scenemanager code (a square drawn on the map that text avoids!).  Tweaked scales for the zoom levels.
	* src/map_draw_cairo.c: Added a simpler line labeler for single-segment roads (we need to profile it to see if it's worth using).  Curved text is temporarily turned off because it doesn't use the scenemanager yet.  All gfloats to gdoubles.
        * src/scenemanager.c: Added scenemanager_can_draw_rectangle().


Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- layers.xml	8 Mar 2005 18:40:49 -0000	1.9
+++ layers.xml	10 Mar 2005 06:12:03 -0000	1.10
@@ -5,9 +5,9 @@
 
 <layer name="minor-roads">
 	<sublayer>
-		<property name="width" level="5" value="1.0" />
+		<property name="width" level="6" value="1.0" />
 		<property name="width" level="7" value="5.0" />
-		<property name="width" level="8" value="11.0" />
+		<property name="width" level="8" value="12.0" />
 		<property name="width" level="9" value="17.0" />
 		<property name="width" level="10" value="35.0" />
 		<property name="color" value="#b0b0b0ff" />
@@ -16,7 +16,7 @@
 	</sublayer>
 	<sublayer>
 		<property name="width" level="7" value="3.0" />
-		<property name="width" level="8" value="9.0" />
+		<property name="width" level="8" value="10.0" />
 		<property name="width" level="9" value="15.0" />
 		<property name="width" level="10" value="33.0" />
 		<property name="color" value="#fffbffff" />
@@ -25,7 +25,7 @@
 	</sublayer>
 	<label>
 		<property name="color" value="#FF000000" />
-		<property name="font-size" level="8" value="9" />
+		<property name="font-size" level="8" value="11" />
 		<property name="font-size" level="9" value="13" />
 		<property name="font-size" level="10" value="24" />
 	</label>

Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- roadster.glade	7 Mar 2005 05:30:10 -0000	1.12
+++ roadster.glade	10 Mar 2005 06:12:03 -0000	1.13
@@ -4113,7 +4113,6 @@
 	      <property name="visible">True</property>
 	      <property name="items" translatable="yes">Find An Address
 Find Points of Interest</property>
-	      <signal name="changed" handler="searchwindow_on_searchtypecombo_changed" last_modification_time="Mon, 07 Feb 2005 11:40:45 GMT"/>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>