Added with code removed from map module.

Removed.
Moved static data to road.c. Removed global map object and moved to
    allocated map object (all map_* functions take a map pointer now).
    Trying to switch to threaded rendering (currently disabled).
Added support for locking.
Now owns an allocated map object. Switched from single-click to
    double-click to move around.
Talk to mainwindow only, not map.
Don't store loaded map data in the layers settings structure. (Stored in
    map object now.)
Changed main_init() to return boolean.
Removed global data, switched to allocated (a scenemanager is owned by a
    map).
Can now deal with search strings containing newlines and other whitespace
    junk.
Perform exact-match for street names of 3 or fewer chars for speed and
    results quality.

1 files changed, 221 insertions, 0 deletions

diff --git a/src/road.c b/src/road.c
new file mode 100644
index 0000000..4eb16c7
--- /dev/null
+++ b/src/road.c
@@ -0,0 +1,221 @@
+/***************************************************************************
+ *            road.c
+ *
+ *  Copyright  2005  Ian McIntosh
+ *  ian_mcintosh@linuxadvocate.org
+ ****************************************************************************/
+
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <gnome.h>
+#include "road.h"
+#include "util.h"
+
+struct {
+	gchar* m_pszLong;
+	gchar* m_pszShort;
+} g_RoadNameSuffix[] = {
+	{"",""},
+	{"Road", "Rd"},
+	{"Street", "St"},
+	{"Drive", "Dr"},
+	{"Boulevard", "Bvd"},
+	{"Avenue", "Ave"},
+	{"Circle", "Crl"},
+	{"Square", "Sq"},
+	{"Path", "Pth"},
+	{"Way", "Wy"},
+	{"Plaza", "Plz"},
+	{"Trail", "Trl"},
+	{"Lane", "Ln"},
+	{"Crossing", "Xing"},
+	{"Place", "Pl"},
+	{"Court", "Ct"},
+	{"Turnpike", "Tpke"},
+	{"Terrace", "Ter"},
+	{"Row", "Row"},
+	{"Parkway", "Pky"},
+	
+	{"Bridge", "Brg"},
+	{"Highway", "Hwy"},
+	{"Run", "Run"},
+	{"Pass", "Pass"},
+	
+	{"Freeway", "Fwy"},
+	{"Alley", "Aly"},
+	{"Crescent", "Cres"},
+	{"Tunnel", "Tunl"},
+	{"Walk", "Walk"},
+	{"Terrace", "Trce"},
+	{"Branch", "Br"},
+	{"Cove", "Cv"},
+	{"Bypass", "Byp"},
+	{"Loop", "Loop"},
+	{"Spur", "Spur"},
+	{"Ramp", "Ramp"},
+	{"Pike", "Pike"},
+	{"Grade", "Grd"},
+	{"Route", "Rte"},
+	{"Arc", "Arc"},
+};
+
+struct {
+	gchar* m_pszName;
+	gint m_nID;
+} g_RoadNameSuffixLookup[] = {
+	{"Rd", ROAD_SUFFIX_ROAD},
+	{"Road", ROAD_SUFFIX_ROAD},
+
+	{"St", ROAD_SUFFIX_STREET},
+	{"Street", ROAD_SUFFIX_STREET},
+
+	{"Dr", ROAD_SUFFIX_DRIVE},
+	{"Drive", ROAD_SUFFIX_DRIVE},
+
+	{"Blv", ROAD_SUFFIX_BOULEVARD},
+	{"Blvd", ROAD_SUFFIX_BOULEVARD},
+	{"Boulevard", ROAD_SUFFIX_BOULEVARD},
+
+	{"Av", ROAD_SUFFIX_AVENUE},
+	{"Ave", ROAD_SUFFIX_AVENUE},
+	{"Avenue", ROAD_SUFFIX_AVENUE},
+	
+	{"Cir", ROAD_SUFFIX_CIRCLE},
+	{"Crl", ROAD_SUFFIX_CIRCLE},
+	{"Circle", ROAD_SUFFIX_CIRCLE},
+
+	{"Sq", ROAD_SUFFIX_SQUARE},
+	{"Square", ROAD_SUFFIX_SQUARE},	
+
+	{"Pl", ROAD_SUFFIX_PLACE},
+	{"Place", ROAD_SUFFIX_PLACE},
+	
+	{"Xing", ROAD_SUFFIX_CROSSING},
+	{"Crossing", ROAD_SUFFIX_CROSSING},
+
+	{"Ct", ROAD_SUFFIX_COURT},
+	{"Court", ROAD_SUFFIX_COURT},
+
+	{"Tpke", ROAD_SUFFIX_TURNPIKE},
+	{"Turnpike", ROAD_SUFFIX_TURNPIKE},
+
+	{"Ter", ROAD_SUFFIX_TERRACE},
+	{"Terrace", ROAD_SUFFIX_TERRACE},
+	
+	{"Row", ROAD_SUFFIX_ROW},
+
+	{"Pth", ROAD_SUFFIX_PATH},
+	{"Path", ROAD_SUFFIX_PATH},	
+
+	{"Wy", ROAD_SUFFIX_WAY},
+	{"Way", ROAD_SUFFIX_WAY},	
+
+	{"Plz", ROAD_SUFFIX_PLAZA},
+	{"Plaza", ROAD_SUFFIX_PLAZA},	
+
+	{"Trl", ROAD_SUFFIX_TRAIL},
+	{"Trail", ROAD_SUFFIX_TRAIL},	
+	
+	{"Ln", ROAD_SUFFIX_LANE},
+	{"Lane", ROAD_SUFFIX_LANE},	
+	
+	{"Pky", ROAD_SUFFIX_PARKWAY},
+	{"Parkway", ROAD_SUFFIX_PARKWAY},
+
+	{"Brg", ROAD_SUFFIX_BRIDGE},
+	{"Bridge", ROAD_SUFFIX_BRIDGE},
+
+	{"Hwy", ROAD_SUFFIX_HIGHWAY},
+	{"Highway", ROAD_SUFFIX_HIGHWAY},
+
+	{"Run", ROAD_SUFFIX_RUN},
+
+	{"Pass", ROAD_SUFFIX_PASS},
+
+	{"Freeway", ROAD_SUFFIX_FREEWAY},
+	{"Fwy", ROAD_SUFFIX_FREEWAY},
+	
+	{"Alley", ROAD_SUFFIX_ALLEY},
+	{"Aly", ROAD_SUFFIX_ALLEY},
+	
+	{"Crescent", ROAD_SUFFIX_CRESCENT},
+	{"Cres", ROAD_SUFFIX_CRESCENT},
+	
+	{"Tunnel", ROAD_SUFFIX_TUNNEL},
+	{"Tunl", ROAD_SUFFIX_TUNNEL},
+	
+	{"Walk", ROAD_SUFFIX_WALK},
+	{"Walk", ROAD_SUFFIX_WALK},
+	
+	{"Branch", ROAD_SUFFIX_BRANCE},
+	{"Br", ROAD_SUFFIX_BRANCE},
+	
+	{"Cove", ROAD_SUFFIX_COVE},
+	{"Cv", ROAD_SUFFIX_COVE},
+	
+	{"Bypass", ROAD_SUFFIX_BYPASS},
+	{"Byp", ROAD_SUFFIX_BYPASS},
+	
+	{"Loop", ROAD_SUFFIX_LOOP},
+	
+	{"Spur", ROAD_SUFFIX_SPUR},
+	
+	{"Ramp", ROAD_SUFFIX_RAMP},
+	
+	{"Pike", ROAD_SUFFIX_PIKE},
+	
+	{"Grade", ROAD_SUFFIX_GRADE},
+	{"Grd", ROAD_SUFFIX_GRADE},
+	
+	{"Route", ROAD_SUFFIX_ROUTE},
+	{"Rte", ROAD_SUFFIX_ROUTE},
+	
+	{"Arc", ROAD_SUFFIX_ARC},
+
+};
+
+
+// ========================================================
+//	Road Direction / Suffix conversions
+// ========================================================
+
+const gchar* road_suffix_itoa(gint nSuffixID, ESuffixLength eSuffixLength)
+{
+	if(nSuffixID >= ROAD_SUFFIX_FIRST && nSuffixID <= ROAD_SUFFIX_LAST) {
+		if(eSuffixLength == ROAD_SUFFIX_LENGTH_SHORT) {
+			return g_RoadNameSuffix[nSuffixID].m_pszShort;
+		}
+		else {
+			return g_RoadNameSuffix[nSuffixID].m_pszLong;			
+		}
+	}
+	if(nSuffixID != ROAD_SUFFIX_NONE) return "???";
+	return "";
+}
+
+gboolean road_suffix_atoi(const gchar* pszSuffix, gint* pReturnSuffixID)
+{
+	gint i;
+	for(i=0 ; i<NUM_ELEMS(g_RoadNameSuffixLookup) ; i++) {
+		if(g_ascii_strcasecmp(pszSuffix, g_RoadNameSuffixLookup[i].m_pszName) == 0) {
+			*pReturnSuffixID = g_RoadNameSuffixLookup[i].m_nID;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+