Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove remaining displays of Osmand vs. OsmAnd

Browse source
This commit is contained in:
sonora 2012-08-30 01:55:58 +02:00
parent 61e43e7fed
commit ca80118174
11 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DataExtractionOSM/src/net/osmand/Algoritms.java
View file

@ -258,7 +258,7 @@ public class Algoritms {
conn.setRequestProperty("Authorization", "Basic " + Base64.encode(userNamePassword)); //$NON-NLS-1$ //$NON-NLS-2$
}
conn.setRequestProperty("User-Agent", "Osmand"); //$NON-NLS-1$ //$NON-NLS-2$
conn.setRequestProperty("User-Agent", "OsmAnd"); //$NON-NLS-1$ //$NON-NLS-2$
log.info("Response code and message : " + conn.getResponseCode() + " " + conn.getResponseMessage());
if(conn.getResponseCode() != 200){
return conn.getResponseMessage();
@ -312,7 +312,7 @@ public class Algoritms {
}
conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY); //$NON-NLS-1$ //$NON-NLS-2$
conn.setRequestProperty("User-Agent", "Osmand"); //$NON-NLS-1$ //$NON-NLS-2$
conn.setRequestProperty("User-Agent", "OsmAnd"); //$NON-NLS-1$ //$NON-NLS-2$
OutputStream ous = conn.getOutputStream();
// for (String key : additionalMapData.keySet()) {

2
DataExtractionOSM/src/net/osmand/MapCreatorVersion.java
View file

