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

Fix small routing plans

Browse source
This commit is contained in:
Victor Shcherb 2011-07-07 23:52:12 +02:00
parent 9cda264b0b
commit 92ff00ea30
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
DataExtractionOSM/src/net/osmand/router/BinaryRoutePlanner.java
View file

@ -391,6 +391,7 @@ public class BinaryRoutePlanner {
} }
// 3.2 calculate possible ways to put into priority queue // 3.2 calculate possible ways to put into priority queue
// next.getRoad().getId() >> 1
while (next != null) { while (next != null) {
long nts = (next.road.getId() << 8l) + next.segmentStart; long nts = (next.road.getId() << 8l) + next.segmentStart;
if(oppositeSegments.containsKey(nts)){ if(oppositeSegments.containsKey(nts)){

17
DataExtractionOSM/src/net/osmand/router/CarRouter.java
View file

@ -32,13 +32,13 @@ public class CarRouter extends VehicleRouter {
autoNotDefinedValues.put("living_street", 20d); autoNotDefinedValues.put("living_street", 20d);
autoPriorityValues.put("motorway", 1.5); autoPriorityValues.put("motorway", 1.5);
autoPriorityValues.put("motorway_link", 1.0); autoPriorityValues.put("motorway_link", 0.9);
autoPriorityValues.put("trunk", 1.5); autoPriorityValues.put("trunk", 1.5);
autoPriorityValues.put("trunk_link", 1d); autoPriorityValues.put("trunk_link", 0.9);
autoPriorityValues.put("primary", 1.3d); autoPriorityValues.put("primary", 1.3d);
autoPriorityValues.put("primary_link", 1d); autoPriorityValues.put("primary_link", 0.9d);
autoPriorityValues.put("secondary", 1.0d); autoPriorityValues.put("secondary", 1.1d);
autoPriorityValues.put("secondary_link", 1.0d); autoPriorityValues.put("secondary_link", 0.9d);
autoPriorityValues.put("tertiary", 0.85d); autoPriorityValues.put("tertiary", 0.85d);
autoPriorityValues.put("tertiary_link", 0.85d); autoPriorityValues.put("tertiary_link", 0.85d);
autoPriorityValues.put("residential", 0.7d); autoPriorityValues.put("residential", 0.7d);
@ -121,6 +121,13 @@ public class CarRouter extends VehicleRouter {
TagValuePair pair = road.getTagValue(0); TagValuePair pair = road.getTagValue(0);
boolean highway = "highway".equals(pair.tag); boolean highway = "highway".equals(pair.tag);
double priority = highway && autoPriorityValues.containsKey(pair.value) ? autoPriorityValues.get(pair.value) : 0.5d; double priority = highway && autoPriorityValues.containsKey(pair.value) ? autoPriorityValues.get(pair.value) : 0.5d;
// keep it in boundaries otherwise
// (it will use first founded exist for trunk even if it in another city and make Uturn there)
if(priority > 1.4){
return 1.4d;
} else if(priority < 0.5d) {
return 0.5d;
}
return priority; return priority;
}; };

2
DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java
View file

@ -102,7 +102,7 @@ public class OsmExtractionPreferencesDialog extends JDialog {
constr.anchor = GridBagConstraints.WEST; constr.anchor = GridBagConstraints.WEST;
l.setConstraints(useInternet, constr); l.setConstraints(useInternet, constr);
JLabel label = new JLabel("Path to obf file (test routing purpose) : "); JLabel label = new JLabel("Path to obf files (test routing, comma separated) : ");
panel.add(label); panel.add(label);
constr = new GridBagConstraints(); constr = new GridBagConstraints();
constr.ipadx = 5; constr.ipadx = 5;