[GRASS-SVN] r49063 - grass-addons/vector/v.in.osm2

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-11-02 22:55:21 -0700 (Wed, 02 Nov 2011)
New Revision: 49063

Modified:
   grass-addons/vector/v.in.osm2/v.in.osm
Log:
update to pull from replacement java-Xapi server (#1482)

Modified: grass-addons/vector/v.in.osm2/v.in.osm
===================================================================
--- grass-addons/vector/v.in.osm2/v.in.osm	2011-11-02 22:44:55 UTC (rev 49062)
+++ grass-addons/vector/v.in.osm2/v.in.osm	2011-11-03 05:55:21 UTC (rev 49063)
@@ -48,7 +48,16 @@
 #%  description: For example: "way[highway=track|path]"
 #%  required : no
 #%end
+#%option
+#%  key: server
+#%  type: string
+#%  description: Xapi server
+#%  answer: http://jxapi.openstreetmap.org/xapi/api/0.6
+#%end
+#failover server 1: http://open.mapquestapi.com/xapi/api/0.6
+#failover server 2: http://jxapi.osm.rambler.ru/xapi/api/0.6
 
+
 if [ -z "$GISBASE" ] ; then
    echo "You must be in GRASS GIS to run this program." >&2
    exit 1
@@ -87,10 +96,10 @@
     exit 1
 fi
 
-BASEURL="http://osmxapi.hypercube.telascience.org/api/0.6"
+BASEURL="$GIS_OPT_SERVER"
 
 if [ -z "$GIS_OPT_QUERY" ] ; then
-   wget -O "$TEMPFILE" "$BASEURL/map?bbox=$BBOX"
+   wget -O "$TEMPFILE" "$BASEURL/*[bbox=$BBOX]"
 else
    wget -O "$TEMPFILE" "$BASEURL/$GIS_OPT_QUERY[bbox=$BBOX]"
 fi