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

fix issue 197

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@698 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-11-23 22:00:13 +00:00
parent 9a1496ea09
commit 2ac6c8ded1
4 changed files with 122 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
DataExtractionOSM/src/net/osmand/ToDoConstants.java
View file

@ -8,15 +8,13 @@ package net.osmand;
public class ToDoConstants {
// TODO max 105
// introduce bidforfix on site
// FIX botanicheskii sad, flood waterb
// For 0.5 release
// 102. Refactoring rendering schema serializing to xml and prepare script to create fast java builder (support pure xml)
// Refactoring MapRenderingTypes to xml either
// Input MAP_ZOOMS as parameter
// 105. Input MAP_ZOOMS and MapRenderingTypes xml as parameter for index creator
// 86. Allow to add/edit custom tags to POI objects (Issue)
// 92. Support poi index with standard map index and unify POI categories (unify done +)
// 97. For voice navigation consider current speed of vehicle. Especially when speed > 50 pronounce more than 200 m
@ -24,7 +22,6 @@ public class ToDoConstants {
// 96. Introduce settings for MPH, imperial units
// 104. Add activity to show current loaded indexes and information about them
// _19. colors for road trunk and motorway
// _12. Fix : find proper location for streets ! centralize them (when create index)?
@ -49,6 +46,8 @@ public class ToDoConstants {
// 101. Introduce shell script to print information about indexes and to modify them
// 69. Add phone and site information to POI (enable call to POI and open site)
// 103. Allow add poi with multiple tags (different types/subtypes for one object). Fix for constructing and updating on mobile. (Issue)
// 102. Refactoring rendering schema serializing to xml and prepare script to create fast java builder (support pure xml)
// Refactoring MapRenderingTypes to xml either
// DONE SWING

21
DataExtractionOSM/src/net/osmand/swing/Messages.java Normal file
View file

@ -0,0 +1,21 @@
package net.osmand.swing;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
public class Messages {
private static final String BUNDLE_NAME = "net.osmand.swing.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
private Messages() {
}
public static String getString(String key) {
try {
return RESOURCE_BUNDLE.getString(key);
} catch (MissingResourceException e) {
return '!' + key + '!';
}
}
}

112
DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java
View file

@ -55,7 +55,7 @@ import org.xml.sax.SAXException;
public class OsmExtractionUI implements IMapLocationListener {
private static final Log log = LogFactory.getLog(OsmExtractionUI.class);
public static final String LOG_PATH = System.getProperty("user.home")+"/Application Data/Osmand/osmand.log";
public static final String LOG_PATH = System.getProperty("user.home")+"/Application Data/Osmand/osmand.log"; //$NON-NLS-1$ //$NON-NLS-2$
public static OsmExtractionUI MAIN_APP;
public static void main(String[] args) {
@ -66,7 +66,7 @@ public class OsmExtractionUI implements IMapLocationListener {
@Override
public void uncaughtException(Thread t, Throwable e) {
if(!(e instanceof ThreadDeath)){
ExceptionHandler.handle("Error in thread " + t.getName(), e);
ExceptionHandler.handle("Error in thread " + t.getName(), e); //$NON-NLS-1$
}
defaultHandler.uncaughtException(t, e);
}
@ -109,11 +109,11 @@ public class OsmExtractionUI implements IMapLocationListener {
public void createUI(){
frame = new JFrame("OsmAnd Map Creator");
frame = new JFrame(Messages.getString("OsmExtractionUI.OSMAND_MAP_CREATOR")); //$NON-NLS-1$
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Exception e) {
log.error("Can't set look and feel", e);
log.error("Can't set look and feel", e); //$NON-NLS-1$
}
@ -128,11 +128,11 @@ public class OsmExtractionUI implements IMapLocationListener {
statusBarLabel = new JLabel();
content.add(statusBarLabel, BorderLayout.SOUTH);
File workingDir = DataExtractionSettings.getSettings().getDefaultWorkingDir();
statusBarLabel.setText(workingDir == null ? "<working directory unspecified>" : "Working directory : " + workingDir.getAbsolutePath());
statusBarLabel.setText(workingDir == null ? Messages.getString("OsmExtractionUI.WORKING_DIR_UNSPECIFIED") : Messages.getString("OsmExtractionUI.WORKING_DIRECTORY") + workingDir.getAbsolutePath()); //$NON-NLS-1$ //$NON-NLS-2$
treePlaces = new JTree();
treePlaces.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("Region"), false));
treePlaces.setModel(new DefaultTreeModel(new DefaultMutableTreeNode(Messages.getString("OsmExtractionUI.REGION")), false)); //$NON-NLS-1$
JSplitPane panelForTreeAndMap = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, new JScrollPane(treePlaces), mapPanel);
panelForTreeAndMap.setResizeWeight(0.2);
content.add(panelForTreeAndMap, BorderLayout.CENTER);
@ -153,27 +153,27 @@ public class OsmExtractionUI implements IMapLocationListener {
content.add(panel, BorderLayout.NORTH);
buildMapIndex = new JCheckBox();
buildMapIndex.setText("Build map index");
buildMapIndex.setText(Messages.getString("OsmExtractionUI.BUILD_MAP")); //$NON-NLS-1$
panel.add(buildMapIndex);
buildMapIndex.setSelected(true);
buildPoiIndex = new JCheckBox();
buildPoiIndex.setText("Build POI index");
buildPoiIndex.setText(Messages.getString("OsmExtractionUI.BUILD_POI")); //$NON-NLS-1$
panel.add(buildPoiIndex);
buildPoiIndex.setSelected(true);
buildAddressIndex = new JCheckBox();
buildAddressIndex.setText("Build Address index");
buildAddressIndex.setText(Messages.getString("OsmExtractionUI.BUILD_ADDRESS")); //$NON-NLS-1$
panel.add(buildAddressIndex);
buildAddressIndex.setSelected(true);
normalizingStreets = new JCheckBox();
normalizingStreets.setText("Normalizing streets");
normalizingStreets.setText(Messages.getString("OsmExtractionUI.NORMALIZE_STREETS")); //$NON-NLS-1$
panel.add(normalizingStreets);
normalizingStreets.setSelected(true);
buildTransportIndex = new JCheckBox();
buildTransportIndex.setText("Build transport index");
buildTransportIndex.setText(Messages.getString("OsmExtractionUI.BUILD_TRANSPORT")); //$NON-NLS-1$
panel.add(buildTransportIndex);
buildTransportIndex.setSelected(true);
@ -182,35 +182,35 @@ public class OsmExtractionUI implements IMapLocationListener {
}
public void fillMenuWithActions(final JMenuBar bar){
JMenu menu = new JMenu("File");
JMenu menu = new JMenu(Messages.getString("OsmExtractionUI.MENU_FILE")); //$NON-NLS-1$
bar.add(menu);
JMenuItem loadFile = new JMenuItem("Select osm file...");
JMenuItem loadFile = new JMenuItem(Messages.getString("OsmExtractionUI.MENU_SELECT_FILE")); //$NON-NLS-1$
menu.add(loadFile);
JMenuItem loadSpecifiedAreaFile = new JMenuItem("Select osm file for specifed area...");
JMenuItem loadSpecifiedAreaFile = new JMenuItem(Messages.getString("OsmExtractionUI.MENU_SELECT_OSM_FILE_AREA")); //$NON-NLS-1$
menu.add(loadSpecifiedAreaFile);
JMenuItem specifyWorkingDir = new JMenuItem("Specify working directory...");
JMenuItem specifyWorkingDir = new JMenuItem(Messages.getString("OsmExtractionUI.SPECIFY_WORKING_DIR")); //$NON-NLS-1$
menu.add(specifyWorkingDir);
menu.addSeparator();
JMenuItem exitMenu= new JMenuItem("Exit");
JMenuItem exitMenu= new JMenuItem(Messages.getString("OsmExtractionUI.MENU_EXIT")); //$NON-NLS-1$
menu.add(exitMenu);
JMenu tileSource = MapPanel.getMenuToChooseSource(mapPanel);
final JMenuItem sqliteDB = new JMenuItem("Create sqlite database");
final JMenuItem sqliteDB = new JMenuItem(Messages.getString("OsmExtractionUI.MENU_CREATE_SQLITE")); //$NON-NLS-1$
tileSource.addSeparator();
tileSource.add(sqliteDB);
bar.add(tileSource);
menu = new JMenu("Window");
menu = new JMenu(Messages.getString("OsmExtractionUI.MENU_WINDOW")); //$NON-NLS-1$
bar.add(menu);
JMenuItem settings = new JMenuItem("Settings...");
JMenuItem settings = new JMenuItem(Messages.getString("OsmExtractionUI.MENU_SETTINGS")); //$NON-NLS-1$
menu.add(settings);
menu.addSeparator();
JMenuItem openLogFile = new JMenuItem("Open log file...");
JMenuItem openLogFile = new JMenuItem(Messages.getString("OsmExtractionUI.MENU_OPEN_LOG")); //$NON-NLS-1$
menu.add(openLogFile);
menu = new JMenu("About");
menu = new JMenu(Messages.getString("OsmExtractionUI.MENU_ABOUT")); //$NON-NLS-1$
bar.add(menu);
JMenuItem aboutApplication = new JMenuItem("About...");
JMenuItem aboutApplication = new JMenuItem(Messages.getString("OsmExtractionUI.MENU_ABOUT_2")); //$NON-NLS-1$
menu.add(aboutApplication);
@ -226,18 +226,18 @@ public class OsmExtractionUI implements IMapLocationListener {
public void actionPerformed(ActionEvent e) {
File file = new File(OsmExtractionUI.LOG_PATH);
if (file != null && file.exists()) {
if (System.getProperty("os.name").startsWith("Windows")) {
if (System.getProperty("os.name").startsWith("Windows")) { //$NON-NLS-1$ //$NON-NLS-2$
try {
Runtime.getRuntime().exec(new String[] { "notepad.exe", file.getAbsolutePath() }); //$NON-NLS-1$
} catch (IOException es) {
ExceptionHandler.handle("Failed to open log file ", es);
ExceptionHandler.handle(Messages.getString("OsmExtractionUI.UNABLE_OPEN_FILE"), es); //$NON-NLS-1$
}
} else {
JOptionPane.showMessageDialog(frame, "Open log file manually " + LOG_PATH);
JOptionPane.showMessageDialog(frame, Messages.getString("OsmExtractionUI.OPEN_LOG_FILE_MANUALLY") + LOG_PATH); //$NON-NLS-1$
}
} else {
ExceptionHandler.handle("Log file is not found");
ExceptionHandler.handle(Messages.getString("OsmExtractionUI.LOG_FILE_NOT_FOUND")); //$NON-NLS-1$
}
}
});
@ -245,11 +245,11 @@ public class OsmExtractionUI implements IMapLocationListener {
sqliteDB.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent e) {
final String regionName = OsmExtractionUI.this.regionName == null ? "Region" : OsmExtractionUI.this.regionName;
final String regionName = OsmExtractionUI.this.regionName == null ? Messages.getString("OsmExtractionUI.REGION") : OsmExtractionUI.this.regionName; //$NON-NLS-1$
final ITileSource map = mapPanel.getMap();
if(map != null){
try {
final ProgressDialog dlg = new ProgressDialog(frame, "Creating index");
final ProgressDialog dlg = new ProgressDialog(frame, Messages.getString("OsmExtractionUI.CREATING_INDEX")); //$NON-NLS-1$
dlg.setRunnable(new Runnable(){
@Override
@ -265,9 +265,9 @@ public class OsmExtractionUI implements IMapLocationListener {
});
dlg.run();
} catch (InterruptedException e1) {
log.error("Interrupted", e1);
log.error("Interrupted", e1); //$NON-NLS-1$
} catch (InvocationTargetException e1) {
ExceptionHandler.handle("Can't create big planet sqlite index", (Exception) e1.getCause());
ExceptionHandler.handle("Can't create big planet sqlite index", (Exception) e1.getCause()); //$NON-NLS-1$
}
@ -296,7 +296,7 @@ public class OsmExtractionUI implements IMapLocationListener {
@Override
public void actionPerformed(ActionEvent e) {
JFileChooser fc = new JFileChooser();
fc.setDialogTitle("Choose working directory");
fc.setDialogTitle(Messages.getString("OsmExtractionUI.CHOOSE_WORKING_DIR")); //$NON-NLS-1$
fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
File workingDir = DataExtractionSettings.getSettings().getDefaultWorkingDir();
if(workingDir != null){
@ -306,7 +306,7 @@ public class OsmExtractionUI implements IMapLocationListener {
fc.getSelectedFile().isDirectory()){
DataExtractionSettings.getSettings().saveDefaultWorkingDir(fc.getSelectedFile());
mapPanel.setTilesLocation(DataExtractionSettings.getSettings().getTilesDirectory());
statusBarLabel.setText("Working directory : " + fc.getSelectedFile().getAbsolutePath());
statusBarLabel.setText(Messages.getString("OsmExtractionUI.WORKING_DIR") + fc.getSelectedFile().getAbsolutePath()); //$NON-NLS-1$
JMenu tileSource = MapPanel.getMenuToChooseSource(mapPanel);
tileSource.add(sqliteDB);
bar.remove(1);
@ -322,12 +322,12 @@ public class OsmExtractionUI implements IMapLocationListener {
int answer = fc.showOpenDialog(frame) ;
if (answer == JFileChooser.APPROVE_OPTION && fc.getSelectedFile() != null){
final JDialog dlg = new JDialog(frame, true);
dlg.setTitle("Select area to filter");
dlg.setTitle(Messages.getString("OsmExtractionUI.SELECT_AREA_TO_FILTER")); //$NON-NLS-1$
MapPanel panel = new MapPanel(DataExtractionSettings.getSettings().getTilesDirectory());
panel.setLatLon(mapPanel.getLatitude(), mapPanel.getLongitude());
panel.setZoom(mapPanel.getZoom());
final StringBuilder res = new StringBuilder();
panel.getLayer(MapInformationLayer.class).setAreaActionHandler(new AbstractAction("Select area"){
panel.getLayer(MapInformationLayer.class).setAreaActionHandler(new AbstractAction(Messages.getString("OsmExtractionUI.SELECT_AREA")){ //$NON-NLS-1$
private static final long serialVersionUID = -3452957517341961969L;
@Override
public void actionPerformed(ActionEvent e) {
@ -374,7 +374,7 @@ public class OsmExtractionUI implements IMapLocationListener {
public JFileChooser getOsmFileChooser(){
JFileChooser fc = new JFileChooser();
fc.setDialogTitle("Choose osm file");
fc.setDialogTitle(Messages.getString("OsmExtractionUI.CHOOSE_OSM_FILE")); //$NON-NLS-1$
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.setAcceptAllFileFilterUsed(true);
fc.setCurrentDirectory(DataExtractionSettings.getSettings().getDefaultWorkingDir().getParentFile());
@ -382,12 +382,12 @@ public class OsmExtractionUI implements IMapLocationListener {
@Override
public boolean accept(File f) {
return f.isDirectory() || f.getName().endsWith(".bz2") || f.getName().endsWith(".osm") || f.getName().endsWith(".pbf");
return f.isDirectory() || f.getName().endsWith(".bz2") || f.getName().endsWith(".osm") || f.getName().endsWith(".pbf"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@Override
public String getDescription() {
return "Osm Files (*.bz2, *.osm, *.pbf)";
return Messages.getString("OsmExtractionUI.OSM_FILES"); //$NON-NLS-1$
}
});
return fc;
@ -399,7 +399,7 @@ public class OsmExtractionUI implements IMapLocationListener {
public void loadCountry(final File f, final IOsmStorageFilter filter){
try {
final ProgressDialog dlg = new ProgressDialog(frame, "Loading osm file");
final ProgressDialog dlg = new ProgressDialog(frame, Messages.getString("OsmExtractionUI.LOADING_OSM_FILE")); //$NON-NLS-1$
dlg.setRunnable(new Runnable(){
@Override
@ -421,55 +421,55 @@ public class OsmExtractionUI implements IMapLocationListener {
}
regionName = creator.getRegionName();
StringBuilder msg = new StringBuilder();
msg.append("Indexes for ").append(regionName).append(" : ");
msg.append(Messages.getString("OsmExtractionUI.INDEXES_FOR")).append(regionName).append(" : "); //$NON-NLS-1$ //$NON-NLS-2$
boolean comma = false;
if (buildMapIndex.isSelected()) {
if(comma) msg.append(", ");
if(comma) msg.append(", "); //$NON-NLS-1$
comma = true;
msg.append("map");
msg.append(Messages.getString("OsmExtractionUI.MAP")); //$NON-NLS-1$
}
if (buildPoiIndex.isSelected()) {
if(comma) msg.append(", ");
if(comma) msg.append(", "); //$NON-NLS-1$
comma = true;
msg.append("POI");
msg.append(Messages.getString("OsmExtractionUI.POI")); //$NON-NLS-1$
}
if (buildAddressIndex.isSelected()) {
if(comma) msg.append(", ");
if(comma) msg.append(", "); //$NON-NLS-1$
comma = true;
msg.append("address");
msg.append(Messages.getString("OsmExtractionUI.ADDRESS")); //$NON-NLS-1$
}
if (buildTransportIndex.isSelected()) {
if(comma) msg.append(", ");
if(comma) msg.append(", "); //$NON-NLS-1$
comma = true;
msg.append("transport");
msg.append(Messages.getString("OsmExtractionUI.TRANSPORT")); //$NON-NLS-1$
}
msg.append(" - successfully created in working directory.");
msg.append(Messages.getString("OsmExtractionUI.SUCCESFULLY_CREATED")); //$NON-NLS-1$
JOptionPane pane = new JOptionPane(msg);
JDialog dialog = pane.createDialog(frame, "Generation data");
JDialog dialog = pane.createDialog(frame, Messages.getString("OsmExtractionUI.GENERATION_DATA")); //$NON-NLS-1$
dialog.setVisible(true);
}
});
dlg.run();
frame.setTitle("OsmAnd Map Creator - " + f.getName());
frame.setTitle(Messages.getString("OsmExtractionUI.OSMAND_MAP_CREATOR_FILE") + f.getName()); //$NON-NLS-1$
} catch (InterruptedException e1) {
log.error("Interrupted", e1);
log.error("Interrupted", e1); //$NON-NLS-1$
} catch (InvocationTargetException e1) {
ExceptionHandler.handle("Exception during operation", e1.getCause());
ExceptionHandler.handle("Exception during operation", e1.getCause()); //$NON-NLS-1$
}
}
public void saveCountry(final File f, final OsmBaseStorage storage){
final OsmStorageWriter writer = new OsmStorageWriter();
try {
final ProgressDialog dlg = new ProgressDialog(frame, "Saving osm file");
final ProgressDialog dlg = new ProgressDialog(frame, Messages.getString("OsmExtractionUI.SAVING_OSM_FILE")); //$NON-NLS-1$
dlg.setRunnable(new Runnable() {
@Override
public void run() {
try {
OutputStream output = new FileOutputStream(f);
try {
if (f.getName().endsWith(".bz2")) {
if (f.getName().endsWith(".bz2")) { //$NON-NLS-1$
output.write('B');
output.write('Z');
output = new CBZip2OutputStream(output);
@ -487,9 +487,9 @@ public class OsmExtractionUI implements IMapLocationListener {
});
dlg.run();
} catch (InterruptedException e1) {
log.error("Interrupted", e1);
log.error("Interrupted", e1); //$NON-NLS-1$
} catch (InvocationTargetException e1) {
ExceptionHandler.handle("Log file is not found", e1.getCause());
ExceptionHandler.handle("Log file is not found", e1.getCause()); //$NON-NLS-1$
}
}

40
DataExtractionOSM/src/net/osmand/swing/messages.properties Normal file
View file

@ -0,0 +1,40 @@
OsmExtractionUI.ADDRESS=address
OsmExtractionUI.BUILD_ADDRESS=Build Address index
OsmExtractionUI.BUILD_MAP=Build map index
OsmExtractionUI.BUILD_POI=Build POI index
OsmExtractionUI.BUILD_TRANSPORT=Build transport index
OsmExtractionUI.CHOOSE_OSM_FILE=Choose osm file
OsmExtractionUI.CHOOSE_WORKING_DIR=Choose working directory
OsmExtractionUI.CREATING_INDEX=Creating index
OsmExtractionUI.GENERATION_DATA=Generation data
OsmExtractionUI.INDEXES_FOR=Indexes for
OsmExtractionUI.LOADING_OSM_FILE=Loading osm file
OsmExtractionUI.LOG_FILE_NOT_FOUND=Log file is not found
OsmExtractionUI.MAP=map
OsmExtractionUI.MENU_ABOUT=About
OsmExtractionUI.MENU_ABOUT_2=About...
OsmExtractionUI.MENU_CREATE_SQLITE=Create sqlite database
OsmExtractionUI.MENU_EXIT=Exit
OsmExtractionUI.MENU_FILE=File
OsmExtractionUI.MENU_OPEN_LOG=Open log file...
OsmExtractionUI.MENU_SELECT_FILE=Select osm file...
OsmExtractionUI.MENU_SELECT_OSM_FILE_AREA=Select osm file for specifed area...
OsmExtractionUI.MENU_SETTINGS=Settings...
OsmExtractionUI.MENU_WINDOW=Window
OsmExtractionUI.NORMALIZE_STREETS=Normalizing streets
OsmExtractionUI.OPEN_LOG_FILE_MANUALLY=Open log file manually
OsmExtractionUI.OSM_FILES=Osm Files (*.bz2, *.osm, *.pbf)
OsmExtractionUI.OSMAND_MAP_CREATOR=OsmAnd Map Creator
OsmExtractionUI.OSMAND_MAP_CREATOR_FILE=OsmAnd Map Creator -
OsmExtractionUI.POI=POI
OsmExtractionUI.REGION=Region
OsmExtractionUI.SAVING_OSM_FILE=Saving osm file
OsmExtractionUI.SELECT_AREA=Select area
OsmExtractionUI.SELECT_AREA_TO_FILTER=Select area to filter
OsmExtractionUI.SPECIFY_WORKING_DIR=Specify working directory...
OsmExtractionUI.SUCCESFULLY_CREATED=\ - successfully created in working directory.
OsmExtractionUI.TRANSPORT=transport
OsmExtractionUI.UNABLE_OPEN_FILE=Failed to open log file
OsmExtractionUI.WORKING_DIR=Working directory :
OsmExtractionUI.WORKING_DIR_UNSPECIFIED=<working directory unspecified>
OsmExtractionUI.WORKING_DIRECTORY=Working directory :