Compare commits

..

No commits in common. "36bdf97a1c3c478ea8ba5d2bae0d5e2de68c3fca" and "463ff954598c69a6b9ea76ee2f952bca30792ed8" have entirely different histories.

1 changed files with 70 additions and 101 deletions

View File

@ -87,6 +87,7 @@
<select value="-1" t="surface" v="unpaved"/>
<select value="-1" t="surface" v="compacted"/>
<select value="-1" t="surface" v="dirt"/>
<select value="-1" t="surface" v="earth"/>
<select value="-1" t="surface" v="gravel"/>
<select value="-1" t="surface" v="fine_gravel"/>
<select value="-1" t="surface" v="grass"/>
@ -223,35 +224,11 @@
<select value="$maxspeed:advisory" t="maxspeed:advisory"/>
<select value="$maxspeed" t="maxspeed"/>
<!-- most important backbone roads -->
<select value="110" t="highway" v="motorway"/>
<select value="110" t="highway" v="motorway_link"/>
<select value="100" t="highway" v="trunk"/>
<select value="75" t="highway" v="trunk_link"/>
<!-- generally linking larger towns -->
<select value="65" t="highway" v="primary"/>
<select value="50" t="highway" v="primary_link"/>
<!-- generally linking smaller towns and villages -->
<select value="60" t="highway" v="secondary"/>
<select value="50" t="highway" v="secondary_link"/>
<!-- roads with speeds lower than 50 and those that we want to ignore abutters
must be placed before the "abutters" block below. -->
<!-- important urban roads -->
<select value="45" t="highway" v="tertiary"/>
<select value="40" t="highway" v="tertiary_link"/>
<!-- Some values of "abutters" mean the road is inside a place,
so cap the speed even if it is a high level road (below). -->
<!--
<select value="30" t="abutters" v="residential"/>
<select value="30" t="abutters" v="commercial"/>
<select value="30" t="abutters" v="retail"/>
<select value="30" t="abutters" v="industrial"/>
<select value="30" t="abutters" v="mixed"/>
-->
<!-- roads with speeds lower than 50 and those that we want to ignore abutters
must be placed before the "abutters" block below. -->
<!-- lowest form of grid network, usually 90% of urban roads -->
<select value="35" t="highway" v="unclassified"/>
<!-- road = no type, no review and may be not accurate -->
@ -264,6 +241,26 @@
<select value="15" t="route" v="ferry"/>
<select value="60" t="route" v="shuttle_train"/>
<!-- most important backbone roads -->
<select value="110" t="highway" v="motorway"/>
<select value="110" t="highway" v="motorway_link"/>
<select value="100" t="highway" v="trunk"/>
<select value="75" t="highway" v="trunk_link"/>
<!-- Some values of "abutters" mean the road is inside a place,
so cap the speed even if it is a high level road (below). -->
<select value="50" t="abutters" v="residential"/>
<select value="50" t="abutters" v="commercial"/>
<select value="50" t="abutters" v="retail"/>
<select value="50" t="abutters" v="industrial"/>
<select value="50" t="abutters" v="mixed"/>
<!-- generally linking larger towns -->
<select value="65" t="highway" v="primary"/>
<select value="50" t="highway" v="primary_link"/>
<!-- generally linking smaller towns and villages -->
<select value="60" t="highway" v="secondary"/>
<select value="50" t="highway" v="secondary_link"/>
</way>
<way attribute="priority">
@ -276,23 +273,24 @@
<select value="1.1" t="highway" v="trunk_link"/>
</if> -->
<!-- access deprioritize -->
<select t="tracktype" v="grade5" value="0.2"/>
<select t="motorcar" v="private" value="0.15"/>
<select t="motorcar" v="destination" value="0.15"/>
<select t="motorcar" v="delivery" value="0.15"/>
<select t="motorcar" v="customers" value="0.15"/>
<select t="motor_vehicle" v="private" value="0.15"/>
<select t="motor_vehicle" v="destination" value="0.15"/>
<select t="motor_vehicle" v="delivery" value="0.15"/>
<select t="motor_vehicle" v="customers" value="0.15"/>
<select t="vehicle" v="private" value="0.15"/>
<select t="vehicle" v="destination" value="0.15"/>
<select t="vehicle" v="delivery" value="0.15"/>
<select t="vehicle" v="customers" value="0.15"/>
<select t="access" v="private" value="0.15"/>
<select t="access" v="destination" value="0.15"/>
<select t="access" v="delivery" value="0.15"/>
<select t="access" v="customers" value="0.15"/>
<select t="tracktype" v="grade5" value="0.1"/>
<select t="motorcar" v="private" value="0.05"/>
<select t="motorcar" v="destination" value="0.05"/>
<select t="motorcar" v="delivery" value="0.05"/>
<select t="motorcar" v="customers" value="0.05"/>
<select t="motorcycle" v="destination" value="0.05"/> <!-- Why is this here? A car can't go where a motorcycle could -->
<select t="motor_vehicle" v="private" value="0.05"/>
<select t="motor_vehicle" v="destination" value="0.05"/>
<select t="motor_vehicle" v="delivery" value="0.05"/>
<select t="motor_vehicle" v="customers" value="0.05"/>
<select t="vehicle" v="private" value="0.05"/>
<select t="vehicle" v="destination" value="0.05"/>
<select t="vehicle" v="delivery" value="0.05"/>
<select t="vehicle" v="customers" value="0.05"/>
<select t="access" v="private" value="0.05"/>
<select t="access" v="destination" value="0.05"/>
<select t="access" v="delivery" value="0.05"/>
<select t="access" v="customers" value="0.05"/>
<select value="1.1" t="highway" v="motorway"/>
<!-- make links slightly smaller so in connections they will not be used -->
@ -413,8 +411,8 @@
<select value="100" t="barrier" v="sally_port"/>
<select value="1" t="barrier" v="toll_booth"/>
<!-- These 2 shouldn't be allowed per the wiki (access=no is assumed) but people often do not add the proper access tags. -->
<select value="300" t="barrier" v="lift_gate"/>
<select value="300" t="barrier" v="swing_gate"/>
<select value="1000" t="barrier" v="lift_gate"/>
<select value="1000" t="barrier" v="swing_gate"/>
<!-- Without explicit access marking, barriers other than the listed values above are impassable to a car. -->
<select value="-1" t="barrier"/>
@ -508,6 +506,8 @@
<select value="1" t="access" v="yes"/>
<select value="1" t="access" v="permissive"/>
<select value="-1" t="crossing" v="no"/>
<select value="1" t="highway" v="motorway"/>
<select value="1" t="highway" v="motorway_link"/>
<select value="1" t="highway" v="trunk"/>
@ -528,7 +528,9 @@
<select value="1" t="highway" v="living_street"/>
<select value="1" t="highway" v="pedestrian"/>
<select value="1" t="highway" v="footway"/>
<select value="1" t="highway" v="byway"/>
<select value="1" t="highway" v="platform"/>
<select value="1" t="highway" v="services"/>
<select value="1" t="highway" v="bridleway"/>
<select value="1" t="highway" v="steps"/>
<select value="1" t="route" v="ferry"/>
@ -557,13 +559,13 @@
<select value="12" t="highway" v="motorway_link"/>
<select value="12" t="highway" v="trunk"/>
<select value="12" t="highway" v="trunk_link"/>
<select value="18" t="highway" v="primary"/>
<select value="18" t="highway" v="primary_link"/>
<select value="18" t="highway" v="secondary"/>
<select value="18" t="highway" v="secondary_link"/>
<select value="18" t="highway" v="tertiary"/>
<select value="18" t="highway" v="tertiary_link"/>
<select value="18" t="highway" v="road"/>
<select value="11" t="highway" v="primary"/>
<select value="11" t="highway" v="primary_link"/>
<select value="13" t="highway" v="secondary"/>
<select value="13" t="highway" v="secondary_link"/>
<select value="14" t="highway" v="tertiary"/>
<select value="14" t="highway" v="tertiary_link"/>
<select value="16" t="highway" v="road"/>
<select value="18" t="highway" v="residential"/>
<select value="18" t="highway" v="cycleway"/>
<select value="13" t="highway" v="unclassified"/>
@ -573,7 +575,9 @@
<select value="18" t="highway" v="living_street"/>
<select value="14" t="highway" v="pedestrian"/>
<select value="14" t="highway" v="footway"/>
<select value="8" t="highway" v="byway"/>
<select value="13" t="highway" v="platform"/>
<select value="13" t="highway" v="services"/>
<select value="13" t="highway" v="bridleway"/>
<select value="16"/>
</way>
@ -586,9 +590,11 @@
<select value="0.1" t="bicycle" v="use_sidepath"/>
<if param="inline_skates_mode">
<select value="0.9" t="highway" v="primary"/>
<select value="0.9" t="highway" v="primary_link"/>
<select value="1.2" t="smoothness" v="excellent"/>
<select value="0.5" t="smoothness" v="intermediate"/>
<select value="1.2" t="tracktype" v="grade1"/>
<select value="1.5" t="tracktype" v="grade1"/>
</if>
<if param="avoid_unpaved">
@ -599,6 +605,7 @@
<select value="0.1" t="surface" v="unpaved"/>
<select value="0.4" t="surface" v="compacted"/>
<select value="0.1" t="surface" v="dirt"/>
<select value="0.1" t="surface" v="earth"/>
<select value="0.1" t="surface" v="gravel"/>
<select value="0.4" t="surface" v="fine_gravel"/>
<select value="0.1" t="surface" v="grass"/>
@ -606,29 +613,17 @@
<select value="0.1" t="surface" v="mud"/>
<select value="0.1" t="surface" v="pebblestone"/>
<select value="0.1" t="surface" v="sand"/>
<select value="0.3" t="surface" v="wood"/>
<select value="0.1" t="surface" v="wood"/>
</if>
<select value="0.5" t="bicycle" v="dismount"/>
<select value="1.0" t="surface" v="concrete"/>
<select value="0.8" t="surface" v="concrete:plates"/>
<select value="0.8" t="surface" v="concrete:lanes"/>
<select value="0.65" t="surface" v="cobblestone"/>
<select value="0.8" t="surface" v="pebblestone"/>
<select value="0.9" t="surface" v="compacted"/>
<select value="0.9" t="surface" v="sett"/>
<select value="0.8" t="surface" v="ground"/>
<select value="0.6" t="surface" v="gravel"/>
<select value="0.8" t="surface" v="gravel"/>
<select value="0.8" t="surface" v="unpaved"/>
<select value="0.7" t="surface" v="grass"/>
<select value="0.3" t="surface" v="sand"/>
<select value="0.1" t="surface" v="mud"/>
<select value="0.9" t="tracktype" v="grade2"/>
<select value="0.8" t="tracktype" v="grade3"/>
<select value="0.8" t="surface" v="grass"/>
<select value="0.8" t="tracktype" v="grade4"/>
<select value="0.7" t="tracktype" v="grade5"/>
<select value="0.8" t="tracktype" v="grade5"/>
<select value="1.6" t="cycleway" v="lane"/>
<select value="1.6" t="cycleway" v="opposite_lane"/>
<select value="1.6" t="cycleway" v="share_busway"/>
@ -636,7 +631,6 @@
<select value="1.6" t="cycleway" v="opposite_track"/>
<select value="1.6" t="cycleway" v="shared"/>
<select value="1.6" t="cycleway" v="shared_lane"/>
<select value="1.6" t="bicycle_road" v="yes"/>
<select value="1.5" t="highway" v="cycleway"/>
@ -657,7 +651,6 @@
</way>
<point attribute="obstacle_time">
<select value="10" t="barrier" v="cycle_barrier"/>
<select value="5" t="barrier"/>
<select value="30" t="highway" v="traffic_signals"/>
@ -671,7 +664,6 @@
<select value="25" t="railway" v="crossing"/>
<select value="25" t="railway" v="level_crossing"/>
</point>
<point attribute="obstacle">
@ -697,6 +689,8 @@
<select value="1" t="access" v="yes"/>
<select value="1" t="access" v="permissive"/>
<select value="-1" t="crossing" v="no"/>
<select value="10" t="barrier" v="cycle_barrier"/>
<select value="5" t="barrier"/>
<select value="10" t="highway" v="traffic_signals"/>
@ -707,7 +701,6 @@
<select value="7" t="highway" v="give_way"/>
<select value="25" t="highway" v="ford" />
<select value="25" t="ford" />
</point>
</routingProfile>
@ -765,9 +758,11 @@
<select value="1" t="highway" v="living_street"/>
<select value="1" t="highway" v="pedestrian"/>
<select value="1" t="highway" v="footway"/>
<select value="1" t="highway" v="byway"/>
<select value="1" t="highway" v="platform"/>
<select value="1" t="railway" v="platform"/>
<select value="1" t="public_transport" v="platform"/>
<select value="1" t="highway" v="services"/>
<select value="1" t="highway" v="bridleway"/>
<select value="1" t="highway" v="steps"/>
<select value="1" t="route" v="ferry"/>
@ -838,36 +833,10 @@
<select value="1" t="foot" v="official"/>
<select value="-1" t="access" v="no"/>
<select value="-1" t="access" v="private"/>
<select value="1" t="access" v="yes"/>
<select value="1" t="access" v="permissive"/>
<select value="-1" t="crossing" v="no"/>
</point>
</routingProfile>
<routingProfile name="geocoding" baseProfile="car" restrictionsAware="true" minDefaultSpeed="10.0" maxDefaultSpeed="10.0">
<way attribute="access">
<select value="1" t="highway" v="motorway"/>
<select value="1" t="highway" v="motorway_link"/>
<select value="1" t="highway" v="trunk"/>
<select value="1" t="highway" v="trunk_link"/>
<select value="1" t="highway" v="primary"/>
<select value="1" t="highway" v="primary_link"/>
<select value="1" t="highway" v="secondary"/>
<select value="1" t="highway" v="secondary_link"/>
<select value="1" t="highway" v="tertiary"/>
<select value="1" t="highway" v="tertiary_link"/>
<select value="1" t="highway" v="unclassified"/>
<select value="1" t="highway" v="road"/>
<select value="1" t="highway" v="residential"/>
<select value="1" t="highway" v="track"/>
<select value="1" t="highway" v="service"/>
<select value="1" t="highway" v="living_street"/>
<select value="1" t="highway" v="pedestrian"/>
<select value="1" t="route" v="ferry"/>
<select value="1" t="route" v="shuttle_train"/>
<select value="-1"/>
</way>
</routingProfile>
</osmand_routing_config>