diff options
37 files changed, 1737 insertions, 2816 deletions
diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin Binary files differindex bd4b04c33d..6a766545a0 100644 --- a/data/drules_proto-bw.bin +++ b/data/drules_proto-bw.bin diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt index 19f4affffd..37e06c71b8 100644 --- a/data/drules_proto-bw.txt +++ b/data/drules_proto-bw.txt @@ -213,30 +213,6 @@ cont { cont { name: "aerialway-station" element { - scale: 13 - circle { - radius: 2.0 - color: 16777215 - priority: 14000 - } - } - element { - scale: 14 - circle { - radius: 2.0 - color: 16777215 - priority: 14000 - } - } - element { - scale: 15 - circle { - radius: 3.0 - color: 16777215 - priority: 14000 - } - } - element { scale: 16 caption { primary { @@ -246,11 +222,6 @@ cont { } priority: 15000 } - circle { - radius: 4.0 - color: 16777215 - priority: 14000 - } } element { scale: 17 @@ -262,11 +233,6 @@ cont { } priority: 15000 } - circle { - radius: 3.2 - color: 16777215 - priority: 14000 - } } element { scale: 18 @@ -278,11 +244,6 @@ cont { } priority: 15000 } - circle { - radius: 3.2 - color: 16777215 - priority: 14000 - } } element { scale: 19 @@ -294,11 +255,6 @@ cont { } priority: 15000 } - circle { - radius: 3.2 - color: 16777215 - priority: 14000 - } } } cont { @@ -7607,11 +7563,6 @@ cont { name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::" priority: 16000 } - circle { - radius: 1.2 - color: 16777215 - priority: 14000 - } } element { scale: 17 @@ -7619,11 +7570,6 @@ cont { name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::" priority: 16000 } - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } } element { scale: 18 @@ -7631,11 +7577,6 @@ cont { name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::" priority: 16000 } - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } } element { scale: 19 @@ -7643,11 +7584,6 @@ cont { name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::" priority: 16000 } - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } } } cont { @@ -7658,11 +7594,6 @@ cont { name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::" priority: 16000 } - circle { - radius: 1.2 - color: 16777215 - priority: 14000 - } } element { scale: 17 @@ -7670,11 +7601,6 @@ cont { name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::" priority: 16000 } - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } } element { scale: 18 @@ -7682,11 +7608,6 @@ cont { name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::" priority: 16000 } - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } } element { scale: 19 @@ -7694,11 +7615,6 @@ cont { name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::" priority: 16000 } - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } } } cont { @@ -8015,76 +7931,6 @@ cont { } } cont { - name: "barrier-stile" - element { - scale: 16 - circle { - radius: 1.2 - color: 16777215 - priority: 14000 - } - } - element { - scale: 17 - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } - } - element { - scale: 18 - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } - } - element { - scale: 19 - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } - } -} -cont { - name: "barrier-toll_booth" - element { - scale: 16 - circle { - radius: 1.2 - color: 16777215 - priority: 14000 - } - } - element { - scale: 17 - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } - } - element { - scale: 18 - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } - } - element { - scale: 19 - circle { - radius: 1.6 - color: 16777215 - priority: 14000 - } - } -} -cont { name: "barrier-wall" element { scale: 16 @@ -10701,7 +10547,20 @@ cont { cont { name: "entrance" element { + scale: 16 + symbol { + name: "symbols/neta/circle-10.svg:#000000:#FFFFFF:::" + apply_for_type: 1 + priority: 16000 + } + } + element { scale: 17 + symbol { + name: "symbols/neta/circle-10.svg:#000000:#FFFFFF:::" + apply_for_type: 1 + priority: 16023 + } caption { primary { height: 9 @@ -10711,14 +10570,14 @@ cont { } priority: 15023 } - circle { - radius: 2.0 - color: 16777215 - priority: 14023 - } } element { scale: 18 + symbol { + name: "symbols/neta/circle-10.svg:#000000:#FFFFFF:::" + apply_for_type: 1 + priority: 16023 + } caption { primary { height: 9 @@ -10728,14 +10587,14 @@ cont { } priority: 15023 } - circle { - radius: 2.0 - color: 16777215 - priority: 14023 - } } element { scale: 19 + symbol { + name: "symbols/neta/circle-10.svg:#000000:#FFFFFF:::" + apply_for_type: 1 + priority: 16023 + } caption { primary { height: 9 @@ -10751,11 +10610,6 @@ cont { } priority: 15023 } - circle { - radius: 2.0 - color: 16777215 - priority: 14023 - } } } cont { @@ -51644,33 +51498,6 @@ cont { } } cont { - name: "man_made-cairn" - element { - scale: 17 - circle { - radius: 3.2 - color: 16777215 - priority: 14000 - } - } - element { - scale: 18 - circle { - radius: 3.2 - color: 16777215 - priority: 14000 - } - } - element { - scale: 19 - circle { - radius: 3.2 - color: 16777215 - priority: 14000 - } - } -} -cont { name: "man_made-communication_tower" element { scale: 16 diff --git a/data/drules_proto.bin b/data/drules_proto.bin Binary files differindex 6d7a9697e8..073130b937 100644 --- a/data/drules_proto.bin +++ b/data/drules_proto.bin diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 7383cf04ad..5af6d25f94 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -213,91 +213,47 @@ cont { cont { name: "aerialway-station" element { - scale: 13 - circle { - radius: 2.0 - color: 2236962 - priority: 14000 - } - } - element { - scale: 14 - circle { - radius: 2.0 - color: 3364317 - priority: 14000 - } - } - element { - scale: 15 - circle { - radius: 3.0 - color: 3364317 - priority: 14000 - } - } - element { scale: 16 - circle { - radius: 4.0 - color: 3364317 - priority: 14000 - } - path_text { + caption { primary { height: 12 color: 3364317 stroke_color: 16777215 } - priority: 16000 + priority: 15000 } } element { scale: 17 - circle { - radius: 3.2 - color: 3364317 - priority: 14000 - } - path_text { + caption { primary { height: 12 color: 3364317 stroke_color: 16777215 } - priority: 16000 + priority: 15000 } } element { scale: 18 - circle { - radius: 3.2 - color: 3364317 - priority: 14000 - } - path_text { + caption { primary { height: 12 color: 3364317 stroke_color: 16777215 } - priority: 16000 + priority: 15000 } } element { scale: 19 - circle { - radius: 3.2 - color: 3364317 - priority: 14000 - } - path_text { + caption { primary { height: 12 color: 3364317 stroke_color: 16777215 } - priority: 16000 + priority: 15000 } } } @@ -10092,6 +10048,11 @@ cont { name: "entrance" element { scale: 16 + symbol { + name: "symbols/neta/circle-10.svg:#444444::::" + apply_for_type: 1 + priority: 16016 + } caption { primary { height: 9 @@ -10100,14 +10061,14 @@ cont { } priority: 15016 } - circle { - radius: 2.0 - color: 2236962 - priority: 14016 - } } element { scale: 17 + symbol { + name: "symbols/neta/circle-10.svg:#444444::::" + apply_for_type: 1 + priority: 16016 + } caption { primary { height: 9 @@ -10121,14 +10082,14 @@ cont { } priority: 15016 } - circle { - radius: 2.0 - color: 2236962 - priority: 14016 - } } element { scale: 18 + symbol { + name: "symbols/neta/circle-10.svg:#444444::::" + apply_for_type: 1 + priority: 16016 + } caption { primary { height: 9 @@ -10142,14 +10103,14 @@ cont { } priority: 15016 } - circle { - radius: 2.0 - color: 2236962 - priority: 14016 - } } element { scale: 19 + symbol { + name: "symbols/neta/circle-10.svg:#444444::::" + apply_for_type: 1 + priority: 16016 + } caption { primary { height: 9 @@ -10163,11 +10124,6 @@ cont { } priority: 15016 } - circle { - radius: 2.0 - color: 2236962 - priority: 14016 - } } } cont { @@ -41336,33 +41292,6 @@ cont { } } cont { - name: "man_made-cairn" - element { - scale: 17 - circle { - radius: 3.2 - color: 16777215 - priority: 14000 - } - } - element { - scale: 18 - circle { - radius: 3.2 - color: 16777215 - priority: 14000 - } - } - element { - scale: 19 - circle { - radius: 3.2 - color: 16777215 - priority: 14000 - } - } -} -cont { name: "man_made-communication_tower" element { scale: 16 diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index b0feae3b2e..1f162c0c47 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1,1029 +1,1029 @@ -building;[building];;addr:housenumber;name;1; -highway|residential;[highway=residential];;name;int_name;2; -highway|service;[highway=service];;name;int_name;3; -waterway|stream;[waterway=stream];;name;int_name;4; -highway|unclassified;[highway=unclassified];;name;int_name;5; -natural|water;[natural=water];;name;int_name;6; -highway|footway;[highway=footway];;name;int_name;7; -highway|track;[highway=track];;name;int_name;8; -highway|tertiary;[highway=tertiary];;name;int_name;9; -power|tower;[power=tower];;name;int_name;10; -landuse|forest;[landuse=forest];;name;int_name;11; -landuse|grass;[landuse=grass];;name;int_name;12; -highway|secondary;[highway=secondary];;name;int_name;13; -natural|wood;[natural=wood];;name;int_name;14; -landuse|residential;[landuse=residential];;name;int_name;15; -highway|path;[highway=path];;name;int_name;16; -highway|bus_stop;[highway=bus_stop];;name;int_name;17; -natural|tree;[natural=tree];;name;int_name;18; -place|locality;[place=locality];;name;int_name;19; -natural|coastline;[natural=ocean];;name;int_name;20; -place|village;[place=village];;name;int_name;21; -highway|residential|oneway;[highway=residential][oneway?];x;name;int_name;22;highway|residential -waterway|river;[waterway=river];;name;int_name;23; -addr:interpolation|even;[addr:interpolation=even];x;name;int_name;24;oneway -addr:interpolation|odd;[addr:interpolation=odd];x;name;int_name;25; -amenity|parking;[amenity=parking][access?], [amenity=parking][!access];;name;int_name;26; -highway|primary;[highway=primary]; ;name;int_name;27; -railway|rail;[railway=rail];;name;int_name;28; -highway|service|parking_aisle;[highway=service][service=parking_aisle];;name;int_name;29; -place|hamlet;[place=hamlet];;name;int_name;30; -highway|road;[highway=road];;name;int_name;31; -highway|track|grade2;[highway=track][tracktype=grade2];;name;int_name;32; -natural|wetland;[natural=wetland];;name;int_name;33; -highway|track|grade3;[highway=track][tracktype=grade3];;name;int_name;34; -boundary|administrative|8;[boundary=administrative][admin_level=8];;name;int_name;35; -amenity|school;[amenity=school];;name;int_name;36; -highway|cycleway;[highway=cycleway];;name;int_name;37; -landuse|farm;[landuse=farm];;name;int_name;38; -amenity|place_of_worship;[amenity=place_of_worship];;name;int_name;39; -highway|track|grade1;[highway=track][tracktype=grade1];;name;int_name;40; -highway|secondary|oneway;[highway=secondary][oneway];x;name;int_name;41;highway|secondary -highway|service|driveway;[highway=service][service=driveway];;name;int_name;42; -man_made|survey_point;[man_made=survey_point];;name;int_name;43; -highway|motorway_link|oneway;[highway=motorway_link][oneway?];x;name;int_name;44;highway|motorway_link -waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45; -highway|track|grade4;[highway=track][tracktype=grade4];;name;int_name;46; -highway|tertiary|oneway;[highway=tertiary][oneway?];x;name;int_name;47;highway|tertiary -landuse|farmland;[landuse=farmland];;name;int_name;48; -barrier|fence;[barrier=fence];;name;int_name;49; -highway|primary|oneway;[highway=primary][oneway?];x;name;int_name;50;highway|primary -power|pole;[power=pole];;name;int_name;51; -waterway|riverbank;[waterway=riverbank];;name;int_name;52; -highway|path|bicycle;[highway=path][bicycle?];;name;int_name;53; -landuse|meadow;[landuse=meadow];;name;int_name;54; -highway|living_street;[highway=living_street];;name;int_name;55; -highway|unclassified|oneway;[highway=unclassified][oneway?];x;name;int_name;56;highway|unclassified -natural|peak;[natural=peak];;name;int_name;57; -highway|motorway|oneway;[highway=motorway][oneway?];x;name;int_name;58;highway|motorway -highway|steps;[highway=steps];;name;int_name;59; -waterway|ditch;[waterway=ditch];;name;int_name;60; -amenity|restaurant;[amenity=restaurant];;name;int_name;61; -landuse|reservoir;[landuse=reservoir];;name;int_name;62; -highway|track|grade5;[highway=track][tracktype=grade5];;name;int_name;63; -amenity|bench;[amenity=bench];;name;int_name;64; -highway|service|oneway;[highway=service][oneway?];x;name;int_name;65;highway|service -highway|trunk;[highway=trunk];;name;int_name;66; -amenity|fuel;[amenity=fuel];;name;int_name;67; -leisure|park;[leisure=park];;name;int_name;68; -leisure|pitch;[leisure=pitch];;name;int_name;69; -highway|pedestrian;[highway=pedestrian];;name;int_name;70; -natural|scrub;[natural=scrub];;name;int_name;71; -highway|motorway|bridge;[highway=motorway][bridge?];;name;int_name;72; -highway|trunk|oneway;[highway=trunk][oneway?];x;name;int_name;73;highway|trunk -railway|level_crossing;[railway=level_crossing];;name;int_name;74; -landuse|industrial;[landuse=industrial];;name;int_name;75; -barrier|wall;[barrier=wall];;name;int_name;76; -amenity|post_box;[amenity=post_box];;name;int_name;77; -place|town;[place=town];;name;int_name;78; -power|line;[power=line];;name;int_name;79; -landuse|farmyard;[landuse=farmyard];;name;int_name;80; -highway|residential|bridge;[highway=residential][bridge?];;name;int_name;81; -railway|rail|bridge;[railway=rail][bridge?];;name;int_name;82; -boundary|administrative|10;[boundary=administrative][admin_level=10];;name;int_name;83; -boundary|administrative|6;[boundary=administrative][admin_level=6];;name;int_name;84; -highway|secondary|bridge;[highway=secondary][bridge?];;name;int_name;85; -highway|tertiary|bridge;[highway=tertiary][bridge?];;name;int_name;86; -barrier|bollard;[barrier=bollard];;name;int_name;87; -leisure|playground;[leisure=playground];;name;int_name;88; -waterway|drain;[waterway=drain];;name;int_name;89; -waterway|canal;[waterway=canal];;name;int_name;90; -highway|trunk_link|oneway;[highway=trunk_link][oneway?];x;name;int_name;91;highway|trunk_link -highway|unclassified|bridge;[highway=unclassified][bridge?];;name;int_name;92; -landuse|forest|deciduous;[landuse=forest][wood=deciduous];;name;int_name;93; -place|island;[place=island];;name;int_name;94; -highway|primary|bridge;[highway=primary][bridge?];;name;int_name;95; -highway|primary_link|oneway;[highway=primary_link][oneway?];x;name;int_name;96;highway|primary_link -amenity|fast_food;[amenity=fast_food];;name;int_name;97; -highway|footway|bridge;[highway=footway][bridge?];;name;int_name;98; -amenity|bank;[amenity=bank];;name;int_name;99; -barrier|hedge;[barrier=hedge];;name;int_name;100; -amenity|pub;[amenity=pub];;name;int_name;101; -leisure|swimming_pool;[leisure=swimming_pool];;name;int_name;102; -natural|land;[natural=land];;name;int_name;103; -tourism|hotel;[tourism=hotel];;name;int_name;104; -landuse|cemetery;[landuse=cemetery];;name;int_name;105; -sport|soccer;[sport=soccer];;name;int_name;106; -boundary|administrative|4;[boundary=administrative][admin_level=4];;name;int_name;107; -amenity|cafe;[amenity=cafe];;name;int_name;108; -amenity|recycling;[amenity=recycling];;name;int_name;109; -leisure|garden;[leisure=garden];;name;int_name;110; -landuse|commercial;[landuse=commercial];;name;int_name;111; -railway|station;[railway=station];;name;int_name;112; -highway|path|hiking;[highway=path][route=hiking];;name;int_name;113; -amenity|hospital;[amenity=hospital];;name;int_name;114; -waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115; -highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116; -amenity|post_office;[amenity=post_office];;name;int_name;117; -landuse|quarry;[landuse=quarry];;name;int_name;118; -amenity|pharmacy;[amenity=pharmacy];;name;int_name;119; -man_made|pier;[man_made=pier];;name;int_name;120; -highway|motorway_junction;[highway=motorway_junction];;name;int_name;121; -amenity|telephone;[amenity=telephone];;name;int_name;122; -waterway|stream|tunnel;[waterway=stream][tunnel?];;name;int_name;123; -tourism|information|guidepost;[tourism=information][information=guidepost];;name;int_name;124; -amenity|parking|fee;[amenity=parking][fee?];;name;int_name;125; -amenity|kindergarten;[amenity=kindergarten];;name;int_name;126; -power|generator|wind;[power=generator][power_source=wind];;name;int_name;127; -place|suburb;[place=suburb];;name;int_name;128; -landuse|allotments;[landuse=allotments];;name;int_name;129; -landuse|forest|coniferous;[landuse=forest][wood=coniferous];;name;int_name;130; -landuse|forest|mixed;[landuse=forest][wood=mixed];;name;int_name;131; -natural|wood|mixed;[natural=wood][wood=mixed];;name;int_name;132; -sport|tennis;[sport=tennis];;name;int_name;133; -landuse|vineyard;[landuse=vineyard];;name;int_name;134; -aeroway|taxiway;[aeroway=taxiway];;name;int_name;135; -aeroway|aerodrome;[aeroway=aerodrome];;name;int_name;136; -highway|secondary|junction;[highway=secondary][junction?];x;name;int_name;137;highway|secondary -amenity|fire_station;[amenity=fire_station];;name;int_name;138; -landuse|retail;[landuse=retail];;name;int_name;139; -leisure|nature_reserve;[leisure=nature_reserve];;name;int_name;140; -leisure|pitch|tennis;[leisure=pitch][sport=tennis];;name;int_name;141; -tourism|information;[tourism=information];;name;int_name;142; -highway|motorway_link|bridge;[highway=motorway_link][bridge?];;name;int_name;143; -railway|abandoned;[railway=abandoned];;name;int_name;144; -amenity|parking|private;[amenity=parking][access=private];;name;int_name;145; -boundary|administrative|7;[boundary=administrative][admin_level=7];;name;int_name;146; -tourism|attraction;[tourism=attraction];;name;int_name;147; -highway|tertiary|junction;[highway=tertiary][junction?];x;name;int_name;148;highway|tertiary -highway|track|private;[highway=track][access=private];;name;int_name;149; -railway|tram;[railway=tram];;name;int_name;150; -amenity|toilets;[amenity=toilets];;name;int_name;151; -highway|residential|junction;[highway=residential][junction?];x;name;int_name;152;highway|residential -highway|footway|permissive;[highway=footway][access=permissive];;name;int_name;153; -highway|primary|junction;[highway=primary][junction?];x;name;int_name;154;highway|primary -landuse|construction;[landuse=construction];;name;int_name;155; -tourism|viewpoint;[tourism=viewpoint];;name;int_name;156; -amenity|atm;[amenity=atm];;name;int_name;157; -highway|pedestrian|area;[highway=pedestrian][area?];;name;int_name;158; -tourism|picnic_site;[tourism=picnic_site];;name;int_name;159; -shop|supermarket;[shop=supermarket];;name;int_name;160; -shop|convenience;[shop=convenience];;name;int_name;161; -shop|bakery;[shop=bakery];;name;int_name;162; -highway|construction;[highway=construction];;name;int_name;163; -highway|cycleway|bridge;[highway=cycleway][bridge?];;name;int_name;164; -leisure|sports_centre;[leisure=sports_centre];;name;int_name;165; -highway|path|mountain_hiking;[highway=path][sac_scale=mountain_hiking];;name;int_name;166; -tourism|camp_site;[tourism=camp_site];;name;int_name;167; -highway|bridleway;[highway=bridleway];;name;int_name;168; -natural|heath;[natural=heath];;name;int_name;169; -landuse|basin;[landuse=basin];;name;int_name;170; -amenity|library;[amenity=library];;name;int_name;171; -natural|wood|coniferous;[natural=wood][wood=coniferous];;name;int_name;172; -landuse|recreation_ground;[landuse=recreation_ground];;name;int_name;173; -landuse|village_green;[landuse=village_green];;name;int_name;174; -amenity|drinking_water;[amenity=drinking_water];;name;int_name;175; -amenity|university;[amenity=university];;name;int_name;176; -highway|secondary_link|oneway;[highway=secondary_link][oneway?];x;name;int_name;177;highway|secondary_link -power|sub_station;[power=sub_station];;name;int_name;178; -railway|tram_stop;[railway=tram_stop];;name;int_name;179; -place|city;[place=city];;name;int_name;180; -amenity|shelter;[amenity=shelter];;name;int_name;181; -natural|beach;[natural=beach];;name;int_name;182; -highway|footway|tunnel;[highway=footway][tunnel?];;name;int_name;183; -shop|hairdresser;[shop=hairdresser];;name;int_name;184; -amenity|hunting_stand;[amenity=hunting_stand];;name;int_name;185; -boundary|administrative|9;[boundary=administrative][admin_level=9];;name;int_name;186; -amenity|fountain;[amenity=fountain];;name;int_name;187; -highway|primary_link;[highway=primary_link];;name;int_name;188; -amenity|bar;[amenity=bar];;name;int_name;189; -landuse|garages;[landuse=garages];;name;int_name;190; -boundary|administrative|2;[boundary=administrative][admin_level=2];;name;int_name;191; -leisure|common;[leisure=common];;name;int_name;192; -highway|track|bridge;[highway=track][bridge?];;name;int_name;193; -highway|path|bridge;[highway=path][bridge?];;name;int_name;194; -piste:type|nordic;[piste:type=nordic];;name;int_name;195; -highway|motorway;[highway=motorway];;name;int_name;196; -railway|crossing;[railway=crossing];;name;int_name;197; -boundary|national_park;[boundary=national_park];;name;int_name;198; -natural|wood|deciduous;[natural=wood][wood=deciduous];;name;int_name;199; -waterway|dam;[waterway=dam];;name;int_name;200; -highway|motorway_link;[highway=motorway_link];;name;int_name;201; -leisure|golf_course;[leisure=golf_course];;name;int_name;202; -highway|service|bridge;[highway=service][bridge?];;name;int_name;203; -power|minor_line;[power=minor_line];;name;int_name;204; -natural|marsh;[natural=marsh];;name;int_name;205; -leisure|stadium;[leisure=stadium];;name;int_name;206; -amenity|doctors;[amenity=doctors];;name;int_name;207; -railway|disused;[railway=disused];;name;int_name;208; -aeroway|runway;[aeroway=runway];;name;int_name;209; -railway|halt;[railway=halt];;name;int_name;210; -addr:interpolation|all;[addr:interpolation=all];x;name;int_name;211; -railway|rail|tunnel;[railway=rail][tunnel?];;name;int_name;212; -man_made|wastewater_plant;[man_made=wastewater_plant];;name;int_name;213; -highway|trunk|motorroad;[highway=trunk][motorroad?];x;name;int_name;214;highway|trunk -place|county;[place=county];;name;int_name;215; -highway|footway|private;[highway=footway][access=private];;name;int_name;216; -landuse|conservation;[landuse=conservation];x;name;int_name;217; -highway|unclassified|junction;[highway=unclassified][junction?];x;name;int_name;218;highway|unclassified -power|station;[power=station];;name;int_name;219; -sport|swimming;[sport=swimming];;name;int_name;220; -leisure|track;[leisure=track];;name;int_name;221; -highway|trunk_link;[highway=trunk_link];;name;int_name;222; -barrier|retaining_wall;[barrier=retaining_wall];;name;int_name;223; -amenity|college;[amenity=college];;name;int_name;224; -sport|baseball;[sport=baseball];;name;int_name;225; -highway|service|area;[highway=service][area?];;name;int_name;226; -highway|residential|area;[highway=residential][area?];;name;int_name;227; -amenity|bus_station;[amenity=bus_station];;name;int_name;228; -highway|track|permissive;[highway=track][access=permissive];;name;int_name;229; -waterway|drain|tunnel;[waterway=drain][tunnel?];;name;int_name;230; -landuse|cemetery|christian;[landuse=cemetery][religion=christian];;name;int_name;231; -highway|cycleway|tunnel;[highway=cycleway][tunnel?];;name;int_name;232; -amenity|parking|permissive;[amenity=parking][access=permissive];;name;int_name;233; -boundary|administrative|5;[boundary=administrative][admin_level=5];;name;int_name;234; -highway|unclassified|tunnel;[highway=unclassified][tunnel?];;name;int_name;235; -highway|track|destination;[highway=track][access=destination];x;name;int_name;236;highway|track -highway|trunk|junction;[highway=trunk][junction?];x;name;int_name;237;highway|trunk -highway|residential|tunnel;[highway=residential][tunnel?];;name;int_name;238; -aeroway|helipad;[aeroway=helipad];;name;int_name;239; -highway|path|permissive;[highway=path][access=permissive];;name;int_name;240; -place|islet;[place=islet];;name;int_name;241; -sport|basketball;[sport=basketball];;name;int_name;242; -amenity|cinema;[amenity=cinema];;name;int_name;243; -amenity|theatre;[amenity=theatre];;name;int_name;244; -highway|secondary_link;[highway=secondary_link];;name;int_name;245; -railway|spur;[railway=spur];;name;int_name;246; -aerialway|station;[aerialway=station];;name;int_name;247; -landuse|brownfield;[landuse=brownfield];;name;int_name;248; -aeroway|apron;[aeroway=apron];;name;int_name;249; -natural|glacier;[natural=glacier];;name;int_name;250; -amenity|grave_yard;[amenity=grave_yard];;name;int_name;251; -waterway|canal|tunnel;[waterway=canal][tunnel?];;name;int_name;252; -piste:type|downhill|easy;[piste:type=downhill][piste:difficulty=easy];;name;int_name;253; -waterway|ditch|tunnel;[waterway=ditch][tunnel?];;name;int_name;254; -landuse|wood;[landuse=wood];x;name;int_name;255;landuse|forest -piste:type|downhill|intermediate;[piste:type=downhill][piste:difficulty=intermediate];;name;int_name;256; -railway|subway_entrance;[railway=subway_entrance];;name;int_name;257; -highway|trunk_link|motorroad;[highway=trunk_link][motorroad?];x;name;int_name;258;highway|trunk_link -man_made|pipeline;[man_made=pipeline];;name;int_name;259; -route|ferry;[route=ferry];;name;int_name;260; -highway|trunk_link|bridge;[highway=trunk_link][bridge?];;name;int_name;261; -landuse|military;[landuse=military];;name;int_name;262; -highway|service|tunnel;[highway=service][tunnel?];;name;int_name;263; -railway|light_rail;[railway=light_rail];;name;int_name;264; -place|region;[place=region];;name;int_name;265; -railway|narrow_gauge;[railway=narrow_gauge];;name;int_name;266; -railway|subway;[railway=subway];;name;int_name;267; -natural|cave_entrance;[natural=cave_entrance];;name;int_name;268; -highway|tertiary|tunnel;[highway=tertiary][tunnel?];;name;int_name;269; -landuse|landfill;[landuse=landfill];;name;int_name;270; -amenity|bicycle_rental;[amenity=bicycle_rental];;name;int_name;271; -highway|track|oneway;[highway=track][oneway?];x;name;int_name;272;highway|track -highway|tertiary_link|oneway;[highway=tertiary_link][oneway?];x;name;int_name;273;highway|tertiary_link -landuse|greenfield;[landuse=greenfield];;name;int_name;274; -tourism|alpine_hut;[tourism=alpine_hut];;name;int_name;275; -highway|footway|area;[highway=footway][area?];;name;int_name;276; -tourism|hostel;[tourism=hostel];;name;int_name;277; -waterway|river|tunnel;[waterway=river][tunnel?];;name;int_name;278; -boundary|administrative|county;[boundary=administrative][border_type=county];;name;int_name;279; -highway|road|bridge;[highway=road][bridge?];;name;int_name;280; -boundary|administrative|3;[boundary=administrative][admin_level=3];;name;int_name;281; -man_made|pipeline|water;[man_made=pipeline][water];x;name;int_name;282;man_made|pipeline -boundary|administrative;[boundary=administrative];;name;int_name;283; -highway|road|oneway;[highway=road][oneway?];x;name;int_name;284;highway|road -highway|path|destination;[highway=path][access=destination];x;name;int_name;285;highway|path -sport|athletics;[sport=athletics];;name;int_name;286; -landuse|railway;[landuse=railway];;name;int_name;287; -leisure|slipway;[leisure=slipway];;name;int_name;288; -tourism|caravan_site;[tourism=caravan_site];;name;int_name;289; -place|state;[place=state];;name;int_name;290; -highway|path|private;[highway=path][access=private];;name;int_name;291; -railway|subway|tunnel;[railway=subway][tunnel?];x;name;int_name;292;railway|subway -barrier|city_wall;[barrier=city_wall];;name;int_name;293; -place|farm;[place=farm];;name;int_name;294; -boundary|administrative|11;[boundary=administrative][admin_level=11];;name;int_name;295; -waterway|weir;[waterway=weir];;name;int_name;296; -highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297; -railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298; -man_made|lighthouse;[man_made=lighthouse];;name;int_name;299; -highway|path|demanding_mountain_hiking;[highway=path][sac_scale=demanding_mountain_hiking];;name;int_name;300; -highway|primary|motorroad;[highway=primary][motorroad?];x;name;int_name;301;highway|primary -amenity|restaurant|hotel;[amenity=restaurant][hotel];;name;int_name;302; -power|generator;[power=generator];;name;int_name;303; -highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304; -man_made|pipeline|overground;[man_made=pipeline][location=overground];;name;int_name;305; -amenity|parking|destination;[amenity=parking][access=destination];x;name;int_name;306;amenity|parking -highway|unsurfaced;[highway=unsurfaced];x;name;int_name;307;highway|unclassified -highway|raceway;[highway=raceway];;name;int_name;308; -highway|primary|tunnel;[highway=primary][tunnel?];;name;int_name;309; -highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310; -landuse|conservation|private;[landuse=conservation][access=private];x;name;int_name;311; -sport|equestrian;[sport=equestrian];;name;int_name;312; -tourism|information|office;[tourism=information][office];;name;int_name;313; -highway|footway|hiking;[highway=footway][sac_scale=hiking];;name;int_name;314; -aeroway|gate;[aeroway=gate];;name;int_name;315; -railway|preserved;[railway=preserved];;name;int_name;316; -highway|path|horse;[highway=path][horse?];;name;int_name;317; -landuse|field;[landuse=field];;name;int_name;318; -highway|tertiary_link;[highway=tertiary_link];;name;int_name;319; -leisure|water_park;[leisure=water_park];;name;int_name;320; -natural|wetland|bog;[natural=wetland][wetland=bog];;name;int_name;321; -man_made|windmill;[man_made=windmill];;name;int_name;322; -military|bunker;[military=bunker];;name;int_name;323; -aerialway|chair_lift;[aerialway=chair_lift];;name;int_name;324; -amenity|grave_yard|christian;[amenity=grave_yard][religion=christian];;name;int_name;325; -highway|trunk|tunnel;[highway=trunk][tunnel?];;name;int_name;326; -highway|steps|tunnel;[highway=steps][tunnel?];;name;int_name;327; -amenity|car_sharing;[amenity=car_sharing];;name;int_name;328; -sport|football;[sport=football];;name;int_name;329; -highway|steps|bridge;[highway=steps][bridge?];;name;int_name;330; -highway|track|tunnel;[highway=track][tunnel?];;name;int_name;331; -highway|pedestrian|tunnel;[highway=pedestrian][tunnel?];;name;int_name;332; -power|generator|hydro;[power=generator][power_source=hydro];;name;int_name;333; -sport|cricket;[sport=cricket];;name;int_name;334; -sport|bowls;[sport=bowls];;name;int_name;335; -highway|path|tunnel;[highway=path][tunnel?];;name;int_name;336; -man_made|breakwater;[man_made=breakwater];;name;int_name;337; -amenity|parking|permissive|fee;[amenity=parking][access=permissive][fee?];;name;int_name;338; -railway|disused|bridge;[railway][disused?][bridge?];x;name;int_name;339; -tourism|zoo;[tourism=zoo];;name;int_name;340; -sport|gymnastics;[sport=gymnastics];;name;int_name;341; -highway|trunk_link|junction;[highway=trunk_link][junction?];x;name;int_name;342;highway|trunk_link -railway|subway|bridge;[railway=subway][bridge?];;name;int_name;343; -railway|light_rail|bridge;[railway=light_rail][bridge?];;name;int_name;344; -aeroway|terminal;[aeroway=terminal];;name;int_name;345; -railway|tram|bridge;[railway=tram][bridge?];;name;int_name;346; -piste:type|downhill|advanced;[piste:type=downhill][piste:difficulty=advanced];;name;int_name;347; -sport|shooting;[sport=shooting];;name;int_name;348; -place|country;[place=country];;name;int_name;349; -highway|path|alpine_hiking;[highway=path][sac_scale][sac_scale=alpine_hiking];;name;int_name;350; -highway|footway|destination;[highway=footway][access=destination];x;name;int_name;351;highway|footway -sport|scuba_diving;[sport=scuba_diving];;name;int_name;352; -highway|cycleway|permissive;[highway=cycleway][access=permissive];;name;int_name;353; -highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354; -natural|volcano;[natural=volcano];;name;int_name;355; -amenity|parking|underground|fee;[amenity=parking][location=underground][fee?];;name;int_name;356; -amenity|parking|underground;[amenity=parking][location=underground];;name;int_name;357; -man_made|pipeline|gas;[man_made=pipeline][gas];x;name;int_name;358;man_made|pipeline -amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_name;359; -leisure|recreation_ground|private;[leisure=recreation_ground][access=private];;name;int_name;360; -highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;name;int_name;361; -highway|service|driveway|bridge;[highway=service][service=driveway][bridge?];;name;int_name;362; -amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee?];;name;int_name;363; -leisure|track|area;[leisure=track][area?];x;name;int_name;364; -highway|byway;[highway=byway];x;name;int_name;365;highway|track -piste:type|downhill|novice;[piste:type=downhill][piste:difficulty=novice];;name;int_name;366; -railway|narrow_gauge|bridge;[railway=narrow_gauge][bridge?];;name;int_name;367; -noexit|motorcar;[noexit=motorcar];x;name;int_name;368; -highway|service|parking_aisle|tunnel;[highway=service][service=parking_aisle][tunnel?];x;name;int_name;369;highway|service|parking_aisle -highway|bridleway|permissive;[highway=bridleway][access=permissive];;name;int_name;370; -railway|construction;[railway=construction];x;name;int_name;371; -highway|primary_link|junction;[highway=primary_link][junction?];x;name;int_name;372;highway|primary_link -landuse|greenhouse_horticulture;[landuse=greenhouse_horticulture];;name;int_name;373; -highway|primary_link|motorroad;[highway=primary_link][motorroad?];x;name;int_name;374;highway|primary_link -amenity|bureau_de_change;[amenity=bureau_de_change];;name;int_name;375; -power|generator|photovoltaic;[power=generator][generator:type=photovoltaic];;name;int_name;376; -highway|motorway_link|junction;[highway=motorway_link][junction?];x;name;int_name;377;highway|motorway_link -highway|bridleway|bridge;[highway=bridleway][bridge?];;name;int_name;378; -highway|service|driveway|tunnel;[highway=service][service=driveway][tunnel?];;name;int_name;379; -highway|track|cutting;[highway=track][cutting?];x;name;int_name;380;highway|track -landuse|basin|retention;[landuse=basin][basin=retention];x;name;int_name;381;natural|water -railway|narrow_gauge|tunnel;[railway=narrow_gauge][tunnel?];;name;int_name;382; -railway|dismantled;[railway=dismantled];x;name;int_name;383; -waterway|dock;[waterway=dock];;name;int_name;384; -natural|forest;[natural=forest];x;name;int_name;385;natural|wood -highway|service|driveway|area;[highway=service][service=driveway][area?];;name;int_name;386; -man_made|pipeline|heat;[man_made=pipeline][type=heat];x;name;int_name;387;man_made|pipeline -place|city|capital;[place=city][capital?];;name;int_name;388; -aerialway|cable_car;[aerialway=cable_car];;name;int_name;389; -piste:type|downhill;[piste:type=downhill];;name;int_name;390; -sport|american_football;[sport=american_football];;name;int_name;391; -highway|cycleway|destination;[highway=cycleway][access=destination];x;name;int_name;392;highway|cycleway -man_made|cairn;[man_made=cairn];;name;int_name;393; -railway|preserved|bridge;[railway=preserved][bridge?];;name;int_name;394; -highway|path|demanding_alpine_hiking;[highway=path][sac_scale=demanding_alpine_hiking];;name;int_name;395; -landuse|basin|infiltration;[landuse=basin][basin=infiltration];x;name;int_name;396;natural|water -highway|secondary_link|bridge;[highway=secondary_link][bridge?];;name;int_name;397; -railway|tram|tunnel;[railway=tram][tunnel?];;name;int_name;398; -highway|footway|cutting;[highway=footway][cutting?];x;name;int_name;399;highway|footway -railway|abandoned|tunnel;[railway=abandoned][tunnel?];;name;int_name;400; -highway|living_street|area;[highway=living_street][area?];x;name;int_name;401;area:highway|living_street -piste:type|sled;[piste:type=sled];;name;int_name;402; -aerialway|chair_lift|4;[aerialway=chair_lift][piste:lift:occupancy=4];x;name;int_name;403;aerialway|chair_lift -leisure|dog_park;[leisure=dog_park];;name;int_name;404; -aerialway|gondola;[aerialway=gondola];;name;int_name;405; -historic|museum;[historic=museum];;name;int_name;406; -highway|living_street|bridge;[highway=living_street][bridge?];;name;int_name;407; -highway|service|cutting;[highway=service][cutting?];x;name;int_name;408;highway|service -railway|monorail;[railway=monorail];;name;int_name;409; -highway|road|junction;[highway=road][junction?];x;name;int_name;410;highway|road -man_made|pipeline|oil;[man_made=pipeline][type=oil];x;name;int_name;411;man_made|pipeline -leisure|park|private;[leisure=park][access=private];;name;int_name;412; -highway|secondary|motorroad;[highway=secondary][motorroad?];x;name;int_name;413;highway|secondary -noexit|motor_vehicle;[noexit=motor_vehicle];;name;int_name;414; -highway|service|parking_aisle|bridge;[highway=service][service=parking_aisle][bridge?];x;name;int_name;415;highway|service|parking_aisle -highway|motorway|tunnel;[highway=motorway][tunnel?];;name;int_name;416; -railway|light_rail|tunnel;[railway=light_rail][tunnel?];;name;int_name;417; -highway|service|parking_aisle|area;[highway=service][service=parking_aisle][area?];x;name;int_name;418;area:highway|service -highway|residential|construction;[highway=residential][construction?];x;name;int_name;419;highway|construction -highway|motorway|construction;[highway=motorway][construction?];x;name;int_name;420;highway|construction -highway|path|cutting;[highway=path][cutting?];x;name;int_name;421;highway|path -landuse|scrub;[landuse=scrub];x;name;int_name;422;natural|scrub -highway|road|tunnel;[highway=road][tunnel?];;name;int_name;423; -sport|archery;[sport=archery];;name;int_name;424; -railway|construction|bridge;[railway][construction?][bridge?];x;name;int_name;425; -highway|track|grade2|area;[highway=track][tracktype=grade2][area?];x;name;int_name;426; -highway|ford;[highway=ford];;name;int_name;427; -highway|path|area;[highway=path][area?];x;name;int_name;428;area:highway|path -railway|siding;[railway=siding];;name;int_name;429; -highway|track|area;[highway=track][area?];;name;int_name;430; -highway|minor;[highway=minor];x;name;int_name;431;highway|unclassified -railway|funicular;[railway=funicular];;name;int_name;432; -amenity|parking|public|fee;[amenity=parking][access=public][fee?];x;name;int_name;433;amenity|parking|fee -historic|battlefield;[historic=battlefield];;name;int_name;434; -highway|primary|construction;[highway=primary][construction?];x;name;int_name;435;highway|construction -sport|australian_football;[sport=australian_football];;name;int_name;436; -railway|disused|tunnel;[railway][disused?][tunnel?];x;name;int_name;437; -highway|secondary_link|junction;[highway=secondary_link][junction?];x;name;int_name;438;highway|secondary_link -highway|cycleway|private;[highway=cycleway][access=private];;name;int_name;439; -highway|steps|cutting;[highway=steps][cutting?];x;name;int_name;440;highway|steps -piste:lift|t-bar;[piste:lift=t-bar];;name;int_name;441; -highway|trunk|construction;[highway=trunk][construction?];x;name;int_name;442;highway|construction -amenity|parking|public;[amenity=parking][access=public];x;name;int_name;443;amenity|parking -highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444; -earthquake:damage|spontaneous_camp;[earthquake:damage=spontaneous_camp];;name;int_name;445; -highway|cycleway|cutting;[highway=cycleway][cutting?];x;name;int_name;446;highway|cycleway -railway|yard;[railway=yard];;name;int_name;447; -highway|trunk|cutting;[highway=trunk][cutting?];x;name;int_name;448;highway|trunk -natural|meadow;[natural=meadow];;name;int_name;449; -highway|motorway|cutting;[highway=motorway][cutting?];x;name;int_name;450;highway|motorway -railway|razed;[railway=razed];;name;int_name;451; -highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452; -aerialway|chair_lift|6;[aerialway=chair_lift][piste:lift:occupancy=6];x;name;int_name;453;aerialway|chair_lift -landuse|basin|detention;[landuse=basin][basin=detention];x;name;int_name;454;natural|water -landuse|orchard;[landuse=orchard];;name;int_name;455; -highway|track|grade1|area;[highway=track][tracktype=grade1][area?];x;name;int_name;456;highway|track -highway|living_street|tunnel;[highway=living_street][tunnel?];;name;int_name;457; -highway|secondary|construction;[highway=secondary][construction?];x;name;int_name;458;highway|construction -highway|living_street|junction;[highway=living_street][junction?];x;name;int_name;459;highway|living_street -railway|construction|tunnel;[railway][construction?][tunnel?];x;name;int_name;460; -sport|handball;[sport=handball];;name;int_name;461; -boundary|administrative|city;[boundary=administrative][border_type=city];;name;int_name;462; -piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride];;name;int_name;463; -amenity|restaurant|vegetarian;[amenity=restaurant][cuisine=vegetarian];;name;int_name;464; -communication|line|submarine;[communication=line][location=submarine];x;name;int_name;465;communication|line -piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466; -landuse|salt_pond;[landuse=salt_pond];;name;int_name;467; -landuse|reservoir|water_storage;[landuse=reservoir][reservoir=water_storage];x;name;int_name;468;natural|water -railway|monorail|bridge;[railway=monorail][bridge?];;name;int_name;469; -highway|steps|area;[highway=steps][area?];x;name;int_name;470;area:highway|steps -railway|proposed;[railway=proposed];x;name;int_name;471; -highway|tertiary|construction;[highway=tertiary][construction?];x;name;int_name;472; -landuse|wood|deciduous;[landuse=wood][wood=deciduous];x;name;int_name;473;highway|construction -natural|grass;[natural=grass];;name;int_name;474;natural|wood -highway|road|area;[highway=road][area?];x;name;int_name;475; -highway|tertiary|area;[highway=tertiary][area?];x;name;int_name;476; -piste:lift|platter;[piste:lift=platter];;name;int_name;477; -man_made|pipeline|natural_gas;[man_made=pipeline][type=natural_gas];x;name;int_name;478;man_made|pipeline -highway|unclassified|disused;[highway=unclassified][disused?];x;name;int_name;479; -railway|preserved|tunnel;[railway=preserved][tunnel?];;name;int_name;480; -noexit|vehicle;[noexit=vehicle];x;name;int_name;481; -highway|disused;[highway=disused];x;name;int_name;482; -highway|unclassified|construction;[highway=unclassified][construction?];x;name;int_name;483;highway|construction -highway|service|disused;[highway=service][disused?];x;name;int_name;484; -highway|service|construction;[highway=service][construction?];x;name;int_name;485;highway|construction -highway|cycleway|disused;[highway=cycleway][disused?];x;name;int_name;486; -leisure|park|permissive;[leisure=park][access=permissive];;name;int_name;487; -highway|bridleway|tunnel;[highway=bridleway][tunnel?];;name;int_name;488; -highway|motorway_link|tunnel;[highway=motorway_link][tunnel?];;name;int_name;489; -highway|residential|disused;[highway=residential][disused?];x;name;int_name;490; -highway|cycleway|construction;[highway=cycleway][construction?];x;name;int_name;491; -highway|bridleway|private;[highway=bridleway][access=private];;name;int_name;492; -highway|tertiary_link|bridge;[highway=tertiary_link][bridge?];;name;int_name;493; -highway|footway|construction;[highway=footway][construction?];x;name;int_name;494;highway|construction -amenity|parking|park_and_ride;[amenity=parking][parking=park_and_ride];;name;int_name;495; -highway|track|dyke;[highway=track][dyke?];x;name;int_name;496;highway|track -highway|track|grade3|area;[highway=track][tracktype=grade3][area?];x;name;int_name;497; -landuse|wood|mixed;[landuse=wood][wood=mixed];x;name;int_name;498;landuse|forest -waterway|lock;[waterway=lock];;name;int_name;499; -highway|path|dyke;[highway=path][dyke?];x;name;int_name;500;highway|path -highway|motorway|junction;[highway=motorway][junction?];x;name;int_name;501;highway|motorway -highway|motorway_link|construction;[highway=motorway_link][construction?];x;name;int_name;502;highway|construction -highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503; -highway|footpath;[highway=footpath];x;name;int_name;504;highway|footway -highway|path|disused;[highway=path][disused?];x;name;int_name;505; -highway|tertiary|motorroad;[highway=tertiary][motorroad?];x;name;int_name;506;highway|tertiary -leisure|green;[leisure=green];x;name;int_name;507; -landuse|reservoir|sewage;[landuse=reservoir][reservoir=sewage];x;name;int_name;508;natural|water -railway|spur|bridge;[railway=spur][bridge?];;name;int_name;509; -highway|track|disused;[highway=track][disused?];x;name;int_name;510; -highway|tertiary_link|junction;[highway=tertiary_link][junction?];x;name;int_name;511;highway|tertiary_link -highway|track|grade3|destination;[highway=track][tracktype=grade3][access=destination];x;name;int_name;512;highway|track -sport|curling;[sport=curling];;name;int_name;513; -landuse|reservoir|evaporator;[landuse=reservoir][reservoir=evaporator];x;name;int_name;514;natural|water -landuse|wood|coniferous;[landuse=wood][wood=coniferous];x;name;int_name;515;landuse|forest|coniferous -natural|scrub|deciduous;[natural=scrub][wood=deciduous];x;name;int_name;516; -highway|footway|disused;[highway=footway][disused?];x;name;int_name;517; -leisure|playground|tennis;[leisure=playground][sport=tennis];;name;int_name;518; -highway|secondary|area;[highway=secondary][area?];x;name;int_name;519; -sport|diving;[sport=diving];;name;int_name;520; -highway|track|grade3|private;[highway=track][tracktype=grade3][access=private];;name;int_name;521; -boundary|administrative|suburb;[boundary=administrative][border_type=suburb];;name;int_name;522; -natural|quarry;[natural=quarry];x;name;int_name;523; -railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524; -railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525; -highway|trunk_link|construction;[highway=trunk_link][construction?];x;name;int_name;526;highway|construction -highway|footway|dyke;[highway=footway][dyke?];x;name;int_name;527;highway|footway -highway|primary_link|tunnel;[highway=primary_link][tunnel?];;name;int_name;528; -highway|footway|alpine_hiking;[highway=footway][sac_scale=alpine_hiking];;name;int_name;529; -natural|scrub|mixed;[natural=scrub][wood=mixed];x;name;int_name;530; -highway|byway|bridge;[highway=byway][bridge?];x;name;int_name;531;highway|track -man_made|pipeline|hot_water;[man_made=pipeline][type=hot_water];x;name;int_name;532;man_made|pipeline -leisure|landscape_reserve;[leisure=landscape_reserve];;name;int_name;533; -leisure|playing_fields;[leisure=playing_fields];x;name;int_name;534; -highway|secondary_link|motorroad;[highway=secondary_link][motorroad];x;name;int_name;535;highway|secondary_link -boundary|administrative|state;[boundary=administrative][border_type=state];;name;int_name;536; -highway|cycleway|dyke;[highway=cycleway][dyke?];x;name;int_name;537;highway|cycleway -highway|cycleway|area;[highway=cycleway][area?];x;name;int_name;538; -railway|funicular|tunnel;[railway=funicular][tunnel?];;name;int_name;539; -barrier|cycle_barrier;[barrier=cycle_barrier];;name;int_name;540; -highway|unsurfaced|bridge;[highway=unsurfaced][bridge?];x;name;int_name;541;highway|unclassified -amenity|speed_trap;[amenity=speed_trap];;name;int_name;542; -highway|track|grade4|area;[highway=track][tracktype=grade4][area?];x;name;int_name;543;area:highway|track -highway|primary|area;[highway=primary][area?];x;name;int_name;544;area:highway|primary -power|line|underground;[power=line][location=underground];;name;int_name;545; -amenity|restaurant|vegan;[amenity=restaurant][cuisine=vegan];;name;int_name;546; -highway|track|construction;[highway=track][construction?];x;name;int_name;547;highway|construction -highway|minor|oneway;[highway=minor][oneway?];x;name;int_name;548;highway|unclassified -highway|bridleway|cutting;[highway=bridleway][cutting?];x;name;int_name;549;highway|bridleway -waterway|lock_gate;[waterway=lock_gate];;name;int_name;550; -railway|proposed|tunnel;[railway=proposed][tunnel?];x;name;int_name;551; -highway|primary|disused;[highway=primary][disused?];x;name;int_name;552; -highway|unsurfaced|private;[highway=unsurfaced][access=private];x;name;int_name;553;highway|unclassified -highway|path|construction;[highway=path][construction?];x;name;int_name;554;highway|construction -highway|footway|demanding_alpine_hiking;[highway=footway][sac_scale=demanding_alpine_hiking];;name;int_name;555; -railway|proposed|bridge;[railway=proposed][bridge?];x;name;int_name;556; -highway|track|grade4|destination;[highway=track][tracktype=grade4][access=destination];x;name;int_name;557;highway|track -landuse|runway;[landuse=runway];x;name;int_name;558; -natural|farm;[natural=farm];x;name;int_name;559;landuse|farmland -highway|unsurfaced|oneway;[highway=unsurfaced][oneway?];x;name;int_name;560;highway|unclassified -highway|motorway_link|disused;[highway=motorway_link][disused?];x;name;int_name;561; -highway|crossing|uncontrolled;[highway=crossing][crossing=uncontrolled];x;name;int_name;562; -highway|track|junction;[highway=track][junction?];x;name;int_name;563;highway|track -natural|lake;[natural=lake];;name;int_name;564; -man_made|pipeline|sewage;[man_made=pipeline][type=sewage];x;name;int_name;565;man_made|pipeline -highway|primary_link|construction;[highway=primary_link][construction?];x;name;int_name;566;highway|construction -landuse|reservoir|tailings;[landuse=reservoir][reservoir=tailings];x;name;int_name;567;natural|water -highway|secondary|disused;[highway=secondary][disused?];x;name;int_name;568; -highway|track|grade5|destination;[highway=track][tracktype=grade5][access=destination];x;name;int_name;569;highway|track -natural|basin;[natural=basin];x;name;int_name;570;natural|water -aerialway|chair_lift|5;[aerialway=chair_lift][piste:lift:occupancy=5];x;name;int_name;571; -natural|reservoir;[natural=reservoir];x;name;int_name;572;natural|water -highway|steps|construction;[highway=steps][construction?];x;name;int_name;573;highway|construction -highway|motorway|area;[highway=motorway][area?];x;name;int_name;574; -piste:lift|rope_tow;[piste:lift=rope_tow];;name;int_name;575; -natural|pond;[natural=pond];;name;int_name;576; -natural|industrial;[natural=industrial];x;name;int_name;577; -highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578; -highway|pedestrian|junction;[highway=pedestrian][junction?];x;name;int_name;579;highway|pedestrian -highway|track|grade5|private;[highway=track][tracktype=grade5][access=private];;name;int_name;580; -highway|track|grade5|area;[highway=track][tracktype=grade5][area?];x;name;int_name;581; -natural|forest|deciduous;[natural=forest][wood=deciduous];x;name;int_name;582;landuse|forest -highway|living_street|construction;[highway=living_street][construction?];x;name;int_name;583;highway|construction -highway|track|racetrack;[highway=raceway];x;name;int_name;584; -highway|tertiary|disused;[highway=tertiary][disused?];x;name;int_name;585; -highway|steps|disused;[highway=steps][disused?];x;name;int_name;586; -aerialway|mixed_lift;[aerialway=mixed_lift];;name;int_name;587; -railway|planned;[railway=planned];x;name;int_name;588; -highway|footway|cycleway;[highway=footway][cycleway?];x;name;int_name;589;highway|footway -power|line|submarine;[power=line][location=submarine];x;name;int_name;590;power|line -highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permissive];;name;int_name;591; -highway|track|grade4|private;[highway=track][tracktype=grade4][access=private];;name;int_name;592; -highway|byway|permissive;[highway=byway][access=permissive];x;name;int_name;593;highway|track -natural|railway;[natural=railway];x;name;int_name;594; -highway|service|dyke;[highway=service][man_made][dyke?];x;name;int_name;595;highway|service -railway|incline;[railway=incline];x;name;int_name;596; -boundary|administrative|region;[boundary=administrative][border_type=region];;name;int_name;597; -highway|pedestrian|construction;[highway=pedestrian][construction?];x;name;int_name;598;highway|construction -highway|path|t1;[highway=path][t1];x;name;int_name;599;highway|path -landuse|raceway;[landuse=raceway];x;name;int_name;600; -place|continent;[place=continent];;name;int_name;601; -natural|farmland;[natural=farmland];x;name;int_name;602;landuse|farmland -highway|footpath|private;[highway=footpath][access=private];x;name;int_name;603;highway|footway -boundary|administrative|nation;[boundary=administrative][type=nation];;name;int_name;604; -railway|dismantled|bridge;[railway=dismantled][bridge?];x;name;int_name;605; -natural|landfill;[natural=landfill];x;name;int_name;606; -highway|byway|tunnel;[highway=byway][tunnel?];x;name;int_name;607;highway|track -piste:lift|magic_carpet;[piste:lift=magic_carpet];;name;int_name;608; -natural|scrub|coniferous;[natural=scrub][wood=coniferous];x;name;int_name;609; -highway|unsurfaced|permissive;[highway=unsurfaced][access=permissive];x;name;int_name;610;highway|unclassified -highway|bridleway|destination;[highway=bridleway][access=destination];x;name;int_name;611;highway|bridleway -highway|motorway|disused;[highway=motorway][disused?];x;name;int_name;612; -landuse|runway|disused;[landuse=runway][disused?];x;name;int_name;613; -highway|unsurfaced|destination;[highway=unsurfaced][access=destination];x;name;int_name;614;highway|unclassified -natural|brownfield;[natural=brownfield];x;name;int_name;615; -natural|village_green;[natural=village_green];x;name;int_name;616; -highway|track|embankment;[highway=track][embankment?];x;name;int_name;617;highway|track -highway|footpath|bridge;[highway=footpath][bridge?];x;name;int_name;618;highway|footway -piste:lift|j-bar;[piste:lift=j-bar];;name;int_name;619; -landuse|scrub|deciduous;[landuse=scrub][wood=deciduous];x;name;int_name;620; -highway|bridleway|area;[highway=bridleway][area?];x;name;int_name;621; -natural|military;[natural=military];x;name;int_name;622; -highway|byway|private;[highway=byway][access=private];x;name;int_name;623;highway|track -natural|forest|mixed;[natural=forest][wood=mixed];x;name;int_name;624;landuse|forest -highway|raceway|disused;[highway=raceway][disused?];x;name;int_name;625; -railway|siding|bridge;[railway=siding][bridge?];;name;int_name;626; -highway|footway|difficult_alpine_hiking;[highway=footway][sac_scale=difficult_alpine_hiking];;name;int_name;627; -man_made|pipeline|oil|overground;[man_made=pipeline][type=oil][location=overground];x;name;int_name;628; -highway|primary_link|area;[highway=primary_link][area?];x;name;int_name;629; -highway|primary_link|disused;[highway=primary_link][disused?];x;name;int_name;630;highway|primary_link -highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permissive];;name;int_name;631; -landuse|reservoir|cooling;[landuse=reservoir][reservoir=cooling];x;name;int_name;632;natural|water -aeroway|airport;[aeroway=airport];;name;int_name;633; -highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634; -man_made|piste:halfpipe;[man_made=piste:halfpipe];x;name;int_name;635; -highway|footpath|permissive;[highway=footpath][access=permissive];x;name;int_name;636;highway|footway -highway|tertiary|cycleway;[highway=tertiary][cycleway?];x;name;int_name;637; -highway|trunk|area;[highway=trunk][area?];x;name;int_name;638; -highway|secondary_link|construction;[highway=secondary_link][construction?];x;name;int_name;639;highway|construction -landuse|street;[landuse=street];x;name;int_name;640; -leisure|park|destination;[leisure=park][access=destination];x;name;int_name;641;leisure|park -highway|footway|t2;[highway=footway][t2];x;name;int_name;642;highway|footway -landuse|raceway|disused;[landuse=raceway][disused?];x;name;int_name;643; -highway|motorway_link|area;[highway=motorway_link][area?];x;name;int_name;644; -natural|recreation_ground;[natural=recreation_ground];x;name;int_name;645; -highway|minor|bridge;[highway=minor][bridge?];x;name;int_name;646;highway|unclassified -highway|secondary|cycleway;[highway=secondary][cycleway?];x;name;int_name;647;highway|secondary -highway|track|dike;[highway=track][dike?];x;name;int_name;648;highway|track -natural|forest|coniferous;[natural=forest][wood=coniferous];x;name;int_name;649;landuse|forest -highway|footway|embankment;[highway=footway][embankment?];x;name;int_name;650;highway|footway -railway|spur|tunnel;[railway=spur][tunnel?];;name;int_name;651; -highway|path|t5;[highway=path][t5];x;name;int_name;652;highway|path -highway|path|t3;[highway=path][t3];x;name;int_name;653;highway|path -highway|trunk|disused;[highway=trunk][disused?];x;name;int_name;654; -highway|trunk_link|area;[highway=trunk_link][area?];x;name;int_name;655; -railway|incline|tunnel;[railway=incline][tunnel?];;name;int_name;656; -boundary|administrative|municipality;[boundary=administrative][border_type=municipality];;name;int_name;657; -highway|path|t2;[highway=path][t2];x;name;int_name;658;highway|path -highway|byway|destination;[highway=byway][access=destination];x;name;int_name;659;highway|bridleway -natural|construction;[natural][construction?];x;name;int_name;660; -communication|line;[communication=line];;name;int_name;661; -highway|tertiary_link|motorroad;[highway=tertiary_link][motorroad?];x;name;int_name;662;highway|tertiary_link -railway|dismantled|tunnel;[railway=dismantled][tunnel?];x;name;int_name;663; -leisure|recreation_ground|permissive;[leisure=recreation_ground][access=permissive];;name;int_name;664; -railway|yard|bridge;[railway=yard][bridge?];;name;int_name;665; -landuse|raceway|dismantled;[landuse=raceway][dismantled?];x;name;int_name;666; -railway|planned|tunnel;[railway=planned][tunnel?];x;name;int_name;667; -highway|residential|turning_circle;[highway=residential][turning_circle?];x;name;int_name;668; -highway|bridleway|disused;[highway=bridleway][disused?];x;name;int_name;669; -highway|service|cycleway;[highway=service][cycleway?];x;name;int_name;670;highway|service -highway|pedestrian|disused;[highway=pedestrian][disused?];x;name;int_name;671; -highway|unsurfaced|area;[highway=unsurfaced][area?];x;name;int_name;672; -highway|minor|tunnel;[highway=minor][tunnel?];x;name;int_name;673;highway|unclassified -highway|minor|area;[highway=minor][area?];x;name;int_name;674; -highway|track|grade4|permissive;[highway=track][tracktype=grade4][access=permissive];;name;int_name;675; -highway|crossing|zebra;[highway=crossing][crossing=zebra];x;name;int_name;676; -landuse|runway|dismantled;[landuse=runway][dismantled?];x;name;int_name;677; -highway|bridleway|construction;[highway=bridleway][construction?];x;name;int_name;678; -railway|planned|bridge;[railway=planned][bridge?];x;name;int_name;679; -highway|service|embankment;[highway=service][embankment?];x;name;int_name;680;highway|service -highway|crossing|island;[highway=crossing][crossing=island];x;name;int_name;681; -highway|unclassified|cycleway;[highway=unclassified][cycleway];x;name;int_name;682;highway|unclassified -highway|residential|cycleway;[highway=residential][cycleway];x;name;int_name;683;highway|residential -natural|commercial;[natural=commercial];x;name;int_name;684; -highway|path|embankment;[highway=path][embankment?];x;name;int_name;685;highway|path -natural|vineyard;[natural=vineyard];;name;int_name;686; -highway|cycleway|dike;[highway=cycleway][dike?];x;name;int_name;687;highway|cycleway -man_made|pipeline|water|overground;[man_made=pipeline][type=water][location=overground];x;name;int_name;688;man_made|pipeline -highway|footpath|area;[highway=footpath][area?];x;name;int_name;689;highway|footway -highway|road|turning_circle;[highway=road][turning_circle?];x;name;int_name;690; -boundary|administrative|country;[boundary=administrative][border_type=country];;name;int_name;691; -highway|service|levee;[highway=service][levee?];x;name;int_name;692;highway|service -natural|orchard;[natural=orchard];;name;int_name;693; -natural|retail;[natural=retail];x;name;int_name;694; -communication|line|underground;[communication=line][location=underground];;name;int_name;695; -natural|cemetery;[natural=cemetery];x;name;int_name;696; -highway|track|levee;[highway=track][levee?];x;name;int_name;697;highway|track -highway|path|dike;[highway=path][dike?];x;name;int_name;698;highway|path -highway|tertiary_link|area;[highway=tertiary_link][area?];x;name;int_name;699; -highway|unsurfaced|tunnel;[highway=unsurfaced][tunnel?];x;name;int_name;700; -highway|secondary_link|area;[highway=secondary_link][area?];x;name;int_name;701; -natural|allotments;[natural=allotments];x;name;int_name;702; -railway|station|subway;[railway=station][transport=subway];;name;int_name;703; -amenity|police;[amenity=police];;name;int_name;704; -amenity|car_rental;[amenity=car_rental];;name;int_name;705; -amenity|taxi;[amenity=taxi];;name;int_name;706; -amenity|marketplace;[amenity=marketplace];;name;int_name;707; -amenity|nightclub;[amenity=nightclub];;name;int_name;708; -amenity|embassy;[amenity=embassy];;name;int_name;709; -amenity|townhall;[amenity=townhall];;name;int_name;710; -barrier|gate;[barrier=gate];;name;int_name;711; -barrier|lift_gate;[barrier=lift_gate];;name;int_name;712; -barrier|stile;[barrier=stile];;name;int_name;713; -barrier|block;[barrier=block];;name;int_name;714; -barrier|toll_booth;[barrier=toll_booth];;name;int_name;715; -historic|memorial;[historic=memorial];;name;int_name;716; -historic|ruins;[historic=ruins];;name;int_name;717; -historic|monument;[historic=monument];;name;int_name;718; -historic|castle;[historic=castle];;name;int_name;719; -historic|archaeological_site;[historic=archaeological_site];;name;int_name;720; -highway|residential|private;[highway=residential][access=private];;name;int_name;721; -man_made|cutline;[man_made=cutline];;name;int_name;722; -natural|bay;[natural=bay];;name;int_name;723; -natural|spring;[natural=spring];;name;int_name;724; -railway|platform;[railway=platform];;name;int_name;725; -shop|clothes;[shop=clothes];;name;int_name;726; -shop|car_repair;[shop=car_repair];;name;int_name;727; -shop|car;[shop=car];;name;int_name;728; -shop|kiosk;[shop=kiosk];;name;int_name;729; -sport|multi;[sport=multi];;name;int_name;730; -sport|golf;[sport=golf];;name;int_name;731; -sport|skiing;[sport=skiing];;name;int_name;732; -tourism|museum;[tourism=museum];;name;int_name;733; -tourism|guest_house;[tourism=guest_house];;name;int_name;734; -tourism|motel;[tourism=motel];;name;int_name;735; -boundary|administrative|4|state;[boundary=administrative][admin_level=4][border_type=state];;name;int_name;736; -place|state|USA;[place=state][addr:country=US];;name;int_name;737; -building|address;[addr:housenumber][addr:street][!shop][!amenity][!office];;addr:housenumber;name;738; -amenity|parking|no-access;[amenity=parking][access=no];;name;int_name;739; -highway|bridleway|dike;[highway=bridleway][dike?];x;name;int_name;740;highway|track -highway|bridleway|dyke;[highway=bridleway][dyke?];x;name;int_name;741;highway|track -highway|bridleway|embankment;[highway=bridleway][embankment?];x;name;int_name;742;highway|track -highway|bridleway|levee;[highway=bridleway][levee?];x;name;int_name;743;highway|track -highway|bridleway|no-access;[highway=bridleway][access=no];x;name;int_name;744;highway|track -highway|byway|area;[highway=byway][area?];x;name;int_name;745;highway|track -highway|byway|construction;[highway=byway][construction?];x;name;int_name;746;highway|track -highway|byway|disused;[highway=byway][disused?];x;name;int_name;747;highway|track -highway|byway|no-access;[highway=byway][access=no];x;name;int_name;748;highway|track -highway|cycleroad;[highway=cycleroad];x;name;int_name;749;highway|cycleway -highway|cycleroad|area;[highway=cycleroad][area?];x;name;int_name;750;highway|cycleway -highway|cycleroad|bridge;[highway=cycleroad][bridge?];x;name;int_name;751;highway|cycleway -highway|cycleroad|construction;[highway=cycleroad][construction?];x;name;int_name;752;highway|cycleway -highway|cycleroad|disused;[highway=cycleroad][disused?];x;name;int_name;753;highway|cycleway -highway|cycleroad|junction;[highway=cycleroad][junction?];x;name;int_name;754;highway|cycleway -highway|cycleroad|tunnel;[highway=cycleroad][tunnel?];x;name;int_name;755;highway|cycleway -highway|cycleway|embankment;[highway=cycleway][embankment?];x;name;int_name;756;highway|cycleway -highway|cycleway|levee;[highway=cycleway][levee?];x;name;int_name;757;highway|cycleway -highway|cycleway|no-access;[highway=cycleway][access=no];x;name;int_name;758;highway|cycleway -highway|footpath|construction;[highway=footpath][construction?];x;name;int_name;759;highway|footway -highway|footpath|cycleway;[highway=footpath][cycleway?];x;name;int_name;760;highway|footway -highway|footpath|destination;[highway=footpath][access=destination];x;name;int_name;761;highway|footway -highway|footpath|disused;[highway=footpath][disused?];x;name;int_name;762;highway|footway -highway|footpath|no-access;[highway=footpath][access=no];x;name;int_name;763;highway|footway -highway|footpath|tunnel;[highway=footpath][tunnel?];x;name;int_name;764;highway|footway -highway|footway|dike;[highway=footway][dike?];x;name;int_name;765;highway|footway -highway|footway|levee;[highway=footway][levee?];x;name;int_name;766;highway|footway -highway|footway|no-access;[highway=footway][access=no];;name;int_name;767;highway|footway -highway|footway|t1;[highway=footway][t1];x;name;int_name;768;highway|footway -highway|footway|t3;[highway=footway][t3];x;name;int_name;769;highway|footway -highway|footway|t4;[highway=footway][t4];x;name;int_name;770;highway|footway -highway|footway|t5;[highway=footway][t5];x;name;int_name;771;highway|footway -highway|footway|t6;[highway=footway][t6];x;name;int_name;772;highway|footway -highway|ford|cycleway;[highway=ford][cycleway];x;name;int_name;773; -highway|living_street|disused;[highway=living_street][disused?];x;name;int_name;774; -highway|minor|construction;[highway=minor][construction?];x;name;int_name;775;highway|unclassified -highway|minor|cycleway;[highway=minor][cycleway];x;name;int_name;776;highway|unclassified -highway|minor|disused;[highway=minor][disused?];x;name;int_name;777;highway|unclassified -highway|minor|junction;[highway=minor][junction?];x;name;int_name;778;highway|unclassified -highway|minor|turning_circle;[highway=minor][turning_circle?];x;name;int_name;779;highway|unclassified -highway|motorway|cycleway;[highway=motorway][cycleway];x;name;int_name;780;highway|motorway -highway|motorway|dike;[highway=motorway][dike?];x;name;int_name;781;highway|motorway -highway|motorway|dyke;[highway=motorway][dyke?];x;name;int_name;782;highway|motorway -highway|motorway|embankment;[highway=motorway][embankment?];x;name;int_name;783;highway|motorway -highway|motorway|levee;[highway=motorway][levee?];x;name;int_name;784;highway|motorway -highway|motorway_link|cycleway;[highway=motorway_link][cycleway?];x;name;int_name;785;highway|motorway -highway|path|area-bicycle;[highway=path][area?][bicycle?];x;name;int_name;786;highway|path -highway|path|area-horse;[highway=path][area?][horse?];x;name;int_name;787;highway|path -highway|path|bicycle-bridge;[highway=path][bicycle?][bridge?];;name;int_name;788;highway|path -highway|path|bicycle-construction;[highway=path][bicycle?][construction?];x;name;int_name;789;highway|path -highway|path|bicycle-disused;[highway=path][bicycle?][disused?];x;name;int_name;790;highway|path -highway|path|bicycle-tunnel;[highway=path][bicycle?][tunnel?];;name;int_name;791;highway|path -highway|path|bridge-horse;[highway=path][bridge?][horse?];x;name;int_name;792;highway|path -highway|path|construction-horse;[highway=path][construction?][horse?];x;name;int_name;793;highway|path -highway|path|disused-horse;[highway=path][disused?][horse?];x;name;int_name;794;highway|path -highway|path|horse-tunnel;[highway=path][horse?][tunnel?];x;name;int_name;795;highway|path -highway|path|levee;[highway=path][levee?];x;name;int_name;796;highway|path -highway|path|no-access;[highway=path][access=no];;name;int_name;797;highway|path -highway|path|t4;[highway=path][t4];x;name;int_name;798;highway|path -highway|path|t6;[highway=path][t6];x;name;int_name;799;highway|path -highway|pedestrian|cycleway;[highway=pedestrian][cycleway];x;name;int_name;800;highway|pedestrian -highway|primary|cycleway;[highway=primary][cycleway];x;name;int_name;801;highway|primary -highway|primary|cycleway-motorroad;[highway=primary][cycleway?][motorroad?];x;name;int_name;802;highway|primary -highway|primary_link|cycleway;[highway=primary_link][cycleway?];x;name;int_name;803;highway|primary_link -highway|primary_link|cycleway-motorroad;[highway=primary_link][cycleway?][motorroad?];x;name;int_name;804;highway|primary_link -highway|raceway|dismantled;[highway=raceway][dismantled?];x;name;int_name;805; -highway|road|cycleway;[highway=road][cycleway];x;name;int_name;806; -highway|secondary|cycleway-motorroad;[highway=secondary][cycleway?][motorroad?];x;name;int_name;807;highway|secondary -highway|secondary_link|cycleway;[highway=secondary_link][cycleway?];x;name;int_name;808;highway|secondary_link -highway|secondary_link|cycleway-motorroad;[highway=secondary_link][cycleway?][motorroad?];x;name;int_name;809;highway|secondary_link -highway|secondary_link|disused;[highway=secondary_link][disused?];x;name;int_name;810;highway|secondary_link -highway|service|dike;[highway=service][dike?];x;name;int_name;811;highway|service -highway|steps|dike;[highway=steps][dike?];x;name;int_name;812;highway|steps -highway|steps|dyke;[highway=steps][dyke?];x;name;int_name;813;highway|steps -highway|steps|embankment;[highway=steps][embankment?];x;name;int_name;814;highway|steps -highway|steps|levee;[highway=steps][levee?];x;name;int_name;815;highway|steps -highway|tertiary|cycleway-motorroad;[highway=tertiary][cycleway?][motorroad?];x;name;int_name;816;highway|tertiary -highway|tertiary_link|construction;[highway=tertiary_link][construction?];x;name;int_name;817;highway|tertiary_link -highway|tertiary_link|cycleway;[highway=tertiary_link][cycleway?];x;name;int_name;818;highway|tertiary_link -highway|tertiary_link|cycleway-motorroad;[highway=tertiary_link][cycleway?][motorroad?];x;name;int_name;819;highway|tertiary_link -highway|tertiary_link|disused;[highway=tertiary_link][disused?];x;name;int_name;820;highway|tertiary_link -highway|track|grade3|no-access;[highway=track][tracktype=grade3][access=no];;name;int_name;821; -highway|track|grade4|no-access;[highway=track][tracktype=grade4][access=no];;name;int_name;822; -highway|track|grade5|no-access;[highway=track][tracktype=grade5][access=no];;name;int_name;823; -highway|track|no-access;[highway=track][access=no];;name;int_name;824; -highway|track|race;[highway=raceway];x;name;int_name;825; -highway|trunk|cycleway;[highway=trunk][cycleway?];x;name;int_name;826;highway|trunk -highway|trunk|cycleway-motorroad;[highway=trunk][cycleway?][motorroad?];x;name;int_name;827;highway|trunk -highway|trunk|dike;[highway=trunk][dike?];x;name;int_name;828;highway|trunk -highway|trunk|dyke;[highway=trunk][dyke?];x;name;int_name;829;highway|trunk -highway|trunk|embankment;[highway=trunk][embankment?];x;name;int_name;830;highway|trunk -highway|trunk|levee;[highway=trunk][levee?];x;name;int_name;831;highway|trunk -highway|trunk_link|cycleway;[highway=trunk_link][cycleway?];x;name;int_name;832;highway|trunk_link -highway|trunk_link|cycleway-motorroad;[highway=trunk_link][cycleway?][motorroad?];x;name;int_name;833;highway|trunk_link -highway|trunk_link|disused;[highway=trunk_link][disused?];x;name;int_name;834;highway|trunk_link -highway|unclassified|turning_circle;[highway=unclassified][turning_circle];x;name;int_name;835;highway|unclassified -highway|unsurfaced|construction;[highway=unsurfaced][construction?];x;name;int_name;836;highway|unclassified -highway|unsurfaced|cycleway;[highway=unsurfaced][cycleway?];x;name;int_name;837;highway|unclassified -highway|unsurfaced|disused;[highway=unsurfaced][disused?];x;name;int_name;838;highway|unclassified -highway|unsurfaced|junction;[highway=unsurfaced][junction?];x;name;int_name;839;highway|unclassified -highway|unsurfaced|no-access;[highway=unsurfaced][access=no];x;name;int_name;840;highway|unclassified -landuse|conservation|destination;[landuse=conservation][access=destination];x;name;int_name;841; -landuse|conservation|no-access;[landuse=conservation][access=no];x;name;int_name;842; -landuse|conservation|permissive;[landuse=conservation][access=permissive];x;name;int_name;843; -landuse|scrub|coniferous;[landuse=scrub][wood=coniferous];x;name;int_name;844; -landuse|scrub|mixed;[landuse=scrub][wood=mixed];x;name;int_name;845; -leisure|dog_park|tennis;[leisure=dog_park][sport=tennis];;name;int_name;846; -leisure|park|no-access;[leisure=park][access=no];;name;int_name;847; -leisure|playing_fields|tennis;[leisure=playing_fields][sport=tennis];;name;int_name;848; -leisure|recreation_ground|destination;[leisure=recreation_ground][access=destination];x;name;int_name;849; -leisure|recreation_ground|no-access;[leisure=recreation_ground][access=no];;name;int_name;850; -man_made|pipeline|gas|overground;[man_made=pipeline][type=gas][location=overground];x;name;int_name;851;man_made|pipeline -man_made|pipeline|heat|overground;[man_made=pipeline][type=heat][location=overground];x;name;int_name;852;man_made|pipeline -man_made|pipeline|hot_water|overground;[man_made=pipeline][type=hot_water][location=overground];x;name;int_name;853;man_made|pipeline -man_made|pipeline|natural_gas|overground;[man_made=pipeline][type=natural_gas][location=overground];x;name;int_name;854;man_made|pipeline -man_made|pipeline|sewage|overground;[man_made=pipeline][type=sewage][location=overground];x;name;int_name;855;man_made|pipeline -mapswithme|grid;[mapswithme=grid];;name;int_name;856; -natural|farmyard;[natural=farmyard];x;name;int_name;857; -natural|garages;[natural=garages];x;name;int_name;858; -natural|greenfield;[natural=greenfield];;name;int_name;859; -natural|greenhouse_horticulture;[natural=greenhouse_horticulture];;name;int_name;860; -natural|salt_pond;[natural=salt_pond];;name;int_name;861; -natural|street;[natural=street];x;name;int_name;862; -railway|incline|bridge;[railway=incline][bridge?];;name;int_name;863; -railway|siding|tunnel;[railway=siding][tunnel?];;name;int_name;864; -railway|yard|tunnel;[railway=yard][tunnel?];;name;int_name;865; -area:highway|footway;[area:highway=footway];;name;int_name;866; -area:highway|service;[area:highway=service];;name;int_name;867; -area:highway|residential;[area:highway=residential];;name;int_name;868; -area:highway|secondary;[area:highway=secondary];;name;int_name;869; -area:highway|tertiary;[area:highway=tertiary];;name;int_name;870; -area:highway|primary;[area:highway=primary];;name;int_name;871; -area:highway|path;[area:highway=path];;name;int_name;872; -area:highway|pedestrian;[area:highway=pedestrian];;name;int_name;873; -area:highway|unclassified;[area:highway=unclassified];;name;int_name;874; -area:highway|steps;[area:highway=steps];;name;int_name;875; -area:highway|living_street;[area:highway=living_street];;name;int_name;876; -area:highway|cycleway;[area:highway=cycleway];;name;int_name;877; -area:highway|track;[area:highway=track];;name;int_name;878; -area:highway|motorway;[area:highway=motorway];;name;int_name;879; -area:highway|trunk;[area:highway=trunk];;name;int_name;880; -area:highway|residental;[area:highway=residental];x;name;int_name;881; -entrance;[entrance];;ref;addr:flats;882; -oneway;[oneway?];;name;int_name;883; -highway|proposed;[highway=proposed];;name;int_name;884; -tourism|artwork;[tourism=artwork];;name;int_name;885; -railway|subway|red;[railway=subway][colour=red];;name;int_name;886; -railway|subway|blue;[railway=subway][colour=blue];;name;int_name;887; -railway|subway|orange;[railway=subway][colour=orange];;name;int_name;888; -railway|subway|green;[railway=subway][colour=green];;name;int_name;889; -railway|subway|brown;[railway=subway][colour=brown];;name;int_name;890; -railway|subway|yellow;[railway=subway][colour=yellow];;name;int_name;891; -railway|subway|purple;[railway=subway][colour=purple];;name;int_name;892; -railway|station|subway|red;[railway=station][transport=subway][colour=red];;name;int_name;893; -railway|station|subway|blue;[railway=station][transport=subway][colour=blue];;name;int_name;894; -railway|station|subway|orange;[railway=station][transport=subway][colour=orange];;name;int_name;895; -railway|station|subway|green;[railway=station][transport=subway][colour=green];;name;int_name;896; -railway|station|subway|brown;[railway=station][transport=subway][colour=brown];;name;int_name;897; -railway|station|subway|yellow;[railway=station][transport=subway][colour=yellow];;name;int_name;898; -railway|station|subway|purple;[railway=station][transport=subway][colour=purple];;name;int_name;899; -railway|subway|darkgreen;[railway=subway][colour=darkgreen];;name;int_name;900; -railway|station|subway|darkgreen;[railway=station][transport=subway][colour=darkgreen];;name;int_name;901; -railway|subway|gray;[railway=subway][colour=gray];;name;int_name;902; -railway|station|subway|gray;[railway=station][transport=subway][colour=gray];;name;int_name;903; -railway|subway|lightblue;[railway=subway][colour=lightblue];;name;int_name;904; -railway|station|subway|lightblue;[railway=station][transport=subway][colour=lightblue];;name;int_name;905; -railway|subway|lightgreen;[railway=subway][colour=lightgreen];;name;int_name;906; -railway|station|subway|lightgreen;[railway=station][transport=subway][colour=lightgreen];;name;int_name;907; -railway|subway|violet;[railway=subway][colour=violet];;name;int_name;908; -railway|station|subway|violet;[railway=station][transport=subway][colour=violet];;name;int_name;909; -railway|subway|grey;[railway=subway][colour=grey];;name;int_name;910; -railway|station|subway|grey;[railway=station][transport=subway][colour=grey];;name;int_name;911; -historic|ship;[historic=ship];;name;int_name;912; -marking|sport;[marking=sport][!colour];;name;int_name;913; -marking|sport|white;[marking=sport][colour=white];;name;int_name;914; -marking|sport|red;[marking=sport][colour=red];;name;int_name;915; -marking|sport|black;[marking=sport][colour=black];;name;int_name;916; -marking|sport|blue;[marking=sport][colour=blue];;name;int_name;917; -shop|mall;[shop=mall];;name;int_name;918; -shop|doityourself;[shop=doityourself];;name;int_name;919; -place|sea;[place=sea];;name;int_name;920; -place|ocean;[place=ocean];;name;int_name;921; -natural|cliff;[natural=cliff];;name;int_name;922; -shop|butcher;[shop=butcher];;name;int_name;923; -shop|florist;[shop=florist];;name;int_name;924; -shop|bicycle;[shop=bicycle];;name;int_name;925; -shop|alcohol;[shop=alcohol];;name;int_name;926; -shop|books;[shop=books];;name;int_name;927; -shop|electronics;[shop=electronics];;name;int_name;928; -shop|shoes;[shop=shoes];;name;int_name;929; -shop|department_store;[shop=department_store];;name;int_name;930; -shop|hardware;[shop=hardware];;name;int_name;931; -shop|jewelry;[shop=jewelry];;name;int_name;932; -shop|chemist;[shop=chemist];;name;int_name;933; -shop|optician;[shop=optician];;name;int_name;934; -shop|garden_centre;[shop=garden_centre];;name;int_name;935; -shop|gift;[shop=gift];;name;int_name;936; -shop|computer;[shop=computer];;name;int_name;937; -shop|mobile_phone;[shop=mobile_phone];;name;int_name;938; -shop|greengrocer;[shop=greengrocer];;name;int_name;939; -shop|beverages;[shop=beverages];;name;int_name;940; -shop|toys;[shop=toys];;name;int_name;941; -shop|confectionery;[shop=confectionery];;name;int_name;942; -shop;[shop?];;name;int_name;943; -lit;[lit?];;name;int_name;944; -office|company;[office=company];;name;int_name;945; -office|telecommunication;[office=telecommunication];;name;int_name;946; -office|government;[office=government];;name;int_name;947; -office|estate_agent;[office=estate_agent];;name;int_name;948; -office|lawyer;[office=lawyer];;name;int_name;949; -office;[office];;name;int_name;950; -landuse|residential|rural;[landuse=residential][residential=rural];;name;int_name;951; -landuse|residential|urban;[landuse=residential][residential=urban];;name;int_name;952; -amenity|ferry_terminal;[amenity=ferry_terminal];;name;int_name;953; -amenity;[amenity];;name;int_name;954; -shop|furniture;[shop=furniture];;name;int_name;955; -tourism|gallery;[tourism=gallery];;name;int_name;956; -shop|car_parts;[shop=car_parts];;name;int_name;957; -amenity|bicycle_parking;[amenity=bicycle_parking];;name;int_name;958; -shop|general;[shop=general];;name;int_name;959; -shop|copyshop;[shop=copyshop];;name;int_name;960; -amenity|emergency_phone;[amenity=emergency_phone];;name;int_name;961; -emergency|phone;[emergency=phone];;name;int_name;962; -harbour;[harbour];;name;int_name;963; -seamark:type|harbour;[seamark:type=harbour];;name;int_name;964; -shop|music;[shop=music];;name;int_name;965; -shop|musical_instrument;[shop=musical_instrument];;name;int_name;966; -wood|deciduous;[wood=deciduous];;name;int_name;967; -wood|coniferous;[wood=coniferous];;name;int_name;968; -amenity|prison;[amenity=prison];;name;int_name;969; -religion|christian;[religion=christian];;name;int_name;970; -religion|jewish;[religion=jewish];;name;int_name;971; -religion|muslim;[religion=muslim];;name;int_name;972; -amenity|brothel;[amenity=brothel];;name;int_name;973; -railway|subway_entrance|red;[railway=subway_entrance][colour=red];;name;int_name;974; -railway|subway_entrance|blue;[railway=subway_entrance][colour=blue];;name;int_name;975; -railway|subway_entrance|orange;[railway=subway_entrance][colour=orange];;name;int_name;976; -railway|subway_entrance|green;[railway=subway_entrance][colour=green];;name;int_name;977; -railway|subway_entrance|brown;[railway=subway_entrance][colour=brown];;name;int_name;978; -railway|subway_entrance|yellow;[railway=subway_entrance][colour=yellow];;name;int_name;979; -railway|subway_entrance|purple;[railway=subway_entrance][colour=purple];;name;int_name;980; -railway|subway_entrance|grey;[railway=subway_entrance][colour=grey];;name;int_name;981; -railway|subway_entrance|violet;[railway=subway_entrance][colour=violet];;name;int_name;982; -railway|subway_entrance|lightgreen;[railway=subway_entrance][colour=lightgreen];;name;int_name;983; -railway|subway_entrance|lightblue;[railway=subway_entrance][colour=lightblue];;name;int_name;984; -railway|subway_entrance|gray;[railway=subway_entrance][colour=gray];;name;int_name;985; -railway|subway_entrance|darkgreen;[railway=subway_entrance][colour=darkgreen];;name;int_name;986; -amenity|money_transfer;[amenity=money_transfer];;name;int_name;987; -craft|carpenter;[craft=carpenter];;name;int_name;988; -shop|motorcycle;[shop=motorcycle];;name;int_name;989; -craft;[craft];;name;int_name;990; -shop|photo;[shop=photo];;name;int_name;991; -craft|shoemaker;[craft=shoemaker];;name;int_name;992; -shop|photo_studio;[shop=photo_studio];;name;int_name;993; -craft|tailor;[craft=tailor];;name;int_name;994; -man_made|water_well;[man_made=water_well];;name;int_name;995; -leisure|beach_resort;[leisure=beach_resort];;name;int_name;996; -amenity|waste_basket;[amenity=waste_basket];;name;int_name;997; -man_made|watermill;[man_made=watermill];;name;int_name;998; -man_made|water_tower;[man_made=water_tower];;name;int_name;999; -man_made|communication_tower;[man_made=communication_tower];;name;int_name;1000; -man_made|mast;[man_made=mast];;name;int_name;1001; -amenity|fire_hydrant;[amenity=fire_hydrant];;name;int_name;1002; -emergency|fire_hydrant;[emergency=fire_hydrant];;name;int_name;1003; -highway|street_lamp;[highway=street_lamp];;name;int_name;1004; -man_made|water_well|drinking_water;[man_made=water_well][drinking_water?];;name;int_name;1005; -power|generator|solar;[power=generator][power_source=solar];;name;int_name;1006; -power|generator|nuclear;[power=generator][power_source=nuclear];;name;int_name;1007; -man_made|storage_tank;[man_made=storage_tank];;name;int_name;1008; -man_made|water_well|manual;[man_made=water_well][pump=manual];;name;int_name;1009; -man_made|water_well|powered;[man_made=water_well][pump=powered];;name;int_name;1010; -barrier|border_control;[barrier=border_control];;name;int_name;1011; -amenity|courthouse;[amenity=courthouse];;name;int_name;1012; -amenity|social_facility;[amenity=social_facility];;name;int_name;1013; -religion|hindu;[religion=hindu];;name;int_name;1014; -office|ngo;[office=ngo];;name;int_name;1015; -amenity|community_centre;[amenity=community_centre];;name;int_name;1016; -healthcare;[healthcare?];;name;int_name;1017; -healthcare|dentist;[healthcare=dentist];;name;int_name;1018; -healthcare|hospital;[healthcare=hospital];;name;int_name;1019; -amenity|dentist;[amenity=dentist];;name;int_name;1020; -amenity|laundry;[amenity=laundry];;name;int_name;1021; -shop|dry_cleaning;[shop=dry_cleaning];;name;int_name;1022; -shop|funeral_directors;[shop=funeral_directors];;name;int_name;1023; -amenity|gambling;[amenity=gambling];;name;int_name;1024; -amenity|casino;[amenity=casino];;name;int_name;1025; -amenity|shower;[amenity=shower];;name;int_name;1026; -shop|confectionery;[shop=confectionery];;name;int_name;1027; -shop|outdoor;[shop=outdoor];;name;int_name;1028; -railway|construction;[railway=construction];;name;int_name;1029; +building;[building];;addr:housenumber;name;1;; +highway|residential;[highway=residential];;name;int_name;2;; +highway|service;[highway=service];;name;int_name;3;; +waterway|stream;[waterway=stream];;name;int_name;4;; +highway|unclassified;[highway=unclassified];;name;int_name;5;; +natural|water;[natural=water];;name;int_name;6;; +highway|footway;[highway=footway];;name;int_name;7;; +highway|track;[highway=track];;name;int_name;8;; +highway|tertiary;[highway=tertiary];;name;int_name;9;; +power|tower;[power=tower];;name;int_name;10;; +landuse|forest;[landuse=forest];;name;int_name;11;; +landuse|grass;[landuse=grass];;name;int_name;12;; +highway|secondary;[highway=secondary];;name;int_name;13;; +natural|wood;[natural=wood];;name;int_name;14;; +landuse|residential;[landuse=residential];;name;int_name;15;; +highway|path;[highway=path];;name;int_name;16;; +highway|bus_stop;[highway=bus_stop];;name;int_name;17;; +natural|tree;[natural=tree];;name;int_name;18;; +place|locality;[place=locality];;name;int_name;19;; +natural|coastline;[natural=ocean];;name;int_name;20;; +place|village;[place=village];;name;int_name;21;; +highway|residential|oneway;[highway=residential][oneway?];x;name;int_name;22;highway|residential; +waterway|river;[waterway=river];;name;int_name;23;; +addr:interpolation|even;[addr:interpolation=even];x;name;int_name;24;oneway; +addr:interpolation|odd;[addr:interpolation=odd];x;name;int_name;25;; +amenity|parking;[amenity=parking][access?], [amenity=parking][!access];;name;int_name;26;; +highway|primary;[highway=primary]; ;name;int_name;27;; +railway|rail;[railway=rail];;name;int_name;28;; +highway|service|parking_aisle;[highway=service][service=parking_aisle];;name;int_name;29;; +place|hamlet;[place=hamlet];;name;int_name;30;; +highway|road;[highway=road];;name;int_name;31;; +highway|track|grade2;[highway=track][tracktype=grade2];;name;int_name;32;; +natural|wetland;[natural=wetland];;name;int_name;33;; +highway|track|grade3;[highway=track][tracktype=grade3];;name;int_name;34;; +boundary|administrative|8;[boundary=administrative][admin_level=8];;name;int_name;35;; +amenity|school;[amenity=school];;name;int_name;36;; +highway|cycleway;[highway=cycleway];;name;int_name;37;; +landuse|farm;[landuse=farm];;name;int_name;38;; +amenity|place_of_worship;[amenity=place_of_worship];;name;int_name;39;; +highway|track|grade1;[highway=track][tracktype=grade1];;name;int_name;40;; +highway|secondary|oneway;[highway=secondary][oneway];x;name;int_name;41;highway|secondary; +highway|service|driveway;[highway=service][service=driveway];;name;int_name;42;; +man_made|survey_point;[man_made=survey_point];;name;int_name;43;; +highway|motorway_link|oneway;[highway=motorway_link][oneway?];x;name;int_name;44;highway|motorway_link; +waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45;; +highway|track|grade4;[highway=track][tracktype=grade4];;name;int_name;46;; +highway|tertiary|oneway;[highway=tertiary][oneway?];x;name;int_name;47;highway|tertiary; +landuse|farmland;[landuse=farmland];;name;int_name;48;; +barrier|fence;[barrier=fence];;name;int_name;49;; +highway|primary|oneway;[highway=primary][oneway?];x;name;int_name;50;highway|primary; +power|pole;[power=pole];;name;int_name;51;; +waterway|riverbank;[waterway=riverbank];;name;int_name;52;; +highway|path|bicycle;[highway=path][bicycle?];;name;int_name;53;; +landuse|meadow;[landuse=meadow];;name;int_name;54;; +highway|living_street;[highway=living_street];;name;int_name;55;; +highway|unclassified|oneway;[highway=unclassified][oneway?];x;name;int_name;56;highway|unclassified; +natural|peak;[natural=peak];;name;int_name;57;; +highway|motorway|oneway;[highway=motorway][oneway?];x;name;int_name;58;highway|motorway; +highway|steps;[highway=steps];;name;int_name;59;; +waterway|ditch;[waterway=ditch];;name;int_name;60;; +amenity|restaurant;[amenity=restaurant];;name;int_name;61;; +landuse|reservoir;[landuse=reservoir];;name;int_name;62;; +highway|track|grade5;[highway=track][tracktype=grade5];;name;int_name;63;; +amenity|bench;[amenity=bench];;name;int_name;64;; +highway|service|oneway;[highway=service][oneway?];x;name;int_name;65;highway|service; +highway|trunk;[highway=trunk];;name;int_name;66;; +amenity|fuel;[amenity=fuel];;name;int_name;67;; +leisure|park;[leisure=park];;name;int_name;68;; +leisure|pitch;[leisure=pitch];;name;int_name;69;; +highway|pedestrian;[highway=pedestrian];;name;int_name;70;; +natural|scrub;[natural=scrub];;name;int_name;71;; +highway|motorway|bridge;[highway=motorway][bridge?];;name;int_name;72;; +highway|trunk|oneway;[highway=trunk][oneway?];x;name;int_name;73;highway|trunk; +railway|level_crossing;[railway=level_crossing];;name;int_name;74;; +landuse|industrial;[landuse=industrial];;name;int_name;75;; +barrier|wall;[barrier=wall];;name;int_name;76;; +amenity|post_box;[amenity=post_box];;name;int_name;77;; +place|town;[place=town];;name;int_name;78;; +power|line;[power=line];;name;int_name;79;; +landuse|farmyard;[landuse=farmyard];;name;int_name;80;; +highway|residential|bridge;[highway=residential][bridge?];;name;int_name;81;; +railway|rail|bridge;[railway=rail][bridge?];;name;int_name;82;; +boundary|administrative|10;[boundary=administrative][admin_level=10];;name;int_name;83;; +boundary|administrative|6;[boundary=administrative][admin_level=6];;name;int_name;84;; +highway|secondary|bridge;[highway=secondary][bridge?];;name;int_name;85;; +highway|tertiary|bridge;[highway=tertiary][bridge?];;name;int_name;86;; +barrier|bollard;[barrier=bollard];;name;int_name;87;; +leisure|playground;[leisure=playground];;name;int_name;88;; +waterway|drain;[waterway=drain];;name;int_name;89;; +waterway|canal;[waterway=canal];;name;int_name;90;; +highway|trunk_link|oneway;[highway=trunk_link][oneway?];x;name;int_name;91;highway|trunk_link; +highway|unclassified|bridge;[highway=unclassified][bridge?];;name;int_name;92;; +landuse|forest|deciduous;[landuse=forest][wood=deciduous];;name;int_name;93;; +place|island;[place=island];;name;int_name;94;; +highway|primary|bridge;[highway=primary][bridge?];;name;int_name;95;; +highway|primary_link|oneway;[highway=primary_link][oneway?];x;name;int_name;96;highway|primary_link; +amenity|fast_food;[amenity=fast_food];;name;int_name;97;; +highway|footway|bridge;[highway=footway][bridge?];;name;int_name;98;; +amenity|bank;[amenity=bank];;name;int_name;99;; +barrier|hedge;[barrier=hedge];;name;int_name;100;; +amenity|pub;[amenity=pub];;name;int_name;101;; +leisure|swimming_pool;[leisure=swimming_pool];;name;int_name;102;; +natural|land;[natural=land];;name;int_name;103;; +tourism|hotel;[tourism=hotel];;name;int_name;104;; +landuse|cemetery;[landuse=cemetery];;name;int_name;105;; +sport|soccer;[sport=soccer];;name;int_name;106;; +boundary|administrative|4;[boundary=administrative][admin_level=4];;name;int_name;107;; +amenity|cafe;[amenity=cafe];;name;int_name;108;; +amenity|recycling;[amenity=recycling];;name;int_name;109;; +leisure|garden;[leisure=garden];;name;int_name;110;; +landuse|commercial;[landuse=commercial];;name;int_name;111;; +railway|station;[railway=station];;name;int_name;112;; +highway|path|hiking;[highway=path][route=hiking];;name;int_name;113;; +amenity|hospital;[amenity=hospital];;name;int_name;114;; +waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;; +highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;; +amenity|post_office;[amenity=post_office];;name;int_name;117;; +landuse|quarry;[landuse=quarry];;name;int_name;118;; +amenity|pharmacy;[amenity=pharmacy];;name;int_name;119;; +man_made|pier;[man_made=pier];;name;int_name;120;; +highway|motorway_junction;[highway=motorway_junction];;name;int_name;121;; +amenity|telephone;[amenity=telephone];;name;int_name;122;; +waterway|stream|tunnel;[waterway=stream][tunnel?];;name;int_name;123;; +tourism|information|guidepost;[tourism=information][information=guidepost];;name;int_name;124;; +amenity|parking|fee;[amenity=parking][fee?];;name;int_name;125;; +amenity|kindergarten;[amenity=kindergarten];;name;int_name;126;; +power|generator|wind;[power=generator][power_source=wind];;name;int_name;127;; +place|suburb;[place=suburb];;name;int_name;128;; +landuse|allotments;[landuse=allotments];;name;int_name;129;; +landuse|forest|coniferous;[landuse=forest][wood=coniferous];;name;int_name;130;; +landuse|forest|mixed;[landuse=forest][wood=mixed];;name;int_name;131;; +natural|wood|mixed;[natural=wood][wood=mixed];;name;int_name;132;; +sport|tennis;[sport=tennis];;name;int_name;133;; +landuse|vineyard;[landuse=vineyard];;name;int_name;134;; +aeroway|taxiway;[aeroway=taxiway];;name;int_name;135;; +aeroway|aerodrome;[aeroway=aerodrome];;name;int_name;136;; +highway|secondary|junction;[highway=secondary][junction?];x;name;int_name;137;highway|secondary; +amenity|fire_station;[amenity=fire_station];;name;int_name;138;; +landuse|retail;[landuse=retail];;name;int_name;139;; +leisure|nature_reserve;[leisure=nature_reserve];;name;int_name;140;; +leisure|pitch|tennis;[leisure=pitch][sport=tennis];;name;int_name;141;; +tourism|information;[tourism=information];;name;int_name;142;; +highway|motorway_link|bridge;[highway=motorway_link][bridge?];;name;int_name;143;; +railway|abandoned;[railway=abandoned];;name;int_name;144;; +amenity|parking|private;[amenity=parking][access=private];;name;int_name;145;; +boundary|administrative|7;[boundary=administrative][admin_level=7];;name;int_name;146;; +tourism|attraction;[tourism=attraction];;name;int_name;147;; +highway|tertiary|junction;[highway=tertiary][junction?];x;name;int_name;148;highway|tertiary; +highway|track|private;[highway=track][access=private];;name;int_name;149;; +railway|tram;[railway=tram];;name;int_name;150;; +amenity|toilets;[amenity=toilets];;name;int_name;151;; +highway|residential|junction;[highway=residential][junction?];x;name;int_name;152;highway|residential; +highway|footway|permissive;[highway=footway][access=permissive];;name;int_name;153;; +highway|primary|junction;[highway=primary][junction?];x;name;int_name;154;highway|primary; +landuse|construction;[landuse=construction];;name;int_name;155;; +tourism|viewpoint;[tourism=viewpoint];;name;int_name;156;; +amenity|atm;[amenity=atm];;name;int_name;157;; +highway|pedestrian|area;[highway=pedestrian][area?];;name;int_name;158;; +tourism|picnic_site;[tourism=picnic_site];;name;int_name;159;; +shop|supermarket;[shop=supermarket];;name;int_name;160;; +shop|convenience;[shop=convenience];;name;int_name;161;; +shop|bakery;[shop=bakery];;name;int_name;162;; +highway|construction;[highway=construction];;name;int_name;163;; +highway|cycleway|bridge;[highway=cycleway][bridge?];;name;int_name;164;; +leisure|sports_centre;[leisure=sports_centre];;name;int_name;165;; +highway|path|mountain_hiking;[highway=path][sac_scale=mountain_hiking];;name;int_name;166;; +tourism|camp_site;[tourism=camp_site];;name;int_name;167;; +highway|bridleway;[highway=bridleway];;name;int_name;168;; +natural|heath;[natural=heath];;name;int_name;169;; +landuse|basin;[landuse=basin];;name;int_name;170;; +amenity|library;[amenity=library];;name;int_name;171;; +natural|wood|coniferous;[natural=wood][wood=coniferous];;name;int_name;172;; +landuse|recreation_ground;[landuse=recreation_ground];;name;int_name;173;; +landuse|village_green;[landuse=village_green];;name;int_name;174;; +amenity|drinking_water;[amenity=drinking_water];;name;int_name;175;; +amenity|university;[amenity=university];;name;int_name;176;; +highway|secondary_link|oneway;[highway=secondary_link][oneway?];x;name;int_name;177;highway|secondary_link; +power|sub_station;[power=sub_station];;name;int_name;178;; +railway|tram_stop;[railway=tram_stop];;name;int_name;179;; +place|city;[place=city];;name;int_name;180;; +amenity|shelter;[amenity=shelter];;name;int_name;181;; +natural|beach;[natural=beach];;name;int_name;182;; +highway|footway|tunnel;[highway=footway][tunnel?];;name;int_name;183;; +shop|hairdresser;[shop=hairdresser];;name;int_name;184;; +amenity|hunting_stand;[amenity=hunting_stand];;name;int_name;185;; +boundary|administrative|9;[boundary=administrative][admin_level=9];;name;int_name;186;; +amenity|fountain;[amenity=fountain];;name;int_name;187;; +highway|primary_link;[highway=primary_link];;name;int_name;188;; +amenity|bar;[amenity=bar];;name;int_name;189;; +landuse|garages;[landuse=garages];;name;int_name;190;; +boundary|administrative|2;[boundary=administrative][admin_level=2];;name;int_name;191;; +leisure|common;[leisure=common];;name;int_name;192;; +highway|track|bridge;[highway=track][bridge?];;name;int_name;193;; +highway|path|bridge;[highway=path][bridge?];;name;int_name;194;; +piste:type|nordic;[piste:type=nordic];;name;int_name;195;; +highway|motorway;[highway=motorway];;name;int_name;196;; +railway|crossing;[railway=crossing];;name;int_name;197;; +boundary|national_park;[boundary=national_park];;name;int_name;198;; +natural|wood|deciduous;[natural=wood][wood=deciduous];;name;int_name;199;; +waterway|dam;[waterway=dam];;name;int_name;200;; +highway|motorway_link;[highway=motorway_link];;name;int_name;201;; +leisure|golf_course;[leisure=golf_course];;name;int_name;202;; +highway|service|bridge;[highway=service][bridge?];;name;int_name;203;; +power|minor_line;[power=minor_line];;name;int_name;204;; +natural|marsh;[natural=marsh];;name;int_name;205;; +leisure|stadium;[leisure=stadium];;name;int_name;206;; +amenity|doctors;[amenity=doctors];;name;int_name;207;; +railway|disused;[railway=disused];;name;int_name;208;; +aeroway|runway;[aeroway=runway];;name;int_name;209;; +railway|halt;[railway=halt];;name;int_name;210;; +addr:interpolation|all;[addr:interpolation=all];x;name;int_name;211;; +railway|rail|tunnel;[railway=rail][tunnel?];;name;int_name;212;; +man_made|wastewater_plant;[man_made=wastewater_plant];;name;int_name;213;; +highway|trunk|motorroad;[highway=trunk][motorroad?];x;name;int_name;214;highway|trunk; +place|county;[place=county];;name;int_name;215;; +highway|footway|private;[highway=footway][access=private];;name;int_name;216;; +landuse|conservation;[landuse=conservation];x;name;int_name;217;; +highway|unclassified|junction;[highway=unclassified][junction?];x;name;int_name;218;highway|unclassified; +power|station;[power=station];;name;int_name;219;; +sport|swimming;[sport=swimming];;name;int_name;220;; +leisure|track;[leisure=track];;name;int_name;221;; +highway|trunk_link;[highway=trunk_link];;name;int_name;222;; +barrier|retaining_wall;[barrier=retaining_wall];;name;int_name;223;; +amenity|college;[amenity=college];;name;int_name;224;; +sport|baseball;[sport=baseball];;name;int_name;225;; +highway|service|area;[highway=service][area?];;name;int_name;226;; +highway|residential|area;[highway=residential][area?];;name;int_name;227;; +amenity|bus_station;[amenity=bus_station];;name;int_name;228;; +highway|track|permissive;[highway=track][access=permissive];;name;int_name;229;; +waterway|drain|tunnel;[waterway=drain][tunnel?];;name;int_name;230;; +landuse|cemetery|christian;[landuse=cemetery][religion=christian];;name;int_name;231;; +highway|cycleway|tunnel;[highway=cycleway][tunnel?];;name;int_name;232;; +amenity|parking|permissive;[amenity=parking][access=permissive];;name;int_name;233;; +boundary|administrative|5;[boundary=administrative][admin_level=5];;name;int_name;234;; +highway|unclassified|tunnel;[highway=unclassified][tunnel?];;name;int_name;235;; +highway|track|destination;[highway=track][access=destination];x;name;int_name;236;highway|track; +highway|trunk|junction;[highway=trunk][junction?];x;name;int_name;237;highway|trunk; +highway|residential|tunnel;[highway=residential][tunnel?];;name;int_name;238;; +aeroway|helipad;[aeroway=helipad];;name;int_name;239;; +highway|path|permissive;[highway=path][access=permissive];;name;int_name;240;; +place|islet;[place=islet];;name;int_name;241;; +sport|basketball;[sport=basketball];;name;int_name;242;; +amenity|cinema;[amenity=cinema];;name;int_name;243;; +amenity|theatre;[amenity=theatre];;name;int_name;244;; +highway|secondary_link;[highway=secondary_link];;name;int_name;245;; +railway|spur;[railway=spur];;name;int_name;246;; +aerialway|station;[aerialway=station];;name;int_name;247;; +landuse|brownfield;[landuse=brownfield];;name;int_name;248;; +aeroway|apron;[aeroway=apron];;name;int_name;249;; +natural|glacier;[natural=glacier];;name;int_name;250;; +amenity|grave_yard;[amenity=grave_yard];;name;int_name;251;; +waterway|canal|tunnel;[waterway=canal][tunnel?];;name;int_name;252;; +piste:type|downhill|easy;[piste:type=downhill][piste:difficulty=easy];;name;int_name;253;; +waterway|ditch|tunnel;[waterway=ditch][tunnel?];;name;int_name;254;; +landuse|wood;[landuse=wood];x;name;int_name;255;landuse|forest; +piste:type|downhill|intermediate;[piste:type=downhill][piste:difficulty=intermediate];;name;int_name;256;; +railway|subway_entrance;[railway=subway_entrance];;name;int_name;257;; +highway|trunk_link|motorroad;[highway=trunk_link][motorroad?];x;name;int_name;258;highway|trunk_link; +man_made|pipeline;[man_made=pipeline];;name;int_name;259;; +route|ferry;[route=ferry];;name;int_name;260;; +highway|trunk_link|bridge;[highway=trunk_link][bridge?];;name;int_name;261;; +landuse|military;[landuse=military];;name;int_name;262;; +highway|service|tunnel;[highway=service][tunnel?];;name;int_name;263;; +railway|light_rail;[railway=light_rail];;name;int_name;264;; +place|region;[place=region];;name;int_name;265;; +railway|narrow_gauge;[railway=narrow_gauge];;name;int_name;266;; +railway|subway;[railway=subway];;name;int_name;267;; +natural|cave_entrance;[natural=cave_entrance];;name;int_name;268;; +highway|tertiary|tunnel;[highway=tertiary][tunnel?];;name;int_name;269;; +landuse|landfill;[landuse=landfill];;name;int_name;270;; +amenity|bicycle_rental;[amenity=bicycle_rental];;name;int_name;271;; +highway|track|oneway;[highway=track][oneway?];x;name;int_name;272;highway|track; +highway|tertiary_link|oneway;[highway=tertiary_link][oneway?];x;name;int_name;273;highway|tertiary_link; +landuse|greenfield;[landuse=greenfield];;name;int_name;274;; +tourism|alpine_hut;[tourism=alpine_hut];;name;int_name;275;; +highway|footway|area;[highway=footway][area?];;name;int_name;276;; +tourism|hostel;[tourism=hostel];;name;int_name;277;; +waterway|river|tunnel;[waterway=river][tunnel?];;name;int_name;278;; +boundary|administrative|county;[boundary=administrative][border_type=county];;name;int_name;279;; +highway|road|bridge;[highway=road][bridge?];;name;int_name;280;; +boundary|administrative|3;[boundary=administrative][admin_level=3];;name;int_name;281;; +man_made|pipeline|water;[man_made=pipeline][water];x;name;int_name;282;man_made|pipeline; +boundary|administrative;[boundary=administrative];;name;int_name;283;; +highway|road|oneway;[highway=road][oneway?];x;name;int_name;284;highway|road; +highway|path|destination;[highway=path][access=destination];x;name;int_name;285;highway|path; +sport|athletics;[sport=athletics];;name;int_name;286;; +landuse|railway;[landuse=railway];;name;int_name;287;; +leisure|slipway;[leisure=slipway];;name;int_name;288;; +tourism|caravan_site;[tourism=caravan_site];;name;int_name;289;; +place|state;[place=state];;name;int_name;290;; +highway|path|private;[highway=path][access=private];;name;int_name;291;; +railway|subway|tunnel;[railway=subway][tunnel?];x;name;int_name;292;railway|subway; +barrier|city_wall;[barrier=city_wall];;name;int_name;293;; +place|farm;[place=farm];;name;int_name;294;; +boundary|administrative|11;[boundary=administrative][admin_level=11];;name;int_name;295;; +waterway|weir;[waterway=weir];;name;int_name;296;; +highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297;; +railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298;; +man_made|lighthouse;[man_made=lighthouse];;name;int_name;299;; +highway|path|demanding_mountain_hiking;[highway=path][sac_scale=demanding_mountain_hiking];;name;int_name;300;; +highway|primary|motorroad;[highway=primary][motorroad?];x;name;int_name;301;highway|primary; +amenity|restaurant|hotel;[amenity=restaurant][hotel];;name;int_name;302;; +power|generator;[power=generator];;name;int_name;303;; +highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304;; +man_made|pipeline|overground;[man_made=pipeline][location=overground];;name;int_name;305;; +amenity|parking|destination;[amenity=parking][access=destination];x;name;int_name;306;amenity|parking; +highway|unsurfaced;[highway=unsurfaced];x;name;int_name;307;highway|unclassified; +highway|raceway;[highway=raceway];;name;int_name;308;; +highway|primary|tunnel;[highway=primary][tunnel?];;name;int_name;309;; +highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310;; +landuse|conservation|private;[landuse=conservation][access=private];x;name;int_name;311;; +sport|equestrian;[sport=equestrian];;name;int_name;312;; +tourism|information|office;[tourism=information][office];;name;int_name;313;; +highway|footway|hiking;[highway=footway][sac_scale=hiking];;name;int_name;314;; +aeroway|gate;[aeroway=gate];;name;int_name;315;; +railway|preserved;[railway=preserved];;name;int_name;316;; +highway|path|horse;[highway=path][horse?];;name;int_name;317;; +landuse|field;[landuse=field];;name;int_name;318;; +highway|tertiary_link;[highway=tertiary_link];;name;int_name;319;; +leisure|water_park;[leisure=water_park];;name;int_name;320;; +natural|wetland|bog;[natural=wetland][wetland=bog];;name;int_name;321;; +man_made|windmill;[man_made=windmill];;name;int_name;322;; +military|bunker;[military=bunker];;name;int_name;323;; +aerialway|chair_lift;[aerialway=chair_lift];;name;int_name;324;; +amenity|grave_yard|christian;[amenity=grave_yard][religion=christian];;name;int_name;325;; +highway|trunk|tunnel;[highway=trunk][tunnel?];;name;int_name;326;; +highway|steps|tunnel;[highway=steps][tunnel?];;name;int_name;327;; +amenity|car_sharing;[amenity=car_sharing];;name;int_name;328;; +sport|football;[sport=football];;name;int_name;329;; +highway|steps|bridge;[highway=steps][bridge?];;name;int_name;330;; +highway|track|tunnel;[highway=track][tunnel?];;name;int_name;331;; +highway|pedestrian|tunnel;[highway=pedestrian][tunnel?];;name;int_name;332;; +power|generator|hydro;[power=generator][power_source=hydro];;name;int_name;333;; +sport|cricket;[sport=cricket];;name;int_name;334;; +sport|bowls;[sport=bowls];;name;int_name;335;; +highway|path|tunnel;[highway=path][tunnel?];;name;int_name;336;; +man_made|breakwater;[man_made=breakwater];;name;int_name;337;; +amenity|parking|permissive|fee;[amenity=parking][access=permissive][fee?];;name;int_name;338;; +railway|disused|bridge;[railway][disused?][bridge?];x;name;int_name;339;; +tourism|zoo;[tourism=zoo];;name;int_name;340;; +sport|gymnastics;[sport=gymnastics];;name;int_name;341;; +highway|trunk_link|junction;[highway=trunk_link][junction?];x;name;int_name;342;highway|trunk_link; +railway|subway|bridge;[railway=subway][bridge?];;name;int_name;343;; +railway|light_rail|bridge;[railway=light_rail][bridge?];;name;int_name;344;; +aeroway|terminal;[aeroway=terminal];;name;int_name;345;; +railway|tram|bridge;[railway=tram][bridge?];;name;int_name;346;; +piste:type|downhill|advanced;[piste:type=downhill][piste:difficulty=advanced];;name;int_name;347;; +sport|shooting;[sport=shooting];;name;int_name;348;; +place|country;[place=country];;name;int_name;349;; +highway|path|alpine_hiking;[highway=path][sac_scale][sac_scale=alpine_hiking];;name;int_name;350;; +highway|footway|destination;[highway=footway][access=destination];x;name;int_name;351;highway|footway; +sport|scuba_diving;[sport=scuba_diving];;name;int_name;352;; +highway|cycleway|permissive;[highway=cycleway][access=permissive];;name;int_name;353;; +highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354;; +natural|volcano;[natural=volcano];;name;int_name;355;; +amenity|parking|underground|fee;[amenity=parking][location=underground][fee?];;name;int_name;356;; +amenity|parking|underground;[amenity=parking][location=underground];;name;int_name;357;; +man_made|pipeline|gas;[man_made=pipeline][gas];x;name;int_name;358;man_made|pipeline; +amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_name;359;; +leisure|recreation_ground|private;[leisure=recreation_ground][access=private];;name;int_name;360;; +highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;name;int_name;361;; +highway|service|driveway|bridge;[highway=service][service=driveway][bridge?];;name;int_name;362;; +amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee?];;name;int_name;363;; +leisure|track|area;[leisure=track][area?];x;name;int_name;364;; +highway|byway;[highway=byway];x;name;int_name;365;highway|track; +piste:type|downhill|novice;[piste:type=downhill][piste:difficulty=novice];;name;int_name;366;; +railway|narrow_gauge|bridge;[railway=narrow_gauge][bridge?];;name;int_name;367;; +noexit|motorcar;[noexit=motorcar];x;name;int_name;368;; +highway|service|parking_aisle|tunnel;[highway=service][service=parking_aisle][tunnel?];x;name;int_name;369;highway|service|parking_aisle; +highway|bridleway|permissive;[highway=bridleway][access=permissive];;name;int_name;370;; +railway|construction;[railway=construction];x;name;int_name;371;; +highway|primary_link|junction;[highway=primary_link][junction?];x;name;int_name;372;highway|primary_link; +landuse|greenhouse_horticulture;[landuse=greenhouse_horticulture];;name;int_name;373;; +highway|primary_link|motorroad;[highway=primary_link][motorroad?];x;name;int_name;374;highway|primary_link; +amenity|bureau_de_change;[amenity=bureau_de_change];;name;int_name;375;; +power|generator|photovoltaic;[power=generator][generator:type=photovoltaic];;name;int_name;376;; +highway|motorway_link|junction;[highway=motorway_link][junction?];x;name;int_name;377;highway|motorway_link; +highway|bridleway|bridge;[highway=bridleway][bridge?];;name;int_name;378;; +highway|service|driveway|tunnel;[highway=service][service=driveway][tunnel?];;name;int_name;379;; +highway|track|cutting;[highway=track][cutting?];x;name;int_name;380;highway|track; +landuse|basin|retention;[landuse=basin][basin=retention];x;name;int_name;381;natural|water; +railway|narrow_gauge|tunnel;[railway=narrow_gauge][tunnel?];;name;int_name;382;; +railway|dismantled;[railway=dismantled];x;name;int_name;383;; +waterway|dock;[waterway=dock];;name;int_name;384;; +natural|forest;[natural=forest];x;name;int_name;385;natural|wood; +highway|service|driveway|area;[highway=service][service=driveway][area?];;name;int_name;386;; +man_made|pipeline|heat;[man_made=pipeline][type=heat];x;name;int_name;387;man_made|pipeline; +place|city|capital;[place=city][capital?];;name;int_name;388;; +aerialway|cable_car;[aerialway=cable_car];;name;int_name;389;; +piste:type|downhill;[piste:type=downhill];;name;int_name;390;; +sport|american_football;[sport=american_football];;name;int_name;391;; +highway|cycleway|destination;[highway=cycleway][access=destination];x;name;int_name;392;highway|cycleway; +man_made|cairn;[man_made=cairn];;name;int_name;393;; +railway|preserved|bridge;[railway=preserved][bridge?];;name;int_name;394;; +highway|path|demanding_alpine_hiking;[highway=path][sac_scale=demanding_alpine_hiking];;name;int_name;395;; +landuse|basin|infiltration;[landuse=basin][basin=infiltration];x;name;int_name;396;natural|water; +highway|secondary_link|bridge;[highway=secondary_link][bridge?];;name;int_name;397;; +railway|tram|tunnel;[railway=tram][tunnel?];;name;int_name;398;; +highway|footway|cutting;[highway=footway][cutting?];x;name;int_name;399;highway|footway; +railway|abandoned|tunnel;[railway=abandoned][tunnel?];;name;int_name;400;; +highway|living_street|area;[highway=living_street][area?];x;name;int_name;401;area:highway|living_street; +piste:type|sled;[piste:type=sled];;name;int_name;402;; +aerialway|chair_lift|4;[aerialway=chair_lift][piste:lift:occupancy=4];x;name;int_name;403;aerialway|chair_lift; +leisure|dog_park;[leisure=dog_park];;name;int_name;404;; +aerialway|gondola;[aerialway=gondola];;name;int_name;405;; +historic|museum;[historic=museum];;name;int_name;406;; +highway|living_street|bridge;[highway=living_street][bridge?];;name;int_name;407;; +highway|service|cutting;[highway=service][cutting?];x;name;int_name;408;highway|service; +railway|monorail;[railway=monorail];;name;int_name;409;; +highway|road|junction;[highway=road][junction?];x;name;int_name;410;highway|road; +man_made|pipeline|oil;[man_made=pipeline][type=oil];x;name;int_name;411;man_made|pipeline; +leisure|park|private;[leisure=park][access=private];;name;int_name;412;; +highway|secondary|motorroad;[highway=secondary][motorroad?];x;name;int_name;413;highway|secondary; +noexit|motor_vehicle;[noexit=motor_vehicle];;name;int_name;414;; +highway|service|parking_aisle|bridge;[highway=service][service=parking_aisle][bridge?];x;name;int_name;415;highway|service|parking_aisle; +highway|motorway|tunnel;[highway=motorway][tunnel?];;name;int_name;416;; +railway|light_rail|tunnel;[railway=light_rail][tunnel?];;name;int_name;417;; +highway|service|parking_aisle|area;[highway=service][service=parking_aisle][area?];x;name;int_name;418;area:highway|service; +highway|residential|construction;[highway=residential][construction?];x;name;int_name;419;highway|construction; +highway|motorway|construction;[highway=motorway][construction?];x;name;int_name;420;highway|construction; +highway|path|cutting;[highway=path][cutting?];x;name;int_name;421;highway|path; +landuse|scrub;[landuse=scrub];x;name;int_name;422;natural|scrub; +highway|road|tunnel;[highway=road][tunnel?];;name;int_name;423;; +sport|archery;[sport=archery];;name;int_name;424;; +railway|construction|bridge;[railway][construction?][bridge?];x;name;int_name;425;; +highway|track|grade2|area;[highway=track][tracktype=grade2][area?];x;name;int_name;426;; +highway|ford;[highway=ford];;name;int_name;427;; +highway|path|area;[highway=path][area?];x;name;int_name;428;area:highway|path; +railway|siding;[railway=siding];;name;int_name;429;; +highway|track|area;[highway=track][area?];;name;int_name;430;; +highway|minor;[highway=minor];x;name;int_name;431;highway|unclassified; +railway|funicular;[railway=funicular];;name;int_name;432;; +amenity|parking|public|fee;[amenity=parking][access=public][fee?];x;name;int_name;433;amenity|parking|fee; +historic|battlefield;[historic=battlefield];;name;int_name;434;; +highway|primary|construction;[highway=primary][construction?];x;name;int_name;435;highway|construction; +sport|australian_football;[sport=australian_football];;name;int_name;436;; +railway|disused|tunnel;[railway][disused?][tunnel?];x;name;int_name;437;; +highway|secondary_link|junction;[highway=secondary_link][junction?];x;name;int_name;438;highway|secondary_link; +highway|cycleway|private;[highway=cycleway][access=private];;name;int_name;439;; +highway|steps|cutting;[highway=steps][cutting?];x;name;int_name;440;highway|steps; +piste:lift|t-bar;[piste:lift=t-bar];;name;int_name;441;; +highway|trunk|construction;[highway=trunk][construction?];x;name;int_name;442;highway|construction; +amenity|parking|public;[amenity=parking][access=public];x;name;int_name;443;amenity|parking; +highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444;; +earthquake:damage|spontaneous_camp;[earthquake:damage=spontaneous_camp];;name;int_name;445;; +highway|cycleway|cutting;[highway=cycleway][cutting?];x;name;int_name;446;highway|cycleway; +railway|yard;[railway=yard];;name;int_name;447;; +highway|trunk|cutting;[highway=trunk][cutting?];x;name;int_name;448;highway|trunk; +natural|meadow;[natural=meadow];;name;int_name;449;; +highway|motorway|cutting;[highway=motorway][cutting?];x;name;int_name;450;highway|motorway; +railway|razed;[railway=razed];;name;int_name;451;; +highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452;; +aerialway|chair_lift|6;[aerialway=chair_lift][piste:lift:occupancy=6];x;name;int_name;453;aerialway|chair_lift; +landuse|basin|detention;[landuse=basin][basin=detention];x;name;int_name;454;natural|water; +landuse|orchard;[landuse=orchard];;name;int_name;455;; +highway|track|grade1|area;[highway=track][tracktype=grade1][area?];x;name;int_name;456;highway|track; +highway|living_street|tunnel;[highway=living_street][tunnel?];;name;int_name;457;; +highway|secondary|construction;[highway=secondary][construction?];x;name;int_name;458;highway|construction; +highway|living_street|junction;[highway=living_street][junction?];x;name;int_name;459;highway|living_street; +railway|construction|tunnel;[railway][construction?][tunnel?];x;name;int_name;460;; +sport|handball;[sport=handball];;name;int_name;461;; +boundary|administrative|city;[boundary=administrative][border_type=city];;name;int_name;462;; +piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride];;name;int_name;463;; +amenity|restaurant|vegetarian;[amenity=restaurant][cuisine=vegetarian];;name;int_name;464;; +communication|line|submarine;[communication=line][location=submarine];x;name;int_name;465;communication|line; +piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466;; +landuse|salt_pond;[landuse=salt_pond];;name;int_name;467;; +landuse|reservoir|water_storage;[landuse=reservoir][reservoir=water_storage];x;name;int_name;468;natural|water; +railway|monorail|bridge;[railway=monorail][bridge?];;name;int_name;469;; +highway|steps|area;[highway=steps][area?];x;name;int_name;470;area:highway|steps; +railway|proposed;[railway=proposed];x;name;int_name;471;; +highway|tertiary|construction;[highway=tertiary][construction?];x;name;int_name;472;; +landuse|wood|deciduous;[landuse=wood][wood=deciduous];x;name;int_name;473;highway|construction; +natural|grass;[natural=grass];;name;int_name;474;natural|wood; +highway|road|area;[highway=road][area?];x;name;int_name;475;; +highway|tertiary|area;[highway=tertiary][area?];x;name;int_name;476;; +piste:lift|platter;[piste:lift=platter];;name;int_name;477;; +man_made|pipeline|natural_gas;[man_made=pipeline][type=natural_gas];x;name;int_name;478;man_made|pipeline; +highway|unclassified|disused;[highway=unclassified][disused?];x;name;int_name;479;; +railway|preserved|tunnel;[railway=preserved][tunnel?];;name;int_name;480;; +noexit|vehicle;[noexit=vehicle];x;name;int_name;481;; +highway|disused;[highway=disused];x;name;int_name;482;; +highway|unclassified|construction;[highway=unclassified][construction?];x;name;int_name;483;highway|construction; +highway|service|disused;[highway=service][disused?];x;name;int_name;484;; +highway|service|construction;[highway=service][construction?];x;name;int_name;485;highway|construction; +highway|cycleway|disused;[highway=cycleway][disused?];x;name;int_name;486;; +leisure|park|permissive;[leisure=park][access=permissive];;name;int_name;487;; +highway|bridleway|tunnel;[highway=bridleway][tunnel?];;name;int_name;488;; +highway|motorway_link|tunnel;[highway=motorway_link][tunnel?];;name;int_name;489;; +highway|residential|disused;[highway=residential][disused?];x;name;int_name;490;; +highway|cycleway|construction;[highway=cycleway][construction?];x;name;int_name;491;; +highway|bridleway|private;[highway=bridleway][access=private];;name;int_name;492;; +highway|tertiary_link|bridge;[highway=tertiary_link][bridge?];;name;int_name;493;; +highway|footway|construction;[highway=footway][construction?];x;name;int_name;494;highway|construction; +amenity|parking|park_and_ride;[amenity=parking][parking=park_and_ride];;name;int_name;495;; +highway|track|dyke;[highway=track][dyke?];x;name;int_name;496;highway|track; +highway|track|grade3|area;[highway=track][tracktype=grade3][area?];x;name;int_name;497;; +landuse|wood|mixed;[landuse=wood][wood=mixed];x;name;int_name;498;landuse|forest; +waterway|lock;[waterway=lock];;name;int_name;499;; +highway|path|dyke;[highway=path][dyke?];x;name;int_name;500;highway|path; +highway|motorway|junction;[highway=motorway][junction?];x;name;int_name;501;highway|motorway; +highway|motorway_link|construction;[highway=motorway_link][construction?];x;name;int_name;502;highway|construction; +highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;; +highway|footpath;[highway=footpath];x;name;int_name;504;highway|footway; +highway|path|disused;[highway=path][disused?];x;name;int_name;505;; +highway|tertiary|motorroad;[highway=tertiary][motorroad?];x;name;int_name;506;highway|tertiary; +leisure|green;[leisure=green];x;name;int_name;507;; +landuse|reservoir|sewage;[landuse=reservoir][reservoir=sewage];x;name;int_name;508;natural|water; +railway|spur|bridge;[railway=spur][bridge?];;name;int_name;509;; +highway|track|disused;[highway=track][disused?];x;name;int_name;510;; +highway|tertiary_link|junction;[highway=tertiary_link][junction?];x;name;int_name;511;highway|tertiary_link; +highway|track|grade3|destination;[highway=track][tracktype=grade3][access=destination];x;name;int_name;512;highway|track; +sport|curling;[sport=curling];;name;int_name;513;; +landuse|reservoir|evaporator;[landuse=reservoir][reservoir=evaporator];x;name;int_name;514;natural|water; +landuse|wood|coniferous;[landuse=wood][wood=coniferous];x;name;int_name;515;landuse|forest|coniferous; +natural|scrub|deciduous;[natural=scrub][wood=deciduous];x;name;int_name;516;; +highway|footway|disused;[highway=footway][disused?];x;name;int_name;517;; +leisure|playground|tennis;[leisure=playground][sport=tennis];;name;int_name;518;; +highway|secondary|area;[highway=secondary][area?];x;name;int_name;519;; +sport|diving;[sport=diving];;name;int_name;520;; +highway|track|grade3|private;[highway=track][tracktype=grade3][access=private];;name;int_name;521;; +boundary|administrative|suburb;[boundary=administrative][border_type=suburb];;name;int_name;522;; +natural|quarry;[natural=quarry];x;name;int_name;523;; +railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524;; +railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525;; +highway|trunk_link|construction;[highway=trunk_link][construction?];x;name;int_name;526;highway|construction; +highway|footway|dyke;[highway=footway][dyke?];x;name;int_name;527;highway|footway; +highway|primary_link|tunnel;[highway=primary_link][tunnel?];;name;int_name;528;; +highway|footway|alpine_hiking;[highway=footway][sac_scale=alpine_hiking];;name;int_name;529;; +natural|scrub|mixed;[natural=scrub][wood=mixed];x;name;int_name;530;; +highway|byway|bridge;[highway=byway][bridge?];x;name;int_name;531;highway|track; +man_made|pipeline|hot_water;[man_made=pipeline][type=hot_water];x;name;int_name;532;man_made|pipeline; +leisure|landscape_reserve;[leisure=landscape_reserve];;name;int_name;533;; +leisure|playing_fields;[leisure=playing_fields];x;name;int_name;534;; +highway|secondary_link|motorroad;[highway=secondary_link][motorroad];x;name;int_name;535;highway|secondary_link; +boundary|administrative|state;[boundary=administrative][border_type=state];;name;int_name;536;; +highway|cycleway|dyke;[highway=cycleway][dyke?];x;name;int_name;537;highway|cycleway; +highway|cycleway|area;[highway=cycleway][area?];x;name;int_name;538;; +railway|funicular|tunnel;[railway=funicular][tunnel?];;name;int_name;539;; +barrier|cycle_barrier;[barrier=cycle_barrier];;name;int_name;540;; +highway|unsurfaced|bridge;[highway=unsurfaced][bridge?];x;name;int_name;541;highway|unclassified; +amenity|speed_trap;[amenity=speed_trap];;name;int_name;542;; +highway|track|grade4|area;[highway=track][tracktype=grade4][area?];x;name;int_name;543;area:highway|track; +highway|primary|area;[highway=primary][area?];x;name;int_name;544;area:highway|primary; +power|line|underground;[power=line][location=underground];;name;int_name;545;; +amenity|restaurant|vegan;[amenity=restaurant][cuisine=vegan];;name;int_name;546;; +highway|track|construction;[highway=track][construction?];x;name;int_name;547;highway|construction; +highway|minor|oneway;[highway=minor][oneway?];x;name;int_name;548;highway|unclassified; +highway|bridleway|cutting;[highway=bridleway][cutting?];x;name;int_name;549;highway|bridleway; +waterway|lock_gate;[waterway=lock_gate];;name;int_name;550;; +railway|proposed|tunnel;[railway=proposed][tunnel?];x;name;int_name;551;; +highway|primary|disused;[highway=primary][disused?];x;name;int_name;552;; +highway|unsurfaced|private;[highway=unsurfaced][access=private];x;name;int_name;553;highway|unclassified; +highway|path|construction;[highway=path][construction?];x;name;int_name;554;highway|construction; +highway|footway|demanding_alpine_hiking;[highway=footway][sac_scale=demanding_alpine_hiking];;name;int_name;555;; +railway|proposed|bridge;[railway=proposed][bridge?];x;name;int_name;556;; +highway|track|grade4|destination;[highway=track][tracktype=grade4][access=destination];x;name;int_name;557;highway|track; +landuse|runway;[landuse=runway];x;name;int_name;558;; +natural|farm;[natural=farm];x;name;int_name;559;landuse|farmland; +highway|unsurfaced|oneway;[highway=unsurfaced][oneway?];x;name;int_name;560;highway|unclassified; +highway|motorway_link|disused;[highway=motorway_link][disused?];x;name;int_name;561;; +highway|crossing|uncontrolled;[highway=crossing][crossing=uncontrolled];x;name;int_name;562;; +highway|track|junction;[highway=track][junction?];x;name;int_name;563;highway|track; +natural|lake;[natural=lake];;name;int_name;564;; +man_made|pipeline|sewage;[man_made=pipeline][type=sewage];x;name;int_name;565;man_made|pipeline; +highway|primary_link|construction;[highway=primary_link][construction?];x;name;int_name;566;highway|construction; +landuse|reservoir|tailings;[landuse=reservoir][reservoir=tailings];x;name;int_name;567;natural|water; +highway|secondary|disused;[highway=secondary][disused?];x;name;int_name;568;; +highway|track|grade5|destination;[highway=track][tracktype=grade5][access=destination];x;name;int_name;569;highway|track; +natural|basin;[natural=basin];x;name;int_name;570;natural|water; +aerialway|chair_lift|5;[aerialway=chair_lift][piste:lift:occupancy=5];x;name;int_name;571;; +natural|reservoir;[natural=reservoir];x;name;int_name;572;natural|water; +highway|steps|construction;[highway=steps][construction?];x;name;int_name;573;highway|construction; +highway|motorway|area;[highway=motorway][area?];x;name;int_name;574;; +piste:lift|rope_tow;[piste:lift=rope_tow];;name;int_name;575;; +natural|pond;[natural=pond];;name;int_name;576;; +natural|industrial;[natural=industrial];x;name;int_name;577;; +highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578;; +highway|pedestrian|junction;[highway=pedestrian][junction?];x;name;int_name;579;highway|pedestrian; +highway|track|grade5|private;[highway=track][tracktype=grade5][access=private];;name;int_name;580;; +highway|track|grade5|area;[highway=track][tracktype=grade5][area?];x;name;int_name;581;; +natural|forest|deciduous;[natural=forest][wood=deciduous];x;name;int_name;582;landuse|forest; +highway|living_street|construction;[highway=living_street][construction?];x;name;int_name;583;highway|construction; +highway|track|racetrack;[highway=raceway];x;name;int_name;584;; +highway|tertiary|disused;[highway=tertiary][disused?];x;name;int_name;585;; +highway|steps|disused;[highway=steps][disused?];x;name;int_name;586;; +aerialway|mixed_lift;[aerialway=mixed_lift];;name;int_name;587;; +railway|planned;[railway=planned];x;name;int_name;588;; +highway|footway|cycleway;[highway=footway][cycleway?];x;name;int_name;589;highway|footway; +power|line|submarine;[power=line][location=submarine];x;name;int_name;590;power|line; +highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permissive];;name;int_name;591;; +highway|track|grade4|private;[highway=track][tracktype=grade4][access=private];;name;int_name;592;; +highway|byway|permissive;[highway=byway][access=permissive];x;name;int_name;593;highway|track; +natural|railway;[natural=railway];x;name;int_name;594;; +highway|service|dyke;[highway=service][man_made][dyke?];x;name;int_name;595;highway|service; +railway|incline;[railway=incline];x;name;int_name;596;; +boundary|administrative|region;[boundary=administrative][border_type=region];;name;int_name;597;; +highway|pedestrian|construction;[highway=pedestrian][construction?];x;name;int_name;598;highway|construction; +highway|path|t1;[highway=path][t1];x;name;int_name;599;highway|path; +landuse|raceway;[landuse=raceway];x;name;int_name;600;; +place|continent;[place=continent];;name;int_name;601;; +natural|farmland;[natural=farmland];x;name;int_name;602;landuse|farmland; +highway|footpath|private;[highway=footpath][access=private];x;name;int_name;603;highway|footway; +boundary|administrative|nation;[boundary=administrative][type=nation];;name;int_name;604;; +railway|dismantled|bridge;[railway=dismantled][bridge?];x;name;int_name;605;; +natural|landfill;[natural=landfill];x;name;int_name;606;; +highway|byway|tunnel;[highway=byway][tunnel?];x;name;int_name;607;highway|track; +piste:lift|magic_carpet;[piste:lift=magic_carpet];;name;int_name;608;; +natural|scrub|coniferous;[natural=scrub][wood=coniferous];x;name;int_name;609;; +highway|unsurfaced|permissive;[highway=unsurfaced][access=permissive];x;name;int_name;610;highway|unclassified; +highway|bridleway|destination;[highway=bridleway][access=destination];x;name;int_name;611;highway|bridleway; +highway|motorway|disused;[highway=motorway][disused?];x;name;int_name;612;; +landuse|runway|disused;[landuse=runway][disused?];x;name;int_name;613;; +highway|unsurfaced|destination;[highway=unsurfaced][access=destination];x;name;int_name;614;highway|unclassified; +natural|brownfield;[natural=brownfield];x;name;int_name;615;; +natural|village_green;[natural=village_green];x;name;int_name;616;; +highway|track|embankment;[highway=track][embankment?];x;name;int_name;617;highway|track; +highway|footpath|bridge;[highway=footpath][bridge?];x;name;int_name;618;highway|footway; +piste:lift|j-bar;[piste:lift=j-bar];;name;int_name;619;; +landuse|scrub|deciduous;[landuse=scrub][wood=deciduous];x;name;int_name;620;; +highway|bridleway|area;[highway=bridleway][area?];x;name;int_name;621;; +natural|military;[natural=military];x;name;int_name;622;; +highway|byway|private;[highway=byway][access=private];x;name;int_name;623;highway|track; +natural|forest|mixed;[natural=forest][wood=mixed];x;name;int_name;624;landuse|forest; +highway|raceway|disused;[highway=raceway][disused?];x;name;int_name;625;; +railway|siding|bridge;[railway=siding][bridge?];;name;int_name;626;; +highway|footway|difficult_alpine_hiking;[highway=footway][sac_scale=difficult_alpine_hiking];;name;int_name;627;; +man_made|pipeline|oil|overground;[man_made=pipeline][type=oil][location=overground];x;name;int_name;628;; +highway|primary_link|area;[highway=primary_link][area?];x;name;int_name;629;; +highway|primary_link|disused;[highway=primary_link][disused?];x;name;int_name;630;highway|primary_link; +highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permissive];;name;int_name;631;; +landuse|reservoir|cooling;[landuse=reservoir][reservoir=cooling];x;name;int_name;632;natural|water; +aeroway|airport;[aeroway=airport];;name;int_name;633;; +highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634;; +man_made|piste:halfpipe;[man_made=piste:halfpipe];x;name;int_name;635;; +highway|footpath|permissive;[highway=footpath][access=permissive];x;name;int_name;636;highway|footway; +highway|tertiary|cycleway;[highway=tertiary][cycleway?];x;name;int_name;637;; +highway|trunk|area;[highway=trunk][area?];x;name;int_name;638;; +highway|secondary_link|construction;[highway=secondary_link][construction?];x;name;int_name;639;highway|construction; +landuse|street;[landuse=street];x;name;int_name;640;; +leisure|park|destination;[leisure=park][access=destination];x;name;int_name;641;leisure|park; +highway|footway|t2;[highway=footway][t2];x;name;int_name;642;highway|footway; +landuse|raceway|disused;[landuse=raceway][disused?];x;name;int_name;643;; +highway|motorway_link|area;[highway=motorway_link][area?];x;name;int_name;644;; +natural|recreation_ground;[natural=recreation_ground];x;name;int_name;645;; +highway|minor|bridge;[highway=minor][bridge?];x;name;int_name;646;highway|unclassified; +highway|secondary|cycleway;[highway=secondary][cycleway?];x;name;int_name;647;highway|secondary; +highway|track|dike;[highway=track][dike?];x;name;int_name;648;highway|track; +natural|forest|coniferous;[natural=forest][wood=coniferous];x;name;int_name;649;landuse|forest; +highway|footway|embankment;[highway=footway][embankment?];x;name;int_name;650;highway|footway; +railway|spur|tunnel;[railway=spur][tunnel?];;name;int_name;651;; +highway|path|t5;[highway=path][t5];x;name;int_name;652;highway|path; +highway|path|t3;[highway=path][t3];x;name;int_name;653;highway|path; +highway|trunk|disused;[highway=trunk][disused?];x;name;int_name;654;; +highway|trunk_link|area;[highway=trunk_link][area?];x;name;int_name;655;; +railway|incline|tunnel;[railway=incline][tunnel?];;name;int_name;656;; +boundary|administrative|municipality;[boundary=administrative][border_type=municipality];;name;int_name;657;; +highway|path|t2;[highway=path][t2];x;name;int_name;658;highway|path; +highway|byway|destination;[highway=byway][access=destination];x;name;int_name;659;highway|bridleway; +natural|construction;[natural][construction?];x;name;int_name;660;; +communication|line;[communication=line];;name;int_name;661;; +highway|tertiary_link|motorroad;[highway=tertiary_link][motorroad?];x;name;int_name;662;highway|tertiary_link; +railway|dismantled|tunnel;[railway=dismantled][tunnel?];x;name;int_name;663;; +leisure|recreation_ground|permissive;[leisure=recreation_ground][access=permissive];;name;int_name;664;; +railway|yard|bridge;[railway=yard][bridge?];;name;int_name;665;; +landuse|raceway|dismantled;[landuse=raceway][dismantled?];x;name;int_name;666;; +railway|planned|tunnel;[railway=planned][tunnel?];x;name;int_name;667;; +highway|residential|turning_circle;[highway=residential][turning_circle?];x;name;int_name;668;; +highway|bridleway|disused;[highway=bridleway][disused?];x;name;int_name;669;; +highway|service|cycleway;[highway=service][cycleway?];x;name;int_name;670;highway|service; +highway|pedestrian|disused;[highway=pedestrian][disused?];x;name;int_name;671;; +highway|unsurfaced|area;[highway=unsurfaced][area?];x;name;int_name;672;; +highway|minor|tunnel;[highway=minor][tunnel?];x;name;int_name;673;highway|unclassified; +highway|minor|area;[highway=minor][area?];x;name;int_name;674;; +highway|track|grade4|permissive;[highway=track][tracktype=grade4][access=permissive];;name;int_name;675;; +highway|crossing|zebra;[highway=crossing][crossing=zebra];x;name;int_name;676;; +landuse|runway|dismantled;[landuse=runway][dismantled?];x;name;int_name;677;; +highway|bridleway|construction;[highway=bridleway][construction?];x;name;int_name;678;; +railway|planned|bridge;[railway=planned][bridge?];x;name;int_name;679;; +highway|service|embankment;[highway=service][embankment?];x;name;int_name;680;highway|service; +highway|crossing|island;[highway=crossing][crossing=island];x;name;int_name;681;; +highway|unclassified|cycleway;[highway=unclassified][cycleway];x;name;int_name;682;highway|unclassified; +highway|residential|cycleway;[highway=residential][cycleway];x;name;int_name;683;highway|residential; +natural|commercial;[natural=commercial];x;name;int_name;684;; +highway|path|embankment;[highway=path][embankment?];x;name;int_name;685;highway|path; +natural|vineyard;[natural=vineyard];;name;int_name;686;; +highway|cycleway|dike;[highway=cycleway][dike?];x;name;int_name;687;highway|cycleway; +man_made|pipeline|water|overground;[man_made=pipeline][type=water][location=overground];x;name;int_name;688;man_made|pipeline; +highway|footpath|area;[highway=footpath][area?];x;name;int_name;689;highway|footway; +highway|road|turning_circle;[highway=road][turning_circle?];x;name;int_name;690;; +boundary|administrative|country;[boundary=administrative][border_type=country];;name;int_name;691;; +highway|service|levee;[highway=service][levee?];x;name;int_name;692;highway|service; +natural|orchard;[natural=orchard];;name;int_name;693;; +natural|retail;[natural=retail];x;name;int_name;694;; +communication|line|underground;[communication=line][location=underground];;name;int_name;695;; +natural|cemetery;[natural=cemetery];x;name;int_name;696;; +highway|track|levee;[highway=track][levee?];x;name;int_name;697;highway|track; +highway|path|dike;[highway=path][dike?];x;name;int_name;698;highway|path; +highway|tertiary_link|area;[highway=tertiary_link][area?];x;name;int_name;699;; +highway|unsurfaced|tunnel;[highway=unsurfaced][tunnel?];x;name;int_name;700;; +highway|secondary_link|area;[highway=secondary_link][area?];x;name;int_name;701;; +natural|allotments;[natural=allotments];x;name;int_name;702;; +railway|station|subway;[railway=station][transport=subway];;name;int_name;703;; +amenity|police;[amenity=police];;name;int_name;704;; +amenity|car_rental;[amenity=car_rental];;name;int_name;705;; +amenity|taxi;[amenity=taxi];;name;int_name;706;; +amenity|marketplace;[amenity=marketplace];;name;int_name;707;; +amenity|nightclub;[amenity=nightclub];;name;int_name;708;; +amenity|embassy;[amenity=embassy];;name;int_name;709;; +amenity|townhall;[amenity=townhall];;name;int_name;710;; +barrier|gate;[barrier=gate];;name;int_name;711;; +barrier|lift_gate;[barrier=lift_gate];;name;int_name;712;; +barrier|stile;[barrier=stile];;name;int_name;713;; +barrier|block;[barrier=block];;name;int_name;714;; +barrier|toll_booth;[barrier=toll_booth];;name;int_name;715;; +historic|memorial;[historic=memorial];;name;int_name;716;; +historic|ruins;[historic=ruins];;name;int_name;717;; +historic|monument;[historic=monument];;name;int_name;718;; +historic|castle;[historic=castle];;name;int_name;719;; +historic|archaeological_site;[historic=archaeological_site];;name;int_name;720;; +highway|residential|private;[highway=residential][access=private];;name;int_name;721;; +man_made|cutline;[man_made=cutline];;name;int_name;722;; +natural|bay;[natural=bay];;name;int_name;723;; +natural|spring;[natural=spring];;name;int_name;724;; +railway|platform;[railway=platform];;name;int_name;725;; +shop|clothes;[shop=clothes];;name;int_name;726;; +shop|car_repair;[shop=car_repair];;name;int_name;727;; +shop|car;[shop=car];;name;int_name;728;; +shop|kiosk;[shop=kiosk];;name;int_name;729;; +sport|multi;[sport=multi];;name;int_name;730;; +sport|golf;[sport=golf];;name;int_name;731;; +sport|skiing;[sport=skiing];;name;int_name;732;; +tourism|museum;[tourism=museum];;name;int_name;733;; +tourism|guest_house;[tourism=guest_house];;name;int_name;734;; +tourism|motel;[tourism=motel];;name;int_name;735;; +boundary|administrative|4|state;[boundary=administrative][admin_level=4][border_type=state];;name;int_name;736;; +place|state|USA;[place=state][addr:country=US];;name;int_name;737;; +building|address;[addr:housenumber][addr:street][!shop][!amenity][!office];;addr:housenumber;name;738;; +amenity|parking|no-access;[amenity=parking][access=no];;name;int_name;739;; +highway|bridleway|dike;[highway=bridleway][dike?];x;name;int_name;740;highway|track; +highway|bridleway|dyke;[highway=bridleway][dyke?];x;name;int_name;741;highway|track; +highway|bridleway|embankment;[highway=bridleway][embankment?];x;name;int_name;742;highway|track; +highway|bridleway|levee;[highway=bridleway][levee?];x;name;int_name;743;highway|track; +highway|bridleway|no-access;[highway=bridleway][access=no];x;name;int_name;744;highway|track; +highway|byway|area;[highway=byway][area?];x;name;int_name;745;highway|track; +highway|byway|construction;[highway=byway][construction?];x;name;int_name;746;highway|track; +highway|byway|disused;[highway=byway][disused?];x;name;int_name;747;highway|track; +highway|byway|no-access;[highway=byway][access=no];x;name;int_name;748;highway|track; +highway|cycleroad;[highway=cycleroad];x;name;int_name;749;highway|cycleway; +highway|cycleroad|area;[highway=cycleroad][area?];x;name;int_name;750;highway|cycleway; +highway|cycleroad|bridge;[highway=cycleroad][bridge?];x;name;int_name;751;highway|cycleway; +highway|cycleroad|construction;[highway=cycleroad][construction?];x;name;int_name;752;highway|cycleway; +highway|cycleroad|disused;[highway=cycleroad][disused?];x;name;int_name;753;highway|cycleway; +highway|cycleroad|junction;[highway=cycleroad][junction?];x;name;int_name;754;highway|cycleway; +highway|cycleroad|tunnel;[highway=cycleroad][tunnel?];x;name;int_name;755;highway|cycleway; +highway|cycleway|embankment;[highway=cycleway][embankment?];x;name;int_name;756;highway|cycleway; +highway|cycleway|levee;[highway=cycleway][levee?];x;name;int_name;757;highway|cycleway; +highway|cycleway|no-access;[highway=cycleway][access=no];x;name;int_name;758;highway|cycleway; +highway|footpath|construction;[highway=footpath][construction?];x;name;int_name;759;highway|footway; +highway|footpath|cycleway;[highway=footpath][cycleway?];x;name;int_name;760;highway|footway; +highway|footpath|destination;[highway=footpath][access=destination];x;name;int_name;761;highway|footway; +highway|footpath|disused;[highway=footpath][disused?];x;name;int_name;762;highway|footway; +highway|footpath|no-access;[highway=footpath][access=no];x;name;int_name;763;highway|footway; +highway|footpath|tunnel;[highway=footpath][tunnel?];x;name;int_name;764;highway|footway; +highway|footway|dike;[highway=footway][dike?];x;name;int_name;765;highway|footway; +highway|footway|levee;[highway=footway][levee?];x;name;int_name;766;highway|footway; +highway|footway|no-access;[highway=footway][access=no];;name;int_name;767;highway|footway; +highway|footway|t1;[highway=footway][t1];x;name;int_name;768;highway|footway; +highway|footway|t3;[highway=footway][t3];x;name;int_name;769;highway|footway; +highway|footway|t4;[highway=footway][t4];x;name;int_name;770;highway|footway; +highway|footway|t5;[highway=footway][t5];x;name;int_name;771;highway|footway; +highway|footway|t6;[highway=footway][t6];x;name;int_name;772;highway|footway; +highway|ford|cycleway;[highway=ford][cycleway];x;name;int_name;773;; +highway|living_street|disused;[highway=living_street][disused?];x;name;int_name;774;; +highway|minor|construction;[highway=minor][construction?];x;name;int_name;775;highway|unclassified; +highway|minor|cycleway;[highway=minor][cycleway];x;name;int_name;776;highway|unclassified; +highway|minor|disused;[highway=minor][disused?];x;name;int_name;777;highway|unclassified; +highway|minor|junction;[highway=minor][junction?];x;name;int_name;778;highway|unclassified; +highway|minor|turning_circle;[highway=minor][turning_circle?];x;name;int_name;779;highway|unclassified; +highway|motorway|cycleway;[highway=motorway][cycleway];x;name;int_name;780;highway|motorway; +highway|motorway|dike;[highway=motorway][dike?];x;name;int_name;781;highway|motorway; +highway|motorway|dyke;[highway=motorway][dyke?];x;name;int_name;782;highway|motorway; +highway|motorway|embankment;[highway=motorway][embankment?];x;name;int_name;783;highway|motorway; +highway|motorway|levee;[highway=motorway][levee?];x;name;int_name;784;highway|motorway; +highway|motorway_link|cycleway;[highway=motorway_link][cycleway?];x;name;int_name;785;highway|motorway; +highway|path|area-bicycle;[highway=path][area?][bicycle?];x;name;int_name;786;highway|path; +highway|path|area-horse;[highway=path][area?][horse?];x;name;int_name;787;highway|path; +highway|path|bicycle-bridge;[highway=path][bicycle?][bridge?];;name;int_name;788;highway|path; +highway|path|bicycle-construction;[highway=path][bicycle?][construction?];x;name;int_name;789;highway|path; +highway|path|bicycle-disused;[highway=path][bicycle?][disused?];x;name;int_name;790;highway|path; +highway|path|bicycle-tunnel;[highway=path][bicycle?][tunnel?];;name;int_name;791;highway|path; +highway|path|bridge-horse;[highway=path][bridge?][horse?];x;name;int_name;792;highway|path; +highway|path|construction-horse;[highway=path][construction?][horse?];x;name;int_name;793;highway|path; +highway|path|disused-horse;[highway=path][disused?][horse?];x;name;int_name;794;highway|path; +highway|path|horse-tunnel;[highway=path][horse?][tunnel?];x;name;int_name;795;highway|path; +highway|path|levee;[highway=path][levee?];x;name;int_name;796;highway|path; +highway|path|no-access;[highway=path][access=no];;name;int_name;797;highway|path; +highway|path|t4;[highway=path][t4];x;name;int_name;798;highway|path; +highway|path|t6;[highway=path][t6];x;name;int_name;799;highway|path; +highway|pedestrian|cycleway;[highway=pedestrian][cycleway];x;name;int_name;800;highway|pedestrian; +highway|primary|cycleway;[highway=primary][cycleway];x;name;int_name;801;highway|primary; +highway|primary|cycleway-motorroad;[highway=primary][cycleway?][motorroad?];x;name;int_name;802;highway|primary; +highway|primary_link|cycleway;[highway=primary_link][cycleway?];x;name;int_name;803;highway|primary_link; +highway|primary_link|cycleway-motorroad;[highway=primary_link][cycleway?][motorroad?];x;name;int_name;804;highway|primary_link; +highway|raceway|dismantled;[highway=raceway][dismantled?];x;name;int_name;805;; +highway|road|cycleway;[highway=road][cycleway];x;name;int_name;806;; +highway|secondary|cycleway-motorroad;[highway=secondary][cycleway?][motorroad?];x;name;int_name;807;highway|secondary; +highway|secondary_link|cycleway;[highway=secondary_link][cycleway?];x;name;int_name;808;highway|secondary_link; +highway|secondary_link|cycleway-motorroad;[highway=secondary_link][cycleway?][motorroad?];x;name;int_name;809;highway|secondary_link; +highway|secondary_link|disused;[highway=secondary_link][disused?];x;name;int_name;810;highway|secondary_link; +highway|service|dike;[highway=service][dike?];x;name;int_name;811;highway|service; +highway|steps|dike;[highway=steps][dike?];x;name;int_name;812;highway|steps; +highway|steps|dyke;[highway=steps][dyke?];x;name;int_name;813;highway|steps; +highway|steps|embankment;[highway=steps][embankment?];x;name;int_name;814;highway|steps; +highway|steps|levee;[highway=steps][levee?];x;name;int_name;815;highway|steps; +highway|tertiary|cycleway-motorroad;[highway=tertiary][cycleway?][motorroad?];x;name;int_name;816;highway|tertiary; +highway|tertiary_link|construction;[highway=tertiary_link][construction?];x;name;int_name;817;highway|tertiary_link; +highway|tertiary_link|cycleway;[highway=tertiary_link][cycleway?];x;name;int_name;818;highway|tertiary_link; +highway|tertiary_link|cycleway-motorroad;[highway=tertiary_link][cycleway?][motorroad?];x;name;int_name;819;highway|tertiary_link; +highway|tertiary_link|disused;[highway=tertiary_link][disused?];x;name;int_name;820;highway|tertiary_link; +highway|track|grade3|no-access;[highway=track][tracktype=grade3][access=no];;name;int_name;821;; +highway|track|grade4|no-access;[highway=track][tracktype=grade4][access=no];;name;int_name;822;; +highway|track|grade5|no-access;[highway=track][tracktype=grade5][access=no];;name;int_name;823;; +highway|track|no-access;[highway=track][access=no];;name;int_name;824;; +highway|track|race;[highway=raceway];x;name;int_name;825;; +highway|trunk|cycleway;[highway=trunk][cycleway?];x;name;int_name;826;highway|trunk; +highway|trunk|cycleway-motorroad;[highway=trunk][cycleway?][motorroad?];x;name;int_name;827;highway|trunk; +highway|trunk|dike;[highway=trunk][dike?];x;name;int_name;828;highway|trunk; +highway|trunk|dyke;[highway=trunk][dyke?];x;name;int_name;829;highway|trunk; +highway|trunk|embankment;[highway=trunk][embankment?];x;name;int_name;830;highway|trunk; +highway|trunk|levee;[highway=trunk][levee?];x;name;int_name;831;highway|trunk; +highway|trunk_link|cycleway;[highway=trunk_link][cycleway?];x;name;int_name;832;highway|trunk_link; +highway|trunk_link|cycleway-motorroad;[highway=trunk_link][cycleway?][motorroad?];x;name;int_name;833;highway|trunk_link; +highway|trunk_link|disused;[highway=trunk_link][disused?];x;name;int_name;834;highway|trunk_link; +highway|unclassified|turning_circle;[highway=unclassified][turning_circle];x;name;int_name;835;highway|unclassified; +highway|unsurfaced|construction;[highway=unsurfaced][construction?];x;name;int_name;836;highway|unclassified; +highway|unsurfaced|cycleway;[highway=unsurfaced][cycleway?];x;name;int_name;837;highway|unclassified; +highway|unsurfaced|disused;[highway=unsurfaced][disused?];x;name;int_name;838;highway|unclassified; +highway|unsurfaced|junction;[highway=unsurfaced][junction?];x;name;int_name;839;highway|unclassified; +highway|unsurfaced|no-access;[highway=unsurfaced][access=no];x;name;int_name;840;highway|unclassified; +landuse|conservation|destination;[landuse=conservation][access=destination];x;name;int_name;841;; +landuse|conservation|no-access;[landuse=conservation][access=no];x;name;int_name;842;; +landuse|conservation|permissive;[landuse=conservation][access=permissive];x;name;int_name;843;; +landuse|scrub|coniferous;[landuse=scrub][wood=coniferous];x;name;int_name;844;; +landuse|scrub|mixed;[landuse=scrub][wood=mixed];x;name;int_name;845;; +leisure|dog_park|tennis;[leisure=dog_park][sport=tennis];;name;int_name;846;; +leisure|park|no-access;[leisure=park][access=no];;name;int_name;847;; +leisure|playing_fields|tennis;[leisure=playing_fields][sport=tennis];;name;int_name;848;; +leisure|recreation_ground|destination;[leisure=recreation_ground][access=destination];x;name;int_name;849;; +leisure|recreation_ground|no-access;[leisure=recreation_ground][access=no];;name;int_name;850;; +man_made|pipeline|gas|overground;[man_made=pipeline][type=gas][location=overground];x;name;int_name;851;man_made|pipeline; +man_made|pipeline|heat|overground;[man_made=pipeline][type=heat][location=overground];x;name;int_name;852;man_made|pipeline; +man_made|pipeline|hot_water|overground;[man_made=pipeline][type=hot_water][location=overground];x;name;int_name;853;man_made|pipeline; +man_made|pipeline|natural_gas|overground;[man_made=pipeline][type=natural_gas][location=overground];x;name;int_name;854;man_made|pipeline; +man_made|pipeline|sewage|overground;[man_made=pipeline][type=sewage][location=overground];x;name;int_name;855;man_made|pipeline; +mapswithme|grid;[mapswithme=grid];;name;int_name;856;; +natural|farmyard;[natural=farmyard];x;name;int_name;857;; +natural|garages;[natural=garages];x;name;int_name;858;; +natural|greenfield;[natural=greenfield];;name;int_name;859;; +natural|greenhouse_horticulture;[natural=greenhouse_horticulture];;name;int_name;860;; +natural|salt_pond;[natural=salt_pond];;name;int_name;861;; +natural|street;[natural=street];x;name;int_name;862;; +railway|incline|bridge;[railway=incline][bridge?];;name;int_name;863;; +railway|siding|tunnel;[railway=siding][tunnel?];;name;int_name;864;; +railway|yard|tunnel;[railway=yard][tunnel?];;name;int_name;865;; +area:highway|footway;[area:highway=footway];;name;int_name;866;; +area:highway|service;[area:highway=service];;name;int_name;867;; +area:highway|residential;[area:highway=residential];;name;int_name;868;; +area:highway|secondary;[area:highway=secondary];;name;int_name;869;; +area:highway|tertiary;[area:highway=tertiary];;name;int_name;870;; +area:highway|primary;[area:highway=primary];;name;int_name;871;; +area:highway|path;[area:highway=path];;name;int_name;872;; +area:highway|pedestrian;[area:highway=pedestrian];;name;int_name;873;; +area:highway|unclassified;[area:highway=unclassified];;name;int_name;874;; +area:highway|steps;[area:highway=steps];;name;int_name;875;; +area:highway|living_street;[area:highway=living_street];;name;int_name;876;; +area:highway|cycleway;[area:highway=cycleway];;name;int_name;877;; +area:highway|track;[area:highway=track];;name;int_name;878;; +area:highway|motorway;[area:highway=motorway];;name;int_name;879;; +area:highway|trunk;[area:highway=trunk];;name;int_name;880;; +area:highway|residental;[area:highway=residental];x;name;int_name;881;; +entrance;[entrance];;ref;addr:flats;882;; +oneway;[oneway?];;name;int_name;883;; +highway|proposed;[highway=proposed];;name;int_name;884;; +tourism|artwork;[tourism=artwork];;name;int_name;885;; +railway|subway|red;[railway=subway][colour=red];;name;int_name;886;; +railway|subway|blue;[railway=subway][colour=blue];;name;int_name;887;; +railway|subway|orange;[railway=subway][colour=orange];;name;int_name;888;; +railway|subway|green;[railway=subway][colour=green];;name;int_name;889;; +railway|subway|brown;[railway=subway][colour=brown];;name;int_name;890;; +railway|subway|yellow;[railway=subway][colour=yellow];;name;int_name;891;; +railway|subway|purple;[railway=subway][colour=purple];;name;int_name;892;; +railway|station|subway|red;[railway=station][transport=subway][colour=red];;name;int_name;893;; +railway|station|subway|blue;[railway=station][transport=subway][colour=blue];;name;int_name;894;; +railway|station|subway|orange;[railway=station][transport=subway][colour=orange];;name;int_name;895;; +railway|station|subway|green;[railway=station][transport=subway][colour=green];;name;int_name;896;; +railway|station|subway|brown;[railway=station][transport=subway][colour=brown];;name;int_name;897;; +railway|station|subway|yellow;[railway=station][transport=subway][colour=yellow];;name;int_name;898;; +railway|station|subway|purple;[railway=station][transport=subway][colour=purple];;name;int_name;899;; +railway|subway|darkgreen;[railway=subway][colour=darkgreen];;name;int_name;900;; +railway|station|subway|darkgreen;[railway=station][transport=subway][colour=darkgreen];;name;int_name;901;; +railway|subway|gray;[railway=subway][colour=gray];;name;int_name;902;; +railway|station|subway|gray;[railway=station][transport=subway][colour=gray];;name;int_name;903;; +railway|subway|lightblue;[railway=subway][colour=lightblue];;name;int_name;904;; +railway|station|subway|lightblue;[railway=station][transport=subway][colour=lightblue];;name;int_name;905;; +railway|subway|lightgreen;[railway=subway][colour=lightgreen];;name;int_name;906;; +railway|station|subway|lightgreen;[railway=station][transport=subway][colour=lightgreen];;name;int_name;907;; +railway|subway|violet;[railway=subway][colour=violet];;name;int_name;908;; +railway|station|subway|violet;[railway=station][transport=subway][colour=violet];;name;int_name;909;; +railway|subway|grey;[railway=subway][colour=grey];;name;int_name;910;; +railway|station|subway|grey;[railway=station][transport=subway][colour=grey];;name;int_name;911;; +historic|ship;[historic=ship];;name;int_name;912;; +marking|sport;[marking=sport][!colour];;name;int_name;913;; +marking|sport|white;[marking=sport][colour=white];;name;int_name;914;; +marking|sport|red;[marking=sport][colour=red];;name;int_name;915;; +marking|sport|black;[marking=sport][colour=black];;name;int_name;916;; +marking|sport|blue;[marking=sport][colour=blue];;name;int_name;917;; +shop|mall;[shop=mall];;name;int_name;918;; +shop|doityourself;[shop=doityourself];;name;int_name;919;; +place|sea;[place=sea];;name;int_name;920;; +place|ocean;[place=ocean];;name;int_name;921;; +natural|cliff;[natural=cliff];;name;int_name;922;; +shop|butcher;[shop=butcher];;name;int_name;923;; +shop|florist;[shop=florist];;name;int_name;924;; +shop|bicycle;[shop=bicycle];;name;int_name;925;; +shop|alcohol;[shop=alcohol];;name;int_name;926;; +shop|books;[shop=books];;name;int_name;927;; +shop|electronics;[shop=electronics];;name;int_name;928;; +shop|shoes;[shop=shoes];;name;int_name;929;; +shop|department_store;[shop=department_store];;name;int_name;930;; +shop|hardware;[shop=hardware];;name;int_name;931;; +shop|jewelry;[shop=jewelry];;name;int_name;932;; +shop|chemist;[shop=chemist];;name;int_name;933;; +shop|optician;[shop=optician];;name;int_name;934;; +shop|garden_centre;[shop=garden_centre];;name;int_name;935;; +shop|gift;[shop=gift];;name;int_name;936;; +shop|computer;[shop=computer];;name;int_name;937;; +shop|mobile_phone;[shop=mobile_phone];;name;int_name;938;; +shop|greengrocer;[shop=greengrocer];;name;int_name;939;; +shop|beverages;[shop=beverages];;name;int_name;940;; +shop|toys;[shop=toys];;name;int_name;941;; +shop|confectionery;[shop=confectionery];;name;int_name;942;; +shop;[shop?];;name;int_name;943;; +lit;[lit?];;name;int_name;944;; +office|company;[office=company];;name;int_name;945;;компания +office|telecommunication;[office=telecommunication];;name;int_name;946;;телекоммуникационная комппания +office|government;[office=government];;name;int_name;947;; +office|estate_agent;[office=estate_agent];;name;int_name;948;; +office|lawyer;[office=lawyer];;name;int_name;949;;юрист +office;[office?];;name;int_name;950;;офис +landuse|residential|rural;[landuse=residential][residential=rural];;name;int_name;951;; +landuse|residential|urban;[landuse=residential][residential=urban];;name;int_name;952;; +amenity|ferry_terminal;[amenity=ferry_terminal];;name;int_name;953;; +amenity;[amenity?];;name;int_name;954;; +shop|furniture;[shop=furniture];;name;int_name;955;;мебельный магазин +tourism|gallery;[tourism=gallery];;name;int_name;956;;галерея +shop|car_parts;[shop=car_parts];;name;int_name;957;;магазин автозапчастей +amenity|bicycle_parking;[amenity=bicycle_parking];;name;int_name;958;;велопарковка +shop|general;[shop=general];;name;int_name;959;;магазин +shop|copyshop;[shop=copyshop];;name;int_name;960;;копировальный центр +amenity|emergency_phone;[amenity=emergency_phone];;name;int_name;961;;телефон экстренного вызова +emergency|phone;[emergency=phone];;name;int_name;962;;телефон экстренного вызова +harbour;[harbour];;name;int_name;963;;гавань +seamark:type|harbour;[seamark:type=harbour];;name;int_name;964;;гавань +shop|music;[shop=music];;name;int_name;965;;магазин музыки +shop|musical_instrument;[shop=musical_instrument];;name;int_name;966;;магазин музыкальных инструментов +wood|deciduous;[wood=deciduous];;name;int_name;967;;хвойный +wood|coniferous;[wood=coniferous];;name;int_name;968;;лиственный +amenity|prison;[amenity=prison];;name;int_name;969;;тюрьма +religion|christian;[religion=christian];;name;int_name;970;;христианство +religion|jewish;[religion=jewish];;name;int_name;971;;иудаизм +religion|muslim;[religion=muslim];;name;int_name;972;;мусульманство +amenity|brothel;[amenity=brothel];;name;int_name;973;;бордель +railway|subway_entrance|red;[railway=subway_entrance][colour=red];;name;int_name;974;;вход в метро +railway|subway_entrance|blue;[railway=subway_entrance][colour=blue];;name;int_name;975;;вход в метро +railway|subway_entrance|orange;[railway=subway_entrance][colour=orange];;name;int_name;976;;вход в метро +railway|subway_entrance|green;[railway=subway_entrance][colour=green];;name;int_name;977;;вход в метро +railway|subway_entrance|brown;[railway=subway_entrance][colour=brown];;name;int_name;978;;вход в метро +railway|subway_entrance|yellow;[railway=subway_entrance][colour=yellow];;name;int_name;979;;вход в метро +railway|subway_entrance|purple;[railway=subway_entrance][colour=purple];;name;int_name;980;;вход в метро +railway|subway_entrance|grey;[railway=subway_entrance][colour=grey];;name;int_name;981;;вход в метро +railway|subway_entrance|violet;[railway=subway_entrance][colour=violet];;name;int_name;982;;вход в метро +railway|subway_entrance|lightgreen;[railway=subway_entrance][colour=lightgreen];;name;int_name;983;;вход в метро +railway|subway_entrance|lightblue;[railway=subway_entrance][colour=lightblue];;name;int_name;984;;вход в метро +railway|subway_entrance|gray;[railway=subway_entrance][colour=gray];;name;int_name;985;;вход в метро +railway|subway_entrance|darkgreen;[railway=subway_entrance][colour=darkgreen];;name;int_name;986;;вход в метро +amenity|money_transfer;[amenity=money_transfer];;name;int_name;987;;денежные переводы +craft|carpenter;[craft=carpenter];;name;int_name;988;;мастерская плотника +shop|motorcycle;[shop=motorcycle];;name;int_name;989;;магазин мотоциклов +craft;[craft];;name;int_name;990;;мастерская +shop|photo;[shop=photo];;name;int_name;991;;фотомагазин +craft|shoemaker;[craft=shoemaker];;name;int_name;992;;обувная мастерская +shop|photo_studio;[shop=photo_studio];;name;int_name;993;;фотостудия +craft|tailor;[craft=tailor];;name;int_name;994;;ателье +man_made|water_well;[man_made=water_well];;name;int_name;995;;колодец +leisure|beach_resort;[leisure=beach_resort];;name;int_name;996;;пляжный курорт +amenity|waste_basket;[amenity=waste_basket];;name;int_name;997;;мусорка +man_made|watermill;[man_made=watermill];;name;int_name;998;;мельница +man_made|water_tower;[man_made=water_tower];;name;int_name;999;;водонапорная башня +man_made|communication_tower;[man_made=communication_tower];;name;int_name;1000;;телекоммуникационная вышка +man_made|mast;[man_made=mast];;name;int_name;1001;;вышка +amenity|fire_hydrant;[amenity=fire_hydrant];;name;int_name;1002;;пожарный гидрант +emergency|fire_hydrant;[emergency=fire_hydrant];;name;int_name;1003;;пожарный гидрант +highway|street_lamp;[highway=street_lamp];;name;int_name;1004;;фонарь +man_made|water_well|drinking_water;[man_made=water_well][drinking_water?];;name;int_name;1005;;колодец +power|generator|solar;[power=generator][power_source=solar];;name;int_name;1006;;солнечная электростанция +power|generator|nuclear;[power=generator][power_source=nuclear];;name;int_name;1007;;атомная электростанция +man_made|storage_tank;[man_made=storage_tank];;name;int_name;1008;;резервуар +man_made|water_well|manual;[man_made=water_well][pump=manual];;name;int_name;1009;;колодец +man_made|water_well|powered;[man_made=water_well][pump=powered];;name;int_name;1010;;колодец +barrier|border_control;[barrier=border_control];;name;int_name;1011;;пограничный контроль +amenity|courthouse;[amenity=courthouse];;name;int_name;1012;;суд +amenity|social_facility;[amenity=social_facility];;name;int_name;1013;;социальное учреждение +religion|hindu;[religion=hindu];;name;int_name;1014;;индуизм +office|ngo;[office=ngo];;name;int_name;1015;;общественная организация +amenity|community_centre;[amenity=community_centre];;name;int_name;1016;;общественный центр +healthcare;[healthcare?];;name;int_name;1017;;здравоохранение +healthcare|dentist;[healthcare=dentist];;name;int_name;1018;;зубной врач +healthcare|hospital;[healthcare=hospital];;name;int_name;1019;;больница +amenity|dentist;[amenity=dentist];;name;int_name;1020;;зубной врач +amenity|laundry;[amenity=laundry];;name;int_name;1021;;прачечная +shop|dry_cleaning;[shop=dry_cleaning];;name;int_name;1022;;прачечная +shop|funeral_directors;[shop=funeral_directors];;name;int_name;1023;;похоронное бюро +amenity|gambling;[amenity=gambling];;name;int_name;1024;;азартные игры +amenity|casino;[amenity=casino];;name;int_name;1025;;казино +amenity|shower;[amenity=shower];;name;int_name;1026;;душ +shop|confectionery;[shop=confectionery];;name;int_name;1027;;кондитерские изделия +shop|outdoor;[shop=outdoor];;name;int_name;1028;;туристический магазин +railway|construction;[railway=construction];;name;int_name;1029;; diff --git a/data/resources-hdpi/basic.skn b/data/resources-hdpi/basic.skn index 893a40c1c3..97131209e6 100644 --- a/data/resources-hdpi/basic.skn +++ b/data/resources-hdpi/basic.skn @@ -220,10 +220,10 @@ <symbolStyle id="73" name="api_pin"> <resourceStyle x="408" y="136" width="21" height="34"/> </symbolStyle> - <symbolStyle id="74" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="74" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="429" y="136" width="30" height="30"/> </symbolStyle> - <symbolStyle id="75" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="75" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="459" y="136" width="30" height="30"/> </symbolStyle> <symbolStyle id="76" name="placemark-blue"> @@ -295,22 +295,22 @@ <symbolStyle id="98" name="symbols/nori/shower-18.svg:#444444::::"> <resourceStyle x="27" y="200" width="27" height="27"/> </symbolStyle> - <symbolStyle id="99" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> + <symbolStyle id="99" name="symbols/nori/beach_resort-18.svg:#444444::::"> <resourceStyle x="54" y="200" width="27" height="27"/> </symbolStyle> - <symbolStyle id="100" name="symbols/nori/watermill-18.svg:#444444::::"> + <symbolStyle id="100" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> <resourceStyle x="81" y="200" width="27" height="27"/> </symbolStyle> - <symbolStyle id="101" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> + <symbolStyle id="101" name="symbols/nori/watermill-18.svg:#444444::::"> <resourceStyle x="108" y="200" width="27" height="27"/> </symbolStyle> - <symbolStyle id="102" name="symbols/nori/border_control-18.svg:#444444::::"> + <symbolStyle id="102" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> <resourceStyle x="135" y="200" width="27" height="27"/> </symbolStyle> - <symbolStyle id="103" name="symbols/nori/grave_yard-18.svg:#444444::::"> + <symbolStyle id="103" name="symbols/nori/border_control-18.svg:#444444::::"> <resourceStyle x="162" y="200" width="27" height="27"/> </symbolStyle> - <symbolStyle id="104" name="symbols/nori/beach_resort-18.svg:#444444::::"> + <symbolStyle id="104" name="symbols/nori/grave_yard-18.svg:#444444::::"> <resourceStyle x="189" y="200" width="27" height="27"/> </symbolStyle> <symbolStyle id="105" name="symbols/nori/camp_site-18.svg:#444444::::"> @@ -352,133 +352,136 @@ <symbolStyle id="117" name="symbols/nori/generator-18.svg:#444444::::"> <resourceStyle x="476" y="200" width="25" height="25"/> </symbolStyle> - <symbolStyle id="118" name="symbols/nori/generator_nuclear-18.svg:#444444::::"> + <symbolStyle id="118" name="symbols/neta/circle-10.svg:#444444::::"> + <resourceStyle x="501" y="200" width="4" height="4"/> + </symbolStyle> + <symbolStyle id="119" name="symbols/nori/generator_nuclear-18.svg:#444444::::"> <resourceStyle x="0" y="227" width="25" height="25"/> </symbolStyle> - <symbolStyle id="119" name="symbols/nori/generator_solar-18.svg:#444444::::"> + <symbolStyle id="120" name="symbols/nori/generator_solar-18.svg:#444444::::"> <resourceStyle x="25" y="227" width="25" height="25"/> </symbolStyle> - <symbolStyle id="120" name="symbols/nori/dry_cleaning-18.svg:#444444::::"> + <symbolStyle id="121" name="symbols/nori/dry_cleaning-18.svg:#444444::::"> <resourceStyle x="50" y="227" width="21" height="25"/> </symbolStyle> - <symbolStyle id="121" name="current-position"> + <symbolStyle id="122" name="current-position"> <resourceStyle x="71" y="227" width="24" height="24"/> </symbolStyle> - <symbolStyle id="122" name="symbols/maki/ferry-18.svg:#444444::::"> + <symbolStyle id="123" name="symbols/maki/ferry-18.svg:#444444::::"> <resourceStyle x="95" y="227" width="20" height="24"/> </symbolStyle> - <symbolStyle id="123" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="124" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="115" y="227" width="23" height="23"/> </symbolStyle> - <symbolStyle id="124" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="125" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="138" y="227" width="23" height="23"/> </symbolStyle> - <symbolStyle id="125" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="126" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="161" y="227" width="23" height="23"/> </symbolStyle> - <symbolStyle id="126" name="symbols/maki/monument-18.svg:#444444::::"> + <symbolStyle id="127" name="symbols/maki/monument-18.svg:#444444::::"> <resourceStyle x="184" y="227" width="18" height="22"/> </symbolStyle> - <symbolStyle id="127" name="symbols/maki/pitch-18.svg:#444444::::"> + <symbolStyle id="128" name="symbols/maki/pitch-18.svg:#444444::::"> <resourceStyle x="202" y="227" width="16" height="22"/> </symbolStyle> - <symbolStyle id="128" name="symbols/maki/golf-18.svg:#444444::::"> + <symbolStyle id="129" name="symbols/maki/golf-18.svg:#444444::::"> <resourceStyle x="218" y="227" width="16" height="22"/> </symbolStyle> - <symbolStyle id="129" name="symbols/nori/storage_tank-18.svg:#444444::::"> + <symbolStyle id="130" name="symbols/nori/storage_tank-18.svg:#444444::::"> <resourceStyle x="234" y="227" width="25" height="21"/> </symbolStyle> - <symbolStyle id="130" name="symbols/nori/information-18.svg:#444444::::"> + <symbolStyle id="131" name="symbols/nori/information-18.svg:#444444::::"> <resourceStyle x="259" y="227" width="21" height="21"/> </symbolStyle> - <symbolStyle id="131" name="symbols/maki/telephone-18.svg:#444444::::"> + <symbolStyle id="132" name="symbols/maki/telephone-18.svg:#444444::::"> <resourceStyle x="280" y="227" width="22" height="20"/> </symbolStyle> - <symbolStyle id="132" name="symbols/maki/emergency-telephone-18.svg:#444444::::"> + <symbolStyle id="133" name="symbols/maki/emergency-telephone-18.svg:#444444::::"> <resourceStyle x="302" y="227" width="22" height="20"/> </symbolStyle> - <symbolStyle id="133" name="symbols/maki/baseball-18.svg:#444444::::"> + <symbolStyle id="134" name="symbols/maki/baseball-18.svg:#444444::::"> <resourceStyle x="324" y="227" width="20" height="20"/> </symbolStyle> - <symbolStyle id="134" name="symbols/maki/tennis-18.svg:#444444::::"> + <symbolStyle id="135" name="symbols/maki/tennis-18.svg:#444444::::"> <resourceStyle x="344" y="227" width="20" height="20"/> </symbolStyle> - <symbolStyle id="135" name="symbols/maki/harbor-18.svg:#444444::::"> + <symbolStyle id="136" name="symbols/maki/harbor-18.svg:#444444::::"> <resourceStyle x="364" y="227" width="20" height="20"/> </symbolStyle> - <symbolStyle id="136" name="symbols/maki/soccer-18.svg:#444444::::"> + <symbolStyle id="137" name="symbols/maki/soccer-18.svg:#444444::::"> <resourceStyle x="384" y="227" width="20" height="20"/> </symbolStyle> - <symbolStyle id="137" name="symbols/maki/star-18.svg:#444444::::"> + <symbolStyle id="138" name="symbols/maki/star-18.svg:#444444::::"> <resourceStyle x="404" y="227" width="20" height="20"/> </symbolStyle> - <symbolStyle id="138" name="symbols/maki/cricket-18.svg:#444444::::"> + <symbolStyle id="139" name="symbols/maki/cricket-18.svg:#444444::::"> <resourceStyle x="424" y="227" width="20" height="20"/> </symbolStyle> - <symbolStyle id="139" name="symbols/maki/basketball-18.svg:#444444::::"> + <symbolStyle id="140" name="symbols/maki/basketball-18.svg:#444444::::"> <resourceStyle x="444" y="227" width="20" height="20"/> </symbolStyle> - <symbolStyle id="140" name="symbols/maki/park2-18.svg:#008000::::"> + <symbolStyle id="141" name="symbols/maki/park2-18.svg:#008000::::"> <resourceStyle x="464" y="227" width="16" height="20"/> </symbolStyle> - <symbolStyle id="141" name="symbols/maki/park-18.svg:#008000::::"> + <symbolStyle id="142" name="symbols/maki/park-18.svg:#008000::::"> <resourceStyle x="480" y="227" width="16" height="20"/> </symbolStyle> - <symbolStyle id="142" name="symbols/nori/power_tower-12.svg:#444444::::"> + <symbolStyle id="143" name="symbols/nori/power_tower-12.svg:#444444::::"> <resourceStyle x="496" y="227" width="16" height="18"/> </symbolStyle> - <symbolStyle id="143" name="symbols/nori/bench-18.svg:#444444::::"> + <symbolStyle id="144" name="symbols/nori/bench-18.svg:#444444::::"> <resourceStyle x="0" y="252" width="27" height="19"/> </symbolStyle> - <symbolStyle id="144" name="symbols/maki/campsite-18.svg:#444444::::"> + <symbolStyle id="145" name="symbols/maki/campsite-18.svg:#444444::::"> <resourceStyle x="27" y="252" width="22" height="18"/> </symbolStyle> - <symbolStyle id="145" name="symbols/maki/art-gallery-18.svg:#444444::::"> + <symbolStyle id="146" name="symbols/maki/art-gallery-18.svg:#444444::::"> <resourceStyle x="49" y="252" width="22" height="18"/> </symbolStyle> - <symbolStyle id="146" name="symbols/maki/skiing-18.svg:#444444::::"> + <symbolStyle id="147" name="symbols/maki/skiing-18.svg:#444444::::"> <resourceStyle x="71" y="252" width="22" height="18"/> </symbolStyle> - <symbolStyle id="147" name="symbols/maki/cemetery-18.svg:#444444::::"> + <symbolStyle id="148" name="symbols/maki/cemetery-18.svg:#444444::::"> <resourceStyle x="93" y="252" width="14" height="18"/> </symbolStyle> - <symbolStyle id="148" name="symbols/maki/america-football-18.svg:#444444::::"> + <symbolStyle id="149" name="symbols/maki/america-football-18.svg:#444444::::"> <resourceStyle x="107" y="252" width="24" height="16"/> </symbolStyle> - <symbolStyle id="149" name="symbols/maki/dam-18.svg:#444444::::"> + <symbolStyle id="150" name="symbols/maki/dam-18.svg:#444444::::"> <resourceStyle x="131" y="252" width="20" height="16"/> </symbolStyle> - <symbolStyle id="150" name="symbols/maki/swimming-18.svg:#0000FF::::"> + <symbolStyle id="151" name="symbols/maki/swimming-18.svg:#0000FF::::"> <resourceStyle x="151" y="252" width="20" height="16"/> </symbolStyle> - <symbolStyle id="151" name="symbols/maki/cross-12.svg:#444444::::"> + <symbolStyle id="152" name="symbols/maki/cross-12.svg:#444444::::"> <resourceStyle x="171" y="252" width="16" height="16"/> </symbolStyle> - <symbolStyle id="152" name="symbols/maki/roadblock-12.svg:#FF0000::::"> + <symbolStyle id="153" name="symbols/maki/roadblock-12.svg:#FF0000::::"> <resourceStyle x="187" y="252" width="16" height="16"/> </symbolStyle> - <symbolStyle id="153" name="symbols/maki/heliport-18.svg:#444444::::"> + <symbolStyle id="154" name="symbols/maki/heliport-18.svg:#444444::::"> <resourceStyle x="203" y="252" width="22" height="14"/> </symbolStyle> - <symbolStyle id="154" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> + <symbolStyle id="155" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> <resourceStyle x="225" y="252" width="16" height="14"/> </symbolStyle> - <symbolStyle id="155" name="symbols/maki/triangle-12.svg:#444444::::"> + <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#444444::::"> <resourceStyle x="241" y="252" width="16" height="14"/> </symbolStyle> - <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#FF0000::::"> + <symbolStyle id="157" name="symbols/maki/triangle-12.svg:#FF0000::::"> <resourceStyle x="257" y="252" width="16" height="14"/> </symbolStyle> - <symbolStyle id="157" name="symbols/neta/entrance-18.svg:#444444::::"> + <symbolStyle id="158" name="symbols/neta/entrance-18.svg:#444444::::"> <resourceStyle x="273" y="252" width="15" height="13"/> </symbolStyle> - <symbolStyle id="158" name="symbols/maki/post-12.svg:#444444::::"> + <symbolStyle id="159" name="symbols/maki/post-12.svg:#444444::::"> <resourceStyle x="288" y="252" width="16" height="12"/> </symbolStyle> - <symbolStyle id="159" name="symbols/neta/lift_gate-18.svg:#444444::::"> + <symbolStyle id="160" name="symbols/neta/lift_gate-18.svg:#444444::::"> <resourceStyle x="304" y="252" width="17" height="11"/> </symbolStyle> - <symbolStyle id="160" name="symbols/arrow.svg:::::"> + <symbolStyle id="161" name="symbols/arrow.svg:::::"> <resourceStyle x="321" y="252" width="27" height="9"/> </symbolStyle> </page> diff --git a/data/resources-hdpi/symbols.png b/data/resources-hdpi/symbols.png Binary files differindex fcd6bb90cd..7d6d2d63cf 100644 --- a/data/resources-hdpi/symbols.png +++ b/data/resources-hdpi/symbols.png diff --git a/data/resources-ldpi/basic.skn b/data/resources-ldpi/basic.skn index 9224e0c7d3..a7339436f8 100644 --- a/data/resources-ldpi/basic.skn +++ b/data/resources-ldpi/basic.skn @@ -43,442 +43,445 @@ <symbolStyle id="14" name="symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="234" y="0" width="18" height="18"/> </symbolStyle> - <symbolStyle id="15" name="symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> + <symbolStyle id="15" name="symbols/neta/circle-10.svg:#444444::::"> + <resourceStyle x="252" y="0" width="3" height="3"/> + </symbolStyle> + <symbolStyle id="16" name="symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> <resourceStyle x="0" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="16" name="symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="17" name="symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="18" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="17" name="symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> + <symbolStyle id="18" name="symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> <resourceStyle x="36" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="18" name="symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="19" name="symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="54" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="19" name="symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="20" name="symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="72" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="20" name="symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="21" name="symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="90" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="21" name="symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="22" name="symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="108" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="22" name="symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="23" name="symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="126" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="23" name="symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="24" name="symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="144" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="24" name="symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="25" name="symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="162" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="25" name="symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> + <symbolStyle id="26" name="symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> <resourceStyle x="180" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="26" name="symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> + <symbolStyle id="27" name="symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> <resourceStyle x="198" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="27" name="symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="28" name="symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="216" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="28" name="symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> + <symbolStyle id="29" name="symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> <resourceStyle x="234" y="18" width="18" height="18"/> </symbolStyle> - <symbolStyle id="29" name="symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> + <symbolStyle id="30" name="symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> <resourceStyle x="0" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="30" name="symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="31" name="symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="18" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="31" name="symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="32" name="symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="36" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="32" name="symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="33" name="symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="54" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="33" name="symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> + <symbolStyle id="34" name="symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> <resourceStyle x="72" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="34" name="symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="35" name="symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="90" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="35" name="symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="36" name="symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="108" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="36" name="symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="37" name="symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="126" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="37" name="symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="38" name="symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="144" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="38" name="symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="39" name="symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="162" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="39" name="symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="40" name="symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="180" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="40" name="symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="41" name="symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="198" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="41" name="symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="42" name="symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="216" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="42" name="symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> + <symbolStyle id="43" name="symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> <resourceStyle x="234" y="36" width="18" height="18"/> </symbolStyle> - <symbolStyle id="43" name="symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="44" name="symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="0" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="44" name="symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="45" name="symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="18" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="45" name="symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="46" name="symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="36" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="46" name="symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> + <symbolStyle id="47" name="symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> <resourceStyle x="54" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="47" name="symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="48" name="symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="72" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="48" name="symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="49" name="symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="90" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="49" name="symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="50" name="symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="108" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="50" name="symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="51" name="symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="126" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="51" name="symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="52" name="symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="144" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="52" name="symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="53" name="symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="162" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="53" name="symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="54" name="symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="180" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="54" name="symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="55" name="symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="198" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="55" name="symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> + <symbolStyle id="56" name="symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> <resourceStyle x="216" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="56" name="symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="57" name="symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="234" y="54" width="18" height="18"/> </symbolStyle> - <symbolStyle id="57" name="symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="58" name="symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="0" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="58" name="symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="59" name="symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="18" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="59" name="symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="60" name="symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="36" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="60" name="symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="61" name="symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="54" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="61" name="symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="62" name="symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="72" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="62" name="symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> + <symbolStyle id="63" name="symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> <resourceStyle x="90" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="63" name="symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="64" name="symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="108" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="64" name="symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> + <symbolStyle id="65" name="symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> <resourceStyle x="126" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="65" name="symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="66" name="symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="144" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="66" name="symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> + <symbolStyle id="67" name="symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> <resourceStyle x="162" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="67" name="symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="68" name="symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="180" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="68" name="symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="69" name="symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="198" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="69" name="symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="70" name="symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="216" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="70" name="symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="71" name="symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="234" y="72" width="18" height="18"/> </symbolStyle> - <symbolStyle id="71" name="symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="72" name="symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="0" y="90" width="18" height="18"/> </symbolStyle> - <symbolStyle id="72" name="symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="73" name="symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="18" y="90" width="18" height="18"/> </symbolStyle> - <symbolStyle id="73" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="74" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="36" y="90" width="18" height="18"/> </symbolStyle> - <symbolStyle id="74" name="api_pin"> + <symbolStyle id="75" name="api_pin"> <resourceStyle x="54" y="90" width="12" height="18"/> </symbolStyle> - <symbolStyle id="75" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="76" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="66" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="76" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="77" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="82" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="77" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="78" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="98" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="78" name="symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="79" name="symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="114" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="79" name="symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="80" name="symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="130" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="80" name="symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="81" name="symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="146" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="81" name="symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="82" name="symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="162" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="82" name="symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="83" name="symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="178" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="83" name="symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="84" name="symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="194" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="84" name="symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="85" name="symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="210" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="85" name="symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="86" name="symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="226" y="90" width="16" height="16"/> </symbolStyle> - <symbolStyle id="86" name="placemark-blue"> + <symbolStyle id="87" name="placemark-blue"> <resourceStyle x="242" y="90" width="10" height="16"/> </symbolStyle> - <symbolStyle id="87" name="symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="88" name="symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="0" y="108" width="16" height="16"/> </symbolStyle> - <symbolStyle id="88" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="89" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="16" y="108" width="16" height="16"/> </symbolStyle> - <symbolStyle id="89" name="symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="90" name="symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="32" y="108" width="16" height="16"/> </symbolStyle> - <symbolStyle id="90" name="placemark-yellow"> + <symbolStyle id="91" name="placemark-yellow"> <resourceStyle x="48" y="108" width="10" height="16"/> </symbolStyle> - <symbolStyle id="91" name="placemark-purple"> + <symbolStyle id="92" name="placemark-purple"> <resourceStyle x="58" y="108" width="10" height="16"/> </symbolStyle> - <symbolStyle id="92" name="placemark-brown"> + <symbolStyle id="93" name="placemark-brown"> <resourceStyle x="68" y="108" width="10" height="16"/> </symbolStyle> - <symbolStyle id="93" name="placemark-red"> + <symbolStyle id="94" name="placemark-red"> <resourceStyle x="78" y="108" width="10" height="16"/> </symbolStyle> - <symbolStyle id="94" name="placemark-pink"> + <symbolStyle id="95" name="placemark-pink"> <resourceStyle x="88" y="108" width="10" height="16"/> </symbolStyle> - <symbolStyle id="95" name="placemark-orange"> + <symbolStyle id="96" name="placemark-orange"> <resourceStyle x="98" y="108" width="10" height="16"/> </symbolStyle> - <symbolStyle id="96" name="placemark-green"> + <symbolStyle id="97" name="placemark-green"> <resourceStyle x="108" y="108" width="10" height="16"/> </symbolStyle> - <symbolStyle id="97" name="symbols/nori/recycling-18.svg:#444444::::"> + <symbolStyle id="98" name="symbols/nori/recycling-18.svg:#444444::::"> <resourceStyle x="118" y="108" width="14" height="14"/> </symbolStyle> - <symbolStyle id="98" name="symbols/nori/shower-18.svg:#444444::::"> + <symbolStyle id="99" name="symbols/nori/shower-18.svg:#444444::::"> <resourceStyle x="132" y="108" width="14" height="14"/> </symbolStyle> - <symbolStyle id="99" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> + <symbolStyle id="100" name="symbols/nori/beach_resort-18.svg:#444444::::"> <resourceStyle x="146" y="108" width="14" height="14"/> </symbolStyle> - <symbolStyle id="100" name="symbols/nori/watermill-18.svg:#444444::::"> + <symbolStyle id="101" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> <resourceStyle x="160" y="108" width="14" height="14"/> </symbolStyle> - <symbolStyle id="101" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::"> + <symbolStyle id="102" name="symbols/nori/watermill-18.svg:#444444::::"> <resourceStyle x="174" y="108" width="14" height="14"/> </symbolStyle> - <symbolStyle id="102" name="symbols/nori/generator-18.svg:#444444::::"> + <symbolStyle id="103" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::"> <resourceStyle x="188" y="108" width="14" height="14"/> </symbolStyle> - <symbolStyle id="103" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> + <symbolStyle id="104" name="symbols/nori/generator-18.svg:#444444::::"> <resourceStyle x="202" y="108" width="14" height="14"/> </symbolStyle> - <symbolStyle id="104" name="symbols/nori/playground-18.svg:#444444::::"> + <symbolStyle id="105" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> <resourceStyle x="216" y="108" width="14" height="14"/> </symbolStyle> - <symbolStyle id="105" name="symbols/nori/border_control-18.svg:#444444::::"> + <symbolStyle id="106" name="symbols/nori/playground-18.svg:#444444::::"> <resourceStyle x="230" y="108" width="14" height="14"/> </symbolStyle> - <symbolStyle id="106" name="symbols/nori/drinking_water-18.svg:#0000FF::::"> + <symbolStyle id="107" name="symbols/nori/drinking_water-18.svg:#0000FF::::"> <resourceStyle x="244" y="108" width="12" height="14"/> </symbolStyle> - <symbolStyle id="107" name="symbols/nori/grave_yard-18.svg:#444444::::"> + <symbolStyle id="108" name="symbols/nori/border_control-18.svg:#444444::::"> <resourceStyle x="0" y="124" width="14" height="14"/> </symbolStyle> - <symbolStyle id="108" name="symbols/nori/generator_solar-18.svg:#444444::::"> + <symbolStyle id="109" name="symbols/nori/grave_yard-18.svg:#444444::::"> <resourceStyle x="14" y="124" width="14" height="14"/> </symbolStyle> - <symbolStyle id="109" name="symbols/nori/beach_resort-18.svg:#444444::::"> + <symbolStyle id="110" name="symbols/nori/generator_solar-18.svg:#444444::::"> <resourceStyle x="28" y="124" width="14" height="14"/> </symbolStyle> - <symbolStyle id="110" name="symbols/nori/camp_site-18.svg:#444444::::"> + <symbolStyle id="111" name="symbols/nori/camp_site-18.svg:#444444::::"> <resourceStyle x="42" y="124" width="14" height="14"/> </symbolStyle> - <symbolStyle id="111" name="symbols/nori/dry_cleaning-18.svg:#444444::::"> + <symbolStyle id="112" name="symbols/nori/dry_cleaning-18.svg:#444444::::"> <resourceStyle x="56" y="124" width="12" height="14"/> </symbolStyle> - <symbolStyle id="112" name="symbols/nori/generator_wind-18.svg:#444444::::"> + <symbolStyle id="113" name="symbols/nori/generator_wind-18.svg:#444444::::"> <resourceStyle x="68" y="124" width="12" height="14"/> </symbolStyle> - <symbolStyle id="113" name="symbols/nori/bucket-18.svg:#0000FF::::"> + <symbolStyle id="114" name="symbols/nori/bucket-18.svg:#0000FF::::"> <resourceStyle x="80" y="124" width="12" height="14"/> </symbolStyle> - <symbolStyle id="114" name="symbols/nori/communication-tower-18.svg:#444444::::"> + <symbolStyle id="115" name="symbols/nori/communication-tower-18.svg:#444444::::"> <resourceStyle x="92" y="124" width="12" height="14"/> </symbolStyle> - <symbolStyle id="115" name="symbols/nori/viewpoint-18.svg:#444444::::"> + <symbolStyle id="116" name="symbols/nori/viewpoint-18.svg:#444444::::"> <resourceStyle x="104" y="124" width="12" height="14"/> </symbolStyle> - <symbolStyle id="116" name="symbols/nori/fire_hydrant-18.svg:#444444::::"> + <symbolStyle id="117" name="symbols/nori/fire_hydrant-18.svg:#444444::::"> <resourceStyle x="116" y="124" width="10" height="14"/> </symbolStyle> - <symbolStyle id="117" name="symbols/nori/water_tower-18.svg:#444444::::"> + <symbolStyle id="118" name="symbols/nori/water_tower-18.svg:#444444::::"> <resourceStyle x="126" y="124" width="10" height="14"/> </symbolStyle> - <symbolStyle id="118" name="symbols/nori/waste_basket-18.svg:#444444::::"> + <symbolStyle id="119" name="symbols/nori/waste_basket-18.svg:#444444::::"> <resourceStyle x="136" y="124" width="10" height="14"/> </symbolStyle> - <symbolStyle id="119" name="symbols/nori/street_lamp-18.svg:#444444::::"> + <symbolStyle id="120" name="symbols/nori/street_lamp-18.svg:#444444::::"> <resourceStyle x="146" y="124" width="8" height="14"/> </symbolStyle> - <symbolStyle id="120" name="symbols/nori/generator_nuclear-18.svg:#444444::::"> + <symbolStyle id="121" name="symbols/nori/generator_nuclear-18.svg:#444444::::"> <resourceStyle x="154" y="124" width="14" height="12"/> </symbolStyle> - <symbolStyle id="121" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="122" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="168" y="124" width="12" height="12"/> </symbolStyle> - <symbolStyle id="122" name="symbols/maki/baseball-18.svg:#444444::::"> + <symbolStyle id="123" name="symbols/maki/baseball-18.svg:#444444::::"> <resourceStyle x="180" y="124" width="12" height="12"/> </symbolStyle> - <symbolStyle id="123" name="symbols/maki/dam-18.svg:#444444::::"> + <symbolStyle id="124" name="symbols/maki/dam-18.svg:#444444::::"> <resourceStyle x="192" y="124" width="12" height="12"/> </symbolStyle> - <symbolStyle id="124" name="symbols/nori/information-18.svg:#444444::::"> + <symbolStyle id="125" name="symbols/nori/information-18.svg:#444444::::"> <resourceStyle x="204" y="124" width="12" height="12"/> </symbolStyle> - <symbolStyle id="125" name="symbols/maki/telephone-18.svg:#444444::::"> + <symbolStyle id="126" name="symbols/maki/telephone-18.svg:#444444::::"> <resourceStyle x="216" y="124" width="12" height="12"/> </symbolStyle> - <symbolStyle id="126" name="symbols/maki/ferry-18.svg:#444444::::"> + <symbolStyle id="127" name="symbols/maki/ferry-18.svg:#444444::::"> <resourceStyle x="228" y="124" width="12" height="12"/> </symbolStyle> - <symbolStyle id="127" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="128" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="240" y="124" width="12" height="12"/> </symbolStyle> - <symbolStyle id="128" name="symbols/maki/tennis-18.svg:#444444::::"> + <symbolStyle id="129" name="symbols/maki/tennis-18.svg:#444444::::"> <resourceStyle x="0" y="138" width="12" height="12"/> </symbolStyle> - <symbolStyle id="129" name="symbols/maki/harbor-18.svg:#444444::::"> + <symbolStyle id="130" name="symbols/maki/harbor-18.svg:#444444::::"> <resourceStyle x="12" y="138" width="12" height="12"/> </symbolStyle> - <symbolStyle id="130" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="131" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="24" y="138" width="12" height="12"/> </symbolStyle> - <symbolStyle id="131" name="symbols/maki/soccer-18.svg:#444444::::"> + <symbolStyle id="132" name="symbols/maki/soccer-18.svg:#444444::::"> <resourceStyle x="36" y="138" width="12" height="12"/> </symbolStyle> - <symbolStyle id="132" name="symbols/maki/star-18.svg:#444444::::"> + <symbolStyle id="133" name="symbols/maki/star-18.svg:#444444::::"> <resourceStyle x="48" y="138" width="12" height="12"/> </symbolStyle> - <symbolStyle id="133" name="symbols/maki/emergency-telephone-18.svg:#444444::::"> + <symbolStyle id="134" name="symbols/maki/emergency-telephone-18.svg:#444444::::"> <resourceStyle x="60" y="138" width="12" height="12"/> </symbolStyle> - <symbolStyle id="134" name="symbols/maki/cricket-18.svg:#444444::::"> + <symbolStyle id="135" name="symbols/maki/cricket-18.svg:#444444::::"> <resourceStyle x="72" y="138" width="12" height="12"/> </symbolStyle> - <symbolStyle id="135" name="symbols/maki/basketball-18.svg:#444444::::"> + <symbolStyle id="136" name="symbols/maki/basketball-18.svg:#444444::::"> <resourceStyle x="84" y="138" width="12" height="12"/> </symbolStyle> - <symbolStyle id="136" name="symbols/maki/pitch-18.svg:#444444::::"> + <symbolStyle id="137" name="symbols/maki/pitch-18.svg:#444444::::"> <resourceStyle x="96" y="138" width="10" height="12"/> </symbolStyle> - <symbolStyle id="137" name="symbols/maki/monument-18.svg:#444444::::"> + <symbolStyle id="138" name="symbols/maki/monument-18.svg:#444444::::"> <resourceStyle x="106" y="138" width="10" height="12"/> </symbolStyle> - <symbolStyle id="138" name="symbols/maki/golf-18.svg:#444444::::"> + <symbolStyle id="139" name="symbols/maki/golf-18.svg:#444444::::"> <resourceStyle x="116" y="138" width="10" height="12"/> </symbolStyle> - <symbolStyle id="139" name="symbols/maki/park2-18.svg:#008000::::"> + <symbolStyle id="140" name="symbols/maki/park2-18.svg:#008000::::"> <resourceStyle x="126" y="138" width="10" height="12"/> </symbolStyle> - <symbolStyle id="140" name="symbols/maki/park-18.svg:#008000::::"> + <symbolStyle id="141" name="symbols/maki/park-18.svg:#008000::::"> <resourceStyle x="136" y="138" width="10" height="12"/> </symbolStyle> - <symbolStyle id="141" name="symbols/neta/bollard-18.svg:#444444::::"> + <symbolStyle id="142" name="symbols/neta/bollard-18.svg:#444444::::"> <resourceStyle x="146" y="138" width="6" height="12"/> </symbolStyle> - <symbolStyle id="142" name="symbols/nori/storage_tank-18.svg:#444444::::"> + <symbolStyle id="143" name="symbols/nori/storage_tank-18.svg:#444444::::"> <resourceStyle x="152" y="138" width="14" height="10"/> </symbolStyle> - <symbolStyle id="143" name="symbols/nori/bench-18.svg:#444444::::"> + <symbolStyle id="144" name="symbols/nori/bench-18.svg:#444444::::"> <resourceStyle x="166" y="138" width="14" height="10"/> </symbolStyle> - <symbolStyle id="144" name="symbols/maki/campsite-18.svg:#444444::::"> + <symbolStyle id="145" name="symbols/maki/campsite-18.svg:#444444::::"> <resourceStyle x="180" y="138" width="12" height="10"/> </symbolStyle> - <symbolStyle id="145" name="symbols/maki/art-gallery-18.svg:#444444::::"> + <symbolStyle id="146" name="symbols/maki/art-gallery-18.svg:#444444::::"> <resourceStyle x="192" y="138" width="12" height="10"/> </symbolStyle> - <symbolStyle id="146" name="symbols/maki/skiing-18.svg:#444444::::"> + <symbolStyle id="147" name="symbols/maki/skiing-18.svg:#444444::::"> <resourceStyle x="204" y="138" width="12" height="10"/> </symbolStyle> - <symbolStyle id="147" name="symbols/maki/swimming-18.svg:#0000FF::::"> + <symbolStyle id="148" name="symbols/maki/swimming-18.svg:#0000FF::::"> <resourceStyle x="216" y="138" width="12" height="10"/> </symbolStyle> - <symbolStyle id="148" name="symbols/maki/cemetery-18.svg:#444444::::"> + <symbolStyle id="149" name="symbols/maki/cemetery-18.svg:#444444::::"> <resourceStyle x="228" y="138" width="10" height="10"/> </symbolStyle> - <symbolStyle id="149" name="symbols/maki/cross-12.svg:#444444::::"> + <symbolStyle id="150" name="symbols/maki/cross-12.svg:#444444::::"> <resourceStyle x="238" y="138" width="9" height="9"/> </symbolStyle> - <symbolStyle id="150" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> + <symbolStyle id="151" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> <resourceStyle x="247" y="138" width="9" height="9"/> </symbolStyle> - <symbolStyle id="151" name="symbols/nori/power_tower-12.svg:#444444::::"> + <symbolStyle id="152" name="symbols/nori/power_tower-12.svg:#444444::::"> <resourceStyle x="0" y="150" width="9" height="9"/> </symbolStyle> - <symbolStyle id="152" name="symbols/maki/triangle-12.svg:#444444::::"> + <symbolStyle id="153" name="symbols/maki/triangle-12.svg:#444444::::"> <resourceStyle x="9" y="150" width="9" height="9"/> </symbolStyle> - <symbolStyle id="153" name="symbols/maki/triangle-12.svg:#FF0000::::"> + <symbolStyle id="154" name="symbols/maki/triangle-12.svg:#FF0000::::"> <resourceStyle x="18" y="150" width="9" height="9"/> </symbolStyle> - <symbolStyle id="154" name="symbols/maki/roadblock-12.svg:#FF0000::::"> + <symbolStyle id="155" name="symbols/maki/roadblock-12.svg:#FF0000::::"> <resourceStyle x="27" y="150" width="9" height="9"/> </symbolStyle> - <symbolStyle id="155" name="symbols/maki/america-football-18.svg:#444444::::"> + <symbolStyle id="156" name="symbols/maki/america-football-18.svg:#444444::::"> <resourceStyle x="36" y="150" width="12" height="8"/> </symbolStyle> - <symbolStyle id="156" name="symbols/maki/heliport-18.svg:#444444::::"> + <symbolStyle id="157" name="symbols/maki/heliport-18.svg:#444444::::"> <resourceStyle x="48" y="150" width="12" height="8"/> </symbolStyle> - <symbolStyle id="157" name="symbols/neta/entrance-18.svg:#444444::::"> + <symbolStyle id="158" name="symbols/neta/entrance-18.svg:#444444::::"> <resourceStyle x="60" y="150" width="8" height="8"/> </symbolStyle> - <symbolStyle id="158" name="symbols/maki/post-12.svg:#444444::::"> + <symbolStyle id="159" name="symbols/maki/post-12.svg:#444444::::"> <resourceStyle x="68" y="150" width="9" height="7"/> </symbolStyle> - <symbolStyle id="159" name="symbols/arrow.svg:::::"> + <symbolStyle id="160" name="symbols/arrow.svg:::::"> <resourceStyle x="77" y="150" width="14" height="6"/> </symbolStyle> - <symbolStyle id="160" name="symbols/neta/lift_gate-18.svg:#444444::::"> + <symbolStyle id="161" name="symbols/neta/lift_gate-18.svg:#444444::::"> <resourceStyle x="91" y="150" width="10" height="6"/> </symbolStyle> </page> diff --git a/data/resources-ldpi/symbols.png b/data/resources-ldpi/symbols.png Binary files differindex 0099a70f20..e838fcf10e 100644 --- a/data/resources-ldpi/symbols.png +++ b/data/resources-ldpi/symbols.png diff --git a/data/resources-mdpi/basic.skn b/data/resources-mdpi/basic.skn index 51479b0e7d..fc30ca3a22 100644 --- a/data/resources-mdpi/basic.skn +++ b/data/resources-mdpi/basic.skn @@ -238,10 +238,10 @@ <symbolStyle id="79" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="24" y="168" width="24" height="24"/> </symbolStyle> - <symbolStyle id="80" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="80" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="48" y="168" width="20" height="20"/> </symbolStyle> - <symbolStyle id="81" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="81" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="68" y="168" width="20" height="20"/> </symbolStyle> <symbolStyle id="82" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> @@ -295,190 +295,193 @@ <symbolStyle id="98" name="symbols/nori/shower-18.svg:#444444::::"> <resourceStyle x="126" y="192" width="18" height="18"/> </symbolStyle> - <symbolStyle id="99" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> + <symbolStyle id="99" name="symbols/nori/beach_resort-18.svg:#444444::::"> <resourceStyle x="144" y="192" width="18" height="18"/> </symbolStyle> - <symbolStyle id="100" name="symbols/nori/watermill-18.svg:#444444::::"> + <symbolStyle id="100" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> <resourceStyle x="162" y="192" width="18" height="18"/> </symbolStyle> - <symbolStyle id="101" name="symbols/maki/telephone-18.svg:#444444::::"> + <symbolStyle id="101" name="symbols/nori/watermill-18.svg:#444444::::"> <resourceStyle x="180" y="192" width="18" height="18"/> </symbolStyle> - <symbolStyle id="102" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> + <symbolStyle id="102" name="symbols/maki/telephone-18.svg:#444444::::"> <resourceStyle x="198" y="192" width="18" height="18"/> </symbolStyle> - <symbolStyle id="103" name="symbols/nori/border_control-18.svg:#444444::::"> + <symbolStyle id="103" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> <resourceStyle x="216" y="192" width="18" height="18"/> </symbolStyle> - <symbolStyle id="104" name="symbols/nori/grave_yard-18.svg:#444444::::"> + <symbolStyle id="104" name="symbols/nori/border_control-18.svg:#444444::::"> <resourceStyle x="234" y="192" width="18" height="18"/> </symbolStyle> - <symbolStyle id="105" name="symbols/nori/beach_resort-18.svg:#444444::::"> + <symbolStyle id="105" name="symbols/neta/circle-10.svg:#444444::::"> + <resourceStyle x="252" y="192" width="4" height="4"/> + </symbolStyle> + <symbolStyle id="106" name="symbols/nori/grave_yard-18.svg:#444444::::"> <resourceStyle x="0" y="212" width="18" height="18"/> </symbolStyle> - <symbolStyle id="106" name="symbols/nori/camp_site-18.svg:#444444::::"> + <symbolStyle id="107" name="symbols/nori/camp_site-18.svg:#444444::::"> <resourceStyle x="18" y="212" width="18" height="18"/> </symbolStyle> - <symbolStyle id="107" name="symbols/maki/ferry-18.svg:#444444::::"> + <symbolStyle id="108" name="symbols/maki/ferry-18.svg:#444444::::"> <resourceStyle x="36" y="212" width="16" height="18"/> </symbolStyle> - <symbolStyle id="108" name="symbols/nori/generator_wind-18.svg:#444444::::"> + <symbolStyle id="109" name="symbols/nori/generator_wind-18.svg:#444444::::"> <resourceStyle x="52" y="212" width="16" height="18"/> </symbolStyle> - <symbolStyle id="109" name="symbols/nori/bucket-18.svg:#0000FF::::"> + <symbolStyle id="110" name="symbols/nori/bucket-18.svg:#0000FF::::"> <resourceStyle x="68" y="212" width="16" height="18"/> </symbolStyle> - <symbolStyle id="110" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::"> + <symbolStyle id="111" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::"> <resourceStyle x="84" y="212" width="16" height="18"/> </symbolStyle> - <symbolStyle id="111" name="symbols/nori/playground-18.svg:#444444::::"> + <symbolStyle id="112" name="symbols/nori/playground-18.svg:#444444::::"> <resourceStyle x="100" y="212" width="16" height="18"/> </symbolStyle> - <symbolStyle id="112" name="symbols/maki/emergency-telephone-18.svg:#444444::::"> + <symbolStyle id="113" name="symbols/maki/emergency-telephone-18.svg:#444444::::"> <resourceStyle x="116" y="212" width="16" height="18"/> </symbolStyle> - <symbolStyle id="113" name="symbols/nori/viewpoint-18.svg:#444444::::"> + <symbolStyle id="114" name="symbols/nori/viewpoint-18.svg:#444444::::"> <resourceStyle x="132" y="212" width="16" height="18"/> </symbolStyle> - <symbolStyle id="114" name="symbols/nori/drinking_water-18.svg:#0000FF::::"> + <symbolStyle id="115" name="symbols/nori/drinking_water-18.svg:#0000FF::::"> <resourceStyle x="148" y="212" width="14" height="18"/> </symbolStyle> - <symbolStyle id="115" name="symbols/nori/communication-tower-18.svg:#444444::::"> + <symbolStyle id="116" name="symbols/nori/communication-tower-18.svg:#444444::::"> <resourceStyle x="162" y="212" width="14" height="18"/> </symbolStyle> - <symbolStyle id="116" name="symbols/nori/fire_hydrant-18.svg:#444444::::"> + <symbolStyle id="117" name="symbols/nori/fire_hydrant-18.svg:#444444::::"> <resourceStyle x="176" y="212" width="12" height="18"/> </symbolStyle> - <symbolStyle id="117" name="symbols/nori/water_tower-18.svg:#444444::::"> + <symbolStyle id="118" name="symbols/nori/water_tower-18.svg:#444444::::"> <resourceStyle x="188" y="212" width="12" height="18"/> </symbolStyle> - <symbolStyle id="118" name="symbols/nori/waste_basket-18.svg:#444444::::"> + <symbolStyle id="119" name="symbols/nori/waste_basket-18.svg:#444444::::"> <resourceStyle x="200" y="212" width="12" height="18"/> </symbolStyle> - <symbolStyle id="119" name="symbols/nori/street_lamp-18.svg:#444444::::"> + <symbolStyle id="120" name="symbols/nori/street_lamp-18.svg:#444444::::"> <resourceStyle x="212" y="212" width="10" height="18"/> </symbolStyle> - <symbolStyle id="120" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="121" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="222" y="212" width="16" height="16"/> </symbolStyle> - <symbolStyle id="121" name="current-position"> + <symbolStyle id="122" name="current-position"> <resourceStyle x="238" y="212" width="16" height="16"/> </symbolStyle> - <symbolStyle id="122" name="symbols/maki/baseball-18.svg:#444444::::"> + <symbolStyle id="123" name="symbols/maki/baseball-18.svg:#444444::::"> <resourceStyle x="0" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="123" name="symbols/maki/dam-18.svg:#444444::::"> + <symbolStyle id="124" name="symbols/maki/dam-18.svg:#444444::::"> <resourceStyle x="16" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="124" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="125" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="32" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="125" name="symbols/maki/tennis-18.svg:#444444::::"> + <symbolStyle id="126" name="symbols/maki/tennis-18.svg:#444444::::"> <resourceStyle x="48" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="126" name="symbols/maki/harbor-18.svg:#444444::::"> + <symbolStyle id="127" name="symbols/maki/harbor-18.svg:#444444::::"> <resourceStyle x="64" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="127" name="symbols/nori/generator-18.svg:#444444::::"> + <symbolStyle id="128" name="symbols/nori/generator-18.svg:#444444::::"> <resourceStyle x="80" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="128" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="129" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="96" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="129" name="symbols/maki/soccer-18.svg:#444444::::"> + <symbolStyle id="130" name="symbols/maki/soccer-18.svg:#444444::::"> <resourceStyle x="112" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="130" name="symbols/maki/star-18.svg:#444444::::"> + <symbolStyle id="131" name="symbols/maki/star-18.svg:#444444::::"> <resourceStyle x="128" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="131" name="symbols/maki/cricket-18.svg:#444444::::"> + <symbolStyle id="132" name="symbols/maki/cricket-18.svg:#444444::::"> <resourceStyle x="144" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="132" name="symbols/nori/generator_nuclear-18.svg:#444444::::"> + <symbolStyle id="133" name="symbols/nori/generator_nuclear-18.svg:#444444::::"> <resourceStyle x="160" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="133" name="symbols/nori/generator_solar-18.svg:#444444::::"> + <symbolStyle id="134" name="symbols/nori/generator_solar-18.svg:#444444::::"> <resourceStyle x="176" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="134" name="symbols/maki/basketball-18.svg:#444444::::"> + <symbolStyle id="135" name="symbols/maki/basketball-18.svg:#444444::::"> <resourceStyle x="192" y="230" width="16" height="16"/> </symbolStyle> - <symbolStyle id="135" name="symbols/nori/dry_cleaning-18.svg:#444444::::"> + <symbolStyle id="136" name="symbols/nori/dry_cleaning-18.svg:#444444::::"> <resourceStyle x="208" y="230" width="14" height="16"/> </symbolStyle> - <symbolStyle id="136" name="symbols/maki/monument-18.svg:#444444::::"> + <symbolStyle id="137" name="symbols/maki/monument-18.svg:#444444::::"> <resourceStyle x="222" y="230" width="14" height="16"/> </symbolStyle> - <symbolStyle id="137" name="symbols/maki/cemetery-18.svg:#444444::::"> + <symbolStyle id="138" name="symbols/maki/cemetery-18.svg:#444444::::"> <resourceStyle x="236" y="230" width="12" height="16"/> </symbolStyle> - <symbolStyle id="138" name="symbols/maki/pitch-18.svg:#444444::::"> + <symbolStyle id="139" name="symbols/maki/pitch-18.svg:#444444::::"> <resourceStyle x="0" y="246" width="12" height="16"/> </symbolStyle> - <symbolStyle id="139" name="symbols/maki/golf-18.svg:#444444::::"> + <symbolStyle id="140" name="symbols/maki/golf-18.svg:#444444::::"> <resourceStyle x="12" y="246" width="12" height="16"/> </symbolStyle> - <symbolStyle id="140" name="symbols/maki/park2-18.svg:#008000::::"> + <symbolStyle id="141" name="symbols/maki/park2-18.svg:#008000::::"> <resourceStyle x="24" y="246" width="12" height="16"/> </symbolStyle> - <symbolStyle id="141" name="symbols/maki/park-18.svg:#008000::::"> + <symbolStyle id="142" name="symbols/maki/park-18.svg:#008000::::"> <resourceStyle x="36" y="246" width="12" height="16"/> </symbolStyle> - <symbolStyle id="142" name="symbols/maki/art-gallery-18.svg:#444444::::"> + <symbolStyle id="143" name="symbols/maki/art-gallery-18.svg:#444444::::"> <resourceStyle x="48" y="246" width="18" height="14"/> </symbolStyle> - <symbolStyle id="143" name="symbols/nori/storage_tank-18.svg:#444444::::"> + <symbolStyle id="144" name="symbols/nori/storage_tank-18.svg:#444444::::"> <resourceStyle x="66" y="246" width="18" height="14"/> </symbolStyle> - <symbolStyle id="144" name="symbols/maki/skiing-18.svg:#444444::::"> + <symbolStyle id="145" name="symbols/maki/skiing-18.svg:#444444::::"> <resourceStyle x="84" y="246" width="16" height="14"/> </symbolStyle> - <symbolStyle id="145" name="symbols/maki/swimming-18.svg:#0000FF::::"> + <symbolStyle id="146" name="symbols/maki/swimming-18.svg:#0000FF::::"> <resourceStyle x="100" y="246" width="16" height="14"/> </symbolStyle> - <symbolStyle id="146" name="symbols/nori/information-18.svg:#444444::::"> + <symbolStyle id="147" name="symbols/nori/information-18.svg:#444444::::"> <resourceStyle x="116" y="246" width="14" height="14"/> </symbolStyle> - <symbolStyle id="147" name="symbols/nori/bench-18.svg:#444444::::"> + <symbolStyle id="148" name="symbols/nori/bench-18.svg:#444444::::"> <resourceStyle x="130" y="246" width="18" height="12"/> </symbolStyle> - <symbolStyle id="148" name="symbols/maki/america-football-18.svg:#444444::::"> + <symbolStyle id="149" name="symbols/maki/america-football-18.svg:#444444::::"> <resourceStyle x="148" y="246" width="18" height="12"/> </symbolStyle> - <symbolStyle id="149" name="symbols/maki/campsite-18.svg:#444444::::"> + <symbolStyle id="150" name="symbols/maki/campsite-18.svg:#444444::::"> <resourceStyle x="166" y="246" width="16" height="12"/> </symbolStyle> - <symbolStyle id="150" name="symbols/maki/heliport-18.svg:#444444::::"> + <symbolStyle id="151" name="symbols/maki/heliport-18.svg:#444444::::"> <resourceStyle x="182" y="246" width="16" height="12"/> </symbolStyle> - <symbolStyle id="151" name="symbols/maki/cross-12.svg:#444444::::"> + <symbolStyle id="152" name="symbols/maki/cross-12.svg:#444444::::"> <resourceStyle x="198" y="246" width="12" height="12"/> </symbolStyle> - <symbolStyle id="152" name="symbols/maki/roadblock-12.svg:#FF0000::::"> + <symbolStyle id="153" name="symbols/maki/roadblock-12.svg:#FF0000::::"> <resourceStyle x="210" y="246" width="12" height="12"/> </symbolStyle> - <symbolStyle id="153" name="symbols/nori/power_tower-12.svg:#444444::::"> + <symbolStyle id="154" name="symbols/nori/power_tower-12.svg:#444444::::"> <resourceStyle x="222" y="246" width="10" height="12"/> </symbolStyle> - <symbolStyle id="154" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> + <symbolStyle id="155" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> <resourceStyle x="232" y="246" width="12" height="10"/> </symbolStyle> - <symbolStyle id="155" name="symbols/maki/triangle-12.svg:#444444::::"> + <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#444444::::"> <resourceStyle x="244" y="246" width="12" height="10"/> </symbolStyle> - <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#FF0000::::"> + <symbolStyle id="157" name="symbols/maki/triangle-12.svg:#FF0000::::"> <resourceStyle x="0" y="262" width="12" height="10"/> </symbolStyle> - <symbolStyle id="157" name="symbols/neta/lift_gate-18.svg:#444444::::"> + <symbolStyle id="158" name="symbols/neta/lift_gate-18.svg:#444444::::"> <resourceStyle x="12" y="262" width="12" height="8"/> </symbolStyle> - <symbolStyle id="158" name="symbols/maki/post-12.svg:#444444::::"> + <symbolStyle id="159" name="symbols/maki/post-12.svg:#444444::::"> <resourceStyle x="24" y="262" width="12" height="8"/> </symbolStyle> - <symbolStyle id="159" name="symbols/neta/entrance-18.svg:#444444::::"> + <symbolStyle id="160" name="symbols/neta/entrance-18.svg:#444444::::"> <resourceStyle x="36" y="262" width="10" height="8"/> </symbolStyle> - <symbolStyle id="160" name="symbols/arrow.svg:::::"> + <symbolStyle id="161" name="symbols/arrow.svg:::::"> <resourceStyle x="46" y="262" width="18" height="6"/> </symbolStyle> </page> diff --git a/data/resources-mdpi/symbols.png b/data/resources-mdpi/symbols.png Binary files differindex 9f9e568fb1..85daf7cd16 100644 --- a/data/resources-mdpi/symbols.png +++ b/data/resources-mdpi/symbols.png diff --git a/data/resources-xhdpi/basic.skn b/data/resources-xhdpi/basic.skn index 49c560d6e0..119c076afc 100644 --- a/data/resources-xhdpi/basic.skn +++ b/data/resources-xhdpi/basic.skn @@ -34,451 +34,454 @@ <symbolStyle id="11" name="symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="460" y="0" width="46" height="46"/> </symbolStyle> - <symbolStyle id="12" name="symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="12" name="symbols/neta/circle-10.svg:#444444::::"> + <resourceStyle x="506" y="0" width="6" height="6"/> + </symbolStyle> + <symbolStyle id="13" name="symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="0" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="13" name="symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="14" name="symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="46" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="14" name="symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> + <symbolStyle id="15" name="symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> <resourceStyle x="92" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="15" name="symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="16" name="symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="138" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="16" name="symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> + <symbolStyle id="17" name="symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> <resourceStyle x="184" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="17" name="symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="18" name="symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="230" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="18" name="symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="19" name="symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="276" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="19" name="symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="20" name="symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="322" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="20" name="symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="21" name="symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="368" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="21" name="symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="22" name="symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="414" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="22" name="symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="23" name="symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="460" y="46" width="46" height="46"/> </symbolStyle> - <symbolStyle id="23" name="symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="24" name="symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="0" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="24" name="symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> + <symbolStyle id="25" name="symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> <resourceStyle x="46" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="25" name="symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> + <symbolStyle id="26" name="symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> <resourceStyle x="92" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="26" name="symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="27" name="symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="138" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="27" name="symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> + <symbolStyle id="28" name="symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> <resourceStyle x="184" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="28" name="symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> + <symbolStyle id="29" name="symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> <resourceStyle x="230" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="29" name="symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="30" name="symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="276" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="30" name="symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="31" name="symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="322" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="31" name="symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="32" name="symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="368" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="32" name="symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> + <symbolStyle id="33" name="symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"> <resourceStyle x="414" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="33" name="symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="34" name="symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="460" y="92" width="46" height="46"/> </symbolStyle> - <symbolStyle id="34" name="symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="35" name="symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="0" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="35" name="symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="36" name="symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="46" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="36" name="symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="37" name="symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="92" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="37" name="symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="38" name="symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="138" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="38" name="symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> + <symbolStyle id="39" name="symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"> <resourceStyle x="184" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="39" name="symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="40" name="symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="230" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="40" name="symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="41" name="symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="276" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="41" name="symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> + <symbolStyle id="42" name="symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> <resourceStyle x="322" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="42" name="symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="43" name="symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="368" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="43" name="symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="44" name="symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="414" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="44" name="symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="45" name="symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="460" y="138" width="46" height="46"/> </symbolStyle> - <symbolStyle id="45" name="symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> + <symbolStyle id="46" name="symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> <resourceStyle x="0" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="46" name="symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="47" name="symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="46" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="47" name="symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="48" name="symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="92" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="48" name="symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="49" name="symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="138" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="49" name="symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="50" name="symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="184" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="50" name="symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="51" name="symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="230" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="51" name="symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="52" name="symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="276" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="52" name="symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="53" name="symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="322" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="53" name="symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="54" name="symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="368" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="54" name="symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> + <symbolStyle id="55" name="symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"> <resourceStyle x="414" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="55" name="symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="56" name="symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="460" y="184" width="46" height="46"/> </symbolStyle> - <symbolStyle id="56" name="symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="57" name="symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="0" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="57" name="symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="58" name="symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="46" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="58" name="symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="59" name="symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="92" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="59" name="symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="60" name="symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="138" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="60" name="symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="61" name="symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="184" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="61" name="symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> + <symbolStyle id="62" name="symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> <resourceStyle x="230" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="62" name="symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="63" name="symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="276" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="63" name="symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> + <symbolStyle id="64" name="symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"> <resourceStyle x="322" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="64" name="symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="65" name="symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="368" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="65" name="symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> + <symbolStyle id="66" name="symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"> <resourceStyle x="414" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="66" name="symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="67" name="symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="460" y="230" width="46" height="46"/> </symbolStyle> - <symbolStyle id="67" name="symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="68" name="symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="0" y="276" width="46" height="46"/> </symbolStyle> - <symbolStyle id="68" name="symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="69" name="symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="46" y="276" width="46" height="46"/> </symbolStyle> - <symbolStyle id="69" name="symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="70" name="symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="92" y="276" width="46" height="46"/> </symbolStyle> - <symbolStyle id="70" name="symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="71" name="symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="138" y="276" width="46" height="46"/> </symbolStyle> - <symbolStyle id="71" name="symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> + <symbolStyle id="72" name="symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"> <resourceStyle x="184" y="276" width="46" height="46"/> </symbolStyle> - <symbolStyle id="72" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> + <symbolStyle id="73" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"> <resourceStyle x="230" y="276" width="46" height="46"/> </symbolStyle> - <symbolStyle id="73" name="api_pin"> + <symbolStyle id="74" name="api_pin"> <resourceStyle x="276" y="276" width="28" height="46"/> </symbolStyle> - <symbolStyle id="74" name="placemark-blue"> + <symbolStyle id="75" name="placemark-blue"> <resourceStyle x="304" y="276" width="28" height="40"/> </symbolStyle> - <symbolStyle id="75" name="placemark-yellow"> + <symbolStyle id="76" name="placemark-yellow"> <resourceStyle x="332" y="276" width="28" height="40"/> </symbolStyle> - <symbolStyle id="76" name="placemark-purple"> + <symbolStyle id="77" name="placemark-purple"> <resourceStyle x="360" y="276" width="28" height="40"/> </symbolStyle> - <symbolStyle id="77" name="placemark-brown"> + <symbolStyle id="78" name="placemark-brown"> <resourceStyle x="388" y="276" width="28" height="40"/> </symbolStyle> - <symbolStyle id="78" name="placemark-red"> + <symbolStyle id="79" name="placemark-red"> <resourceStyle x="416" y="276" width="28" height="40"/> </symbolStyle> - <symbolStyle id="79" name="placemark-pink"> + <symbolStyle id="80" name="placemark-pink"> <resourceStyle x="444" y="276" width="28" height="40"/> </symbolStyle> - <symbolStyle id="80" name="placemark-orange"> + <symbolStyle id="81" name="placemark-orange"> <resourceStyle x="472" y="276" width="28" height="40"/> </symbolStyle> - <symbolStyle id="81" name="symbols/neta/bollard-18.svg:#444444::::"> + <symbolStyle id="82" name="symbols/neta/bollard-18.svg:#444444::::"> <resourceStyle x="500" y="276" width="10" height="28"/> </symbolStyle> - <symbolStyle id="82" name="placemark-green"> + <symbolStyle id="83" name="placemark-green"> <resourceStyle x="0" y="322" width="28" height="40"/> </symbolStyle> - <symbolStyle id="83" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="84" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="28" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="84" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="85" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="66" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="85" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="86" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="104" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="86" name="symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="87" name="symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="142" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="87" name="symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="88" name="symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="180" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="88" name="symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="89" name="symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="218" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="89" name="symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="90" name="symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="256" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="90" name="symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="91" name="symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="294" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="91" name="symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="92" name="symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="332" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="92" name="symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="93" name="symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="370" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="93" name="symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="94" name="symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="408" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="94" name="symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="95" name="symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="446" y="322" width="38" height="38"/> </symbolStyle> - <symbolStyle id="95" name="symbols/nori/drinking_water-18.svg:#0000FF::::"> + <symbolStyle id="96" name="symbols/nori/drinking_water-18.svg:#0000FF::::"> <resourceStyle x="484" y="322" width="28" height="36"/> </symbolStyle> - <symbolStyle id="96" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="97" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="0" y="362" width="38" height="38"/> </symbolStyle> - <symbolStyle id="97" name="symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="98" name="symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="38" y="362" width="38" height="38"/> </symbolStyle> - <symbolStyle id="98" name="symbols/nori/recycling-18.svg:#444444::::"> + <symbolStyle id="99" name="symbols/nori/recycling-18.svg:#444444::::"> <resourceStyle x="76" y="362" width="36" height="36"/> </symbolStyle> - <symbolStyle id="99" name="symbols/nori/shower-18.svg:#444444::::"> + <symbolStyle id="100" name="symbols/nori/shower-18.svg:#444444::::"> <resourceStyle x="112" y="362" width="36" height="36"/> </symbolStyle> - <symbolStyle id="100" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> + <symbolStyle id="101" name="symbols/nori/beach_resort-18.svg:#444444::::"> <resourceStyle x="148" y="362" width="36" height="36"/> </symbolStyle> - <symbolStyle id="101" name="symbols/nori/watermill-18.svg:#444444::::"> + <symbolStyle id="102" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> <resourceStyle x="184" y="362" width="36" height="36"/> </symbolStyle> - <symbolStyle id="102" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> + <symbolStyle id="103" name="symbols/nori/watermill-18.svg:#444444::::"> <resourceStyle x="220" y="362" width="36" height="36"/> </symbolStyle> - <symbolStyle id="103" name="symbols/nori/border_control-18.svg:#444444::::"> + <symbolStyle id="104" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> <resourceStyle x="256" y="362" width="36" height="36"/> </symbolStyle> - <symbolStyle id="104" name="symbols/nori/grave_yard-18.svg:#444444::::"> + <symbolStyle id="105" name="symbols/nori/border_control-18.svg:#444444::::"> <resourceStyle x="292" y="362" width="36" height="36"/> </symbolStyle> - <symbolStyle id="105" name="symbols/nori/beach_resort-18.svg:#444444::::"> + <symbolStyle id="106" name="symbols/nori/grave_yard-18.svg:#444444::::"> <resourceStyle x="328" y="362" width="36" height="36"/> </symbolStyle> - <symbolStyle id="106" name="symbols/nori/camp_site-18.svg:#444444::::"> + <symbolStyle id="107" name="symbols/nori/camp_site-18.svg:#444444::::"> <resourceStyle x="364" y="362" width="36" height="36"/> </symbolStyle> - <symbolStyle id="107" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::"> + <symbolStyle id="108" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::"> <resourceStyle x="400" y="362" width="32" height="36"/> </symbolStyle> - <symbolStyle id="108" name="symbols/nori/playground-18.svg:#444444::::"> + <symbolStyle id="109" name="symbols/nori/playground-18.svg:#444444::::"> <resourceStyle x="432" y="362" width="32" height="36"/> </symbolStyle> - <symbolStyle id="109" name="symbols/nori/viewpoint-18.svg:#444444::::"> + <symbolStyle id="110" name="symbols/nori/viewpoint-18.svg:#444444::::"> <resourceStyle x="464" y="362" width="32" height="36"/> </symbolStyle> - <symbolStyle id="110" name="symbols/maki/ferry-18.svg:#444444::::"> + <symbolStyle id="111" name="symbols/maki/ferry-18.svg:#444444::::"> <resourceStyle x="0" y="400" width="30" height="36"/> </symbolStyle> - <symbolStyle id="111" name="symbols/nori/generator_wind-18.svg:#444444::::"> + <symbolStyle id="112" name="symbols/nori/generator_wind-18.svg:#444444::::"> <resourceStyle x="30" y="400" width="30" height="36"/> </symbolStyle> - <symbolStyle id="112" name="symbols/nori/bucket-18.svg:#0000FF::::"> + <symbolStyle id="113" name="symbols/nori/bucket-18.svg:#0000FF::::"> <resourceStyle x="60" y="400" width="30" height="36"/> </symbolStyle> - <symbolStyle id="113" name="symbols/nori/communication-tower-18.svg:#444444::::"> + <symbolStyle id="114" name="symbols/nori/communication-tower-18.svg:#444444::::"> <resourceStyle x="90" y="400" width="28" height="36"/> </symbolStyle> - <symbolStyle id="114" name="symbols/nori/fire_hydrant-18.svg:#444444::::"> + <symbolStyle id="115" name="symbols/nori/fire_hydrant-18.svg:#444444::::"> <resourceStyle x="118" y="400" width="24" height="36"/> </symbolStyle> - <symbolStyle id="115" name="symbols/nori/water_tower-18.svg:#444444::::"> + <symbolStyle id="116" name="symbols/nori/water_tower-18.svg:#444444::::"> <resourceStyle x="142" y="400" width="24" height="36"/> </symbolStyle> - <symbolStyle id="116" name="symbols/nori/waste_basket-18.svg:#444444::::"> + <symbolStyle id="117" name="symbols/nori/waste_basket-18.svg:#444444::::"> <resourceStyle x="166" y="400" width="24" height="36"/> </symbolStyle> - <symbolStyle id="117" name="symbols/nori/street_lamp-18.svg:#444444::::"> + <symbolStyle id="118" name="symbols/nori/street_lamp-18.svg:#444444::::"> <resourceStyle x="190" y="400" width="20" height="36"/> </symbolStyle> - <symbolStyle id="118" name="symbols/maki/monument-18.svg:#444444::::"> + <symbolStyle id="119" name="symbols/maki/monument-18.svg:#444444::::"> <resourceStyle x="210" y="400" width="28" height="34"/> </symbolStyle> - <symbolStyle id="119" name="symbols/maki/pitch-18.svg:#444444::::"> + <symbolStyle id="120" name="symbols/maki/pitch-18.svg:#444444::::"> <resourceStyle x="238" y="400" width="24" height="34"/> </symbolStyle> - <symbolStyle id="120" name="symbols/maki/golf-18.svg:#444444::::"> + <symbolStyle id="121" name="symbols/maki/golf-18.svg:#444444::::"> <resourceStyle x="262" y="400" width="24" height="34"/> </symbolStyle> - <symbolStyle id="121" name="current-position"> + <symbolStyle id="122" name="current-position"> <resourceStyle x="286" y="400" width="32" height="32"/> </symbolStyle> - <symbolStyle id="122" name="symbols/nori/generator-18.svg:#444444::::"> + <symbolStyle id="123" name="symbols/nori/generator-18.svg:#444444::::"> <resourceStyle x="318" y="400" width="32" height="32"/> </symbolStyle> - <symbolStyle id="123" name="symbols/nori/generator_nuclear-18.svg:#444444::::"> + <symbolStyle id="124" name="symbols/nori/generator_nuclear-18.svg:#444444::::"> <resourceStyle x="350" y="400" width="32" height="32"/> </symbolStyle> - <symbolStyle id="124" name="symbols/nori/generator_solar-18.svg:#444444::::"> + <symbolStyle id="125" name="symbols/nori/generator_solar-18.svg:#444444::::"> <resourceStyle x="382" y="400" width="32" height="32"/> </symbolStyle> - <symbolStyle id="125" name="symbols/nori/dry_cleaning-18.svg:#444444::::"> + <symbolStyle id="126" name="symbols/nori/dry_cleaning-18.svg:#444444::::"> <resourceStyle x="414" y="400" width="28" height="32"/> </symbolStyle> - <symbolStyle id="126" name="symbols/maki/emergency-telephone-18.svg:#444444::::"> + <symbolStyle id="127" name="symbols/maki/emergency-telephone-18.svg:#444444::::"> <resourceStyle x="442" y="400" width="32" height="30"/> </symbolStyle> - <symbolStyle id="127" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="128" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="474" y="400" width="30" height="30"/> </symbolStyle> - <symbolStyle id="128" name="symbols/maki/baseball-18.svg:#444444::::"> + <symbolStyle id="129" name="symbols/maki/baseball-18.svg:#444444::::"> <resourceStyle x="0" y="436" width="30" height="30"/> </symbolStyle> - <symbolStyle id="129" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="130" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="30" y="436" width="30" height="30"/> </symbolStyle> - <symbolStyle id="130" name="symbols/maki/tennis-18.svg:#444444::::"> + <symbolStyle id="131" name="symbols/maki/tennis-18.svg:#444444::::"> <resourceStyle x="60" y="436" width="30" height="30"/> </symbolStyle> - <symbolStyle id="131" name="symbols/maki/harbor-18.svg:#444444::::"> + <symbolStyle id="132" name="symbols/maki/harbor-18.svg:#444444::::"> <resourceStyle x="90" y="436" width="30" height="30"/> </symbolStyle> - <symbolStyle id="132" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> + <symbolStyle id="133" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"> <resourceStyle x="120" y="436" width="30" height="30"/> </symbolStyle> - <symbolStyle id="133" name="symbols/maki/soccer-18.svg:#444444::::"> + <symbolStyle id="134" name="symbols/maki/soccer-18.svg:#444444::::"> <resourceStyle x="150" y="436" width="30" height="30"/> </symbolStyle> - <symbolStyle id="134" name="symbols/maki/star-18.svg:#444444::::"> + <symbolStyle id="135" name="symbols/maki/star-18.svg:#444444::::"> <resourceStyle x="180" y="436" width="30" height="30"/> </symbolStyle> - <symbolStyle id="135" name="symbols/maki/cricket-18.svg:#444444::::"> + <symbolStyle id="136" name="symbols/maki/cricket-18.svg:#444444::::"> <resourceStyle x="210" y="436" width="30" height="30"/> </symbolStyle> - <symbolStyle id="136" name="symbols/maki/basketball-18.svg:#444444::::"> + <symbolStyle id="137" name="symbols/maki/basketball-18.svg:#444444::::"> <resourceStyle x="240" y="436" width="30" height="30"/> </symbolStyle> - <symbolStyle id="137" name="symbols/maki/park2-18.svg:#008000::::"> + <symbolStyle id="138" name="symbols/maki/park2-18.svg:#008000::::"> <resourceStyle x="270" y="436" width="24" height="30"/> </symbolStyle> - <symbolStyle id="138" name="symbols/maki/park-18.svg:#008000::::"> + <symbolStyle id="139" name="symbols/maki/park-18.svg:#008000::::"> <resourceStyle x="294" y="436" width="24" height="30"/> </symbolStyle> - <symbolStyle id="139" name="symbols/maki/campsite-18.svg:#444444::::"> + <symbolStyle id="140" name="symbols/maki/campsite-18.svg:#444444::::"> <resourceStyle x="318" y="436" width="34" height="28"/> </symbolStyle> - <symbolStyle id="140" name="symbols/maki/art-gallery-18.svg:#444444::::"> + <symbolStyle id="141" name="symbols/maki/art-gallery-18.svg:#444444::::"> <resourceStyle x="352" y="436" width="34" height="28"/> </symbolStyle> - <symbolStyle id="141" name="symbols/nori/storage_tank-18.svg:#444444::::"> + <symbolStyle id="142" name="symbols/nori/storage_tank-18.svg:#444444::::"> <resourceStyle x="386" y="436" width="34" height="28"/> </symbolStyle> - <symbolStyle id="142" name="symbols/maki/skiing-18.svg:#444444::::"> + <symbolStyle id="143" name="symbols/maki/skiing-18.svg:#444444::::"> <resourceStyle x="420" y="436" width="34" height="28"/> </symbolStyle> - <symbolStyle id="143" name="symbols/maki/telephone-18.svg:#444444::::"> + <symbolStyle id="144" name="symbols/maki/telephone-18.svg:#444444::::"> <resourceStyle x="454" y="436" width="32" height="28"/> </symbolStyle> - <symbolStyle id="144" name="symbols/maki/cemetery-18.svg:#444444::::"> + <symbolStyle id="145" name="symbols/maki/cemetery-18.svg:#444444::::"> <resourceStyle x="486" y="436" width="22" height="28"/> </symbolStyle> - <symbolStyle id="145" name="symbols/nori/information-18.svg:#444444::::"> + <symbolStyle id="146" name="symbols/nori/information-18.svg:#444444::::"> <resourceStyle x="0" y="466" width="28" height="28"/> </symbolStyle> - <symbolStyle id="146" name="symbols/nori/bench-18.svg:#444444::::"> + <symbolStyle id="147" name="symbols/nori/bench-18.svg:#444444::::"> <resourceStyle x="28" y="466" width="36" height="24"/> </symbolStyle> - <symbolStyle id="147" name="symbols/maki/america-football-18.svg:#444444::::"> + <symbolStyle id="148" name="symbols/maki/america-football-18.svg:#444444::::"> <resourceStyle x="64" y="466" width="34" height="24"/> </symbolStyle> - <symbolStyle id="148" name="symbols/maki/dam-18.svg:#444444::::"> + <symbolStyle id="149" name="symbols/maki/dam-18.svg:#444444::::"> <resourceStyle x="98" y="466" width="30" height="24"/> </symbolStyle> - <symbolStyle id="149" name="symbols/maki/swimming-18.svg:#0000FF::::"> + <symbolStyle id="150" name="symbols/maki/swimming-18.svg:#0000FF::::"> <resourceStyle x="128" y="466" width="30" height="24"/> </symbolStyle> - <symbolStyle id="150" name="symbols/nori/power_tower-12.svg:#444444::::"> + <symbolStyle id="151" name="symbols/nori/power_tower-12.svg:#444444::::"> <resourceStyle x="158" y="466" width="20" height="24"/> </symbolStyle> - <symbolStyle id="151" name="symbols/maki/heliport-18.svg:#444444::::"> + <symbolStyle id="152" name="symbols/maki/heliport-18.svg:#444444::::"> <resourceStyle x="178" y="466" width="34" height="22"/> </symbolStyle> - <symbolStyle id="152" name="symbols/maki/roadblock-12.svg:#FF0000::::"> + <symbolStyle id="153" name="symbols/maki/roadblock-12.svg:#FF0000::::"> <resourceStyle x="212" y="466" width="20" height="22"/> </symbolStyle> - <symbolStyle id="153" name="symbols/maki/cross-12.svg:#444444::::"> + <symbolStyle id="154" name="symbols/maki/cross-12.svg:#444444::::"> <resourceStyle x="232" y="466" width="20" height="20"/> </symbolStyle> - <symbolStyle id="154" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> + <symbolStyle id="155" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> <resourceStyle x="252" y="466" width="22" height="18"/> </symbolStyle> - <symbolStyle id="155" name="symbols/maki/triangle-12.svg:#444444::::"> + <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#444444::::"> <resourceStyle x="274" y="466" width="22" height="18"/> </symbolStyle> - <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#FF0000::::"> + <symbolStyle id="157" name="symbols/maki/triangle-12.svg:#FF0000::::"> <resourceStyle x="296" y="466" width="22" height="18"/> </symbolStyle> - <symbolStyle id="157" name="symbols/neta/entrance-18.svg:#444444::::"> + <symbolStyle id="158" name="symbols/neta/entrance-18.svg:#444444::::"> <resourceStyle x="318" y="466" width="20" height="18"/> </symbolStyle> - <symbolStyle id="158" name="symbols/neta/lift_gate-18.svg:#444444::::"> + <symbolStyle id="159" name="symbols/neta/lift_gate-18.svg:#444444::::"> <resourceStyle x="338" y="466" width="22" height="14"/> </symbolStyle> - <symbolStyle id="159" name="symbols/maki/post-12.svg:#444444::::"> + <symbolStyle id="160" name="symbols/maki/post-12.svg:#444444::::"> <resourceStyle x="360" y="466" width="20" height="14"/> </symbolStyle> - <symbolStyle id="160" name="symbols/arrow.svg:::::"> + <symbolStyle id="161" name="symbols/arrow.svg:::::"> <resourceStyle x="380" y="466" width="36" height="12"/> </symbolStyle> </page> diff --git a/data/resources-xhdpi/symbols.png b/data/resources-xhdpi/symbols.png Binary files differindex bec06e0b79..4399047d66 100644 --- a/data/resources-xhdpi/symbols.png +++ b/data/resources-xhdpi/symbols.png diff --git a/data/resources-xxhdpi/basic.skn b/data/resources-xxhdpi/basic.skn index c5c9af4f8d..a757a82d8f 100644 --- a/data/resources-xxhdpi/basic.skn +++ b/data/resources-xxhdpi/basic.skn @@ -244,10 +244,10 @@ <symbolStyle id="81" name="placemark-green"> <resourceStyle x="120" y="340" width="40" height="62"/> </symbolStyle> - <symbolStyle id="82" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> + <symbolStyle id="82" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> <resourceStyle x="160" y="340" width="58" height="58"/> </symbolStyle> - <symbolStyle id="83" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> + <symbolStyle id="83" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"> <resourceStyle x="218" y="340" width="58" height="58"/> </symbolStyle> <symbolStyle id="84" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"> @@ -295,22 +295,22 @@ <symbolStyle id="98" name="symbols/nori/shower-18.svg:#444444::::"> <resourceStyle x="54" y="402" width="54" height="54"/> </symbolStyle> - <symbolStyle id="99" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> + <symbolStyle id="99" name="symbols/nori/beach_resort-18.svg:#444444::::"> <resourceStyle x="108" y="402" width="54" height="54"/> </symbolStyle> - <symbolStyle id="100" name="symbols/nori/watermill-18.svg:#444444::::"> + <symbolStyle id="100" name="symbols/nori/pump-manual-18.svg:#0000FF::::"> <resourceStyle x="162" y="402" width="54" height="54"/> </symbolStyle> - <symbolStyle id="101" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> + <symbolStyle id="101" name="symbols/nori/watermill-18.svg:#444444::::"> <resourceStyle x="216" y="402" width="54" height="54"/> </symbolStyle> - <symbolStyle id="102" name="symbols/nori/border_control-18.svg:#444444::::"> + <symbolStyle id="102" name="symbols/nori/pump-powered-18.svg:#0000FF::::"> <resourceStyle x="270" y="402" width="54" height="54"/> </symbolStyle> - <symbolStyle id="103" name="symbols/nori/grave_yard-18.svg:#444444::::"> + <symbolStyle id="103" name="symbols/nori/border_control-18.svg:#444444::::"> <resourceStyle x="324" y="402" width="54" height="54"/> </symbolStyle> - <symbolStyle id="104" name="symbols/nori/beach_resort-18.svg:#444444::::"> + <symbolStyle id="104" name="symbols/nori/grave_yard-18.svg:#444444::::"> <resourceStyle x="378" y="402" width="54" height="54"/> </symbolStyle> <symbolStyle id="105" name="symbols/nori/camp_site-18.svg:#444444::::"> @@ -430,55 +430,58 @@ <symbolStyle id="143" name="symbols/maki/campsite-18.svg:#444444::::"> <resourceStyle x="970" y="456" width="44" height="36"/> </symbolStyle> - <symbolStyle id="144" name="symbols/maki/art-gallery-18.svg:#444444::::"> + <symbolStyle id="144" name="symbols/neta/circle-10.svg:#444444::::"> + <resourceStyle x="1014" y="456" width="8" height="8"/> + </symbolStyle> + <symbolStyle id="145" name="symbols/maki/art-gallery-18.svg:#444444::::"> <resourceStyle x="0" y="504" width="44" height="36"/> </symbolStyle> - <symbolStyle id="145" name="symbols/maki/skiing-18.svg:#444444::::"> + <symbolStyle id="146" name="symbols/maki/skiing-18.svg:#444444::::"> <resourceStyle x="44" y="504" width="44" height="36"/> </symbolStyle> - <symbolStyle id="146" name="symbols/nori/power_tower-12.svg:#444444::::"> + <symbolStyle id="147" name="symbols/nori/power_tower-12.svg:#444444::::"> <resourceStyle x="88" y="504" width="30" height="36"/> </symbolStyle> - <symbolStyle id="147" name="symbols/maki/cemetery-18.svg:#444444::::"> + <symbolStyle id="148" name="symbols/maki/cemetery-18.svg:#444444::::"> <resourceStyle x="118" y="504" width="28" height="36"/> </symbolStyle> - <symbolStyle id="148" name="symbols/maki/roadblock-12.svg:#FF0000::::"> + <symbolStyle id="149" name="symbols/maki/roadblock-12.svg:#FF0000::::"> <resourceStyle x="146" y="504" width="30" height="34"/> </symbolStyle> - <symbolStyle id="149" name="symbols/maki/america-football-18.svg:#444444::::"> + <symbolStyle id="150" name="symbols/maki/america-football-18.svg:#444444::::"> <resourceStyle x="176" y="504" width="46" height="32"/> </symbolStyle> - <symbolStyle id="150" name="symbols/maki/dam-18.svg:#444444::::"> + <symbolStyle id="151" name="symbols/maki/dam-18.svg:#444444::::"> <resourceStyle x="222" y="504" width="40" height="32"/> </symbolStyle> - <symbolStyle id="151" name="symbols/maki/swimming-18.svg:#0000FF::::"> + <symbolStyle id="152" name="symbols/maki/swimming-18.svg:#0000FF::::"> <resourceStyle x="262" y="504" width="40" height="32"/> </symbolStyle> - <symbolStyle id="152" name="symbols/maki/cross-12.svg:#444444::::"> + <symbolStyle id="153" name="symbols/maki/cross-12.svg:#444444::::"> <resourceStyle x="302" y="504" width="30" height="30"/> </symbolStyle> - <symbolStyle id="153" name="symbols/maki/heliport-18.svg:#444444::::"> + <symbolStyle id="154" name="symbols/maki/heliport-18.svg:#444444::::"> <resourceStyle x="332" y="504" width="44" height="28"/> </symbolStyle> - <symbolStyle id="154" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> + <symbolStyle id="155" name="symbols/maki/triangle-stroked-12.svg:#444444::::"> <resourceStyle x="376" y="504" width="34" height="28"/> </symbolStyle> - <symbolStyle id="155" name="symbols/maki/triangle-12.svg:#444444::::"> + <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#444444::::"> <resourceStyle x="410" y="504" width="34" height="28"/> </symbolStyle> - <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#FF0000::::"> + <symbolStyle id="157" name="symbols/maki/triangle-12.svg:#FF0000::::"> <resourceStyle x="444" y="504" width="34" height="28"/> </symbolStyle> - <symbolStyle id="157" name="symbols/neta/entrance-18.svg:#444444::::"> + <symbolStyle id="158" name="symbols/neta/entrance-18.svg:#444444::::"> <resourceStyle x="478" y="504" width="28" height="26"/> </symbolStyle> - <symbolStyle id="158" name="symbols/neta/lift_gate-18.svg:#444444::::"> + <symbolStyle id="159" name="symbols/neta/lift_gate-18.svg:#444444::::"> <resourceStyle x="506" y="504" width="34" height="22"/> </symbolStyle> - <symbolStyle id="159" name="symbols/maki/post-12.svg:#444444::::"> + <symbolStyle id="160" name="symbols/maki/post-12.svg:#444444::::"> <resourceStyle x="540" y="504" width="30" height="22"/> </symbolStyle> - <symbolStyle id="160" name="symbols/arrow.svg:::::"> + <symbolStyle id="161" name="symbols/arrow.svg:::::"> <resourceStyle x="570" y="504" width="54" height="18"/> </symbolStyle> </page> diff --git a/data/resources-xxhdpi/symbols.png b/data/resources-xxhdpi/symbols.png Binary files differindex 3767e5a492..3077d238af 100644 --- a/data/resources-xxhdpi/symbols.png +++ b/data/resources-xxhdpi/symbols.png diff --git a/data/resources-yota/basic.skn b/data/resources-yota/basic.skn index 68c63bb99f..38dc2c4d6f 100644 --- a/data/resources-yota/basic.skn +++ b/data/resources-yota/basic.skn @@ -130,325 +130,328 @@ <symbolStyle id="43" name="symbols/nori/generator_solar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="480" y="24" width="24" height="24"/> </symbolStyle> - <symbolStyle id="44" name="symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="44" name="symbols/neta/circle-10.svg:#000000:#FFFFFF:::"> + <resourceStyle x="504" y="24" width="4" height="4"/> + </symbolStyle> + <symbolStyle id="45" name="symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="0" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="45" name="symbols/nori/drinking_water-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="46" name="symbols/nori/drinking_water-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="24" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="46" name="symbols/nori/street_lamp-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="47" name="symbols/nori/street_lamp-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="48" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="47" name="symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="48" name="symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="72" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="48" name="symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="49" name="symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="96" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="49" name="symbols/nori/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="50" name="symbols/nori/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="120" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="50" name="symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="51" name="symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="144" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="51" name="symbols/nori/drinking_water_well-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="52" name="symbols/nori/drinking_water_well-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="168" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="52" name="symbols/maki/bank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="53" name="symbols/maki/bank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="192" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="53" name="symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="54" name="symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="216" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="54" name="symbols/maki/prison-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="55" name="symbols/maki/prison-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="240" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="55" name="symbols/maki/fast-food-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="56" name="symbols/maki/fast-food-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="264" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="56" name="symbols/maki/place-of-worship-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="57" name="symbols/maki/place-of-worship-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="288" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="57" name="symbols/maki/skiing-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="58" name="symbols/maki/skiing-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="312" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="58" name="symbols/nori/car_repair-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="59" name="symbols/nori/car_repair-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="336" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="59" name="symbols/nori/pharmacy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="60" name="symbols/nori/pharmacy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="360" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="60" name="symbols/maki/fire-station-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="61" name="symbols/maki/fire-station-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="384" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="61" name="symbols/nori/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="62" name="symbols/nori/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="408" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="62" name="symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="63" name="symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="432" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="63" name="symbols/maki/post-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="64" name="symbols/maki/post-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="456" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="64" name="symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="65" name="symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="480" y="48" width="24" height="24"/> </symbolStyle> - <symbolStyle id="65" name="symbols/nori/tailor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="66" name="symbols/nori/tailor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="0" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="66" name="symbols/maki/telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="67" name="symbols/maki/telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="24" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="67" name="symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="68" name="symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="48" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="68" name="symbols/maki/cafe-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="69" name="symbols/maki/cafe-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="72" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="69" name="symbols/nori/community_centre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="70" name="symbols/nori/community_centre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="96" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="70" name="symbols/nori/bucket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="71" name="symbols/nori/bucket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="120" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="71" name="symbols/nori/pump-manual-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="72" name="symbols/nori/pump-manual-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="144" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="72" name="symbols/nori/car_parts-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="73" name="symbols/nori/car_parts-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="168" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="73" name="symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="74" name="symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="192" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="74" name="symbols/nori/beach_resort-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="75" name="symbols/nori/beach_resort-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="216" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="75" name="symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="76" name="symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="240" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="76" name="symbols/maki/post-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="77" name="symbols/maki/post-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="264" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="77" name="symbols/nori/courthouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="78" name="symbols/nori/courthouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="288" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="78" name="symbols/nori/beverages-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="79" name="symbols/nori/beverages-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="312" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="79" name="symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="80" name="symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="336" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="80" name="symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="81" name="symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="360" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="81" name="symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="82" name="symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="384" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="82" name="symbols/nori/craft-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="83" name="symbols/nori/craft-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="408" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="83" name="symbols/maki/embassy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="84" name="symbols/maki/embassy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="432" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="84" name="symbols/nori/hardware-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="85" name="symbols/nori/hardware-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="456" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="85" name="symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="86" name="symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="480" y="72" width="24" height="24"/> </symbolStyle> - <symbolStyle id="86" name="symbols/nori/money_transfer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="87" name="symbols/nori/money_transfer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="0" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="87" name="symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="88" name="symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="24" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="88" name="symbols/maki/cricket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="89" name="symbols/maki/cricket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="48" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="89" name="symbols/maki/religious-muslim-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="90" name="symbols/maki/religious-muslim-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="72" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="90" name="symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="91" name="symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="96" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="91" name="symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="92" name="symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="120" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="92" name="symbols/nori/bench-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="93" name="symbols/nori/bench-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="144" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="93" name="symbols/nori/camp_site-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="94" name="symbols/nori/camp_site-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="168" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="94" name="symbols/maki/baseball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="95" name="symbols/maki/baseball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="192" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="95" name="symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="96" name="symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="216" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="96" name="symbols/nori/motorcycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="97" name="symbols/nori/motorcycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="240" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="97" name="symbols/maki/star-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="98" name="symbols/maki/star-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="264" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="98" name="symbols/maki/alcohol-shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="99" name="symbols/maki/alcohol-shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="288" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="99" name="symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="100" name="symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="312" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="100" name="symbols/maki/pitch-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="101" name="symbols/maki/pitch-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="336" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="101" name="symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="102" name="symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="360" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="102" name="symbols/nori/storage_tank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="103" name="symbols/nori/storage_tank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="384" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="103" name="symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="104" name="symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="408" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="104" name="symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="105" name="symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="432" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="105" name="symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="106" name="symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="456" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="106" name="symbols/maki/dam-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="107" name="symbols/maki/dam-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="480" y="96" width="24" height="24"/> </symbolStyle> - <symbolStyle id="107" name="symbols/nori/atm-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="108" name="symbols/nori/atm-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="0" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="108" name="symbols/maki/art-gallery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="109" name="symbols/maki/art-gallery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="24" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="109" name="symbols/nori/recycling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="110" name="symbols/nori/recycling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="48" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="110" name="symbols/nori/hindu-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="111" name="symbols/nori/hindu-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="72" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="111" name="symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="112" name="symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="96" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="112" name="symbols/maki/cemetery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="113" name="symbols/maki/cemetery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="120" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="113" name="symbols/maki/heliport-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="114" name="symbols/maki/heliport-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="144" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="114" name="symbols/maki/basketball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="115" name="symbols/maki/basketball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="168" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="115" name="symbols/nori/ngo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="116" name="symbols/nori/ngo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="192" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="116" name="symbols/nori/shower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="117" name="symbols/nori/shower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="216" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="117" name="symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> + <symbolStyle id="118" name="symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"> <resourceStyle x="240" y="120" width="24" height="24"/> </symbolStyle> - <symbolStyle id="118" name="api_pin"> + <symbolStyle id="119" name="api_pin"> <resourceStyle x="264" y="120" width="14" height="24"/> </symbolStyle> - <symbolStyle id="119" name="symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="120" name="symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="278" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="120" name="symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="121" name="symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="298" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="121" name="symbols/nori/taxi-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="122" name="symbols/nori/taxi-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="318" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="122" name="symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="123" name="symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="338" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="123" name="symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="124" name="symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="358" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="124" name="symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="125" name="symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="378" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="125" name="symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="126" name="symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="398" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="126" name="symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="127" name="symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="418" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="127" name="symbols/maki/fuel-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="128" name="symbols/maki/fuel-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="438" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="128" name="symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="129" name="symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="458" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="129" name="symbols/maki/rail-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> + <symbolStyle id="130" name="symbols/maki/rail-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"> <resourceStyle x="478" y="120" width="20" height="20"/> </symbolStyle> - <symbolStyle id="130" name="placemark-blue"> + <symbolStyle id="131" name="placemark-blue"> <resourceStyle x="498" y="120" width="14" height="20"/> </symbolStyle> - <symbolStyle id="131" name="placemark-yellow"> + <symbolStyle id="132" name="placemark-yellow"> <resourceStyle x="0" y="144" width="14" height="20"/> </symbolStyle> - <symbolStyle id="132" name="placemark-purple"> + <symbolStyle id="133" name="placemark-purple"> <resourceStyle x="14" y="144" width="14" height="20"/> </symbolStyle> - <symbolStyle id="133" name="placemark-brown"> + <symbolStyle id="134" name="placemark-brown"> <resourceStyle x="28" y="144" width="14" height="20"/> </symbolStyle> - <symbolStyle id="134" name="placemark-red"> + <symbolStyle id="135" name="placemark-red"> <resourceStyle x="42" y="144" width="14" height="20"/> </symbolStyle> - <symbolStyle id="135" name="placemark-pink"> + <symbolStyle id="136" name="placemark-pink"> <resourceStyle x="56" y="144" width="14" height="20"/> </symbolStyle> - <symbolStyle id="136" name="placemark-orange"> + <symbolStyle id="137" name="placemark-orange"> <resourceStyle x="70" y="144" width="14" height="20"/> </symbolStyle> - <symbolStyle id="137" name="placemark-green"> + <symbolStyle id="138" name="placemark-green"> <resourceStyle x="84" y="144" width="14" height="20"/> </symbolStyle> - <symbolStyle id="138" name="symbols/nori/border_control-18.svg:#000000:#FFFFFF:::"> + <symbolStyle id="139" name="symbols/nori/border_control-18.svg:#000000:#FFFFFF:::"> <resourceStyle x="98" y="144" width="18" height="18"/> </symbolStyle> - <symbolStyle id="139" name="symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"> + <symbolStyle id="140" name="symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"> <resourceStyle x="116" y="144" width="16" height="16"/> </symbolStyle> - <symbolStyle id="140" name="current-position"> + <symbolStyle id="141" name="current-position"> <resourceStyle x="132" y="144" width="16" height="16"/> </symbolStyle> - <symbolStyle id="141" name="symbols/maki/rail-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"> + <symbolStyle id="142" name="symbols/maki/rail-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"> <resourceStyle x="148" y="144" width="16" height="16"/> </symbolStyle> - <symbolStyle id="142" name="symbols/maki/rail-above-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"> + <symbolStyle id="143" name="symbols/maki/rail-above-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"> <resourceStyle x="164" y="144" width="16" height="16"/> </symbolStyle> - <symbolStyle id="143" name="symbols/maki/park2-18.svg:#000000:#FFFFFF:::"> + <symbolStyle id="144" name="symbols/maki/park2-18.svg:#000000:#FFFFFF:::"> <resourceStyle x="180" y="144" width="12" height="16"/> </symbolStyle> - <symbolStyle id="144" name="symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"> + <symbolStyle id="145" name="symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"> <resourceStyle x="192" y="144" width="12" height="12"/> </symbolStyle> - <symbolStyle id="145" name="symbols/maki/cross-12.svg:#000000:#FFFFFF:::"> + <symbolStyle id="146" name="symbols/maki/cross-12.svg:#000000:#FFFFFF:::"> <resourceStyle x="204" y="144" width="12" height="12"/> </symbolStyle> - <symbolStyle id="146" name="symbols/nori/power_tower-12.svg:#000000:#FFFFFF:::"> + <symbolStyle id="147" name="symbols/nori/power_tower-12.svg:#000000:#FFFFFF:::"> <resourceStyle x="216" y="144" width="10" height="12"/> </symbolStyle> - <symbolStyle id="147" name="symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"> + <symbolStyle id="148" name="symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"> <resourceStyle x="226" y="144" width="12" height="10"/> </symbolStyle> - <symbolStyle id="148" name="symbols/neta/lift_gate-18.svg:#000000:#FFFFFF:::"> + <symbolStyle id="149" name="symbols/neta/lift_gate-18.svg:#000000:#FFFFFF:::"> <resourceStyle x="238" y="144" width="12" height="8"/> </symbolStyle> - <symbolStyle id="149" name="symbols/neta/entrance-18.svg:#000000:#FFFFFF:::"> + <symbolStyle id="150" name="symbols/neta/entrance-18.svg:#000000:#FFFFFF:::"> <resourceStyle x="250" y="144" width="10" height="8"/> </symbolStyle> - <symbolStyle id="150" name="symbols/arrow.svg:::::"> + <symbolStyle id="151" name="symbols/arrow.svg:::::"> <resourceStyle x="260" y="144" width="18" height="6"/> </symbolStyle> </page> diff --git a/data/resources-yota/symbols.png b/data/resources-yota/symbols.png Binary files differindex 065c80ed76..d7689dc80f 100644 --- a/data/resources-yota/symbols.png +++ b/data/resources-yota/symbols.png diff --git a/data/styles/include/icons_neta.mapcss b/data/styles/include/icons_neta.mapcss index ba62f09cb7..1db93804bd 100644 --- a/data/styles/include/icons_neta.mapcss +++ b/data/styles/include/icons_neta.mapcss @@ -23,3 +23,7 @@ { icon-image: symbols/neta/subway-12.svg; } +node|z16-[entrance] +{ + icon-image: symbols/neta/circle-10.svg; +}
\ No newline at end of file diff --git a/data/styles/ink.mapcss b/data/styles/ink.mapcss index e1cc979a9e..22a0590b33 100644 --- a/data/styles/ink.mapcss +++ b/data/styles/ink.mapcss @@ -880,12 +880,6 @@ line|z13[boundary=administrative][border_type=state] z-index: 438; dashes: 12,4,4,4; } -node|z13[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #202020; - symbol-size: 2; -} area|z13-15[natural=peak], node|z13-15[natural=peak] { @@ -1567,12 +1561,6 @@ line|z14[waterway=stream] width: 1; z-index: 101; } -node|z14[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 2; -} line|z14[boundary=administrative][admin_level=2]::d2p2 { color: #f9574b; @@ -1628,12 +1616,6 @@ line|z14[natural=glacier] width: 0.8; z-index: 8; } -node|z15[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 3; -} line|z14[railway=funicular]::d1p2 { color: #e6b7b7; @@ -2558,13 +2540,6 @@ line|z16[railway=abandoned] z-index: 542; opacity: 0.4; } -area|z16[aerialway=station], -node|z16[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 4; -} line|z16[power=minor_line] { color: white; @@ -2682,16 +2657,6 @@ node|z16-[natural=volcano] font-size: 16; text-color: #202020; } -line|z16[barrier=bollard], -node|z16[barrier=block], -node|z16[barrier=bollard], -node|z16[barrier=stile], -node|z16[barrier=toll_booth] -{ - symbol-shape: circle; - symbol-fill-color: #707070; - symbol-size: 1.2; -} line|z16[boundary=administrative][admin_level=2]::d2p2 { color: #f9574b; @@ -3367,12 +3332,6 @@ line|z17-[railway=disused]::d1p3 z-index: 677; dashes: 12,12; } -node|z17-[man_made=cairn] -{ - symbol-shape: circle; - symbol-fill-color: white; - symbol-size: 3.2; -} line|z17-[aerialway=chair_lift] { color: #202020; @@ -3563,17 +3522,6 @@ line|z17-[boundary=administrative][border_type=region] z-index: 974; dashes: 12,4,4,4; } - -node|z17-[barrier=bollard], -node|z17-[barrier=block], -node|z17-[barrier=bollard], -node|z17-[barrier=stile], -node|z17-[barrier=toll_booth] -{ - symbol-shape: circle; - symbol-fill-color: #707070; - symbol-size: 1.6; -} line|z17-[boundary=administrative][border_type=state] { color: #f9574b; @@ -3642,14 +3590,6 @@ line|z17-[power=minor_line]::d1p2 dashes: 1.2,2,1.2,2,1.2,4.4; linecap: butt; } - -area|z17-[aerialway=station], -node|z17-[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 3.2; -} line|z17-[railway=funicular]::d1p2 { color: #e6b7b7; @@ -3809,9 +3749,6 @@ line[waterway=canal] node|z17-[entrance] { - symbol-shape: circle; - symbol-fill-color: #202020; - symbol-size: 2; font-size: 9; text: ref; text-offset-x: 6; @@ -4112,7 +4049,7 @@ area|z15-[area:highway=steps] icon-color: #f; symbol-fill-color: #f; } -*[natural!=tree][!barrier][power!=pole][power!=tower][natural!=peak] +*[natural!=tree][!barrier][power!=pole][power!=tower][natural!=peak][!entrance] { symbol-image: eval(any(prop("symbol-image"), "symbols/neta/circle-24.svg")); }
\ No newline at end of file diff --git a/data/styles/normal.mapcss b/data/styles/normal.mapcss index 5f4aa81435..ec45aa236a 100644 --- a/data/styles/normal.mapcss +++ b/data/styles/normal.mapcss @@ -683,12 +683,6 @@ line|z13[boundary=administrative][border_type=state] z-index: 438; dashes: 12,4,4,4; } -node|z13[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #202020; - symbol-size: 2; -} area|z13-15[natural=peak], node|z13-15[natural=peak] { @@ -1378,12 +1372,6 @@ line|z14[railway=light_rail]::d1p2 width: 1.7; z-index: 677; } -node|z14[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 2; -} line|z14[boundary=administrative][admin_level=2]::d2p2 { color: #f9574b; @@ -1429,12 +1417,6 @@ line|z14[railway=spur]::d1p3 dashes: 3,6; linecap: butt; } -node|z15[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 3; -} line|z14[railway=funicular]::d1p2 { color: #e6b7b7; @@ -2215,13 +2197,6 @@ line|z16[railway=abandoned] z-index: 542; opacity: 0.4; } -area|z16[aerialway=station], -node|z16[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 4; -} line|z16[power=minor_line] { color: white; @@ -2993,12 +2968,6 @@ line|z17-[railway=disused]::d1p3 z-index: 677; dashes: 12,12; } -node|z17-[man_made=cairn] -{ - symbol-shape: circle; - symbol-fill-color: white; - symbol-size: 3.2; -} line|z17-[aerialway=chair_lift] { color: #202020; @@ -3261,13 +3230,6 @@ line|z17-[power=minor_line]::d1p2 dashes: 1.2,2,1.2,2,1.2,4.4; linecap: butt; } -area|z17-[aerialway=station], -node|z17-[aerialway=station] -{ - symbol-shape: circle; - symbol-fill-color: #3050d8; - symbol-size: 3.2; -} line|z17-[railway=funicular]::d1p2 { color: #e6b7b7; @@ -3385,9 +3347,6 @@ line|z17-[power=minor_line] node|z16-[entrance] { - symbol-shape: circle; - symbol-fill-color: #202020; - symbol-size: 2; font-size: 9; text: ref; text-offset-x: 6; diff --git a/data/styles/symbols/neta/circle-10.svg b/data/styles/symbols/neta/circle-10.svg new file mode 100644 index 0000000000..8bf6fb55a4 --- /dev/null +++ b/data/styles/symbols/neta/circle-10.svg @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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="12" + height="12" + id="svg2" + version="1.1" + inkscape:version="0.48.4 r9939" + sodipodi:docname="circle-10.svg"> + <metadata + id="metadata16"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs14" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1852" + inkscape:window-height="1060" + id="namedview12" + showgrid="true" + inkscape:zoom="55.625733" + inkscape:cx="5.1939999" + inkscape:cy="3.7297509" + inkscape:window-x="64" + inkscape:window-y="-4" + inkscape:window-maximized="1" + inkscape:current-layer="g6"> + <inkscape:grid + type="xygrid" + id="grid3012" /> + </sodipodi:namedview> + <g + transform="matrix(0.40979295,0,0,0.40979295,15.627778,-436.51754)" + id="g4" + style="color:#000000"> + <g + id="g6" + transform="matrix(0.24962248,0,0,0.24962248,-17.629557,810.30001)"> + <path + d="m -33.023035,1079.8562 c 0,5.2627 4.266183,9.5288 9.528785,9.5288 5.262602,0 9.528785,-4.2661 9.528785,-9.5288 0,-5.2626 -4.266183,-9.5287 -9.528785,-9.5287 -5.262602,0 -9.528785,4.2661 -9.528785,9.5287 z" + overflow="visible" + id="path8" + inkscape:connector-curvature="0" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:4.2354002;overflow:visible;enable-background:accumulate" /> + <path + d="m -33.023035,1079.8562 c 0,5.2627 4.266183,9.5288 9.528785,9.5288 5.262602,0 9.528785,-4.2661 9.528785,-9.5288 0,-5.2626 -4.266183,-9.5287 -9.528785,-9.5287 -5.262602,0 -9.528785,4.2661 -9.528785,9.5287 z" + overflow="visible" + id="path10" + inkscape:connector-curvature="0" + style="fill:#444444;overflow:visible;enable-background:accumulate" /> + </g> + </g> +</svg> diff --git a/graphics/circled_symbol.cpp b/graphics/circled_symbol.cpp deleted file mode 100644 index 108ecc5c14..0000000000 --- a/graphics/circled_symbol.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "circled_symbol.hpp" - -namespace graphics -{ - CircledSymbol::CircledSymbol(SymbolElement::Params const & symbolElement, - CircleElement::Params const & circleElement) - : SymbolElement(symbolElement) - , m_circle(circleElement) {} - - void CircledSymbol::draw(OverlayRenderer * s, math::Matrix<double, 3, 3> const & m) const - { - m_circle.draw(s, m); - SymbolElement::draw(s, m); - } - - void CircledSymbol::setTransformation(const math::Matrix<double, 3, 3> & m) - { - m_circle.setTransformation(m); - SymbolElement::setTransformation(m); - } -} diff --git a/graphics/circled_symbol.hpp b/graphics/circled_symbol.hpp deleted file mode 100644 index cd573fdf54..0000000000 --- a/graphics/circled_symbol.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "symbol_element.hpp" -#include "circle_element.hpp" - -namespace graphics -{ - class CircledSymbol : public SymbolElement - { - public: - CircledSymbol(SymbolElement::Params const & symbolElement, - CircleElement::Params const & circleElement); - - void draw(OverlayRenderer * s, math::Matrix<double, 3, 3> const & m) const; - void setTransformation(const math::Matrix<double, 3, 3> & m); - - private: - CircleElement m_circle; - }; -} diff --git a/graphics/graphics.pro b/graphics/graphics.pro index 24b0519d78..f1c323e4af 100644 --- a/graphics/graphics.pro +++ b/graphics/graphics.pro @@ -74,8 +74,7 @@ SOURCES += \ brush.cpp \ pipeline_manager.cpp \ geometry_pipeline.cpp \ - path_view.cpp \ - circled_symbol.cpp + path_view.cpp HEADERS += \ opengl/opengl.hpp \ @@ -146,7 +145,6 @@ HEADERS += \ path_view.hpp \ path.hpp \ depth_constants.hpp \ - circled_symbol.hpp win32* { SOURCES += opengl/opengl_win32.cpp diff --git a/graphics/overlay_renderer.cpp b/graphics/overlay_renderer.cpp index 4a23641faa..228f4381e2 100644 --- a/graphics/overlay_renderer.cpp +++ b/graphics/overlay_renderer.cpp @@ -5,7 +5,6 @@ #include "path_text_element.hpp" #include "symbol_element.hpp" #include "circle_element.hpp" -#include "circled_symbol.hpp" #include "overlay.hpp" #include "resource_manager.hpp" @@ -80,19 +79,6 @@ namespace graphics drawCircle(params); } - void OverlayRenderer::drawCircledSymbol(SymbolElement::Params const & symParams, - CircleElement::Params const & circleParams) - { - shared_ptr<OverlayElement> oe(new CircledSymbol(symParams, circleParams)); - - math::Matrix<double, 3, 3> id = math::Identity<double, 3>(); - - if (!m_overlay.get()) - oe->draw(this, id); - else - m_overlay->processOverlayElement(oe); - } - void OverlayRenderer::drawText(FontDesc const & fontDesc, m2::PointD const & pt, graphics::EPosition pos, diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp index 01efd1174c..0385c160d6 100644 --- a/indexer/classificator.cpp +++ b/indexer/classificator.cpp @@ -242,9 +242,9 @@ namespace void add_rule(int ft, iter_t i) { static const int visible[3][drule::count_of_rules] = { - { 0, 0, 1, 1, 1, 0, 0 }, // fpoint - { 1, 0, 0, 0, 0, 1, 0 }, // fline - { 1, 1, 1, 1, 1, 0, 0 } // farea + { 0, 0, 1, 1, 0, 0 }, // fpoint + { 1, 0, 0, 0, 1, 0 }, // fline + { 1, 1, 1, 1, 0, 0 } // farea }; if (visible[ft][i->m_type] == 1) @@ -301,9 +301,9 @@ bool ClassifObject::IsDrawableLike(FeatureGeoType ft) const ASSERT ( ft <= FEATURE_TYPE_AREA, () ); static const int visible[3][drule::count_of_rules] = { - {0, 0, 1, 1, 1, 0, 0}, // fpoint - {1, 0, 0, 0, 0, 1, 0}, // fline - {0, 1, 0, 0, 0, 0, 0} // farea (!!! key difference with GetSuitable !!!) + {0, 0, 1, 1, 0, 0}, // fpoint + {1, 0, 0, 0, 1, 0}, // fline + {0, 1, 0, 0, 0, 0} // farea (!!! key difference with GetSuitable !!!) }; for (size_t i = 0; i < m_drawRule.size(); ++i) diff --git a/indexer/drawing_rule_def.hpp b/indexer/drawing_rule_def.hpp index 3fbc1685fb..6f140af21f 100644 --- a/indexer/drawing_rule_def.hpp +++ b/indexer/drawing_rule_def.hpp @@ -25,7 +25,7 @@ namespace drule }; /// drawing type of rule - can be one of ... - enum rule_type_t { line, area, symbol, caption, circle, pathtext, waymarker, count_of_rules }; + enum rule_type_t { line, area, symbol, caption, pathtext, waymarker, count_of_rules }; /// geo type of rule - can be one combined of ... enum rule_geo_t { node = 1, way = 2 }; diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp index 4eea7e4dd9..978d4a4c90 100644 --- a/indexer/drawing_rules.cpp +++ b/indexer/drawing_rules.cpp @@ -69,11 +69,6 @@ CaptionDefProto const * BaseRule::GetCaption(int) const return 0; } -CircleRuleProto const * BaseRule::GetCircle() const -{ - return 0; -} - RulesHolder::~RulesHolder() { Clean(); @@ -209,14 +204,6 @@ namespace typedef CaptionT<CaptionRuleProto> Caption; typedef CaptionT<PathTextRuleProto> PathText; - class Circle : public BaseRule - { - CircleRuleProto m_circle; - public: - Circle(CircleRuleProto const & r) : m_circle(r) {} - - virtual CircleRuleProto const * GetCircle() const { return &m_circle; } - }; } class DoSetIndex @@ -325,9 +312,6 @@ namespace if (de.has_caption()) AddRule<Caption>(p, de.scale(), caption, de.caption()); - if (de.has_circle()) - AddRule<Circle>(p, de.scale(), circle, de.circle()); - if (de.has_path_text()) AddRule<PathText>(p, de.scale(), pathtext, de.path_text()); } diff --git a/indexer/drawing_rules.hpp b/indexer/drawing_rules.hpp index ed9937f293..b3c62be828 100644 --- a/indexer/drawing_rules.hpp +++ b/indexer/drawing_rules.hpp @@ -16,7 +16,6 @@ class LineDefProto; class AreaRuleProto; class SymbolRuleProto; class CaptionDefProto; -class CircleRuleProto; namespace drule @@ -47,7 +46,6 @@ namespace drule virtual AreaRuleProto const * GetArea() const; virtual SymbolRuleProto const * GetSymbol() const; virtual CaptionDefProto const * GetCaption(int) const; - virtual CircleRuleProto const * GetCircle() const; }; class RulesHolder diff --git a/indexer/drules_struct.pb.cc b/indexer/drules_struct.pb.cc index 2dca326e96..bf4e8eabdb 100644 --- a/indexer/drules_struct.pb.cc +++ b/indexer/drules_struct.pb.cc @@ -21,7 +21,6 @@ void protobuf_ShutdownFile_drules_5fstruct_2eproto() { delete SymbolRuleProto::default_instance_; delete CaptionDefProto::default_instance_; delete CaptionRuleProto::default_instance_; - delete CircleRuleProto::default_instance_; delete PathTextRuleProto::default_instance_; delete DrawElementProto::default_instance_; delete ClassifElementProto::default_instance_; @@ -48,7 +47,6 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() { SymbolRuleProto::default_instance_ = new SymbolRuleProto(); CaptionDefProto::default_instance_ = new CaptionDefProto(); CaptionRuleProto::default_instance_ = new CaptionRuleProto(); - CircleRuleProto::default_instance_ = new CircleRuleProto(); PathTextRuleProto::default_instance_ = new PathTextRuleProto(); DrawElementProto::default_instance_ = new DrawElementProto(); ClassifElementProto::default_instance_ = new ClassifElementProto(); @@ -61,7 +59,6 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() { SymbolRuleProto::default_instance_->InitAsDefaultInstance(); CaptionDefProto::default_instance_->InitAsDefaultInstance(); CaptionRuleProto::default_instance_->InitAsDefaultInstance(); - CircleRuleProto::default_instance_->InitAsDefaultInstance(); PathTextRuleProto::default_instance_->InitAsDefaultInstance(); DrawElementProto::default_instance_->InitAsDefaultInstance(); ClassifElementProto::default_instance_->InitAsDefaultInstance(); @@ -2382,288 +2379,6 @@ void CaptionRuleProto::Swap(CaptionRuleProto* other) { // =================================================================== #ifndef _MSC_VER -const int CircleRuleProto::kRadiusFieldNumber; -const int CircleRuleProto::kColorFieldNumber; -const int CircleRuleProto::kBorderFieldNumber; -const int CircleRuleProto::kPriorityFieldNumber; -#endif // !_MSC_VER - -CircleRuleProto::CircleRuleProto() - : ::google::protobuf::MessageLite() { - SharedCtor(); -} - -void CircleRuleProto::InitAsDefaultInstance() { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - border_ = const_cast< ::LineDefProto*>( - ::LineDefProto::internal_default_instance()); -#else - border_ = const_cast< ::LineDefProto*>(&::LineDefProto::default_instance()); -#endif -} - -CircleRuleProto::CircleRuleProto(const CircleRuleProto& from) - : ::google::protobuf::MessageLite() { - SharedCtor(); - MergeFrom(from); -} - -void CircleRuleProto::SharedCtor() { - _cached_size_ = 0; - radius_ = 0; - color_ = 0u; - border_ = NULL; - priority_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -CircleRuleProto::~CircleRuleProto() { - SharedDtor(); -} - -void CircleRuleProto::SharedDtor() { - #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - if (this != &default_instance()) { - #else - if (this != default_instance_) { - #endif - delete border_; - } -} - -void CircleRuleProto::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const CircleRuleProto& CircleRuleProto::default_instance() { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - protobuf_AddDesc_drules_5fstruct_2eproto(); -#else - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); -#endif - return *default_instance_; -} - -CircleRuleProto* CircleRuleProto::default_instance_ = NULL; - -CircleRuleProto* CircleRuleProto::New() const { - return new CircleRuleProto; -} - -void CircleRuleProto::Clear() { - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - radius_ = 0; - color_ = 0u; - if (has_border()) { - if (border_ != NULL) border_->::LineDefProto::Clear(); - } - priority_ = 0; - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -bool CircleRuleProto::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!(EXPRESSION)) return false - ::google::protobuf::uint32 tag; - while ((tag = input->ReadTag()) != 0) { - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required double radius = 1; - case 1: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &radius_))); - set_has_radius(); - } else { - goto handle_uninterpreted; - } - if (input->ExpectTag(16)) goto parse_color; - break; - } - - // required uint32 color = 2; - case 2: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { - parse_color: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &color_))); - set_has_color(); - } else { - goto handle_uninterpreted; - } - if (input->ExpectTag(26)) goto parse_border; - break; - } - - // optional .LineDefProto border = 3; - case 3: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_border: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_border())); - } else { - goto handle_uninterpreted; - } - if (input->ExpectTag(32)) goto parse_priority; - break; - } - - // required int32 priority = 4; - case 4: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { - parse_priority: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, &priority_))); - set_has_priority(); - } else { - goto handle_uninterpreted; - } - if (input->ExpectAtEnd()) return true; - break; - } - - default: { - handle_uninterpreted: - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - return true; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } - } - } - return true; -#undef DO_ -} - -void CircleRuleProto::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // required double radius = 1; - if (has_radius()) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->radius(), output); - } - - // required uint32 color = 2; - if (has_color()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); - } - - // optional .LineDefProto border = 3; - if (has_border()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 3, this->border(), output); - } - - // required int32 priority = 4; - if (has_priority()) { - ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); - } - -} - -int CircleRuleProto::ByteSize() const { - int total_size = 0; - - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required double radius = 1; - if (has_radius()) { - total_size += 1 + 8; - } - - // required uint32 color = 2; - if (has_color()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->color()); - } - - // optional .LineDefProto border = 3; - if (has_border()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->border()); - } - - // required int32 priority = 4; - if (has_priority()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->priority()); - } - - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void CircleRuleProto::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast<const CircleRuleProto*>(&from)); -} - -void CircleRuleProto::MergeFrom(const CircleRuleProto& from) { - GOOGLE_CHECK_NE(&from, this); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_radius()) { - set_radius(from.radius()); - } - if (from.has_color()) { - set_color(from.color()); - } - if (from.has_border()) { - mutable_border()->::LineDefProto::MergeFrom(from.border()); - } - if (from.has_priority()) { - set_priority(from.priority()); - } - } -} - -void CircleRuleProto::CopyFrom(const CircleRuleProto& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool CircleRuleProto::IsInitialized() const { - if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false; - - if (has_border()) { - if (!this->border().IsInitialized()) return false; - } - return true; -} - -void CircleRuleProto::Swap(CircleRuleProto* other) { - if (other != this) { - std::swap(radius_, other->radius_); - std::swap(color_, other->color_); - std::swap(border_, other->border_); - std::swap(priority_, other->priority_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - std::swap(_cached_size_, other->_cached_size_); - } -} - -::std::string CircleRuleProto::GetTypeName() const { - return "CircleRuleProto"; -} - - -// =================================================================== - -#ifndef _MSC_VER const int PathTextRuleProto::kPrimaryFieldNumber; const int PathTextRuleProto::kSecondaryFieldNumber; const int PathTextRuleProto::kPriorityFieldNumber; @@ -2929,7 +2644,6 @@ const int DrawElementProto::kLinesFieldNumber; const int DrawElementProto::kAreaFieldNumber; const int DrawElementProto::kSymbolFieldNumber; const int DrawElementProto::kCaptionFieldNumber; -const int DrawElementProto::kCircleFieldNumber; const int DrawElementProto::kPathTextFieldNumber; #endif // !_MSC_VER @@ -2958,12 +2672,6 @@ void DrawElementProto::InitAsDefaultInstance() { caption_ = const_cast< ::CaptionRuleProto*>(&::CaptionRuleProto::default_instance()); #endif #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - circle_ = const_cast< ::CircleRuleProto*>( - ::CircleRuleProto::internal_default_instance()); -#else - circle_ = const_cast< ::CircleRuleProto*>(&::CircleRuleProto::default_instance()); -#endif -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER path_text_ = const_cast< ::PathTextRuleProto*>( ::PathTextRuleProto::internal_default_instance()); #else @@ -2983,7 +2691,6 @@ void DrawElementProto::SharedCtor() { area_ = NULL; symbol_ = NULL; caption_ = NULL; - circle_ = NULL; path_text_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -3001,7 +2708,6 @@ void DrawElementProto::SharedDtor() { delete area_; delete symbol_; delete caption_; - delete circle_; delete path_text_; } } @@ -3038,9 +2744,6 @@ void DrawElementProto::Clear() { if (has_caption()) { if (caption_ != NULL) caption_->::CaptionRuleProto::Clear(); } - if (has_circle()) { - if (circle_ != NULL) circle_->::CircleRuleProto::Clear(); - } if (has_path_text()) { if (path_text_ != NULL) path_text_->::PathTextRuleProto::Clear(); } @@ -3123,20 +2826,6 @@ bool DrawElementProto::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(50)) goto parse_circle; - break; - } - - // optional .CircleRuleProto circle = 6; - case 6: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_circle: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_circle())); - } else { - goto handle_uninterpreted; - } if (input->ExpectTag(58)) goto parse_path_text; break; } @@ -3201,12 +2890,6 @@ void DrawElementProto::SerializeWithCachedSizes( 5, this->caption(), output); } - // optional .CircleRuleProto circle = 6; - if (has_circle()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 6, this->circle(), output); - } - // optional .PathTextRuleProto path_text = 7; if (has_path_text()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( @@ -3247,13 +2930,6 @@ int DrawElementProto::ByteSize() const { this->caption()); } - // optional .CircleRuleProto circle = 6; - if (has_circle()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->circle()); - } - // optional .PathTextRuleProto path_text = 7; if (has_path_text()) { total_size += 1 + @@ -3297,9 +2973,6 @@ void DrawElementProto::MergeFrom(const DrawElementProto& from) { if (from.has_caption()) { mutable_caption()->::CaptionRuleProto::MergeFrom(from.caption()); } - if (from.has_circle()) { - mutable_circle()->::CircleRuleProto::MergeFrom(from.circle()); - } if (from.has_path_text()) { mutable_path_text()->::PathTextRuleProto::MergeFrom(from.path_text()); } @@ -3327,9 +3000,6 @@ bool DrawElementProto::IsInitialized() const { if (has_caption()) { if (!this->caption().IsInitialized()) return false; } - if (has_circle()) { - if (!this->circle().IsInitialized()) return false; - } if (has_path_text()) { if (!this->path_text().IsInitialized()) return false; } @@ -3343,7 +3013,6 @@ void DrawElementProto::Swap(DrawElementProto* other) { std::swap(area_, other->area_); std::swap(symbol_, other->symbol_); std::swap(caption_, other->caption_); - std::swap(circle_, other->circle_); std::swap(path_text_, other->path_text_); std::swap(_has_bits_[0], other->_has_bits_[0]); std::swap(_cached_size_, other->_cached_size_); diff --git a/indexer/drules_struct.pb.h b/indexer/drules_struct.pb.h index d52b39fb68..a094bbfd26 100644 --- a/indexer/drules_struct.pb.h +++ b/indexer/drules_struct.pb.h @@ -38,7 +38,6 @@ class AreaRuleProto; class SymbolRuleProto; class CaptionDefProto; class CaptionRuleProto; -class CircleRuleProto; class PathTextRuleProto; class DrawElementProto; class ClassifElementProto; @@ -997,121 +996,6 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- -class CircleRuleProto : public ::google::protobuf::MessageLite { - public: - CircleRuleProto(); - virtual ~CircleRuleProto(); - - CircleRuleProto(const CircleRuleProto& from); - - inline CircleRuleProto& operator=(const CircleRuleProto& from) { - CopyFrom(from); - return *this; - } - - static const CircleRuleProto& default_instance(); - - #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - // Returns the internal default instance pointer. This function can - // return NULL thus should not be used by the user. This is intended - // for Protobuf internal code. Please use default_instance() declared - // above instead. - static inline const CircleRuleProto* internal_default_instance() { - return default_instance_; - } - #endif - - void Swap(CircleRuleProto* other); - - // implements Message ---------------------------------------------- - - CircleRuleProto* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); - void CopyFrom(const CircleRuleProto& from); - void MergeFrom(const CircleRuleProto& from); - void Clear(); - bool IsInitialized() const; - - int ByteSize() const; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input); - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const; - int GetCachedSize() const { return _cached_size_; } - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const; - public: - - ::std::string GetTypeName() const; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // required double radius = 1; - inline bool has_radius() const; - inline void clear_radius(); - static const int kRadiusFieldNumber = 1; - inline double radius() const; - inline void set_radius(double value); - - // required uint32 color = 2; - inline bool has_color() const; - inline void clear_color(); - static const int kColorFieldNumber = 2; - inline ::google::protobuf::uint32 color() const; - inline void set_color(::google::protobuf::uint32 value); - - // optional .LineDefProto border = 3; - inline bool has_border() const; - inline void clear_border(); - static const int kBorderFieldNumber = 3; - inline const ::LineDefProto& border() const; - inline ::LineDefProto* mutable_border(); - inline ::LineDefProto* release_border(); - inline void set_allocated_border(::LineDefProto* border); - - // required int32 priority = 4; - inline bool has_priority() const; - inline void clear_priority(); - static const int kPriorityFieldNumber = 4; - inline ::google::protobuf::int32 priority() const; - inline void set_priority(::google::protobuf::int32 value); - - // @@protoc_insertion_point(class_scope:CircleRuleProto) - private: - inline void set_has_radius(); - inline void clear_has_radius(); - inline void set_has_color(); - inline void clear_has_color(); - inline void set_has_border(); - inline void clear_has_border(); - inline void set_has_priority(); - inline void clear_has_priority(); - - double radius_; - ::LineDefProto* border_; - ::google::protobuf::uint32 color_; - ::google::protobuf::int32 priority_; - - mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32]; - - #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); - #else - friend void protobuf_AddDesc_drules_5fstruct_2eproto(); - #endif - friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); - friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - - void InitAsDefaultInstance(); - static CircleRuleProto* default_instance_; -}; -// ------------------------------------------------------------------- - class PathTextRuleProto : public ::google::protobuf::MessageLite { public: PathTextRuleProto(); @@ -1318,15 +1202,6 @@ class DrawElementProto : public ::google::protobuf::MessageLite { inline ::CaptionRuleProto* release_caption(); inline void set_allocated_caption(::CaptionRuleProto* caption); - // optional .CircleRuleProto circle = 6; - inline bool has_circle() const; - inline void clear_circle(); - static const int kCircleFieldNumber = 6; - inline const ::CircleRuleProto& circle() const; - inline ::CircleRuleProto* mutable_circle(); - inline ::CircleRuleProto* release_circle(); - inline void set_allocated_circle(::CircleRuleProto* circle); - // optional .PathTextRuleProto path_text = 7; inline bool has_path_text() const; inline void clear_path_text(); @@ -1346,8 +1221,6 @@ class DrawElementProto : public ::google::protobuf::MessageLite { inline void clear_has_symbol(); inline void set_has_caption(); inline void clear_has_caption(); - inline void set_has_circle(); - inline void clear_has_circle(); inline void set_has_path_text(); inline void clear_has_path_text(); @@ -1355,12 +1228,11 @@ class DrawElementProto : public ::google::protobuf::MessageLite { ::AreaRuleProto* area_; ::SymbolRuleProto* symbol_; ::CaptionRuleProto* caption_; - ::CircleRuleProto* circle_; ::PathTextRuleProto* path_text_; ::google::protobuf::int32 scale_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32]; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); @@ -2544,118 +2416,6 @@ inline void CaptionRuleProto::set_priority(::google::protobuf::int32 value) { // ------------------------------------------------------------------- -// CircleRuleProto - -// required double radius = 1; -inline bool CircleRuleProto::has_radius() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -inline void CircleRuleProto::set_has_radius() { - _has_bits_[0] |= 0x00000001u; -} -inline void CircleRuleProto::clear_has_radius() { - _has_bits_[0] &= ~0x00000001u; -} -inline void CircleRuleProto::clear_radius() { - radius_ = 0; - clear_has_radius(); -} -inline double CircleRuleProto::radius() const { - return radius_; -} -inline void CircleRuleProto::set_radius(double value) { - set_has_radius(); - radius_ = value; -} - -// required uint32 color = 2; -inline bool CircleRuleProto::has_color() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void CircleRuleProto::set_has_color() { - _has_bits_[0] |= 0x00000002u; -} -inline void CircleRuleProto::clear_has_color() { - _has_bits_[0] &= ~0x00000002u; -} -inline void CircleRuleProto::clear_color() { - color_ = 0u; - clear_has_color(); -} -inline ::google::protobuf::uint32 CircleRuleProto::color() const { - return color_; -} -inline void CircleRuleProto::set_color(::google::protobuf::uint32 value) { - set_has_color(); - color_ = value; -} - -// optional .LineDefProto border = 3; -inline bool CircleRuleProto::has_border() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -inline void CircleRuleProto::set_has_border() { - _has_bits_[0] |= 0x00000004u; -} -inline void CircleRuleProto::clear_has_border() { - _has_bits_[0] &= ~0x00000004u; -} -inline void CircleRuleProto::clear_border() { - if (border_ != NULL) border_->::LineDefProto::Clear(); - clear_has_border(); -} -inline const ::LineDefProto& CircleRuleProto::border() const { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - return border_ != NULL ? *border_ : *default_instance().border_; -#else - return border_ != NULL ? *border_ : *default_instance_->border_; -#endif -} -inline ::LineDefProto* CircleRuleProto::mutable_border() { - set_has_border(); - if (border_ == NULL) border_ = new ::LineDefProto; - return border_; -} -inline ::LineDefProto* CircleRuleProto::release_border() { - clear_has_border(); - ::LineDefProto* temp = border_; - border_ = NULL; - return temp; -} -inline void CircleRuleProto::set_allocated_border(::LineDefProto* border) { - delete border_; - border_ = border; - if (border) { - set_has_border(); - } else { - clear_has_border(); - } -} - -// required int32 priority = 4; -inline bool CircleRuleProto::has_priority() const { - return (_has_bits_[0] & 0x00000008u) != 0; -} -inline void CircleRuleProto::set_has_priority() { - _has_bits_[0] |= 0x00000008u; -} -inline void CircleRuleProto::clear_has_priority() { - _has_bits_[0] &= ~0x00000008u; -} -inline void CircleRuleProto::clear_priority() { - priority_ = 0; - clear_has_priority(); -} -inline ::google::protobuf::int32 CircleRuleProto::priority() const { - return priority_; -} -inline void CircleRuleProto::set_priority(::google::protobuf::int32 value) { - set_has_priority(); - priority_ = value; -} - -// ------------------------------------------------------------------- - // PathTextRuleProto // required .CaptionDefProto primary = 1; @@ -2941,57 +2701,15 @@ inline void DrawElementProto::set_allocated_caption(::CaptionRuleProto* caption) } } -// optional .CircleRuleProto circle = 6; -inline bool DrawElementProto::has_circle() const { - return (_has_bits_[0] & 0x00000020u) != 0; -} -inline void DrawElementProto::set_has_circle() { - _has_bits_[0] |= 0x00000020u; -} -inline void DrawElementProto::clear_has_circle() { - _has_bits_[0] &= ~0x00000020u; -} -inline void DrawElementProto::clear_circle() { - if (circle_ != NULL) circle_->::CircleRuleProto::Clear(); - clear_has_circle(); -} -inline const ::CircleRuleProto& DrawElementProto::circle() const { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - return circle_ != NULL ? *circle_ : *default_instance().circle_; -#else - return circle_ != NULL ? *circle_ : *default_instance_->circle_; -#endif -} -inline ::CircleRuleProto* DrawElementProto::mutable_circle() { - set_has_circle(); - if (circle_ == NULL) circle_ = new ::CircleRuleProto; - return circle_; -} -inline ::CircleRuleProto* DrawElementProto::release_circle() { - clear_has_circle(); - ::CircleRuleProto* temp = circle_; - circle_ = NULL; - return temp; -} -inline void DrawElementProto::set_allocated_circle(::CircleRuleProto* circle) { - delete circle_; - circle_ = circle; - if (circle) { - set_has_circle(); - } else { - clear_has_circle(); - } -} - // optional .PathTextRuleProto path_text = 7; inline bool DrawElementProto::has_path_text() const { - return (_has_bits_[0] & 0x00000040u) != 0; + return (_has_bits_[0] & 0x00000020u) != 0; } inline void DrawElementProto::set_has_path_text() { - _has_bits_[0] |= 0x00000040u; + _has_bits_[0] |= 0x00000020u; } inline void DrawElementProto::clear_has_path_text() { - _has_bits_[0] &= ~0x00000040u; + _has_bits_[0] &= ~0x00000020u; } inline void DrawElementProto::clear_path_text() { if (path_text_ != NULL) path_text_->::PathTextRuleProto::Clear(); diff --git a/indexer/drules_struct.proto b/indexer/drules_struct.proto index e6412fd55f..c70dba0de0 100644 --- a/indexer/drules_struct.proto +++ b/indexer/drules_struct.proto @@ -78,14 +78,6 @@ message CaptionRuleProto required int32 priority = 3; } -message CircleRuleProto -{ - required double radius = 1; - required uint32 color = 2; - optional LineDefProto border = 3; - required int32 priority = 4; -} - message PathTextRuleProto { required CaptionDefProto primary = 1; @@ -100,7 +92,6 @@ message DrawElementProto optional AreaRuleProto area = 3; optional SymbolRuleProto symbol = 4; optional CaptionRuleProto caption = 5; - optional CircleRuleProto circle = 6; optional PathTextRuleProto path_text = 7; } diff --git a/map/drawer.cpp b/map/drawer.cpp index 633264fa2c..6dc1de2f13 100644 --- a/map/drawer.cpp +++ b/map/drawer.cpp @@ -86,26 +86,6 @@ void Drawer::drawSymbol(m2::PointD const & pt, m_pScreen->drawSymbol(pt, symbolName, pos, depth); } -void Drawer::drawCircle(m2::PointD const & pt, - graphics::EPosition pos, - di::DrawRule const & rule, - FeatureID const & id) -{ - graphics::Circle::Info ci; - ConvertStyle(rule.m_rule->GetCircle(), m_visualScale, ci); - - graphics::CircleElement::Params params; - - params.m_depth = rule.m_depth; - params.m_position = pos; - params.m_pivot = pt; - params.m_ci = ci; - params.m_userInfo.m_mwmID = id.m_mwm; - params.m_userInfo.m_offset = id.m_offset; - - m_pScreen->drawCircle(params); -} - void Drawer::drawSymbol(m2::PointD const & pt, graphics::EPosition pos, di::DrawRule const & rule, @@ -126,38 +106,6 @@ void Drawer::drawSymbol(m2::PointD const & pt, m_pScreen->drawSymbol(params); } -void Drawer::drawCircledSymbol(m2::PointD const & pt, - graphics::EPosition pos, - di::DrawRule const & symbolRule, - di::DrawRule const & circleRule, - FeatureID const & id) -{ - graphics::Icon::Info info; - ConvertStyle(symbolRule.m_rule->GetSymbol(), info); - - graphics::Circle::Info ci; - ConvertStyle(circleRule.m_rule->GetCircle(), m_visualScale, ci); - - graphics::SymbolElement::Params symParams; - symParams.m_depth = symbolRule.m_depth; - symParams.m_position = pos; - symParams.m_pivot = pt; - symParams.m_info = info; - symParams.m_renderer = m_pScreen.get(); - symParams.m_userInfo.m_mwmID = id.m_mwm; - symParams.m_userInfo.m_offset = id.m_offset; - - graphics::CircleElement::Params circleParams; - circleParams.m_depth = circleRule.m_depth; - circleParams.m_position = pos; - circleParams.m_pivot = pt; - circleParams.m_ci = ci; - circleParams.m_userInfo.m_mwmID = id.m_mwm; - circleParams.m_userInfo.m_offset = id.m_offset; - - m_pScreen->drawCircledSymbol(symParams, circleParams); -} - void Drawer::drawPath(di::PathInfo const & path, di::DrawRule const * rules, size_t count) { // if any rule needs caching - cache as a whole vector @@ -340,39 +288,16 @@ void Drawer::Draw(di::FeatureInfo const & fi) bool const isPath = !fi.m_pathes.empty(); bool const isArea = !fi.m_areas.empty(); - bool isCircleAndSymbol = false; - drule::BaseRule const * pCircleRule = NULL; - double circleDepth = graphics::minDepth; - drule::BaseRule const * pSymbolRule = NULL; - double symbolDepth = graphics::minDepth; // separating path rules from other for (size_t i = 0; i < rules.size(); ++i) { drule::BaseRule const * pRule = rules[i].m_rule; - bool const isSymbol = pRule->GetSymbol() != 0; - bool const isCaption = pRule->GetCaption(0) != 0; - bool const isCircle = pRule->GetCircle() != 0; - - if (pSymbolRule == NULL && isSymbol) - { - pSymbolRule = pRule; - symbolDepth = rules[i].m_depth; - } - - if (pCircleRule == NULL && isCircle) - { - pCircleRule = pRule; - circleDepth = rules[i].m_depth; - } - - if (!isCaption && isPath && !isSymbol && (pRule->GetLine() != 0)) + if (isPath && (pRule->GetLine() != 0)) pathRules.push_back(rules[i]); } - isCircleAndSymbol = (pSymbolRule != NULL) && (pCircleRule != NULL); - if (!pathRules.empty()) { for (list<di::PathInfo>::const_iterator i = fi.m_pathes.begin(); i != fi.m_pathes.end(); ++i) @@ -386,7 +311,6 @@ void Drawer::Draw(di::FeatureInfo const & fi) bool const isCaption = pRule->GetCaption(0) != 0; bool const isSymbol = pRule->GetSymbol() != 0; - bool const isCircle = pRule->GetCircle() != 0; if (!isCaption) { @@ -399,36 +323,16 @@ void Drawer::Draw(di::FeatureInfo const & fi) { if (isFill) drawArea(*i, di::DrawRule(pRule, depth)); - else if (isCircleAndSymbol && isCircle) - { - drawCircledSymbol(i->GetCenter(), - graphics::EPosCenter, - di::DrawRule(pSymbolRule, symbolDepth), - di::DrawRule(pCircleRule, circleDepth), - id); - } else if (isSymbol) drawSymbol(i->GetCenter(), graphics::EPosCenter, di::DrawRule(pRule, depth), id); - else if (isCircle) - drawCircle(i->GetCenter(), graphics::EPosCenter, di::DrawRule(pRule, depth), id); } } // draw point symbol if (!isPath && !isArea && ((pRule->GetType() & drule::node) != 0)) { - if (isCircleAndSymbol) - { - drawCircledSymbol(fi.m_point, - graphics::EPosCenter, - di::DrawRule(pSymbolRule, symbolDepth), - di::DrawRule(pCircleRule, circleDepth), - id); - } - else if (isSymbol) + if (isSymbol) drawSymbol(fi.m_point, graphics::EPosCenter, di::DrawRule(pRule, depth), id); - else if (isCircle) - drawCircle(fi.m_point, graphics::EPosCenter, di::DrawRule(pRule, depth), id); } } else diff --git a/map/drawer.hpp b/map/drawer.hpp index 700f7b86f6..75c7a037f8 100644 --- a/map/drawer.hpp +++ b/map/drawer.hpp @@ -45,17 +45,6 @@ protected: di::DrawRule const & rule, FeatureID const & id); - void drawCircle(m2::PointD const & pt, - graphics::EPosition pos, - di::DrawRule const & rule, - FeatureID const & id); - - void drawCircledSymbol(m2::PointD const & pt, - graphics::EPosition pos, - di::DrawRule const & symbolRule, - di::DrawRule const & circleRule, - FeatureID const & id); - void drawPath(di::PathInfo const & path, di::DrawRule const * rules, size_t count); diff --git a/map/feature_styler.cpp b/map/feature_styler.cpp index 58db70aa03..6823ac6cb1 100644 --- a/map/feature_styler.cpp +++ b/map/feature_styler.cpp @@ -137,18 +137,15 @@ namespace di || (keys[i].m_type == drule::waymarker))) depth = (layer * drule::layer_base_priority) + fmod(depth, drule::layer_base_priority); - if ((keys[i].m_type == drule::symbol) - || (keys[i].m_type == drule::circle)) + if (keys[i].m_type == drule::symbol) hasIcon = true; if ((keys[i].m_type == drule::caption && hasName) - || (keys[i].m_type == drule::symbol) - || (keys[i].m_type == drule::circle)) + || (keys[i].m_type == drule::symbol)) m_hasPointStyles = true; if ((keys[i].m_type == drule::caption) || (keys[i].m_type == drule::symbol) - || (keys[i].m_type == drule::circle) || (keys[i].m_type == drule::pathtext)) { // show labels of larger objects first @@ -223,11 +220,10 @@ namespace di if (hasIcon && hasCaptionWithoutOffset) { - // we need to delete symbol style and circle style + // we need to delete symbol style for (size_t i = 0; i < m_rules.size();) { - if ((keys[i].m_type == drule::symbol) - || (keys[i].m_type == drule::circle)) + if (keys[i].m_type == drule::symbol) { m_rules[i] = m_rules[m_rules.size() - 1]; m_rules.pop_back(); diff --git a/map/proto_to_styles.cpp b/map/proto_to_styles.cpp index ebc32fdf00..eea5a922e5 100644 --- a/map/proto_to_styles.cpp +++ b/map/proto_to_styles.cpp @@ -99,22 +99,6 @@ void ConvertStyle(SymbolRuleProto const * pSrc, graphics::Icon::Info & dest) dest.m_name = pSrc->name(); } -void ConvertStyle(CircleRuleProto const * pSrc, double scale, graphics::Circle::Info & dest) -{ - dest = graphics::Circle::Info(pSrc->radius() * scale, - ConvertColor(pSrc->color())); - - if (pSrc->has_border()) - { - graphics::Pen::Info pen; - ConvertStyle(&(pSrc->border()), scale, pen); - - dest.m_isOutlined = true; - dest.m_outlineColor = pen.m_color; - dest.m_outlineWidth = pen.m_w; - } -} - void ConvertStyle(CaptionDefProto const * pSrc, double scale, graphics::FontDesc & dest, m2::PointD & offset) { // fonts smaller than 8px look "jumpy" on LDPI devices diff --git a/map/proto_to_styles.hpp b/map/proto_to_styles.hpp index ae6541fa0e..2698b2fc4b 100644 --- a/map/proto_to_styles.hpp +++ b/map/proto_to_styles.hpp @@ -3,19 +3,16 @@ #include "../graphics/pen.hpp" #include "../graphics/brush.hpp" #include "../graphics/icon.hpp" -#include "../graphics/circle.hpp" #include "../graphics/font_desc.hpp" class LineDefProto; class AreaRuleProto; class SymbolRuleProto; class CaptionDefProto; -class CircleRuleProto; void ConvertStyle(LineDefProto const * pSrc, double scale, graphics::Pen::Info & dest); void ConvertStyle(AreaRuleProto const * pSrc, graphics::Brush::Info & dest); void ConvertStyle(SymbolRuleProto const * pSrc, graphics::Icon::Info & dest); -void ConvertStyle(CircleRuleProto const * pSrc, double scale, graphics::Circle::Info & dest); void ConvertStyle(CaptionDefProto const * pSrc, double scale, graphics::FontDesc & dest, m2::PointD & offset); uint8_t GetFontSize(CaptionDefProto const * pSrc); |
