X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2FGetWikipediaFunction.java;h=be33a95b7ba3266944726b498d5bddf2e84ef8d8;hb=0a2480df5845e2d7190dfdec9b2653b1609e853d;hp=4c11bf9d13d4e0b393604939e1535d633499204f;hpb=7f5ed2be62905bd37717376dc22d09e5ea7edb4d;p=GpsPrune.git

diff --git a/tim/prune/function/GetWikipediaFunction.java b/tim/prune/function/GetWikipediaFunction.java
index 4c11bf9..be33a95 100644
--- a/tim/prune/function/GetWikipediaFunction.java
+++ b/tim/prune/function/GetWikipediaFunction.java
@@ -13,8 +13,8 @@ import tim.prune.data.DataPoint;
 import tim.prune.data.Field;
 import tim.prune.data.Latitude;
 import tim.prune.data.Longitude;
-import tim.prune.function.gpsies.GenericDownloaderFunction;
-import tim.prune.function.gpsies.GpsiesTrack;
+import tim.prune.function.search.GenericDownloaderFunction;
+import tim.prune.function.search.SearchResult;
 
 /**
  * Function to load nearby point information from Wikipedia
@@ -91,7 +91,7 @@ public class GetWikipediaFunction extends GenericDownloaderFunction
 
 		// Set status label according to error or "none found", leave blank if ok
 		if (_errorMessage == null && _trackListModel.isEmpty()) {
-			_errorMessage = I18nManager.getText("dialog.gpsies.nonefound");
+			_errorMessage = I18nManager.getText("dialog.wikipedia.nonefound");
 		}
 		_statusLabel.setText(_errorMessage == null ? "" : _errorMessage);
 	}
@@ -128,7 +128,7 @@ public class GetWikipediaFunction extends GenericDownloaderFunction
 			inStream.close();
 		} catch (Exception e) {}
 		// Add track list to model
-		ArrayList<GpsiesTrack> trackList = xmlHandler.getTrackList();
+		ArrayList<SearchResult> trackList = xmlHandler.getTrackList();
 		_trackListModel.addTracks(trackList);
 
 		// Show error message if any
@@ -157,11 +157,11 @@ public class GetWikipediaFunction extends GenericDownloaderFunction
 			int rowNum = rowNums[i];
 			if (rowNum >= 0 && rowNum < _trackListModel.getRowCount())
 			{
-				String coords = _trackListModel.getTrack(rowNum).getDownloadLink();
-				String[] latlon = coords.split(",");
-				if (latlon.length == 2)
+				String lat = _trackListModel.getTrack(rowNum).getLatitude();
+				String lon = _trackListModel.getTrack(rowNum).getLongitude();
+				if (lat != null && lon != null)
 				{
-					DataPoint point = new DataPoint(new Latitude(latlon[0]), new Longitude(latlon[1]), null);
+					DataPoint point = new DataPoint(new Latitude(lat), new Longitude(lon), null);
 					point.setFieldValue(Field.WAYPT_NAME, _trackListModel.getTrack(rowNum).getTrackName(), false);
 					_app.createPoint(point);
 				}