diff options
| author | jandegr <jandegr@users.noreply.github.com> | 2016-01-28 07:37:03 +0100 |
|---|---|---|
| committer | jandegr <jandegr@users.noreply.github.com> | 2016-01-28 07:37:03 +0100 |
| commit | 089c9ea7ea1ab535efcf9e9248b99c31aaf989f6 (patch) | |
| tree | c643ffad8a1f6eb9afe823968ec7e4330db9390a | |
| parent | 02bcdb2d4dd6fcdedf211604a3dd81e193ab4e86 (diff) | |
| parent | 0600f85990fecd0368e3763f96ff2210494b8a79 (diff) | |
| download | navit-089c9ea7ea1ab535efcf9e9248b99c31aaf989f6.tar.gz | |
Merge pull request #72 from navit-gps/no-HOVR6558
No hov
| -rw-r--r-- | navit/attr.h | 1 | ||||
| -rw-r--r-- | navit/maptool/osm.c | 2 | ||||
| -rw-r--r-- | navit/navit_shipped.xml | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/navit/attr.h b/navit/attr.h index 27b37be60..4884ea95b 100644 --- a/navit/attr.h +++ b/navit/attr.h @@ -73,6 +73,7 @@ enum attr_format { #define AF_UNPAVED (1<<12) #define AF_FORD (1<<13) #define AF_UNDERGROUND (1<<14) +#define AF_HIGH_OCCUPANCY_CAR_ONLY (1<<18) #define AF_DANGEROUS_GOODS (1<<19) #define AF_EMERGENCY_VEHICLES (1<<20) #define AF_TRANSPORT_TRUCK (1<<21) diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index a8baac6d1..f049f67e1 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -1049,6 +1049,8 @@ osm_add_tag(char *k, char *v) flagsa[access_value(v)] |= AF_DANGEROUS_GOODS|AF_EMERGENCY_VEHICLES|AF_TRANSPORT_TRUCK|AF_DELIVERY_TRUCK|AF_PUBLIC_BUS|AF_TAXI|AF_HIGH_OCCUPANCY_CAR|AF_CAR|AF_MOTORCYCLE|AF_MOPED|AF_HORSE|AF_BIKE|AF_PEDESTRIAN; else flags[0] |= AF_THROUGH_TRAFFIC_LIMIT; + if (! strcmp(v,"hov")) + flags[0] |= AF_HIGH_OCCUPANCY_CAR_ONLY; level=5; } if (! strcmp(k,"vehicle")) { diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml index 9ac4f0faf..8c2d16e68 100644 --- a/navit/navit_shipped.xml +++ b/navit/navit_shipped.xml @@ -182,7 +182,7 @@ Waypoint</text></img> <!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 --> <tracking cdf_histsize="0"/> - <vehicleprofile name="car" route_depth="4:25%,8:40000,18:10000" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25"> + <vehicleprofile name="car" route_depth="4:25%,8:40000,18:10000" flags="0x4000000" flags_forward_mask="0x4040002" flags_reverse_mask="0x4040001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25"> <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10" /> <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30" /> <roadprofile item_types="street_3_city" speed="40" route_weight="40" /> |