From 82a9bf338060776fdf871dca90880eb7ca6bdbe6 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Sat, 20 Nov 2010 21:11:27 +0000 Subject: [PATCH] fixed use of commas in WGS84 coordinates git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@363 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractEfaProvider.java | 5 +++-- src/de/schildbach/pte/LinzProvider.java | 5 +++-- src/de/schildbach/pte/MvvProvider.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 6cfbae0c..facf5553 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -26,6 +26,7 @@ import java.util.GregorianCalendar; import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.TimeZone; import java.util.regex.Matcher; @@ -1160,8 +1161,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider if ((location.type == LocationType.POI || location.type == LocationType.ADDRESS) && location.lat != 0 && location.lon != 0) { uri.append("&type_").append(paramSuffix).append("=coord"); - uri.append("&name_").append(paramSuffix).append("=").append(String.format("%2.6f:%2.6f", location.lon / 1E6, location.lat / 1E6)).append( - ":WGS84[DD.dddddd]"); + uri.append("&name_").append(paramSuffix).append("=").append( + String.format(Locale.ENGLISH, "%.6f:%.6f", location.lon / 1E6, location.lat / 1E6)).append(":WGS84"); } else { diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java index b0058036..7e321467 100644 --- a/src/de/schildbach/pte/LinzProvider.java +++ b/src/de/schildbach/pte/LinzProvider.java @@ -20,6 +20,7 @@ package de.schildbach.pte; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; import de.schildbach.pte.dto.Location; import de.schildbach.pte.util.ParserUtils; @@ -57,7 +58,7 @@ public class LinzProvider extends AbstractEfaProvider @Override protected String nearbyLatLonUri(final int lat, final int lon) { - return String.format(NEARBY_LATLON_URI, latLonToDouble(lon), latLonToDouble(lat)); + return String.format(Locale.ENGLISH, NEARBY_LATLON_URI, latLonToDouble(lon), latLonToDouble(lat)); } private static final String NEARBY_STATION_URI = API_BASE @@ -110,7 +111,7 @@ public class LinzProvider extends AbstractEfaProvider uri.append("&ptOptionsActive=1"); uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed)); uri.append(productParams(products)); - + uri.append("&useRealtime=1"); return uri.toString(); diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index 3003ea08..7d50141f 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/src/de/schildbach/pte/MvvProvider.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -67,7 +68,7 @@ public class MvvProvider extends AbstractEfaProvider @Override protected String nearbyLatLonUri(final int lat, final int lon) { - return String.format(NEARBY_LATLON_URI, latLonToDouble(lon), latLonToDouble(lat)); + return String.format(Locale.ENGLISH, NEARBY_LATLON_URI, latLonToDouble(lon), latLonToDouble(lat)); } private static final String NEARBY_STATION_URI = "http://efa.mvv-muenchen.de/ultralite/XML_DM_REQUEST"