From f23475ad1bb7f32fc2982375115b0e38e008f172 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 19 Jun 2010 17:13:52 +0000 Subject: [PATCH] add non-nls strings git-svn-id: https://osmand.googlecode.com/svn/trunk@177 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8 --- .../src/com/osmand/map/TileSourceManager.java | 34 ++++++------- .../src/com/osmand/osm/LatLon.java | 2 +- .../src/com/osmand/osm/MapUtils.java | 4 +- .../src/com/osmand/osm/OSMSettings.java | 46 +++++++++--------- .../src/com/osmand/osm/io/OsmBaseStorage.java | 48 +++++++++---------- OsmAnd/src/com/osmand/ResourceManager.java | 5 +- .../osmand/activities/EditingPOIActivity.java | 6 +-- .../osmand/activities/MainMenuActivity.java | 5 +- .../com/osmand/activities/RoutingHelper.java | 40 ++++++++-------- OsmAnd/src/com/osmand/views/OsmBugsLayer.java | 2 +- 10 files changed, 97 insertions(+), 95 deletions(-) diff --git a/DataExtractionOSM/src/com/osmand/map/TileSourceManager.java b/DataExtractionOSM/src/com/osmand/map/TileSourceManager.java index c9e884f390..399fdb0c71 100644 --- a/DataExtractionOSM/src/com/osmand/map/TileSourceManager.java +++ b/DataExtractionOSM/src/com/osmand/map/TileSourceManager.java @@ -122,60 +122,60 @@ public class TileSourceManager { public static TileSourceTemplate getMapnikSource(){ - return new TileSourceTemplate("Mapnik", "http://tile.openstreetmap.org/{0}/{1}/{2}.png", ".png", 18, 1, 256, 18000); + return new TileSourceTemplate("Mapnik", "http://tile.openstreetmap.org/{0}/{1}/{2}.png", ".png", 18, 1, 256, 18000); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getOsmaRenderSource(){ - return new TileSourceTemplate("OsmaRender", "http://tah.openstreetmap.org/Tiles/tile/{0}/{1}/{2}.png", ".png", 17, 1, 256, 18000); + return new TileSourceTemplate("OsmaRender", "http://tah.openstreetmap.org/Tiles/tile/{0}/{1}/{2}.png", ".png", 17, 1, 256, 18000); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getCycleMapSource(){ - return new TileSourceTemplate("CycleMap", "http://b.andy.sandbox.cloudmade.com/tiles/cycle/{0}/{1}/{2}.png", ".png", 17, 0, 256, 18000); + return new TileSourceTemplate("CycleMap", "http://b.andy.sandbox.cloudmade.com/tiles/cycle/{0}/{1}/{2}.png", ".png", 17, 0, 256, 18000); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getAerialMapSource(){ - return new TileSourceTemplate("OpenAerialMap", "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/{0}/{1}/{2}.jpg", ".jpg", 13, 0, 256, 18000); + return new TileSourceTemplate("OpenAerialMap", "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/{0}/{1}/{2}.jpg", ".jpg", 13, 0, 256, 18000); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getCloudMadeSource(){ - return new TileSourceTemplate("Cloudmade", "http://tile.cloudmade.com/7ded028e030c5929b28bf823486ce84f/1/256/{0}/{1}/{2}.png", ".png", 18, 0, 256, 18000); + return new TileSourceTemplate("Cloudmade", "http://tile.cloudmade.com/7ded028e030c5929b28bf823486ce84f/1/256/{0}/{1}/{2}.png", ".png", 18, 0, 256, 18000); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getMapSurferSource(){ - return new TileSourceTemplate("MapSurfer", "http://tiles1.mapsurfer.net/tms_r.ashx?z={0}&x={1}&y={2}", ".png", 19, 0, 256, 18000); + return new TileSourceTemplate("MapSurfer", "http://tiles1.mapsurfer.net/tms_r.ashx?z={0}&x={1}&y={2}", ".png", 19, 0, 256, 18000);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getNavigationDebugSource(){ - return new TileSourceTemplate("NavigationDebug", "http://ec2-184-73-15-218.compute-1.amazonaws.com/6700/256/{0}/{1}/{2}.png", ".png", 18, 0, 256, 18000); + return new TileSourceTemplate("NavigationDebug", "http://ec2-184-73-15-218.compute-1.amazonaws.com/6700/256/{0}/{1}/{2}.png", ".png", 18, 0, 256, 18000); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getOpenPisteMapSource(){ - return new TileSourceTemplate("OpenPisteMap", "http://openpistemap.org/tiles/contours/{0}/{1}/{2}.png", ".png", 17, 0, 256, 18000); + return new TileSourceTemplate("OpenPisteMap", "http://openpistemap.org/tiles/contours/{0}/{1}/{2}.png", ".png", 17, 0, 256, 18000); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getGoogleMapsSource(){ - return new TileSourceTemplate("GoogleMaps", "http://mt3.google.com/vt/v=w2.97&x={1}&y={2}&z={0}", ".png", 19, 0, 256, 18000); + return new TileSourceTemplate("GoogleMaps", "http://mt3.google.com/vt/v=w2.97&x={1}&y={2}&z={0}", ".png", 19, 0, 256, 18000); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getGoogleMapsSatelliteSource(){ - return new TileSourceTemplate("GoogleMaps Satellite", "http://khm1.google.com/kh/v=59&x={1}&y={2}&z={0}", ".jpg", 20, 0, 256, 18000); + return new TileSourceTemplate("GoogleMaps Satellite", "http://khm1.google.com/kh/v=59&x={1}&y={2}&z={0}", ".jpg", 20, 0, 256, 18000); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getGoogleMapsTerrainSource(){ - return new TileSourceTemplate("GoogleMaps Terrain", "http://mt3.google.com/vt/v=w2p.111&hl=en&x={1}&y={2}&z={0}", ".jpg", 15, 0, 256, 18000); + return new TileSourceTemplate("GoogleMaps Terrain", "http://mt3.google.com/vt/v=w2p.111&hl=en&x={1}&y={2}&z={0}", ".jpg", 15, 0, 256, 18000); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getMicrosoftMapsSource(){ - return new MicrosoftTileSourceTemplate("Microsoft Maps", 'r', "png", ".png", 19, 1, 256, 18000); + return new MicrosoftTileSourceTemplate("Microsoft Maps", 'r', "png", ".png", 19, 1, 256, 18000); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getMicrosoftEarthSource(){ - return new MicrosoftTileSourceTemplate("Microsoft Earth", 'a', "jpg", ".jpg", 19, 1, 256, 18000); + return new MicrosoftTileSourceTemplate("Microsoft Earth", 'a', "jpg", ".jpg", 19, 1, 256, 18000); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public static TileSourceTemplate getMicrosoftHybridSource(){ - return new MicrosoftTileSourceTemplate("Microsoft Hybrid", 'h', "jpg", ".jpg", 19, 1, 256, 18000); + return new MicrosoftTileSourceTemplate("Microsoft Hybrid", 'h', "jpg", ".jpg", 19, 1, 256, 18000); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } @@ -206,8 +206,8 @@ public class TileSourceManager { private final char mapTypeChar; int serverNum = 0; // 0..3 - protected String urlBase = ".ortho.tiles.virtualearth.net/tiles/"; - protected String urlAppend = "?g=45"; + protected String urlBase = ".ortho.tiles.virtualearth.net/tiles/"; //$NON-NLS-1$ + protected String urlAppend = "?g=45"; //$NON-NLS-1$ private final String tileType; public MicrosoftTileSourceTemplate(String name, char mapTypeChar , String type, @@ -222,7 +222,7 @@ public class TileSourceManager { public String getUrlToLoad(int x, int y, int zoom) { String tileNum = encodeQuadTree(zoom, x, y); // serverNum = (serverNum + 1) % serverNumMax; - return "http://" + mapTypeChar + serverNum + urlBase + mapTypeChar + tileNum + "." + return "http://" + mapTypeChar + serverNum + urlBase + mapTypeChar + tileNum + "." //$NON-NLS-1$ //$NON-NLS-2$ + tileType + urlAppend; } diff --git a/DataExtractionOSM/src/com/osmand/osm/LatLon.java b/DataExtractionOSM/src/com/osmand/osm/LatLon.java index 6f63d64ada..2c0450773a 100644 --- a/DataExtractionOSM/src/com/osmand/osm/LatLon.java +++ b/DataExtractionOSM/src/com/osmand/osm/LatLon.java @@ -38,7 +38,7 @@ public class LatLon { } @Override public String toString() { - return "Lat " + latitude +" Lon "+ longitude; + return "Lat " + latitude +" Lon "+ longitude; //$NON-NLS-1$ //$NON-NLS-2$ } public double getLatitude() { diff --git a/DataExtractionOSM/src/com/osmand/osm/MapUtils.java b/DataExtractionOSM/src/com/osmand/osm/MapUtils.java index 609b3a7a11..8c27a7ddbb 100644 --- a/DataExtractionOSM/src/com/osmand/osm/MapUtils.java +++ b/DataExtractionOSM/src/com/osmand/osm/MapUtils.java @@ -210,9 +210,9 @@ public class MapUtils { if(meters >= 100000){ return meters / 1000 + " km"; } else if(meters >= 10000){ - return MessageFormat.format("{0, number, #.#} km", ((float) meters) / 1000); + return MessageFormat.format("{0, number, #.#}"+" km", ((float) meters) / 1000); //$NON-NLS-1$ } else if(meters > 1500){ - return MessageFormat.format("{0, number, #.##} km", ((float) meters) / 1000); + return MessageFormat.format("{0, number, #.##}"+" km", ((float) meters) / 1000); //$NON-NLS-1$ } else { return meters + " m"; } diff --git a/DataExtractionOSM/src/com/osmand/osm/OSMSettings.java b/DataExtractionOSM/src/com/osmand/osm/OSMSettings.java index 7e91465216..1c38f7c582 100644 --- a/DataExtractionOSM/src/com/osmand/osm/OSMSettings.java +++ b/DataExtractionOSM/src/com/osmand/osm/OSMSettings.java @@ -3,33 +3,33 @@ package com.osmand.osm; public class OSMSettings { public enum OSMTagKey { - NAME("name"), - NAME_EN("name:en"), + NAME("name"), //$NON-NLS-1$ + NAME_EN("name:en"), //$NON-NLS-1$ // ways - HIGHWAY("highway"), - BUILDING("building"), + HIGHWAY("highway"), //$NON-NLS-1$ + BUILDING("building"), //$NON-NLS-1$ // transport - ROUTE("route"), - OPERATOR("operator"), - REF("ref"), + ROUTE("route"), //$NON-NLS-1$ + OPERATOR("operator"), //$NON-NLS-1$ + REF("ref"), //$NON-NLS-1$ // address - PLACE("place"), - ADDR_HOUSE_NUMBER("addr:housenumber"), - ADDR_STREET("addr:street"), - ADDR_POSTCODE("addr:postcode"), + PLACE("place"), //$NON-NLS-1$ + ADDR_HOUSE_NUMBER("addr:housenumber"), //$NON-NLS-1$ + ADDR_STREET("addr:street"), //$NON-NLS-1$ + ADDR_POSTCODE("addr:postcode"), //$NON-NLS-1$ // POI - AMENITY("amenity"), - SHOP("shop"), - LEISURE("leisure"), - TOURISM("tourism"), - SPORT("sport"), - HISTORIC("historic"), - NATURAL("natural"), - INTERNET_ACCESS("internet_access"), + AMENITY("amenity"), //$NON-NLS-1$ + SHOP("shop"), //$NON-NLS-1$ + LEISURE("leisure"), //$NON-NLS-1$ + TOURISM("tourism"), //$NON-NLS-1$ + SPORT("sport"), //$NON-NLS-1$ + HISTORIC("historic"), //$NON-NLS-1$ + NATURAL("natural"), //$NON-NLS-1$ + INTERNET_ACCESS("internet_access"), //$NON-NLS-1$ - OPENING_HOURS("opening_hours"), + OPENING_HOURS("opening_hours"), //$NON-NLS-1$ ; private final String value; @@ -53,9 +53,9 @@ public class OSMSettings { public static boolean wayForCar(String tagHighway){ if(tagHighway != null){ - String[] cars = new String[]{"trunk", "motorway", "primary", "secondary", "tertiary", "service", "residential", - "trunk_link", "motorway_link", "primary_link", "secondary_link", "residential_link", - "tertiary_link", "track" }; + String[] cars = new String[]{"trunk", "motorway", "primary", "secondary", "tertiary", "service", "residential", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ + "trunk_link", "motorway_link", "primary_link", "secondary_link", "residential_link", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + "tertiary_link", "track" }; //$NON-NLS-1$ //$NON-NLS-2$ for(String c : cars){ if(c.equals(tagHighway)){ return true; diff --git a/DataExtractionOSM/src/com/osmand/osm/io/OsmBaseStorage.java b/DataExtractionOSM/src/com/osmand/osm/io/OsmBaseStorage.java index 8e59099440..9b385e6584 100644 --- a/DataExtractionOSM/src/com/osmand/osm/io/OsmBaseStorage.java +++ b/DataExtractionOSM/src/com/osmand/osm/io/OsmBaseStorage.java @@ -26,30 +26,30 @@ import com.osmand.osm.Way; public class OsmBaseStorage extends DefaultHandler { - protected static final String ELEM_OSM = "osm"; - protected static final String ELEM_NODE = "node"; - protected static final String ELEM_TAG = "tag"; - protected static final String ELEM_WAY = "way"; - protected static final String ELEM_ND = "nd"; - protected static final String ELEM_RELATION = "relation"; - protected static final String ELEM_MEMBER = "member"; + protected static final String ELEM_OSM = "osm"; //$NON-NLS-1$ + protected static final String ELEM_NODE = "node"; //$NON-NLS-1$ + protected static final String ELEM_TAG = "tag"; //$NON-NLS-1$ + protected static final String ELEM_WAY = "way"; //$NON-NLS-1$ + protected static final String ELEM_ND = "nd"; //$NON-NLS-1$ + protected static final String ELEM_RELATION = "relation"; //$NON-NLS-1$ + protected static final String ELEM_MEMBER = "member"; //$NON-NLS-1$ - protected static final String ATTR_VERSION = "version"; - protected static final String ATTR_ID = "id"; - protected static final String ATTR_LAT = "lat"; - protected static final String ATTR_LON = "lon"; - protected static final String ATTR_TIMESTAMP = "timestamp"; - protected static final String ATTR_UID = "uid"; - protected static final String ATTR_USER = "user"; - protected static final String ATTR_VISIBLE = "visible"; - protected static final String ATTR_CHANGESET = "changeset"; - protected static final String ATTR_K = "k"; - protected static final String ATTR_V = "v"; + protected static final String ATTR_VERSION = "version"; //$NON-NLS-1$ + protected static final String ATTR_ID = "id"; //$NON-NLS-1$ + protected static final String ATTR_LAT = "lat"; //$NON-NLS-1$ + protected static final String ATTR_LON = "lon"; //$NON-NLS-1$ + protected static final String ATTR_TIMESTAMP = "timestamp"; //$NON-NLS-1$ + protected static final String ATTR_UID = "uid"; //$NON-NLS-1$ + protected static final String ATTR_USER = "user"; //$NON-NLS-1$ + protected static final String ATTR_VISIBLE = "visible"; //$NON-NLS-1$ + protected static final String ATTR_CHANGESET = "changeset"; //$NON-NLS-1$ + protected static final String ATTR_K = "k"; //$NON-NLS-1$ + protected static final String ATTR_V = "v"; //$NON-NLS-1$ - protected static final String ATTR_TYPE = "type"; - protected static final String ATTR_REF = "ref"; - protected static final String ATTR_ROLE = "role"; + protected static final String ATTR_TYPE = "type"; //$NON-NLS-1$ + protected static final String ATTR_REF = "ref"; //$NON-NLS-1$ + protected static final String ATTR_ROLE = "role"; //$NON-NLS-1$ protected Entity currentParsedEntity = null; protected EntityInfo currentParsedEntityInfo = null; @@ -123,7 +123,7 @@ public class OsmBaseStorage extends DefaultHandler { } SAXParserFactory factory = SAXParserFactory.newInstance(); try { - factory.setFeature("http://xml.org/sax/features/namespace-prefixes", false); + factory.setFeature("http://xml.org/sax/features/namespace-prefixes", false); //$NON-NLS-1$ return saxParser = factory.newSAXParser(); } catch (ParserConfigurationException e) { throw new IllegalStateException(e); @@ -154,8 +154,8 @@ public class OsmBaseStorage extends DefaultHandler { protected static final Set supportedVersions = new HashSet(); static { - supportedVersions.add("0.6"); - supportedVersions.add("0.5"); + supportedVersions.add("0.6"); //$NON-NLS-1$ + supportedVersions.add("0.5"); //$NON-NLS-1$ } protected void initRootElement(String uri, String localName, String name, Attributes attributes) throws OsmVersionNotSupported{ diff --git a/OsmAnd/src/com/osmand/ResourceManager.java b/OsmAnd/src/com/osmand/ResourceManager.java index ece67bc659..ec6cee6400 100644 --- a/OsmAnd/src/com/osmand/ResourceManager.java +++ b/OsmAnd/src/com/osmand/ResourceManager.java @@ -2,6 +2,7 @@ package com.osmand; import java.io.File; import java.text.Collator; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; @@ -187,7 +188,7 @@ public class ResourceManager { if (initialized) { amenityRepositories.add(repository); }else { - warnings.add("The version of index '" + f.getName() +"'is not supported"); + warnings.add(MessageFormat.format("The version of index ''{0}''is not supported", f.getName())); } } } @@ -209,7 +210,7 @@ public class ResourceManager { if (initialized) { addressMap.put(repository.getName(), repository); } else { - warnings.add("The version of index '" + f.getName() +"'is not supported"); + warnings.add(MessageFormat.format("The version of index ''{0}''is not supported", f.getName())); } } } diff --git a/OsmAnd/src/com/osmand/activities/EditingPOIActivity.java b/OsmAnd/src/com/osmand/activities/EditingPOIActivity.java index 44d9d0c42f..959c24809a 100644 --- a/OsmAnd/src/com/osmand/activities/EditingPOIActivity.java +++ b/OsmAnd/src/com/osmand/activities/EditingPOIActivity.java @@ -104,7 +104,7 @@ public class EditingPOIActivity { public void showCreateDialog(double latitude, double longitude){ dlg = new Dialog(ctx); Node n = new Node(latitude, longitude, -1); - n.putTag(OSMTagKey.AMENITY.getValue(), ""); + n.putTag(OSMTagKey.AMENITY.getValue(), ""); //$NON-NLS-1$ n.putTag(OSMTagKey.OPENING_HOURS.getValue(), "Mo-Su 08:00-20:00"); //$NON-NLS-1$ dlg.setTitle(R.string.poi_create_title); showDialog(n); @@ -341,7 +341,7 @@ public class EditingPOIActivity { boolean f = true; while ((s = in.readLine()) != null) { if(!f){ - responseBody.append("\n"); + responseBody.append("\n"); //$NON-NLS-1$ } else { f = false; } @@ -514,7 +514,7 @@ public class EditingPOIActivity { String res = sendRequest(SITE_API+"api/0.6/node/"+id, "GET", null, "Loading poi " + id, false); //$NON-NLS-1$ //$NON-NLS-2$ if(res != null){ OsmBaseStorage st = new OsmBaseStorage(); - st.parseOSM(new ByteArrayInputStream(res.getBytes("UTF-8")), null, null, true); + st.parseOSM(new ByteArrayInputStream(res.getBytes("UTF-8")), null, null, true); //$NON-NLS-1$ Entity entity = st.getRegisteredEntities().get(id); entityInfo = st.getRegisteredEntityInfo().get(id); if(entity instanceof Node){ diff --git a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java b/OsmAnd/src/com/osmand/activities/MainMenuActivity.java index 2e67b8ea84..efd01b58b6 100644 --- a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java +++ b/OsmAnd/src/com/osmand/activities/MainMenuActivity.java @@ -6,6 +6,7 @@ import java.io.File; import java.io.FileWriter; import java.io.PrintStream; import java.lang.Thread.UncaughtExceptionHandler; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -84,8 +85,8 @@ public class MainMenuActivity extends Activity { File file = new File(Environment.getExternalStorageDirectory(), EXCEPTION_PATH); if(file.exists() && file.length() > 0){ if(size != file.length()){ - String msg = "Previous application run was crashed. Log file is in " + EXCEPTION_PATH +". "; - msg += "Please raise the issue and attach log file."; + String msg = MessageFormat.format("Previous application run was crashed. Log file is at {0}. Please raise the issue and attach log file.", + EXCEPTION_PATH); Builder builder = new AlertDialog.Builder(MainMenuActivity.this); builder.setMessage(msg).setNeutralButton("Close", null).show(); getPreferences(MODE_WORLD_READABLE).edit().putLong(EXCEPTION_FILE_SIZE, file.length()).commit(); diff --git a/OsmAnd/src/com/osmand/activities/RoutingHelper.java b/OsmAnd/src/com/osmand/activities/RoutingHelper.java index 6bb7dd2fb2..11416a0d3e 100644 --- a/OsmAnd/src/com/osmand/activities/RoutingHelper.java +++ b/OsmAnd/src/com/osmand/activities/RoutingHelper.java @@ -183,7 +183,7 @@ public class RoutingHelper { float bearingMovement = currentLocation.bearingTo(routeNodes.get(currentRoute)); float d = Math.abs(currentLocation.distanceTo(routeNodes.get(currentRoute)) * FloatMath.sin((bearingMovement - bearing)*3.14f/180f)); if(d > 50) { - log.info("Recalculate route, because correlation : " + d); + log.info("Recalculate route, because correlation : " + d); //$NON-NLS-1$ calculateRoute = true; } } @@ -197,12 +197,12 @@ public class RoutingHelper { float f1 = currentLocation.distanceTo(routeNodes.get(currentRoute - 1)) + d; float c = routeNodes.get(currentRoute - 1).distanceTo(routeNodes.get(currentRoute)); if (c * 2 < d + f1) { - log.info("Recalculate route, because too far from points : " + d + " " + f1 + " >> " + c); + log.info("Recalculate route, because too far from points : " + d + " " + f1 + " >> " + c); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ calculateRoute = true; } } else { // that case is needed - log.info("Recalculate route, because too far from start : " + d); + log.info("Recalculate route, because too far from start : " + d); //$NON-NLS-1$ calculateRoute = true; } } @@ -288,7 +288,7 @@ public class RoutingHelper { } lastTimeEvaluatedRoute = System.currentTimeMillis(); } - }, "Calculating route"); + }, "Calculating route"); //$NON-NLS-1$ currentRunningJob.start(); } } @@ -372,29 +372,29 @@ public class RoutingHelper { if (start != null && end != null) { List res = new ArrayList(); if(log.isInfoEnabled()){ - log.info("Start finding route from " + start + " to " + end); + log.info("Start finding route from " + start + " to " + end); //$NON-NLS-1$ //$NON-NLS-2$ } try { StringBuilder uri = new StringBuilder(); - uri.append("http://www.yournavigation.org/api/1.0/gosmore.php?format=kml"); - uri.append("&flat=").append(start.getLatitude()); - uri.append("&flon=").append(start.getLongitude()); - uri.append("&tlat=").append(end.getLatitude()); - uri.append("&tlon=").append(end.getLongitude()); + uri.append("http://www.yournavigation.org/api/1.0/gosmore.php?format=kml"); //$NON-NLS-1$ + uri.append("&flat=").append(start.getLatitude()); //$NON-NLS-1$ + uri.append("&flon=").append(start.getLongitude()); //$NON-NLS-1$ + uri.append("&tlat=").append(end.getLatitude()); //$NON-NLS-1$ + uri.append("&tlon=").append(end.getLongitude()); //$NON-NLS-1$ if(ApplicationMode.PEDESTRIAN== mode){ - uri.append("&v=foot") ; + uri.append("&v=foot") ; //$NON-NLS-1$ } else if(ApplicationMode.BICYCLE == mode){ - uri.append("&v=bicycle") ; + uri.append("&v=bicycle") ; //$NON-NLS-1$ } else { - uri.append("&v=motorcar"); + uri.append("&v=motorcar"); //$NON-NLS-1$ } - uri.append("&fast=1").append("&layer=mapnik"); + uri.append("&fast=1").append("&layer=mapnik"); //$NON-NLS-1$ //$NON-NLS-2$ URL url = new URL(uri.toString()); URLConnection connection = url.openConnection(); DocumentBuilder dom = DocumentBuilderFactory.newInstance().newDocumentBuilder(); Document doc = dom.parse(new InputSource(new InputStreamReader(connection.getInputStream()))); - NodeList list = doc.getElementsByTagName("coordinates"); + NodeList list = doc.getElementsByTagName("coordinates"); //$NON-NLS-1$ for(int i=0; i