@ -8,7 +8,7 @@ public class MapCreatorVersion {
public static String APP_VERSION = "0.8.3"; //$NON-NLS-1$
public static final String APP_DESCRIPTION = "alpha"; //$NON-NLS-1$
public static final String APP_MAP_CREATOR_NAME = "OsmandMapCreator"; //$NON-NLS-1$
public static final String APP_MAP_CREATOR_NAME = "OsmAndMapCreator"; //$NON-NLS-1$
public static final String APP_MAP_CREATOR_VERSION = APP_MAP_CREATOR_NAME + " " + APP_VERSION; //$NON-NLS-1$
public static final String APP_MAP_CREATOR_FULL_NAME = APP_MAP_CREATOR_NAME + " " + APP_VERSION + " " +APP_DESCRIPTION; //$NON-NLS-1$ //$NON-NLS-2$

6
DataExtractionOSM/src/net/osmand/binary/BinaryInspector.java
View file

@ -333,7 +333,7 @@ public class BinaryInspector {
public static void printFileInformation(String fileName,VerboseInfo verbose) throws IOException {
File file = new File(fileName);
if(!file.exists()){
println("Binary Osmand index " + fileName + " was not found.");
println("Binary OsmAnd index " + fileName + " was not found.");
return;
}
printFileInformation(file,verbose);
@ -573,10 +573,10 @@ public class BinaryInspector {
if(warning != null){
println(warning);
}
println("Inspector is console utility for working with binary indexes of Osmand.");
println("Inspector is console utility for working with binary indexes of OsmAnd.");
println("It allows print info about file, extract parts and merge indexes.");
println("\nUsage for print info : inspector [-vaddress] [-vmap] [-vpoi] [-vtransport] [-zoom=Zoom] [-bbox=LeftLon,TopLat,RightLon,BottomLan] [file]");
println(" Prints information about [file] binary index of Osmand.");
println(" Prints information about [file] binary index of OsmAnd.");
println(" -v.. more verbouse output (like all cities and their streets or all map objects with tags/values and coordinates)");
println("\nUsage for combining indexes : inspector -c file_to_create (file_from_extract ((+|-)parts_to_extract)? )*");
println("\tCreate new file of extracted parts from input file. [parts_to_extract] could be parts to include or exclude.");

2
DataExtractionOSM/src/net/osmand/data/MapTileDownloader.java
View file

@ -33,7 +33,7 @@ public class MapTileDownloader {
private static MapTileDownloader downloader = null;
private static Log log = LogUtil.getLog(MapTileDownloader.class);
public static String USER_AGENT = "Osmand~";
public static String USER_AGENT = "OsmAnd~";
private ThreadPoolExecutor threadPoolExecutor;

2
DataExtractionOSM/src/net/osmand/osm/OpeningHoursParser.java
View file

@ -26,7 +26,7 @@ public class OpeningHoursParser {
* hour of when you would expect a day to be ended.
* This is to be used when no end hour is known (like pubs that open at a certain time,
* but close at a variable time, depending on the number of clients).
* Osmand needs to show a value, so there is some arbitrary default value chosen.
* OsmAnd needs to show a value, so there is some arbitrary default value chosen.
*/
private static String endOfDay = "24:00";

4
DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java
View file

@ -166,7 +166,7 @@ public class MapRouterLayer implements MapPanelLayer {
}
};
menu.add(end);
Action selfRoute = new AbstractAction("Calculate Osmand route") {
Action selfRoute = new AbstractAction("Calculate OsmAnd route") {
private static final long serialVersionUID = 507156107455281238L;
@Override
@ -189,7 +189,7 @@ public class MapRouterLayer implements MapPanelLayer {
}
};
Action recalculate = new AbstractAction("Recalculate Osmand route") {
Action recalculate = new AbstractAction("Recalculate OsmAnd route") {
private static final long serialVersionUID = 507156107455281238L;
@Override

2
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -253,7 +253,7 @@ public class OsmandApplication extends Application {
SpecialPhrases.setLanguage(this, osmandSettings);
} catch (IOException e) {
LOG.error("I/O exception", e);
Toast error = Toast.makeText(this, "Error while reading the special phrases. Restart Osmand if possible", Toast.LENGTH_LONG);
Toast error = Toast.makeText(this, "Error while reading the special phrases. Restart OsmAnd if possible", Toast.LENGTH_LONG);
error.show();
}

2
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -541,7 +541,7 @@ public class OsmandSettings {
// this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<String> USER_OSM_BUG_NAME =
new StringPreference("user_osm_bug_name", "NoName/Osmand").makeGlobal();
new StringPreference("user_osm_bug_name", "NoName/OsmAnd").makeGlobal();
// this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<String> USER_PASSWORD =

2
OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
View file

@ -68,7 +68,7 @@ public class MainMenuActivity extends Activity {
intent.putExtra(Intent.EXTRA_EMAIL, new String[] { "osmand.app@gmail.com" }); //$NON-NLS-1$
intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
intent.setType("vnd.android.cursor.dir/email"); //$NON-NLS-1$
intent.putExtra(Intent.EXTRA_SUBJECT, "Osmand bug"); //$NON-NLS-1$
intent.putExtra(Intent.EXTRA_SUBJECT, "OsmAnd bug"); //$NON-NLS-1$
StringBuilder text = new StringBuilder();
text.append("\nDevice : ").append(Build.DEVICE); //$NON-NLS-1$
text.append("\nBrand : ").append(Build.BRAND); //$NON-NLS-1$

2
OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
View file

@ -113,7 +113,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements LockInfoCont
public void settingsActivityCreate(final SettingsActivity activity, PreferenceScreen screen) {
Preference offlineData = screen.findPreference("local_indexes");
if (offlineData == null) {
log.error("OsmandMonitoringPlugin: Index settings preference not found !");
log.error("OsmAndMonitoringPlugin: Index settings preference not found !");
} else {
offlineData.setSummary(offlineData.getSummary() + " " + app.getString(R.string.gpx_index_settings_descr));
}

4
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -58,10 +58,10 @@ import android.location.Location;
public class RouteProvider {
private static final org.apache.commons.logging.Log log = LogUtil.getLog(RouteProvider.class);
private static final String OSMAND_ROUTER = "OsmandRouter";
private static final String OSMAND_ROUTER = "OsmAndRouter";
public enum RouteService {
OSMAND("Osmand (offline)"), CLOUDMADE("CloudMade"), YOURS("YOURS"), ORS("OpenRouteService"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
OSMAND("OsmAnd (offline)"), CLOUDMADE("CloudMade"), YOURS("YOURS"), ORS("OpenRouteService"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
private final String name;
private RouteService(String name){
this.name = name;