diff options
author | jkoan <jkoan@users.noreply.github.com> | 2020-07-02 14:41:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-02 14:41:24 +0200 |
commit | fb1ff63507a48d6904cf177f2dbc0395ba9fe9fb (patch) | |
tree | e24cb07c6c3c772c739f07ce26dbcbb6ac261221 | |
parent | e0a5fcc629b81cef25b0a6a6ef442eb023837952 (diff) | |
parent | 17f516a150c90aa25a42e3fe21398e137c14b2af (diff) | |
download | navit-andrmapsdownlds.tar.gz |
Merge branch 'trunk' into andrmapsdownldsandrmapsdownlds
-rw-r--r-- | navit/item_def.h | 1 | ||||
-rw-r--r-- | navit/maptool/osm.c | 17 | ||||
-rw-r--r-- | navit/navit_layout_car_dark_shipped.xml | 1373 | ||||
-rwxr-xr-x | navit/navit_layout_car_generatedarkxml.sh | 143 | ||||
-rw-r--r-- | navit/navit_layout_car_shipped.xml | 29 | ||||
-rw-r--r-- | navit/textures/diagonal-stripes-gray.svg | 70 |
6 files changed, 1025 insertions, 608 deletions
diff --git a/navit/item_def.h b/navit/item_def.h index b82d1907d..82f49d2a0 100644 --- a/navit/item_def.h +++ b/navit/item_def.h @@ -528,6 +528,7 @@ ITEM(former_itinerary) ITEM(former_itinerary_part) ITEM(cliff) ITEM(sports_track) +ITEM(archaeological_site) /* Area */ ITEM2(0xc0000000,area) ITEM2(0xc0000001,area_unspecified) diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index cbe13cc6f..288a227be 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -581,6 +581,9 @@ static char *attrmap= { "w aerialway=chair_lift lift_chair\n" "w aerialway=drag_lift lift_drag\n" "w aeroway=aerodrome poly_airport\n" + /* airport wins over military landuse and specifier if given */ + "w aeroway=aerodrome,landuse=military poly_airfield\n" + "w aeroway=aerodrome,landuse=military,military=* poly_airfield\n" "w aeroway=apron poly_apron\n" "w aeroway=runway aeroway_runway\n" "w aeroway=taxiway aeroway_taxiway\n" @@ -675,6 +678,10 @@ static char *attrmap= { "w highway=unsurfaced track_gravelled\n" "w highway=steps steps\n" "w historic=archaeological_site poly_archaeological_site\n" + /* Albeit historic=archaeological_site should not be used on ways (only on areas) according to OSM wiki, + * it is at least done so for the Limes in germany. Luckily we can sort the Limes out as it has it's own + * tag scheme.*/ + "w historic=archaeological_site,site_type=fortification,fortification_type=limes archaeological_site\n" "w historic=battlefield poly_battlefield\n" "w historic=ruins poly_ruins\n" "w historic=town_gate poly_building\n" @@ -692,7 +699,15 @@ static char *attrmap= { "w landuse=greenfield poly_greenfield\n" "w landuse=industrial poly_industry\n" "w landuse=landfill poly_landfill\n" + /* landuse=military plus military tag */ "w landuse=military poly_military\n" + "w landuse=military,military=* poly_military\n" + "w landuse=military,military=airfield poly_airfield\n" + "w landuse=military,military=barracks poly_barracks\n" + "w landuse=military,military=danger_area poly_danger_area\n" + "w landuse=military,military=naval_base poly_naval_base\n" + "w landuse=military,military=range poly_range\n" + "w landuse=military,military=training_area poly_military_zone\n" "w landuse=meadow poly_meadow\n" "w landuse=plaza poly_plaza\n" "w landuse=quarry poly_quarry\n" @@ -729,11 +744,13 @@ static char *attrmap= { "w leisure=track sports_track\n" "w leisure=water_park poly_water_park\n" "w leisure=swimming_pool poly_swimming_pool\n" + /* military tag without further info */ "w military=airfield poly_airfield\n" "w military=barracks poly_barracks\n" "w military=danger_area poly_danger_area\n" "w military=naval_base poly_naval_base\n" "w military=range poly_range\n" + "w military=training_area poly_military_zone\n" "w natural=beach poly_beach\n" "w natural=coastline water_line\n" "w natural=fell poly_fell\n" diff --git a/navit/navit_layout_car_dark_shipped.xml b/navit/navit_layout_car_dark_shipped.xml index f858078ea..768962a3f 100644 --- a/navit/navit_layout_car_dark_shipped.xml +++ b/navit/navit_layout_car_dark_shipped.xml @@ -66,1191 +66,1468 @@ </polyline> </itemgra> </cursor> + <!-- + After modifying the layers in navit_layout_car_shipped.xml, + run the navit_layout_car_generatedarkxml.sh script to + automatically update the layers in + navit_layout_car_dark_shipped.xml. Do not modify the layers in + navit_layout_car_dark_shipped.xml directly, as changes will be + lost when the script is run. + --> <layer name="polygons"> - <!-- - After modifying the polygons layer in - navit_layout_car_shipped.xml, run the - navit_layout_car_generatedarkxml.sh script to - automatically update the polygons layer in - navit_layout_car_dark_shipped.xml. Do not modify the - polygons layer in navit_layout_car_dark_shipped.xml - directly, as changes will be lost when the script is run. - --> <itemgra item_types="image" order="0-"> <image/> </itemgra> <itemgra item_types="poly_glacier" order="10-"> - <polygon color="#1d2529"/> + <polygon color="#2b3140"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_town" order="0-"> - <polygon color="#1f2221"/> - <polyline color="#1e201c"/> + <polygon color="#2a2e38"/> + <polyline color="#272931"/> </itemgra> <itemgra item_types="poly_industry,poly_place" order="0-"> - <polygon color="#1d2427"/> - <polyline color="#1b2023"/> + <polygon color="#29303d"/> + <polyline color="#252935"/> </itemgra> <itemgra item_types="poly_naval_base" order="10-"> - <polygon color="#161d1e"/> + <polygon color="#1e2229"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_college" order="10-"> - <polygon color="#1f262a"/> + <polygon color="#2d3444"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_attraction" order="10-"> - <polygon color="#1a2023"/> + <polygon color="#242934"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_depot" order="10-"> - <polygon color="#1c1f1f"/> + <polygon color="#252832"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_railway" order="10-"> - <polygon color="#1b2024"/> + <polygon color="#262a36"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_port" order="10-"> - <polygon color="#181b20"/> + <polygon color="#21222c"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_marina" order="10-"> - <polygon color="#1a2126"/> + <polygon color="#262b38"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_commercial" order="10-"> - <polygon color="#1e2526"/> + <polygon color="#2b303e"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_retail" order="10-"> - <polygon color="#1d201e"/> + <polygon color="#262932"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_plaza" order="10-"> - <polygon color="#1c2123"/> + <polygon color="#272b37"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_battlefield" order="10-"> - <polygon color="#13140f"/> + <polygon color="#141411"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_archaeological_site" order="10-"> - <polygon color="#1d2222"/> + <polygon color="#282d37"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_ruins" order="10-"> - <polygon color="#1d2222"/> + <polygon color="#282d37"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_camp_site" order="10-"> - <polygon color="#17241a"/> - <polyline color="#152016"/> + <polygon color="#20262a"/> + <polyline color="#1c2122"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_caravan_site" order="10-"> - <polygon color="#182418"/> + <polygon color="#212729"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_golf_course" order="10-"> - <polygon color="#16241d"/> - <polyline color="#142018"/> + <polygon color="#20272c"/> + <polyline color="#1c2123"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_marsh" order="10-"> - <polygon color="#151410" src="wetland.png" w="50" h="50"/> + <polygon color="#171514" src="wetland.png" w="50" h="50"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_fell" order="10-"> - <polygon color="#1b2019"/> + <polygon color="#23262b"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_greenfield" order="10-"> - <polygon color="#1f2529"/> + <polygon color="#2d3242"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_brownfield" order="10-"> - <polygon color="#1d221d"/> + <polygon color="#272b32"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_park" order="0-"> - <polygon color="#19241a"/> - <polyline color="#172016"/> + <polygon color="#22282c"/> + <polyline color="#1e2224"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_heath" order="10-"> - <polygon color="#1d231f"/> - <polyline color="#1b201a"/> + <polygon color="#272c35"/> + <polyline color="#23262c"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_scree" order="10-"> - <polygon color="#1e2427"/> + <polygon color="#2b313f"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_quarry" order="10-"> - <polygon color="#1c2124" src="quarry.png" w="50" h="50"/> + <polygon color="#282c38" src="quarry.png" w="50" h="50"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_landfill" order="10-"> - <polygon color="#191d1e"/> + <polygon color="#21242c"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_construction" order="10-"> - <polygon color="#1c191899"/> + <polygon color="#22212799"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_range" order="10-"> - <polygon color="#191b1a"/> + <polygon color="#202127"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_common" order="10-"> - <polygon color="#171f12"/> + <polygon color="#1d211f"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_recreation_ground" order="10-"> - <polygon color="#182012"/> + <polygon color="#1e2221"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_sport" order="10-"> - <polygon color="#1a241a"/> - <polyline color="#182016"/> + <polygon color="#23282d"/> + <polyline color="#1f2325"/> </itemgra> <itemgra item_types="poly_fishing" order="10-"> - <polygon color="#17130c"/> + <polygon color="#181412"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_allotments" order="10-"> - <polygon color="#1e2222"/> + <polygon color="#292d38"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_garden" order="10-"> - <polygon color="#1c2521"/> + <polygon color="#282e37"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_village_green" order="10-"> - <polygon color="#191f14"/> + <polygon color="#202223"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_picnic_site" order="10-"> - <polygon color="#1d241f"/> - <polyline color="#1b201a"/> + <polygon color="#272d35"/> + <polyline color="#23262c"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_greenhouse" order="10-"> - <polygon color="#1f2525"/> + <polygon color="#2c313e"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_orchard" order="10-"> - <polygon color="#19241e"/> - <polyline color="#17201a"/> + <polygon color="#232a30"/> + <polyline color="#1f2328"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_plantnursery" order="10-"> - <polygon color="#1a2420"/> + <polygon color="#252b33"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_farm" order="0-"> - <polygon color="#1d2525"/> - <polyline color="#1b2221"/> + <polygon color="#2a303c"/> + <polyline color="#262b34"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_cemetery" order="1-"> - <polygon color="#1c2425" src="cemetery.png" w="32" h="32"/> + <polygon color="#282e3a" src="cemetery.png" w="32" h="32"/> </itemgra> <itemgra item_types="poly_car_parking" order="1-"> - <polygon color="#1e241a"/> - <polyline color="#1c2016"/> + <polygon color="#272b31"/> + <polyline color="#232629"/> </itemgra> <itemgra item_types="poly_meadow" order="0-"> - <polygon color="#1b251f"/> - <polyline color="#17211e"/> + <polygon color="#262c34"/> + <polyline color="#21272d"/> </itemgra> <itemgra item_types="poly_playground" order="10-"> - <polygon color="#1c251f"/> - <polyline color="#1a221a"/> + <polygon color="#272d35"/> + <polyline color="#23282c"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_water_tiled" order="0-"> - <polygon color="#182229"/> + <polygon color="#252a39"/> </itemgra> <itemgra item_types="poly_land" order="0-"> - <polygon color="#1f2522"/> - <polyline color="#1f2522"/> + <polygon color="#2b303b"/> + <polyline color="#2b303b"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_flats,poly_scrub,poly_marine,plantation,tundra" order="9-"> - <polygon color="#1c2321" src="scrub.png" w="50" h="50"/> - <polyline color="#1a201d"/> + <polygon color="#272c36" src="scrub.png" w="50" h="50"/> + <polyline color="#23272e"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_wood" order="0-"> - <polygon color="#18201d" src="wood.png" w="100" h="100"/> - <polyline color="#161d18"/> + <polygon color="#21252c" src="wood.png" w="100" h="100"/> + <polyline color="#1d2023"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_beach" order="0-"> - <polygon color="#1e251a"/> - <polyline color="#1c2216"/> + <polygon color="#282c32"/> + <polyline color="#24282a"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_mud" order="0-"> - <polygon color="#1a2227" src="wetland.png" w="50" h="50"/> + <polygon color="#262d39" src="wetland.png" w="50" h="50"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_pedestrian" order="10"> - <polyline color="#1d2326" width="3"/> - <polyline color="#1d2427" width="1"/> - <polygon color="#1d2427"/> + <polyline color="#292d3c" width="3"/> + <polyline color="#29303d" width="1"/> + <polygon color="#29303d"/> </itemgra> <itemgra item_types="poly_pedestrian" order="11"> - <polyline color="#1d2326" width="5"/> - <polyline color="#1d2427" width="3"/> - <polygon color="#1d2427"/> + <polyline color="#292d3c" width="5"/> + <polyline color="#29303d" width="3"/> + <polygon color="#29303d"/> </itemgra> <itemgra item_types="poly_pedestrian" order="12"> - <polyline color="#1d2326" width="8"/> - <polyline color="#1d2427" width="6"/> - <polygon color="#1d2427"/> + <polyline color="#292d3c" width="8"/> + <polyline color="#29303d" width="6"/> + <polygon color="#29303d"/> </itemgra> <itemgra item_types="poly_pedestrian" order="13"> - <polyline color="#1d2326" width="9"/> - <polyline color="#1d2427" width="7"/> - <polygon color="#1d2427"/> + <polyline color="#292d3c" width="9"/> + <polyline color="#29303d" width="7"/> + <polygon color="#29303d"/> </itemgra> <itemgra item_types="poly_pedestrian" order="14"> - <polyline color="#1d2326" width="13"/> - <polyline color="#1d2427" width="9"/> - <polygon color="#1d2427"/> + <polyline color="#292d3c" width="13"/> + <polyline color="#29303d" width="9"/> + <polygon color="#29303d"/> </itemgra> <itemgra item_types="poly_pedestrian" order="15"> - <polyline color="#1d2326" width="18"/> - <polyline color="#1d2427" width="14"/> - <polygon color="#1d2427"/> + <polyline color="#292d3c" width="18"/> + <polyline color="#29303d" width="14"/> + <polygon color="#29303d"/> </itemgra> <itemgra item_types="poly_pedestrian" order="16"> - <polyline color="#1d2326" width="21"/> - <polyline color="#1d2427" width="17"/> - <polygon color="#1d2427"/> + <polyline color="#292d3c" width="21"/> + <polyline color="#29303d" width="17"/> + <polygon color="#29303d"/> </itemgra> <itemgra item_types="poly_pedestrian" order="17"> - <polyline color="#1d2326" width="25"/> - <polyline color="#1d2427" width="21"/> - <polygon color="#1d2427"/> + <polyline color="#292d3c" width="25"/> + <polyline color="#29303d" width="21"/> + <polygon color="#29303d"/> </itemgra> <itemgra item_types="poly_pedestrian" order="18"> - <polyline color="#1d2326" width="40"/> - <polyline color="#1d2427" width="34"/> - <polygon color="#1d2427"/> + <polyline color="#292d3c" width="40"/> + <polyline color="#29303d" width="34"/> + <polygon color="#29303d"/> </itemgra> <itemgra item_types="poly_sports_pitch" order="10-"> - <polygon color="#18251d"/> - <polyline color="#152016"/> + <polygon color="#23292f"/> + <polyline color="#1c2122"/> </itemgra> <itemgra item_types="poly_service" order="8-18"> - <polygon color="#1f272b"/> - <polyline color="#1d2326" width="1"/> + <polygon color="#2d3545"/> + <polyline color="#292d3c" width="1"/> </itemgra> <itemgra item_types="poly_street_1" order="8-13"> - <polygon color="#1f272b"/> - <polyline color="#1d2326" width="1"/> + <polygon color="#2d3545"/> + <polyline color="#292d3c" width="1"/> </itemgra> <itemgra item_types="poly_street_1" order="14-16"> - <polygon color="#1f272b"/> - <polyline color="#1d2326" width="2"/> + <polygon color="#2d3545"/> + <polyline color="#292d3c" width="2"/> </itemgra> <itemgra item_types="poly_street_1" order="17-18"> - <polygon color="#1f272b"/> - <polyline color="#1d2326" width="3"/> + <polygon color="#2d3545"/> + <polyline color="#292d3c" width="3"/> </itemgra> <itemgra item_types="poly_street_2" order="7-12"> - <polygon color="#1f270c"/> - <polyline color="#1c2124" width="1"/> + <polygon color="#262b26"/> + <polyline color="#282c38" width="1"/> </itemgra> <itemgra item_types="poly_street_2" order="13-16"> - <polygon color="#1f270c"/> - <polyline color="#1c2124" width="2"/> + <polygon color="#262b26"/> + <polyline color="#282c38" width="2"/> </itemgra> <itemgra item_types="poly_street_2" order="17-18"> - <polygon color="#1f270c"/> - <polyline color="#1c2124" width="3"/> + <polygon color="#262b26"/> + <polyline color="#282c38" width="3"/> </itemgra> <itemgra item_types="poly_street_3" order="7-11"> - <polygon color="#1f270c"/> - <polyline color="#1a1e20" width="1"/> + <polygon color="#262b26"/> + <polyline color="#242530" width="1"/> </itemgra> <itemgra item_types="poly_street_3" order="12-15"> - <polygon color="#1f270c"/> - <polyline color="#1a1e20" width="2"/> + <polygon color="#262b26"/> + <polyline color="#242530" width="2"/> </itemgra> <itemgra item_types="poly_street_3" order="16-18"> - <polygon color="#1f270c"/> - <polyline color="#1a1e20" width="3"/> + <polygon color="#262b26"/> + <polyline color="#242530" width="3"/> </itemgra> <itemgra item_types="poly_saltpond" order="10-"> - <polygon color="#1d1a15"/> + <polygon color="#232126"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_dam" order="12-"> - <polygon color="#1a1f21"/> - <polyline color="#141414"/> + <polygon color="#242831"/> + <polyline color="#181518"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-"> - <polygon color="#182229"/> - <polyline color="#151d23"/> + <polygon color="#252a39"/> + <polyline color="#1e222d"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_swimming_pool" order="10-"> - <polygon color="#182229"/> - <polyline color="#151d23"/> + <polygon color="#252a39"/> + <polyline color="#1e222d"/> </itemgra> <itemgra item_types="water_line" order="0-"> - <polyline color="#151d23" width="1"/> + <polyline color="#1e222d" width="1"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="water_river" order="4-5"> - <polyline color="#182229" width="1"/> + <polyline color="#252a39" width="1"/> </itemgra> <itemgra item_types="water_river" order="6"> - <polyline color="#182229" width="2"/> + <polyline color="#252a39" width="2"/> </itemgra> <itemgra item_types="water_river" order="7"> - <polyline color="#182229" width="3"/> + <polyline color="#252a39" width="3"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="water_river" order="8-9"> - <polyline color="#182229" width="4"/> + <polyline color="#252a39" width="4"/> <text color="#55c4bd" background_color="#000000" text_size="7"/> </itemgra> <itemgra item_types="water_river" order="10-"> - <polyline color="#182229" width="4"/> + <polyline color="#252a39" width="4"/> <text color="#55c4bd" background_color="#000000" text_size="10"/> </itemgra> <itemgra item_types="water_canal" order="6"> - <polyline color="#182229" width="1"/> + <polyline color="#252a39" width="1"/> </itemgra> <itemgra item_types="water_canal" order="7"> - <polyline color="#182229" width="2"/> + <polyline color="#252a39" width="2"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="water_canal" order="8-9"> - <polyline color="#182229" width="3"/> + <polyline color="#252a39" width="3"/> <text color="#55c4bd" background_color="#000000" text_size="7"/> </itemgra> <itemgra item_types="water_canal" order="10-"> - <polyline color="#182229" width="3"/> + <polyline color="#252a39" width="3"/> <text color="#55c4bd" background_color="#000000" text_size="10"/> </itemgra> <itemgra item_types="water_stream" order="8-9"> - <polyline color="#182229" width="1"/> + <polyline color="#252a39" width="1"/> </itemgra> <itemgra item_types="water_stream" order="10-"> - <polyline color="#182229" width="2"/> + <polyline color="#252a39" width="2"/> <text color="#55c4bd" background_color="#000000" text_size="7"/> </itemgra> <itemgra item_types="water_drain" order="10-"> - <polyline color="#182229" width="1"/> + <polyline color="#252a39" width="1"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_apron" order="0-"> - <polygon color="#1d2226"/> + <polygon color="#292d3c"/> </itemgra> <itemgra item_types="poly_terminal" order="7-"> - <polygon color="#1e2120"/> + <polygon color="#292b36"/> </itemgra> <itemgra item_types="poly_artwork" order="10-"> - <polygon color="#1f2724"/> + <polygon color="#2c323e"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_sports_stadium" order="10-"> - <polygon color="#162017"/> + <polygon color="#1d2224"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_sports_track" order="10-"> - <polygon color="#1b1615"/> + <polygon color="#1f1d21"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="sports_track" order="10-"> - <polyline color="#1b1615" width="1"/> + <polyline color="#1f1d21" width="1"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_garages" order="10-"> - <polygon color="#1d2425"/> + <polygon color="#292f3b"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> + <itemgra item_types="archaeological_site" order="8-"> + <polyline color="#282d37" width="3"/> + <text color="#55c4bd" background_color="#000000" text_size="8"/> + </itemgra> <itemgra item_types="poly_building" order="0-"> - <polygon color="#1a1f21"/> - <polyline color="#17191a"/> + <polygon color="#242831"/> + <polyline color="#1d1d24"/> </itemgra> <itemgra item_types="rail" order="6-"> - <polyline color="#161819" width="3"/> - <polyline color="#1f272b" width="1" dash="5,5"/> + <polyline color="#1c1c21" width="3"/> + <polyline color="#2d3545" width="1" dash="5,5"/> </itemgra> <itemgra item_types="rail_narrow_gauge" order="6-"> - <polyline color="#161819" width="3"/> - <polyline color="#1f272b" width="1" dash="4,4"/> + <polyline color="#1c1c21" width="3"/> + <polyline color="#2d3545" width="1" dash="4,4"/> </itemgra> <itemgra item_types="ferry" order="5-"> - <polyline color="#100e0c" width="1" dash="10"/> + <polyline color="#100c08" width="1" dash="10"/> </itemgra> <itemgra item_types="border_country" order="0-"> - <polyline color="#1b1415" width="1" dash="10,5,2,5"/> + <polyline color="#1f1b20" width="1" dash="10,5,2,5"/> </itemgra> <itemgra item_types="border_state" order="0-"> - <polyline color="#181a1c" width="1"/> + <polyline color="#202028" width="1"/> </itemgra> <itemgra item_types="poly_university" order="8-"> - <polygon color="#1d1c2388"/> - <polyline color="#180f1688"/> + <polygon color="#26263488"/> + <polyline color="#1a151b88"/> </itemgra> <itemgra item_types="poly_barracks" order="10-"> - <polygon color="#1b1e20aa"/> + <polygon color="#252631aa"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_zoo" order="10-"> - <polyline color="#1c202099" width="10"/> + <polyline color="#26293399" width="10"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_nature_reserve" order="10-"> - <polyline color="#1c242466" width="10"/> + <polyline color="#282e3966" width="10"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_theme_park" order="10-"> - <polyline color="#101e1999" width="10"/> + <polyline color="#181d1f99" width="10"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_water_park" order="10-"> - <polyline color="#18212599" width="10"/> + <polyline color="#24293599" width="10"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> - <itemgra item_types="poly_military_zone" order="9-"> - <polygon color="#1a1e2044"/> + <itemgra item_types="poly_military_zone,poly_military" order="9-"> + <polygon color="#24253044" src="diagonal-stripes-gray.png" w="16" h="16"/> + <polyline color="#21242cb5" width="1"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_airport" order="0-"> - <polygon color="#1a1e2066"/> + <polygon color="#24253066"/> </itemgra> <itemgra item_types="poly_airfield" order="10-"> - <polygon color="#1e232566"/> + <polygon color="#2a2e3c66" src="diagonal-stripes-gray.png" w="16" h="16"/> + <polyline color="#21242cb5" width="1"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> <itemgra item_types="poly_danger_area" order="8-"> - <polygon color="#1f200f33" src="diagonal-stripes.png" w="16" h="16"/> - <polyline color="#1f0e0cb5"/> + <polygon color="#24262533" src="diagonal-stripes.png" w="16" h="16"/> + <polyline color="#1f1617b5"/> <text color="#55c4bd" background_color="#000000" text_size="5"/> </itemgra> </layer> <layer name="heightlines"> - <itemgra item_types="height_line_1" order="0-"> - <polyline color="#000000" width="1"/> + <itemgra item_types="height_line_1" order="7"> + <polyline color="#100c08" width="1"/> + </itemgra> + <itemgra item_types="height_line_1" order="8-"> + <polyline color="#100c08" width="3"/> + <text color="#55c4bd" background_color="#000000" text_size="8"/> + </itemgra> + <itemgra item_types="height_line_2" order="8"> + <polyline color="#100c08" width="1"/> + </itemgra> + <itemgra item_types="height_line_2" order="9-"> + <polyline color="#100c08" width="2"/> + <text color="#55c4bd" background_color="#000000" text_size="8"/> </itemgra> - <itemgra item_types="height_line_2" order="0-"> - <polyline color="#000000" width="2"/> + <itemgra item_types="height_line_3" order="9-11"> + <polyline color="#100c08" width="1"/> + </itemgra> + <itemgra item_types="height_line_3" order="12-"> + <polyline color="#100c08" width="1"/> + <text color="#55c4bd" background_color="#000000" text_size="8"/> </itemgra> </layer> <layer name="streets"> <itemgra item_types="street_route" order="2"> - <polyline color="#0000a0" width="4"/> + <polyline color="#15121c" width="4"/> </itemgra> <itemgra item_types="street_route" order="3-5"> - <polyline color="#0000a0" width="8"/> + <polyline color="#15121c" width="8"/> </itemgra> <itemgra item_types="street_route" order="6"> - <polyline color="#0000a0" width="10"/> + <polyline color="#15121c" width="10"/> </itemgra> <itemgra item_types="street_route" order="7-8"> - <polyline color="#0000a0" width="16"/> + <polyline color="#15121c" width="16"/> </itemgra> <itemgra item_types="street_route" order="9-10"> - <polyline color="#0000a0" width="20"/> + <polyline color="#15121c" width="20"/> </itemgra> <itemgra item_types="street_route" order="11"> - <polyline color="#0000a0" width="28"/> + <polyline color="#15121c" width="28"/> </itemgra> <itemgra item_types="street_route" order="12"> - <polyline color="#0000a0" width="32"/> + <polyline color="#15121c" width="32"/> </itemgra> <itemgra item_types="street_route" order="13"> - <polyline color="#0000a0" width="52"/> + <polyline color="#15121c" width="52"/> </itemgra> <itemgra item_types="street_route" order="14"> - <polyline color="#0000a0" width="64"/> + <polyline color="#15121c" width="64"/> </itemgra> <itemgra item_types="street_route" order="15"> - <polyline color="#0000a0" width="68"/> + <polyline color="#15121c" width="68"/> </itemgra> <itemgra item_types="street_route" order="16"> - <polyline color="#0000a0" width="132"/> + <polyline color="#15121c" width="132"/> </itemgra> <itemgra item_types="street_route" order="17"> - <polyline color="#0000a0" width="268"/> + <polyline color="#15121c" width="268"/> </itemgra> <itemgra item_types="street_route" order="18"> - <polyline color="#0000a0" width="530"/> + <polyline color="#15121c" width="530"/> + </itemgra> + <itemgra item_types="selected_line" order="2"> + <polyline color="#201a2a" width="4"/> + </itemgra> + <itemgra item_types="selected_line" order="3-5"> + <polyline color="#201a2a" width="8"/> + </itemgra> + <itemgra item_types="selected_line" order="6"> + <polyline color="#201a2a" width="10"/> + </itemgra> + <itemgra item_types="selected_line" order="7-8"> + <polyline color="#201a2a" width="16"/> + </itemgra> + <itemgra item_types="selected_line" order="9-10"> + <polyline color="#201a2a" width="20"/> + </itemgra> + <itemgra item_types="selected_line" order="11"> + <polyline color="#201a2a" width="28"/> + </itemgra> + <itemgra item_types="selected_line" order="12"> + <polyline color="#201a2a" width="32"/> + </itemgra> + <itemgra item_types="selected_line" order="13"> + <polyline color="#201a2a" width="52"/> + </itemgra> + <itemgra item_types="selected_line" order="14"> + <polyline color="#201a2a" width="64"/> + </itemgra> + <itemgra item_types="selected_line" order="15"> + <polyline color="#201a2a" width="68"/> + </itemgra> + <itemgra item_types="selected_line" order="16"> + <polyline color="#201a2a" width="132"/> + </itemgra> + <itemgra item_types="selected_line" order="17"> + <polyline color="#201a2a" width="268"/> + </itemgra> + <itemgra item_types="selected_line" order="18"> + <polyline color="#201a2a" width="530"/> + </itemgra> + <itemgra item_types="forest_way_1" order="10-"> + <polyline color="#191d27" width="6"/> + </itemgra> + <itemgra item_types="forest_way_2" order="10-"> + <polyline color="#1f1617" width="3"/> + </itemgra> + <itemgra item_types="forest_way_3" order="10-"> + <polyline color="#1f1617" width="1" dash="2,4"/> + </itemgra> + <itemgra item_types="forest_way_4" order="10-"> + <polyline color="#161917" width="1" dash="4,10"/> </itemgra> <itemgra item_types="street_nopass" order="10-"> - <polyline color="#000000" width="1"/> + <polyline color="#100c08" width="1"/> </itemgra> <itemgra item_types="track_paved" order="10-"> - <polyline color="#000000" width="1"/> + <polyline color="#100c08" width="1"/> </itemgra> - <itemgra item_types="track_gravelled" order="10-12"> - <polyline color="#800000" width="1" dash="3,6"/> + <itemgra item_types="track_gravelled,track_grass" order="10-12"> + <polyline color="#181110" width="1" dash="3,6"/> </itemgra> - <itemgra item_types="track_gravelled" order="13-14"> - <polyline color="#3d3d3d" width="4"/> - <polyline color="#800000" width="1" dash="4,8"/> + <itemgra item_types="track_gravelled,track_grass" order="13-14"> + <polyline color="#2d3545" width="4"/> + <polyline color="#181110" width="1" dash="4,8"/> </itemgra> - <itemgra item_types="track_gravelled" order="15-16"> - <polyline color="#3d3d3d" width="5"/> - <polyline color="#800000" width="1" dash="5,10"/> + <itemgra item_types="track_gravelled,track_grass" order="15-16"> + <polyline color="#2d3545" width="5"/> + <polyline color="#181110" width="1" dash="5,10"/> </itemgra> - <itemgra item_types="track_gravelled" order="17-"> - <polyline color="#3d3d3d" width="7"/> - <polyline color="#800000" width="1" dash="7,15"/> + <itemgra item_types="track_gravelled,track_grass" order="17-"> + <polyline color="#2d3545" width="7"/> + <polyline color="#181110" width="1" dash="7,15"/> </itemgra> - <itemgra item_types="track_unpaved" order="10-"> - <polyline color="#020a09" width="1"/> + <itemgra item_types="track_unpaved,track_ground,path,hiking,hiking_mountain,hiking_mountain_demanding,hiking_alpine,hiking_alpine_demanding,hiking_alpine_difficult" order="10-"> + <polyline color="#19191c" width="1"/> </itemgra> <itemgra item_types="bridleway" order="10-"> - <polyline color="#030c07" width="1"/> + <polyline color="#1b1a1c" width="1"/> </itemgra> <itemgra item_types="cycleway" order="10-"> - <polyline color="#03080b" width="1"/> + <polyline color="#1b191e" width="1"/> </itemgra> <itemgra item_types="piste_downhill_novice" order="10-12"> - <polyline color="#00A000" width="1"/> + <polyline color="#151912" width="1"/> </itemgra> <itemgra item_types="piste_downhill_novice" order="13-14"> - <polyline color="#00A000" width="2"/> + <polyline color="#151912" width="2"/> </itemgra> <itemgra item_types="piste_downhill_novice" order="15-16"> - <polyline color="#00A000" width="3"/> + <polyline color="#151912" width="3"/> </itemgra> <itemgra item_types="piste_downhill_novice" order="17-"> - <polyline color="#00A000" width="5"/> + <polyline color="#151912" width="5"/> </itemgra> <itemgra item_types="piste_downhill_easy" order="10-12"> - <polyline color="#0000ff" width="1"/> + <polyline color="#171627" width="1"/> </itemgra> <itemgra item_types="piste_downhill_easy" order="13-14"> - <polyline color="#0000ff" width="2"/> + <polyline color="#171627" width="2"/> </itemgra> <itemgra item_types="piste_downhill_easy" order="15-16"> - <polyline color="#0000ff" width="3"/> + <polyline color="#171627" width="3"/> </itemgra> <itemgra item_types="piste_downhill_easy" order="17-"> - <polyline color="#0000ff" width="5"/> + <polyline color="#171627" width="5"/> </itemgra> <itemgra item_types="piste_downhill_intermediate" order="10-12"> - <polyline color="#900000" width="1"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="piste_downhill_intermediate" order="13-14"> - <polyline color="#900000" width="2"/> + <polyline color="#1f1617" width="2"/> </itemgra> <itemgra item_types="piste_downhill_intermediate" order="15-16"> - <polyline color="#900000" width="3"/> + <polyline color="#1f1617" width="3"/> </itemgra> <itemgra item_types="piste_downhill_intermediate" order="17-"> - <polyline color="#900000" width="5"/> + <polyline color="#1f1617" width="5"/> </itemgra> <itemgra item_types="piste_downhill_advanced" order="10-12"> - <polyline color="#000000" width="1"/> + <polyline color="#100c08" width="1"/> </itemgra> <itemgra item_types="piste_downhill_advanced" order="13-14"> - <polyline color="#000000" width="2"/> + <polyline color="#100c08" width="2"/> </itemgra> <itemgra item_types="piste_downhill_advanced" order="15-16"> - <polyline color="#000000" width="3"/> + <polyline color="#100c08" width="3"/> </itemgra> <itemgra item_types="piste_downhill_advanced" order="17-"> - <polyline color="#000000" width="5"/> + <polyline color="#100c08" width="5"/> </itemgra> <itemgra item_types="piste_downhill_expert" order="10-12"> - <polyline color="#ffaa00" width="1"/> + <polyline color="#242421" width="1"/> </itemgra> <itemgra item_types="piste_downhill_expert" order="13-14"> - <polyline color="#ffaa00" width="2"/> + <polyline color="#242421" width="2"/> </itemgra> <itemgra item_types="piste_downhill_expert" order="15-16"> - <polyline color="#ffaa00" width="3"/> + <polyline color="#242421" width="3"/> </itemgra> <itemgra item_types="piste_downhill_expert" order="17-"> - <polyline color="#ffaa00" width="5"/> + <polyline color="#242421" width="5"/> </itemgra> <itemgra item_types="piste_downhill_freeride" order="10-12"> - <polyline color="#c5c300" width="1"/> + <polyline color="#262b26" width="1"/> </itemgra> <itemgra item_types="piste_downhill_freeride" order="13-14"> - <polyline color="#c5c300" width="2"/> + <polyline color="#262b26" width="2"/> </itemgra> <itemgra item_types="piste_downhill_freeride" order="15-16"> - <polyline color="#c5c300" width="3"/> + <polyline color="#262b26" width="3"/> </itemgra> <itemgra item_types="piste_downhill_freeride" order="17-"> - <polyline color="#c5c300" width="5"/> + <polyline color="#262b26" width="5"/> </itemgra> <itemgra item_types="lift_cable_car" order="6-"> - <polyline color="#3d3d3d" width="1" dash="5"/> + <polyline color="#1c1c21" width="1" dash="5"/> </itemgra> <itemgra item_types="lift_chair" order="6-"> - <polyline color="#3d3d3d" width="1" dash="5"/> + <polyline color="#1c1c21" width="1" dash="5"/> </itemgra> <itemgra item_types="lift_drag" order="6-"> - <polyline color="#3d3d3d" width="1" dash="5"/> + <polyline color="#1c1c21" width="1" dash="5"/> </itemgra> <itemgra item_types="piste_nordic" order="10-12"> - <polyline color="#0000ff" width="1" dash="3,6"/> + <polyline color="#171627" width="1" dash="3,6" offset="4"/> </itemgra> <itemgra item_types="piste_nordic" order="13-14"> - <polyline color="#0000ff" width="2"/> - <polyline color="#000000" width="1" dash="4,8"/> + <polyline color="#2d3545" width="4" offset="6"/> + <polyline color="#171627" width="1" dash="4,8" offset="6"/> </itemgra> <itemgra item_types="piste_nordic" order="15-16"> - <polyline color="#0000ff" width="3"/> - <polyline color="#000000" width="1" dash="5,10"/> + <polyline color="#2d3545" width="5" offset="7"/> + <polyline color="#171627" width="1" dash="5,10" offset="7"/> </itemgra> <itemgra item_types="piste_nordic" order="17-"> - <polyline color="#0000ff" width="5"/> - <polyline color="#000000" width="1" dash="7,15"/> + <polyline color="#2d3545" width="7" offset="10"/> + <polyline color="#171627" width="1" dash="7,15" offset="10"/> + </itemgra> + <itemgra item_types="footway_and_piste_nordic" order="10-12"> + <polyline color="#1f1617" width="1" dash="3,15"/> + <polyline color="#171627" width="1" dash="3,15" offset="9"/> + </itemgra> + <itemgra item_types="footway_and_piste_nordic" order="13-14"> + <polyline color="#2d3545" width="4"/> + <polyline color="#1f1617" width="2"/> + <polyline color="#171627" width="1" dash="4,20" offset="12"/> + </itemgra> + <itemgra item_types="footway_and_piste_nordic" order="15-16"> + <polyline color="#2d3545" width="5"/> + <polyline color="#1f1617" width="3"/> + <polyline color="#171627" width="1" dash="5,25" offset="15"/> + </itemgra> + <itemgra item_types="footway_and_piste_nordic" order="17-"> + <polyline color="#2d3545" width="7"/> + <polyline color="#1f1617" width="5"/> + <polyline color="#171627" width="1" dash="7,37" offset="22"/> </itemgra> - <itemgra item_types="footway" order="11-12"> - <polyline color="#4e0000" width="1" dash="3,6"/> + <itemgra item_types="footway" order="10-12"> + <polyline color="#1f1617" width="1" dash="3,6"/> </itemgra> <itemgra item_types="footway" order="13-14"> - <polyline color="#4e0000" width="2"/> - <polyline color="#000000" width="1" dash="4,8"/> + <polyline color="#2d3545" width="4"/> + <polyline color="#1f1617" width="1" dash="4,8"/> </itemgra> <itemgra item_types="footway" order="15-16"> - <polyline color="#4e0000" width="3"/> - <polyline color="#000000" width="1" dash="5,10"/> + <polyline color="#2d3545" width="5"/> + <polyline color="#1f1617" width="1" dash="5,10"/> </itemgra> <itemgra item_types="footway" order="17-"> - <polyline color="#4e0000" width="5"/> - <polyline color="#000000" width="1" dash="7,15"/> + <polyline color="#2d3545" width="7"/> + <polyline color="#1f1617" width="1" dash="7,15"/> </itemgra> - <itemgra item_types="steps" order="14-15"> - <polyline color="#4d4e11" width="1"/> - </itemgra> - <itemgra item_types="steps" order="16"> - <polyline color="#4d4e11" width="2"/> - </itemgra> - <itemgra item_types="steps" order="17-18"> - <polyline color="#4d4e11" width="3"/> + <itemgra item_types="steps" order="10-"> + <polyline color="#100c08" width="1"/> </itemgra> <itemgra item_types="street_pedestrian,living_street" order="10"> - <polyline color="#1e0728" width="1"/> + <polyline color="#292d3c" width="3"/> + <polyline color="#29303d" width="1"/> </itemgra> <itemgra item_types="street_pedestrian,living_street" order="11"> - <polyline color="#1e0728" width="5"/> - <polyline color="#202020" width="2"/> + <polyline color="#292d3c" width="5"/> + <polyline color="#29303d" width="3"/> </itemgra> <itemgra item_types="street_pedestrian,living_street" order="12"> - <polyline color="#1e0728" width="8"/> - <polyline color="#202020" width="3"/> + <polyline color="#292d3c" width="8"/> + <polyline color="#29303d" width="6"/> </itemgra> <itemgra item_types="street_pedestrian,living_street" order="13"> - <polyline color="#1e0728" width="9"/> - <polyline color="#202020" width="4"/> + <polyline color="#292d3c" width="9"/> + <polyline color="#29303d" width="7"/> </itemgra> <itemgra item_types="street_pedestrian,living_street" order="14"> - <polyline color="#1e0728" width="13"/> - <polyline color="#202020" width="7"/> + <polyline color="#292d3c" width="13"/> + <polyline color="#29303d" width="9"/> + <arrows color="#171627" width="7" oneway="1"/> </itemgra> <itemgra item_types="street_pedestrian,living_street" order="15"> - <polyline color="#1e0728" width="18"/> - <polyline color="#202020" width="10"/> + <polyline color="#292d3c" width="18"/> + <polyline color="#29303d" width="14"/> + <arrows color="#171627" width="12" oneway="1"/> </itemgra> <itemgra item_types="street_pedestrian,living_street" order="16"> - <polyline color="#1e0728" width="21"/> - <polyline color="#202020" width="13"/> + <polyline color="#292d3c" width="21"/> + <polyline color="#29303d" width="17"/> + <arrows color="#171627" width="15" oneway="1"/> </itemgra> <itemgra item_types="street_pedestrian,living_street" order="17"> - <polyline color="#1e0728" width="25"/> - <polyline color="#202020" width="17"/> + <polyline color="#292d3c" width="25"/> + <polyline color="#29303d" width="21"/> + <arrows color="#171627" width="19" oneway="1"/> </itemgra> <itemgra item_types="street_pedestrian,living_street" order="18"> - <polyline color="#1e0728" width="40"/> - <polyline color="#202020" width="30"/> + <polyline color="#292d3c" width="40"/> + <polyline color="#29303d" width="34"/> + <arrows color="#171627" width="32" oneway="1"/> </itemgra> <itemgra item_types="street_service" order="10"> - <polyline color="#2c2c2c" width="2"/> + <polyline color="#292d3c" width="4"/> + <polyline color="#2d3545" width="2"/> </itemgra> <itemgra item_types="street_service" order="11"> - <polyline color="#2c2c2c" width="2"/> + <polyline color="#292d3c" width="4"/> + <polyline color="#2d3545" width="2"/> </itemgra> <itemgra item_types="street_service" order="12"> - <polyline color="#2c2c2c" width="3"/> + <polyline color="#292d3c" width="5"/> + <polyline color="#2d3545" width="3"/> </itemgra> <itemgra item_types="street_service" order="13"> - <polyline color="#2c2c2c" width="4"/> + <polyline color="#292d3c" width="6"/> + <polyline color="#2d3545" width="4"/> </itemgra> <itemgra item_types="street_service" order="14"> - <polyline color="#2c2c2c" width="5"/> + <polyline color="#292d3c" width="7"/> + <polyline color="#2d3545" width="5"/> + <arrows color="#171627" width="4" oneway="1"/> </itemgra> <itemgra item_types="street_service" order="15"> - <polyline color="#2c2c2c" width="6"/> + <polyline color="#292d3c" width="8"/> + <polyline color="#2d3545" width="6"/> + <arrows color="#171627" width="5" oneway="1"/> </itemgra> <itemgra item_types="street_service" order="16"> - <polyline color="#2c2c2c" width="7"/> + <polyline color="#292d3c" width="9"/> + <polyline color="#2d3545" width="7"/> + <arrows color="#171627" width="7" oneway="1"/> </itemgra> <itemgra item_types="street_service" order="17"> - <polyline color="#2c2c2c" width="8"/> + <polyline color="#292d3c" width="10"/> + <polyline color="#2d3545" width="8"/> + <arrows color="#171627" width="7" oneway="1"/> </itemgra> <itemgra item_types="street_service" order="18"> - <polyline color="#2c2c2c" width="9"/> + <polyline color="#292d3c" width="11"/> + <polyline color="#2d3545" width="9"/> + <arrows color="#171627" width="7" oneway="1"/> </itemgra> <itemgra item_types="street_parking_lane" order="12"> - <polyline color="#2c2c2c" width="2"/> + <polyline color="#292d3c" width="4"/> + <polyline color="#2d3545" width="2"/> </itemgra> <itemgra item_types="street_parking_lane" order="13"> - <polyline color="#2c2c2c" width="2"/> + <polyline color="#292d3c" width="4"/> + <polyline color="#2d3545" width="2"/> </itemgra> <itemgra item_types="street_parking_lane" order="14"> - <polyline color="#2c2c2c" width="3"/> + <polyline color="#292d3c" width="5"/> + <polyline color="#2d3545" width="3"/> </itemgra> <itemgra item_types="street_parking_lane" order="15"> - <polyline color="#2c2c2c" width="4"/> + <polyline color="#292d3c" width="6"/> + <polyline color="#2d3545" width="4"/> + <arrows color="#171627" width="4" oneway="1"/> </itemgra> <itemgra item_types="street_parking_lane" order="16"> - <polyline color="#2c2c2c" width="5"/> + <polyline color="#292d3c" width="7"/> + <polyline color="#2d3545" width="5"/> + <arrows color="#171627" width="4" oneway="1"/> </itemgra> <itemgra item_types="street_parking_lane" order="17"> - <polyline color="#2c2c2c" width="6"/> + <polyline color="#292d3c" width="8"/> + <polyline color="#2d3545" width="6"/> + <arrows color="#171627" width="4" oneway="1"/> </itemgra> <itemgra item_types="street_parking_lane" order="18"> - <polyline color="#2c2c2c" width="7"/> + <polyline color="#292d3c" width="9"/> + <polyline color="#2d3545" width="7"/> + <arrows color="#171627" width="5" oneway="1"/> </itemgra> <itemgra item_types="street_0,street_1_city,street_1_land" order="10"> - <polyline color="#24092f" width="2"/> + <polyline color="#292d3c" width="4"/> + <polyline color="#2d3545" width="2"/> </itemgra> <itemgra item_types="street_0,street_1_city,street_1_land" order="11"> - <polyline color="#24092f" width="3"/> + <polyline color="#292d3c" width="6"/> + <polyline color="#2d3545" width="4"/> </itemgra> <itemgra item_types="street_0,street_1_city,street_1_land" order="12"> - <polyline color="#24092f" width="5"/> + <polyline color="#292d3c" width="10"/> + <polyline color="#2d3545" width="8"/> </itemgra> <itemgra item_types="street_0,street_1_city,street_1_land" order="13"> - <polyline color="#24092f" width="9"/> + <polyline color="#292d3c" width="11"/> + <polyline color="#2d3545" width="9"/> </itemgra> <itemgra item_types="street_0,street_1_city,street_1_land" order="14"> - <polyline color="#24092f" width="13"/> + <polyline color="#292d3c" width="17"/> + <polyline color="#2d3545" width="13"/> + <arrows color="#171627" width="12" oneway="1"/> </itemgra> <itemgra item_types="street_0,street_1_city,street_1_land" order="15"> - <polyline color="#24092f" width="14"/> + <polyline color="#292d3c" width="18"/> + <polyline color="#2d3545" width="14"/> + <arrows color="#171627" width="12" oneway="1"/> </itemgra> <itemgra item_types="street_0,street_1_city,street_1_land" order="16"> - <polyline color="#24092f" width="26"/> + <polyline color="#292d3c" width="30"/> + <polyline color="#2d3545" width="26"/> + <arrows color="#171627" width="24" oneway="1"/> </itemgra> <itemgra item_types="street_0,street_1_city,street_1_land" order="17"> - <polyline color="#24092f" width="61"/> + <polyline color="#292d3c" width="67"/> + <polyline color="#2d3545" width="61"/> + <arrows color="#171627" width="59" oneway="1"/> </itemgra> <itemgra item_types="street_0,street_1_city,street_1_land" order="18"> - <polyline color="#24092f" width="126"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="8"> - <polyline color="#1d4c19" width="1"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="9"> - <polyline color="#1d4c19" width="1"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="10"> - <polyline color="#1d4c19" width="2"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="11"> - <polyline color="#1d4c19" width="4"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="12"> - <polyline color="#1d4c19" width="7"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="13"> - <polyline color="#1d4c19" width="11"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="14"> - <polyline color="#1d4c19" width="14"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="15"> - <polyline color="#1d4c19" width="17"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="16"> - <polyline color="#1d4c19" width="30"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="17"> - <polyline color="#1d4c19" width="67"/> - </itemgra> - <itemgra item_types="street_2_city,street_2_land" order="18"> - <polyline color="#1d4c19" width="138"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="7-8"> - <polyline color="#4d4e11" width="1"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="9"> - <polyline color="#4d4e11" width="2"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="10"> - <polyline color="#4d4e11" width="4"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="11"> - <polyline color="#4d4e11" width="5"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="12"> - <polyline color="#4d4e11" width="7"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="13"> - <polyline color="#4d4e11" width="14"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="14"> - <polyline color="#4d4e11" width="17"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="15"> - <polyline color="#4d4e11" width="21"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="16"> - <polyline color="#4d4e11" width="34"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="17"> - <polyline color="#4d4e11" width="73"/> - </itemgra> - <itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="18"> - <polyline color="#4d4e11" width="150"/> - </itemgra> - <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-5"> - <polyline color="#430000" width="1"/> - </itemgra> - <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-8"> - <polyline color="#430000" width="2"/> + <polyline color="#292d3c" width="132"/> + <polyline color="#2d3545" width="126"/> + <arrows color="#171627" width="124" oneway="1"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="7-8"> + <polyline color="#282c38" width="2"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="9"> + <polyline color="#282c38" width="3"/> + <polyline color="#262b26" width="1"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="10"> + <polyline color="#282c38" width="4"/> + <polyline color="#262b26" width="2"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="11"> + <polyline color="#282c38" width="5"/> + <polyline color="#262b26" width="3"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="12"> + <polyline color="#282c38" width="7"/> + <polyline color="#262b26" width="5"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="13"> + <polyline color="#282c38" width="11"/> + <polyline color="#262b26" width="8"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="14"> + <polyline color="#282c38" width="14"/> + <polyline color="#262b26" width="11"/> + <arrows color="#171627" width="9" oneway="1"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="15"> + <polyline color="#282c38" width="19"/> + <polyline color="#262b26" width="15"/> + <arrows color="#171627" width="13" oneway="1"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="16"> + <polyline color="#282c38" width="30"/> + <polyline color="#262b26" width="26"/> + <arrows color="#171627" width="24" oneway="1"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="17"> + <polyline color="#282c38" width="63"/> + <polyline color="#262b26" width="57"/> + <arrows color="#171627" width="55" oneway="1"/> + </itemgra> + <itemgra item_types="street_2_city,street_2_land,ramp" order="18"> + <polyline color="#282c38" width="100"/> + <polyline color="#262b26" width="90"/> + <arrows color="#171627" width="88" oneway="1"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="7-8"> + <polyline color="#242530" width="3"/> + <polyline color="#262b26" width="1"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="9"> + <polyline color="#242530" width="5"/> + <polyline color="#262b26" width="3"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="10"> + <polyline color="#242530" width="8"/> + <polyline color="#262b26" width="6"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="11"> + <polyline color="#242530" width="9"/> + <polyline color="#262b26" width="7"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="12"> + <polyline color="#242530" width="13"/> + <polyline color="#262b26" width="9"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="13"> + <polyline color="#242530" width="18"/> + <polyline color="#262b26" width="14"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="14"> + <polyline color="#242530" width="21"/> + <polyline color="#262b26" width="17"/> + <arrows color="#171627" width="15" oneway="1"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="15"> + <polyline color="#242530" width="25"/> + <polyline color="#262b26" width="21"/> + <arrows color="#171627" width="19" oneway="1"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="16"> + <polyline color="#242530" width="40"/> + <polyline color="#262b26" width="34"/> + <arrows color="#171627" width="32" oneway="1"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="17"> + <polyline color="#242530" width="79"/> + <polyline color="#262b26" width="73"/> + <arrows color="#171627" width="70" oneway="1"/> + </itemgra> + <itemgra item_types="street_3_city,street_3_land,roundabout" order="18"> + <polyline color="#242530" width="156"/> + <polyline color="#262b26" width="150"/> + <arrows color="#171627" width="148" oneway="1"/> + </itemgra> + <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6"> + <polyline color="#181518" width="1"/> + </itemgra> + <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8"> + <polyline color="#181518" width="3"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9"> - <polyline color="#430000" width="3"/> + <polyline color="#100c08" width="5"/> + <polyline color="#1f1617" width="3"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10"> - <polyline color="#430000" width="4"/> + <polyline color="#100c08" width="6"/> + <polyline color="#1f1617" width="4"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11"> - <polyline color="#430000" width="7"/> + <polyline color="#100c08" width="9"/> + <polyline color="#1f1617" width="7"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12"> - <polyline color="#430000" width="9"/> + <polyline color="#100c08" width="13"/> + <polyline color="#1f1617" width="9"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13"> - <polyline color="#430000" width="14"/> + <polyline color="#100c08" width="18"/> + <polyline color="#1f1617" width="14"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14"> - <polyline color="#430000" width="17"/> + <polyline color="#100c08" width="21"/> + <polyline color="#1f1617" width="17"/> + <arrows color="#171627" width="15" oneway="1"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15"> - <polyline color="#430000" width="20"/> + <polyline color="#100c08" width="24"/> + <polyline color="#1f1617" width="20"/> + <arrows color="#171627" width="18" oneway="1"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16"> - <polyline color="#430000" width="33"/> + <polyline color="#100c08" width="39"/> + <polyline color="#1f1617" width="33"/> + <arrows color="#171627" width="30" oneway="1"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17"> - <polyline color="#430000" width="72"/> + <polyline color="#100c08" width="78"/> + <polyline color="#1f1617" width="72"/> + <arrows color="#171627" width="70" oneway="1"/> </itemgra> <itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18"> - <polyline color="#430000" width="150"/> + <polyline color="#100c08" width="156"/> + <polyline color="#1f1617" width="150"/> + <arrows color="#171627" width="148" oneway="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="2"> - <polyline color="#760000" width="1"/> + <polyline color="#1f1617" width="1"/> </itemgra> - <!--1d4c19/0d740d--> <itemgra item_types="highway_city,highway_land" order="3-5"> - <polyline color="#640000" width="3"/> - <polyline color="#0a5c0a" width="1"/> + <polyline color="#1f1617" width="3"/> + <polyline color="#262b26" width="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="6"> - <polyline color="#640000" width="4"/> - <polyline color="#0a5c0a" width="1"/> + <polyline color="#1f1617" width="4"/> + <polyline color="#262b26" width="2"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="7-8"> - <polyline color="#640000" width="6"/> - <polyline color="#005b00" width="1"/> + <polyline color="#1f1617" width="7"/> + <polyline color="#262b26" width="5"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="9-10"> - <polyline color="#640000" width="8"/> - <polyline color="#0a5c0a" width="2"/> + <polyline color="#1f1617" width="9"/> + <polyline color="#262b26" width="5"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="11"> - <polyline color="#640000" width="12"/> - <polyline color="#0a5c0a" width="3"/> + <polyline color="#1f1617" width="13"/> + <polyline color="#262b26" width="9"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="12"> - <polyline color="#640000" width="13"/> - <polyline color="#0a5c0a" width="3"/> + <polyline color="#1f1617" width="15"/> + <polyline color="#262b26" width="10"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="13"> - <polyline color="#640000" width="17"/> - <polyline color="#0a5c0a" width="4"/> + <polyline color="#1f1617" width="25"/> + <polyline color="#262b26" width="17"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="14"> - <polyline color="#640000" width="24"/> - <polyline color="#0a5c0a" width="4"/> + <polyline color="#1f1617" width="31"/> + <polyline color="#262b26" width="24"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="15"> - <polyline color="#640000" width="27"/> - <polyline color="#0a5c0a" width="5"/> + <polyline color="#1f1617" width="33"/> + <polyline color="#262b26" width="27"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="16"> - <polyline color="#640000" width="59"/> - <polyline color="#0a5c0a" width="6"/> + <polyline color="#1f1617" width="65"/> + <polyline color="#262b26" width="59"/> + <polyline color="#1f1617" width="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="17"> - <polyline color="#640000" width="127"/> - <polyline color="#0a5c0a" width="7"/> + <polyline color="#1f1617" width="133"/> + <polyline color="#262b26" width="127"/> + <polyline color="#1f1617" width="1"/> + <arrows color="#171627" width="125" oneway="1"/> </itemgra> <itemgra item_types="highway_city,highway_land" order="18"> - <polyline color="#640000" width="258"/> - <polyline color="#0a5c0a" width="8"/> - </itemgra> - <!-- This entry shows all unknown linear elements as blue lines --> - <!-- - <itemgra item_types="street_unkn" order="0-"> - <polyline color="#8080ff" width="3"/> - </itemgra> - --> + <polyline color="#1f1617" width="264"/> + <polyline color="#262b26" width="258"/> + <polyline color="#1f1617" width="1"/> + <arrows color="#171627" width="256" oneway="1"/> + </itemgra> + <itemgra item_types="tracking_0" order="0-"> + <polyline color="#100c08" width="3"/> + </itemgra> + <itemgra item_types="tracking_10" order="0-"> + <polyline color="#11100d" width="3"/> + </itemgra> + <itemgra item_types="tracking_20" order="0-"> + <polyline color="#151414" width="3"/> + </itemgra> + <itemgra item_types="tracking_30" order="0-"> + <polyline color="#181819" width="3"/> + </itemgra> + <itemgra item_types="tracking_40" order="0-"> + <polyline color="#1c1c20" width="3"/> + </itemgra> + <itemgra item_types="tracking_50" order="0-"> + <polyline color="#1d2025" width="3"/> + </itemgra> + <itemgra item_types="tracking_60" order="0-"> + <polyline color="#21242d" width="3"/> + </itemgra> + <itemgra item_types="tracking_70" order="0-"> + <polyline color="#252834" width="3"/> + </itemgra> + <itemgra item_types="tracking_80" order="0-"> + <polyline color="#282d39" width="3"/> + </itemgra> + <itemgra item_types="tracking_90" order="0-"> + <polyline color="#2c3140" width="3"/> + </itemgra> + <itemgra item_types="tracking_100" order="0-"> + <polyline color="#2d3545" width="3"/> + </itemgra> <itemgra item_types="highway_exit_label" order="10-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="7"/> </itemgra> <itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18"> - <text text_size="8" color="#55c4bd" background_color="#000000"/> + <text color="#55c4bd" background_color="#000000" text_size="8"/> </itemgra> <itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18"> - <text text_size="9" color="#55c4bd" background_color="#000000"/> + <text color="#55c4bd" background_color="#000000" text_size="9"/> </itemgra> <itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18"> - <text text_size="9" color="#55c4bd" background_color="#000000"/> + <text color="#55c4bd" background_color="#000000" text_size="9"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="2"> + <polyline color="#232220" width="2"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="3-5"> + <polyline color="#232220" width="4"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="6"> + <polyline color="#232220" width="5"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="7-8"> + <polyline color="#232220" width="8"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="9-10"> + <polyline color="#232220" width="10"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="11"> + <polyline color="#232220" width="14"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="12"> + <polyline color="#232220" width="16"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="13"> + <polyline color="#232220" width="26"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="14"> + <polyline color="#232220" width="32"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="15"> + <polyline color="#232220" width="34"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="16"> + <polyline color="#232220" width="66"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="17"> + <polyline color="#232220" width="134"/> + </itemgra> + <itemgra item_types="traffic_distortion" order="18"> + <polyline color="#232220" width="265"/> </itemgra> </layer> <layer name="polylines"> <itemgra item_types="aeroway_taxiway" order="10"> - <polyline color="#404040" width="4"/> + <polyline color="#21242c" width="4"/> + <polyline color="#282d39" width="2"/> </itemgra> <itemgra item_types="aeroway_taxiway" order="11"> - <polyline color="#404040" width="6"/> + <polyline color="#21242c" width="6"/> + <polyline color="#282d39" width="4"/> </itemgra> <itemgra item_types="aeroway_taxiway" order="12"> - <polyline color="#404040" width="10"/> + <polyline color="#21242c" width="10"/> + <polyline color="#282d39" width="8"/> </itemgra> <itemgra item_types="aeroway_taxiway" order="13"> - <polyline color="#404040" width="12"/> + <polyline color="#21242c" width="12"/> + <polyline color="#282d39" width="9"/> </itemgra> <itemgra item_types="aeroway_taxiway" order="14"> - <polyline color="#404040" width="15"/> + <polyline color="#21242c" width="15"/> + <polyline color="#282d39" width="13"/> </itemgra> <itemgra item_types="aeroway_taxiway" order="15"> - <polyline color="#404040" width="17"/> + <polyline color="#21242c" width="17"/> + <polyline color="#282d39" width="14"/> </itemgra> <itemgra item_types="aeroway_taxiway" order="16"> - <polyline color="#404040" width="33"/> + <polyline color="#21242c" width="33"/> + <polyline color="#282d39" width="26"/> </itemgra> <itemgra item_types="aeroway_taxiway" order="17"> - <polyline color="#404040" width="69"/> + <polyline color="#21242c" width="69"/> + <polyline color="#282d39" width="61"/> </itemgra> <itemgra item_types="aeroway_taxiway" order="18"> - <polyline color="#404040" width="132"/> + <polyline color="#21242c" width="132"/> + <polyline color="#282d39" width="126"/> </itemgra> <itemgra item_types="aeroway_runway" order="2-6"> - <polyline color="#404040" width="1"/> + <polyline color="#181518" width="1"/> </itemgra> <itemgra item_types="aeroway_runway" order="7-8"> - <polyline color="#404040" width="3"/> + <polyline color="#181518" width="3"/> + <polyline color="#282d39" width="1"/> </itemgra> <itemgra item_types="aeroway_runway" order="9"> - <polyline color="#404040" width="5"/> + <polyline color="#1b1c1f" width="5"/> + <polyline color="#282d39" width="3"/> </itemgra> <itemgra item_types="aeroway_runway" order="10"> - <polyline color="#404040" width="6"/> + <polyline color="#1b1c1f" width="6"/> + <polyline color="#282d39" width="4"/> </itemgra> <itemgra item_types="aeroway_runway" order="11"> - <polyline color="#404040" width="9"/> + <polyline color="#1b1c1f" width="9"/> + <polyline color="#282d39" width="7"/> </itemgra> <itemgra item_types="aeroway_runway" order="12"> - <polyline color="#404040" width="13"/> + <polyline color="#1b1c1f" width="13"/> + <polyline color="#282d39" width="9"/> </itemgra> <itemgra item_types="aeroway_runway" order="13"> - <polyline color="#404040" width="18"/> + <polyline color="#1b1c1f" width="18"/> + <polyline color="#282d39" width="14"/> </itemgra> <itemgra item_types="aeroway_runway" order="14"> - <polyline color="#404040" width="21"/> + <polyline color="#1b1c1f" width="21"/> + <polyline color="#282d39" width="17"/> </itemgra> <itemgra item_types="aeroway_runway" order="15"> - <polyline color="#404040" width="24"/> + <polyline color="#1b1c1f" width="24"/> + <polyline color="#282d39" width="20"/> </itemgra> <itemgra item_types="aeroway_runway" order="16"> - <polyline color="#404040" width="39"/> + <polyline color="#1b1c1f" width="39"/> + <polyline color="#282d39" width="33"/> </itemgra> <itemgra item_types="aeroway_runway" order="17"> - <polyline color="#404040" width="78"/> + <polyline color="#1b1c1f" width="78"/> + <polyline color="#282d39" width="72"/> </itemgra> <itemgra item_types="aeroway_runway" order="18"> - <polyline color="#404040" width="156"/> + <polyline color="#1b1c1f" width="156"/> + <polyline color="#282d39" width="150"/> </itemgra> - <itemgra item_types="rail_tram,bus_guideway" order="10-"> - <polyline color="#3d3d3d" width="2"/> + <itemgra item_types="rail_tram" order="10-"> + <polyline color="#1c1c20" width="2"/> + </itemgra> + <itemgra item_types="cliff" order="12-"> + <polyline color="#1c1c20" width="1"/> </itemgra> </layer> <layer name="labels"> <itemgra item_types="house_number" order="15-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="7"/> </itemgra> <itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="11-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="7"/> </itemgra> <itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="10-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="7"/> </itemgra> <itemgra item_types="town_label_1e3,place_label" order="10-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="10"/> </itemgra> <itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="7"/> </itemgra> <itemgra item_types="town_label_2e3" order="9-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="10"/> </itemgra> <itemgra item_types="town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4" order="9-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="15"/> </itemgra> <itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="8-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="7"/> </itemgra> <itemgra item_types="town_label_2e3" order="8"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="7"/> </itemgra> <itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" order="7-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="7"/> </itemgra> <itemgra item_types="town_label_5e3" order="7-8"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="10"/> </itemgra> <itemgra item_types="town_label_1e4" order="6-8"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="10"/> </itemgra> <itemgra item_types="town_label_2e4,town_label_5e4" order="7-8"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="10"/> </itemgra> <itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="5-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="15"/> </itemgra> <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="5-"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="20"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="20"/> </itemgra> <itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="3-4"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="10"/> </itemgra> <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="3-4"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="15"/> </itemgra> <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="0-2"> - <circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/> + <circle color="#100c08" background_color="#55c4bd" radius="3" text_size="10"/> </itemgra> </layer> <layer name="Internal"> - <itemgra item_types="track" order="3-"> - <polyline color="#3f3f3f" width="1"/> + <itemgra item_types="track" order="7-"> + <polyline color="#151515" width="1"/> </itemgra> <itemgra item_types="track_tracked" order="7-"> - <polyline color="#3f3fff" width="3"/> + <polyline color="#1b1d2d" width="3"/> </itemgra> - <itemgra item_types="rg_segment" order="0-"> - <polyline color="#FF089C" width="1"/> - <arrows color="#FF089C" width="1"/> + <itemgra item_types="rg_segment" order="12-"> + <polyline color="#231c2a" width="1"/> + <arrows color="#231c2a" width="1"/> + <text color="#55c4bd" background_color="#000000" text_size="15"/> </itemgra> - <itemgra item_types="rg_point" order="0-"> - <circle color="#FF089C" radius="10" background_color="#000000" text_size="7"/> + <itemgra item_types="rg_point" order="12-"> + <circle color="#231c2a" background_color="#55c4bd" radius="10" text_size="7"/> </itemgra> <itemgra item_types="nav_left_1" order="0-"> - <icon src="nav_left_1_bk.svg" w="32" h="32"/> + <icon src="nav_left_1_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_left_2" order="0-"> - <icon src="nav_left_2_bk.svg" w="32" h="32"/> + <icon src="nav_left_2_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_left_3" order="0-"> - <icon src="nav_left_3_bk.svg" w="32" h="32"/> + <icon src="nav_left_3_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_right_1" order="0-"> - <icon src="nav_right_1_bk.svg" w="32" h="32"/> + <icon src="nav_right_1_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_right_2" order="0-"> - <icon src="nav_right_2_bk.svg" w="32" h="32"/> + <icon src="nav_right_2_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_right_3" order="0-"> - <icon src="nav_right_3_bk.svg" w="32" h="32"/> + <icon src="nav_right_3_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_straight" order="0-"> - <icon src="nav_straight_bk.svg" w="32" h="32"/> + <icon src="nav_straight_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_turnaround_left" order="0-"> - <icon src="nav_turnaround_left_bk.svg" w="32" h="32"/> + <icon src="nav_turnaround_left_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_turnaround_right" order="0-"> - <icon src="nav_turnaround_right_bk.svg" w="32" h="32"/> + <icon src="nav_turnaround_right_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_l1" order="0-"> - <icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_l1_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_r1" order="0-"> - <icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_r1_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_l2" order="0-"> - <icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_l2_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_r2" order="0-"> - <icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_r2_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_l3" order="0-"> - <icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_l3_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_r3" order="0-"> - <icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_r3_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_l4" order="0-"> - <icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_l4_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_r4" order="0-"> - <icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_r4_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_l5" order="0-"> - <icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_l5_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_r5" order="0-"> - <icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_r5_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_l6" order="0-"> - <icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_l6_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_r6" order="0-"> - <icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_r6_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_l7" order="0-"> - <icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_l7_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_r7" order="0-"> - <icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_r7_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_l8" order="0-"> - <icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_l8_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_roundabout_r8" order="0-"> - <icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/> + <icon src="nav_roundabout_r8_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_keep_left" order="0-"> - <icon src="nav_keep_left_bk.svg" w="32" h="32"/> + <icon src="nav_keep_left_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_merge_left" order="0-"> - <icon src="nav_merge_left_bk.svg" w="32" h="32"/> + <icon src="nav_merge_left_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_keep_right" order="0-"> - <icon src="nav_keep_right_bk.svg" w="32" h="32"/> + <icon src="nav_keep_right_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_merge_right" order="0-"> - <icon src="nav_merge_right_bk.svg" w="32" h="32"/> + <icon src="nav_merge_right_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_exit_left" order="0-"> - <icon src="nav_exit_left_bk.svg" w="32" h="32"/> + <icon src="nav_exit_left_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="nav_exit_right" order="0-"> - <icon src="nav_exit_right_bk.svg" w="32" h="32"/> + <icon src="nav_exit_right_wh.svg" w="32" h="32"/> </itemgra> <itemgra item_types="route_end" order="0-"> <icon src="nav_destination_wh.svg" w="32" h="32" x="4" y="30"/> @@ -1260,46 +1537,46 @@ </itemgra> <itemgra item_types="announcement" order="7-"> <icon src="gui_sound_32_32.png"/> - <circle color="#FF089C" radius="10" background_color="#000000" text_size="7"/> + <circle color="#231c2a" background_color="#55c4bd" radius="10" text_size="7"/> </itemgra> <itemgra item_types="waypoint,route_end" order="2"> - <circle color="#00a0a0" radius="4" width="2" background_color="#000000" text_size="24"/> + <circle color="#181b20" background_color="#55c4bd" radius="4" width="2" text_size="24"/> </itemgra> <itemgra item_types="waypoint,route_end" order="3-5"> - <circle color="#00a0a0" radius="8" width="2" background_color="#000000" text_size="24"/> + <circle color="#181b20" background_color="#55c4bd" radius="8" width="2" text_size="24"/> </itemgra> <itemgra item_types="waypoint,route_end" order="6"> - <circle color="#00a0a0" radius="10" width="2" background_color="#000000" text_size="24"/> + <circle color="#181b20" background_color="#55c4bd" radius="10" width="2" text_size="24"/> </itemgra> <itemgra item_types="waypoint,route_end" order="7-8"> - <circle color="#00a0a0" radius="16" width="2" background_color="#000000" text_size="24"/> + <circle color="#181b20" background_color="#55c4bd" radius="16" width="2" text_size="24"/> </itemgra> <itemgra item_types="waypoint,route_end" order="9-10"> - <circle color="#00a0a0" radius="20" width="4" background_color="#000000" text_size="32"/> + <circle color="#181b20" background_color="#55c4bd" radius="20" width="4" text_size="32"/> </itemgra> <itemgra item_types="waypoint,route_end" order="11"> - <circle color="#00a0a0" radius="28" width="4" background_color="#000000" text_size="32"/> + <circle color="#181b20" background_color="#55c4bd" radius="28" width="4" text_size="32"/> </itemgra> <itemgra item_types="waypoint,route_end" order="12"> - <circle color="#00a0a0" radius="32" width="4" background_color="#000000" text_size="32"/> + <circle color="#181b20" background_color="#55c4bd" radius="32" width="4" text_size="32"/> </itemgra> <itemgra item_types="waypoint,route_end" order="13"> - <circle color="#00a0a0" radius="52" width="4" background_color="#000000" text_size="24"/> + <circle color="#181b20" background_color="#55c4bd" radius="52" width="4" text_size="24"/> </itemgra> <itemgra item_types="waypoint,route_end" order="14"> - <circle color="#00a0a0" radius="64" width="4" background_color="#000000" text_size="24"/> + <circle color="#181b20" background_color="#55c4bd" radius="64" width="4" text_size="24"/> </itemgra> <itemgra item_types="waypoint,route_end" order="15"> - <circle color="#00a0a0" radius="68" width="6" background_color="#000000" text_size="24"/> + <circle color="#181b20" background_color="#55c4bd" radius="68" width="6" text_size="24"/> </itemgra> <itemgra item_types="waypoint,route_end" order="16"> - <circle color="#00a0a0" radius="132" width="8" background_color="#000000" text_size="32"/> + <circle color="#181b20" background_color="#55c4bd" radius="132" width="8" text_size="32"/> </itemgra> <itemgra item_types="waypoint,route_end" order="17"> - <circle color="#00a0a0" radius="268" width="8" background_color="#000000" text_size="48"/> + <circle color="#181b20" background_color="#55c4bd" radius="268" width="8" text_size="48"/> </itemgra> <itemgra item_types="waypoint,route_end" order="18"> - <circle color="#00a0a0" radius="530" width="8" background_color="#000000" text_size="48"/> + <circle color="#181b20" background_color="#55c4bd" radius="530" width="8" text_size="48"/> </itemgra> </layer> <layer name="POI Symbols"> @@ -1312,7 +1589,7 @@ <itemgra item_types="poi_airport" order="5-"> <icon src="airport.png"/> </itemgra> - <itemgra item_types="town_ghost" order="0-"> + <itemgra item_types="town_ghost" order="10-"> <icon src="ghost_town.xpm"/> </itemgra> <itemgra item_types="poi_hotel" order="12-"> @@ -1321,12 +1598,12 @@ <itemgra item_types="poi_car_parking" order="11-"> <icon src="parking.png"/> </itemgra> - <itemgra item_types="poi_car_sharing" order="11-"> - <icon src="car_sharing.png"/> - </itemgra> <itemgra item_types="poi_car_dealer_parts" order="12-"> <icon src="car_dealer.png"/> </itemgra> + <itemgra item_types="poi_car_sharing" order="11-"> + <icon src="car_sharing.png"/> + </itemgra> <itemgra item_types="poi_fuel" order="12-"> <icon src="fuel.png"/> </itemgra> @@ -1336,6 +1613,9 @@ <itemgra item_types="poi_attraction" order="11-"> <icon src="attraction.png"/> </itemgra> + <itemgra item_types="poi_cave" order="11-"> + <icon src="cave.png"/> + </itemgra> <itemgra item_types="poi_cafe" order="12-"> <icon src="cafe.png"/> </itemgra> @@ -1360,12 +1640,6 @@ <itemgra item_types="poi_hospital" order="12-"> <icon src="hospital.png"/> </itemgra> - <!-- not really usefull --> - <!-- - <itemgra item_types="point_unkn" order="9-"> - <circle color="#8080ff" radius="3"/> - </itemgra> - --> <itemgra item_types="poi_dining" order="12-"> <icon src="restaurant.png"/> </itemgra> @@ -1507,6 +1781,9 @@ <itemgra item_types="poi_forbidden_area" order="12-"> <icon src="forbidden_area.xpm"/> </itemgra> + <itemgra item_types="poi_shop_bicycle" order="12-"> + <icon src="bicycle_shop.png"/> + </itemgra> <itemgra item_types="poi_shop_gps" order="15-"> <icon src="garmin.xpm"/> </itemgra> @@ -1535,7 +1812,7 @@ <icon src="justice.png"/> </itemgra> <itemgra item_types="poi_landmark" order="11-"> - <icon src="landmark.png"/> + <icon src="landmark.xpm"/> </itemgra> <itemgra item_types="poi_levee" order="12-"> <icon src="levee.xpm"/> @@ -1595,19 +1872,19 @@ <icon src="public_office.xpm"/> </itemgra> <itemgra item_types="poi_rail_halt" order="11-"> - <circle color="#000000" radius="3" width="3"/> - <circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/> + <circle color="#1f1617" background_color="#55c4bd" radius="3" width="3"/> + <circle color="#100c08" background_color="#55c4bd" radius="5" width="2" text_size="8"/> </itemgra> <itemgra item_types="poi_rail_station" order="9-"> - <circle color="#000000" radius="3" width="3"/> - <circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/> + <circle color="#1f1617" background_color="#55c4bd" radius="3" width="3"/> + <circle color="#100c08" background_color="#55c4bd" radius="6" width="2" text_size="8"/> </itemgra> <itemgra item_types="poi_rail_tram_stop" order="10-11"> - <circle color="#3d3d3d" background_color="#000000" radius="2" width="2"/> + <circle color="#1f1617" background_color="#55c4bd" radius="2" width="2"/> </itemgra> <itemgra item_types="poi_rail_tram_stop" order="12-"> - <circle color="#000000" radius="3" width="3"/> - <circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/> + <circle color="#1f1617" background_color="#55c4bd" radius="3" width="3"/> + <circle color="#1c1c20" background_color="#55c4bd" radius="5" width="2" text_size="8"/> </itemgra> <itemgra item_types="poi_repair_service" order="12-"> <icon src="repair_service.png"/> @@ -1681,9 +1958,6 @@ <itemgra item_types="poi_swimming" order="12-"> <icon src="swimming.png"/> </itemgra> - <itemgra item_types="poi_taxi" order="13-"> - <icon src="taxi.png"/> - </itemgra> <itemgra item_types="poi_telephone" order="13-"> <icon src="telephone.png"/> </itemgra> @@ -1708,9 +1982,6 @@ <itemgra item_types="poi_tunnel" order="12-"> <icon src="tunnel.xpm"/> </itemgra> - <itemgra item_types="poi_wifi" order="13-"> - <icon src="wifi.png"/> - </itemgra> <itemgra item_types="poi_wine" order="12-"> <icon src="wine.xpm"/> </itemgra> @@ -1756,10 +2027,16 @@ <itemgra item_types="traffic_signals" order="13-"> <icon src="traffic_signals.png"/> </itemgra> + <itemgra item_types="poi_wifi" order="13-"> + <icon src="wifi.png"/> + </itemgra> + <itemgra item_types="poi_taxi" order="13-"> + <icon src="taxi.png"/> + </itemgra> <itemgra item_types="poi_image" order="12-"> <image/> </itemgra> - <!-- I'm not sure if the following stuff should appear in any layout. Maybe portions should only apply to the bike layout? --> + <!-- I'm not sure if the following stuff should appear in any layout. Maybe portions should only apply to the bicyle layout. --> <itemgra item_types="poi_bench" order="13-"> <icon src="bench.png"/> </itemgra> @@ -1772,6 +2049,9 @@ <itemgra item_types="poi_castle" order="11-"> <icon src="castle.png"/> </itemgra> + <itemgra item_types="poi_ruins" order="11-"> + <icon src="ruins.png"/> + </itemgra> <itemgra item_types="poi_hunting_stand" order="12-"> <icon src="hunting_stand.png"/> </itemgra> @@ -1781,6 +2061,9 @@ <itemgra item_types="poi_monument" order="12-"> <icon src="memorial.png"/> </itemgra> + <itemgra item_types="poi_archaeological_site" order="12-"> + <icon src="archaeological_site.png"/> + </itemgra> <itemgra item_types="poi_shelter" order="11-"> <icon src="shelter.png"/> </itemgra> @@ -1805,10 +2088,16 @@ <itemgra item_types="vehicle_pedestrian" order="0-"> <icon src="gui_vehicle_pedestrian_16_16.png"/> </itemgra> + <itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="10-"> + <icon src="%s"/> + </itemgra> </layer> <layer name="POI Labels"> - <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_car_sharing,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-"> - <circle color="#606060" background_color="#000000" radius="0" width="0" text_size="10"/> + <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_cave,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_bicycle,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_archaeological_site,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-"> + <circle color="#1c1c20" background_color="#55c4bd" radius="0" width="0" text_size="10"/> + </itemgra> + <itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="14-"> + <circle color="#1c1c20" background_color="#55c4bd" radius="0" width="0" text_size="10"/> </itemgra> </layer> <layer name="Found items" ref="Found items"/> diff --git a/navit/navit_layout_car_generatedarkxml.sh b/navit/navit_layout_car_generatedarkxml.sh index 9c3aa70ca..7b659b20d 100755 --- a/navit/navit_layout_car_generatedarkxml.sh +++ b/navit/navit_layout_car_generatedarkxml.sh @@ -1,10 +1,14 @@ #!/bin/bash -# This script automatically converts the rgb colors used for the polygons in the +# This script automatically converts the rgb colors used for the layers in # navit_layout_car_shipped.xml to the values appropriate for the dark layout in # navit_layout_car_dark_shipped.xml. # It's a bit of a mess, but gets the job done. +# Variables +textcolor='55c4bd' + +# Settings IFS='' # Keep whitespace # Light and dark input files @@ -14,78 +18,109 @@ ifd=navit_layout_car_dark_shipped.xml # Temporary dark output file ofd=$ifd.new -# Create new temporary dark output file -[ -f $ofd ] && rm -f $ofd -touch $ofd +# Iterate over all layers in dark input file +grep \<layer\ name=\" $ifd | cut -d\" -f2 | while read -r layer +do -# Init: not in polygons layer -inpolygons=false -getpolygons=false + echo $layer -# Read dark input file -while read -r l -do + # Create new temporary dark output file + [ -f $ofd ] && rm -f $ofd + touch $ofd - # Check to see if inside polygons layer - open tag - if [[ $l =~ .*\<layer\ name=\"polygons\"\>.* ]]; then - inpolygons=true - getpolygons=true - fi + # Init: not in layer + inlayer=false + getlayer=false - # Check to see if inside polygons layer - close tag - if [[ $l =~ .*\</layer\>.* ]]; then - inpolygons=false - fi + # Read dark input file + while read -r l + do - # Trigger once when polygons open tag found in dark input file - if [ $getpolygons == true ]; then + # Check to see if inside layer - open tag + if [[ $l =~ .*\<layer\ name=\"$layer\"\>.* ]]; then + inlayer=true + getlayer=true + fi - getpolygons=false # Just triggered - inpolygons=false # Now used for light input file + # Check to see if inside layer - close tag + if [[ $l =~ .*\</layer\>.* ]]; then + inlayer=false + fi - # Insert data from light input file - while read -r l - do + # Trigger once when open tag found in dark input file + if [ $getlayer == true ]; then - # Check to see if inside polygons layer - if [[ $l =~ .*\<layer\ name=\"polygons\"\>.* ]]; then - inpolygons=true - fi + getlayer=false # Just triggered + inlayer=false # Now used for light input file - if [[ $l =~ .*\</layer\>.* ]]; then - inpolygons=false - fi + # Insert data from light input file + while read -r l + do - # Inside polygons layer - if [ $inpolygons == true ]; then + # Check to see if inside layer - open tag + if [[ $l =~ .*\<layer\ name=\"$layer\"\>.* ]]; then + inlayer=true + fi - if [[ $l =~ .*color=\"#[0-9a-fA-F]{6}.* ]]; then # Contains rgb(a) color - coll=$(echo $l | cut -d# -f2 | cut -c-6) # Get rgb color and convert - cold=$( printf '%02x' $(echo $(printf "%d" 0x${coll:0:2})/16+16 | bc)) - cold=$cold$(printf '%02x' $(echo $(printf "%d" 0x${coll:2:2})/10+14 | bc)) - cold=$cold$(printf '%02x' $(echo $(printf "%d" 0x${coll:4:2})/8+12 | bc)) - l=$(echo $l | sed "s/#$coll/#$cold/") # Replace color + # Check to see if inside layer - close tag + if [[ $l =~ .*\</layer\>.* ]]; then + inlayer=false fi - l=$(echo $l | sed "s/<text /<text color=\"#55c4bd\" background_color=\"#000000\" /") # Add text color + # Inside layer + if [ $inlayer == true ]; then - echo $l >> $ofd # (Modified) line from light input file to dark output file + # Modify color + if [[ $l =~ .*color=\"#[0-9a-fA-F]{6}.* ]]; then # Contains rgb(a) color - fi + # Get hexadecimal color + coll=$(echo $l | cut -d# -f2 | cut -c-6) + + # Get color values in decimal + cr=$(printf "%d" 0x${coll:0:2}) + cg=$(printf "%d" 0x${coll:2:2}) + cb=$(printf "%d" 0x${coll:4:2}) + + # Modify decimal color values + crn=$(echo $cr/16+$cg/32+$cb/32+16 | bc) + cgn=$(echo $cr/24+$cg/12+$cb/24+12 | bc) + cbn=$(echo $cr/16+$cg/16+$cb/ 8+ 8 | bc) - done < $ifl # Read light input file - inpolygons=true # Done inserting, still in polygons layer in dark input file + # Convert new decimal color values to hexadecimal + cold=$( printf '%02x' $crn) + cold=$cold$(printf '%02x' $cgn) + cold=$cold$(printf '%02x' $cbn) - else + # Replace old color with new hexadecimal color values + l=$(echo $l | sed "s/#$coll/#$cold/") + + fi + + # Miscellaneous modifications + l=$(echo $l | sed -r "s/_bk\./_wh\./") # Black to white icons + l=$(echo $l | sed -r "s/(<text )/\1color=\"#$textcolor\" background_color=\"#000000\" /") # Add text color + l=$(echo $l | sed -r "s/(<circle color=\"#[0-9a-fA-F]{6,8}\" )/\1background_color=\"#$textcolor\" /") # Add circle bg color + + echo $l >> $ofd # Modified line from light input file to dark output file + + fi + + done < $ifl # Read light input file + + inlayer=true # Done inserting, still in layer in dark input file + + else + + # Outside layer + if [ $inlayer == false ]; then + echo $l >> $ofd # Just copy as-is to dark output file + fi - # Outside polygons layer - if [ $inpolygons == false ]; then - echo $l >> $ofd # Just copy as-is to dark output file fi - fi + done < $ifd # Read dark input file -done < $ifd # Read dark input file + cp $ofd $ifd # Replace + rm -f $ofd # Clean up -cp $ofd $ifd # Replace -rm -f $ofd # Clean up +done # Next layer in dark input file diff --git a/navit/navit_layout_car_shipped.xml b/navit/navit_layout_car_shipped.xml index 064bc2dbc..3c25259c1 100644 --- a/navit/navit_layout_car_shipped.xml +++ b/navit/navit_layout_car_shipped.xml @@ -66,16 +66,15 @@ </polyline> </itemgra> </cursor> + <!-- + After modifying the layers in navit_layout_car_shipped.xml, + run the navit_layout_car_generatedarkxml.sh script to + automatically update the layers in + navit_layout_car_dark_shipped.xml. Do not modify the layers in + navit_layout_car_dark_shipped.xml directly, as changes will be + lost when the script is run. + --> <layer name="polygons"> - <!-- - After modifying the polygons layer in - navit_layout_car_shipped.xml, run the - navit_layout_car_generatedarkxml.sh script to - automatically update the polygons layer in - navit_layout_car_dark_shipped.xml. Do not modify the - polygons layer in navit_layout_car_dark_shipped.xml - directly, as changes will be lost when the script is run. - --> <itemgra item_types="image" order="0-"> <image/> </itemgra> @@ -478,6 +477,10 @@ <polygon color="#deddcc"/> <text text_size="5"/> </itemgra> + <itemgra item_types="archaeological_site" order="8-"> + <polyline color="#d9cfb6" width="3"/> + <text text_size="8"/> + </itemgra> <itemgra item_types="poly_building" order="0-"> <polygon color="#aaaaaa"/> <polyline color="#777777"/> @@ -523,15 +526,17 @@ <polyline color="#8cc1c899" width="10"/> <text text_size="5"/> </itemgra> - <itemgra item_types="poly_military_zone" order="9-"> - <polygon color="#a0a0a044"/> + <itemgra item_types="poly_military_zone,poly_military" order="9-"> + <polygon color="#a0a0a044" src="diagonal-stripes-gray.png" w="16" h="16"/> + <polyline color="#969696b5" width="1"/> <text text_size="5"/> </itemgra> <itemgra item_types="poly_airport" order="0-"> <polygon color="#a0a0a066"/> </itemgra> <itemgra item_types="poly_airfield" order="10-"> - <polygon color="#ecd3cf66"/> + <polygon color="#ecd3cf66" src="diagonal-stripes-gray.png" w="16" h="16"/> + <polyline color="#969696b5" width="1"/> <text text_size="5"/> </itemgra> <itemgra item_types="poly_danger_area" order="8-"> diff --git a/navit/textures/diagonal-stripes-gray.svg b/navit/textures/diagonal-stripes-gray.svg new file mode 100644 index 000000000..7b6858521 --- /dev/null +++ b/navit/textures/diagonal-stripes-gray.svg @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + viewBox="0 0 16 16" + version="1.1" + id="svg8" + inkscape:version="0.92.4 5da689c313, 2019-01-14" + sodipodi:docname="diagonal-stripes-gray.svg"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="31.678384" + inkscape:cx="7.1319523" + inkscape:cy="7.0756723" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + units="px" + inkscape:window-width="1889" + inkscape:window-height="1025" + inkscape:window-x="31" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,93.566687)"> + <path + style="fill:none;stroke:#969696;stroke-width:1.0015748;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.70980394;opacity:1" + d="m 0,-81.566687 12,-12" + id="path817" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#969696;stroke-width:1.0015748;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.70980394;opacity:1" + d="m 12,-77.566687 4,-4" + id="path821" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + </g> +</svg> |