diff options
| -rw-r--r-- | data/visibility.txt | 1003 | ||||
| -rw-r--r-- | indexer/classificator.cpp | 19 | ||||
| -rw-r--r-- | indexer/classificator.hpp | 4 | ||||
| -rw-r--r-- | indexer/classificator_loader.cpp | 18 | ||||
| -rw-r--r-- | indexer/drawing_rules.cpp | 2 | ||||
| -rw-r--r-- | installer/win/MapsWithMe.wxs | 4 | ||||
| -rw-r--r-- | installer/win/generator.pl | 2 | ||||
| -rw-r--r-- | iphone/Maps/Maps.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | qt/classificator_tree.cpp | 294 | ||||
| -rw-r--r-- | qt/classificator_tree.hpp | 83 | ||||
| -rw-r--r-- | qt/mainwindow.cpp | 17 | ||||
| -rw-r--r-- | qt/qt.pro | 4 | ||||
| -rw-r--r-- | qt/res/resources.qrc | 8 | ||||
| -rwxr-xr-x | tools/android/update_assets_for_version.sh | 2 |
14 files changed, 8 insertions, 1458 deletions
diff --git a/data/visibility.txt b/data/visibility.txt deleted file mode 100644 index 6241a1de03..0000000000 --- a/data/visibility.txt +++ /dev/null @@ -1,1003 +0,0 @@ -world 000000000000000000 + - aerialway 000000000000000000 + - cable_car 000000000000000111 - - chair_lift 000000000000000111 - - gondola 000000000000000111 - - mixed_lift 000000000000000111 - - station 000000000000011111 - - {} - aeroway 000000000000000000 + - aerodrome 000000000111111111 - - airport 000000000111111000 - - apron 000000000011111111 - - gate 000000000000000001 - - helipad 000000000000000001 - - runway 000000000000111111 - - taxiway 000000000000111111 - - terminal 000000000000111111 - - {} - amenity 000000000000000000 + - atm 000000000000000011 - - bank 000000000000000011 - - bar 000000000000000011 - - bench 000000000000000011 - - bicycle_rental 000000000000000011 - - bureau_de_change 000000000000000011 - - bus_station 000000000000000011 - - cafe 000000000000000011 - - car_rental 000000000000000011 - - car_sharing 000000000000000011 - - cinema 000000000000000011 - - college 000000000000011111 - - doctors 000000000000000011 - - drinking_water 000000000000000011 - - embassy 000000000000000011 - - fast_food 000000000000000011 - - fire_station 000000000000000011 - - fountain 000000000000000011 - - fuel 000000000000000111 - - grave_yard 000000000000010000 + - christian 000000000000010000 - - {} - hospital 000000000000000111 - - hunting_stand 000000000000000001 - - kindergarten 000000000000011111 - - library 000000000000000011 - - marketplace 000000000000000011 - - nightclub 000000000000000011 - - parking 000000000011111111 + - destination 000000000000000000 - - fee 000000000000000001 - - multi-storey 000000000000000001 + - fee 000000000000000001 - - {} - no-access 000000000000000000 - - park_and_ride 000000000000000001 - - permissive 000000000000000001 + - fee 000000000000000001 - - {} - private 000000000000000000 - - public 000000000000000001 + - fee 000000000000000001 - - {} - underground 000000000000000001 + - fee 000000000000000001 - - {} - {} - pharmacy 000000000000000011 - - place_of_worship 000000000000000011 - - police 000000000000000011 - - post_box 000000000000000001 - - post_office 000000000000000011 - - pub 000000000000000011 - - recycling 000000000000000011 - - restaurant 000000000000000011 + - hotel 000000000000000011 - - vegan 000000000000000011 - - vegetarian 000000000000000011 - - {} - school 000000000000011111 - - shelter 000000000000001111 - - speed_trap 000000000000000011 - - taxi 000000000000000011 - - telephone 000000000000000011 - - theatre 000000000000000011 - - toilets 000000000000000011 - - townhall 000000000000000011 - - university 000000000000011111 - - {} - area:highway 000000000000000000 + - cycleway 000000000000000000 - - footway 000000000000000000 - - living_street 000000000000000000 - - motorway 000000000000000000 - - path 000000000000000000 - - pedestrian 000000000000000000 - - primary 000000000000000000 - - residental 000000000000000000 - - residential 000000000000000000 - - secondary 000000000000000000 - - service 000000000000000000 - - steps 000000000000000000 - - tertiary 000000000000000000 - - track 000000000000000000 - - trunk 000000000000000000 - - unclassified 000000000000000000 - - {} - barrier 000000000000000000 + - block 000000000000000011 - - bollard 000000000000000011 - - city_wall 000000000000000011 - - cycle_barrier 000000000000000000 - - fence 000000000000000011 - - gate 000000000000000001 - - hedge 000000000000000011 - - lift_gate 000000000000000011 - - retaining_wall 000000000000000011 - - stile 000000000000000011 - - toll_booth 000000000000000011 - - wall 000000000000000011 - - {} - boundary 000000000000000000 + - administrative 000000000000000000 + - 10 000000000000000111 - - 11 000000000000000001 - - 2 000011111111111111 - - 3 000000100000000000 - - 4 000000111110000000 + - state 000000111111111111 - - {} - 5 000000000000001111 - - 6 000000000000001111 - - 7 000000000000000111 - - 8 000000000000000111 - - 9 000000000000000111 - - city 000000000000000111 - - country 000000000000111111 - - county 000000000000001111 - - municipality 000000000000000111 - - nation 000000000000111111 - - region 000000000000111111 - - state 000000111111111111 - - suburb 000000000000000111 - - {} - national_park 000000000011111111 - - {} - building 000000000000000111 + - address 000000000000000111 - - {} - communication 000000000000000000 + - line 000000000000000011 + - submarine 000000000000000011 - - underground 000000000000000011 - - {} - {} - earthquake:damage 000000000000000000 + - spontaneous_camp 000000000000001111 - - {} - entrance 000000000000000000 - - highway 000000000000000000 + - bridleway 000000000011111111 + - area 000000000011111111 - - bridge 000000000011111111 - - construction 000000000011111111 - - cutting 000000000011111111 - - destination 000000000011111111 - - disused 000000000011111111 - - dyke 000000000011111111 - - embankment 000000000011111111 - - levee 000000000011111111 - - no-access 000000000011111111 - - permissive 000000000011111111 - - private 000000000011111111 - - tunnel 000000000011111111 - - {} - bus_stop 000000000000000011 - - byway 000000000011111111 + - area 000000000011111111 - - bridge 000000000011111111 - - construction 000000000011111111 - - destination 000000000011111111 - - disused 000000000011111111 - - no-access 000000000011111111 - - permissive 000000000011111111 - - private 000000000011111111 - - tunnel 000000000011111111 - - {} - construction 000000000000011111 - - crossing 000000000000000000 + - island 000000000000000000 - - uncontrolled 000000000000000000 - - zebra 000000000000000000 - - {} - cycleroad 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - construction 000000000000111111 - - disused 000000000000111111 - - junction 000000000000111111 - - tunnel 000000000000111111 - - {} - cycleway 000000000000011111 + - area 000000000000011111 - - bridge 000000000000011111 - - construction 000000000000011111 - - cutting 000000000000011111 - - destination 000000000000011111 - - disused 000000000000011111 - - dyke 000000000000011111 - - embankment 000000000000011111 - - levee 000000000000011111 - - no-access 000000000000011111 - - permissive 000000000000011111 - - private 000000000000011111 - - tunnel 000000000000111111 - - {} - footway 000000000000000111 + - alpine_hiking 000000000000000111 - - area 000000000000000111 - - bridge 000000000000000111 - - construction 000000000000001111 - - cutting 000000000000000111 - - cycleway 000000000000000111 - - demanding_alpine_hiking 000000000000000111 - - demanding_mountain_hiking 000000000000000111 - - destination 000000000000000111 - - difficult_alpine_hiking 000000000000000111 - - disused 000000000000000111 - - dyke 000000000000000111 - - embankment 000000000000000111 - - hiking 000000000000000111 - - levee 000000000000000111 - - mountain_hiking 000000000000000111 - - no-access 000000000000000111 - - permissive 000000000000000111 - - private 000000000000000111 - - tunnel 000000000000011111 - - {} - ford 000000000000011111 + - cycleway 000000000000011111 - - {} - living_street 000000000001111111 + - area 000000000001111111 - - bridge 000000000001111111 - - construction 000000000001111111 - - disused 000000000001111111 - - junction 000000000001111111 - - tunnel 000000000011111111 - - {} - minor 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - construction 000000000000111111 - - cycleway 000000000000111111 - - disused 000000000000111111 - - junction 000000000000111111 - - oneway 000000000000111111 - - tunnel 000000000011111111 - - turning_circle 000000000000111111 - - {} - motorway 000000011111111111 + - area 000000011111111111 - - bridge 000000011111111111 - - construction 000000011111111111 - - cutting 000000011111111111 - - cycleway 000000011111111111 - - disused 000000011111111111 - - dyke 000000011111111111 - - embankment 000000011111111111 - - junction 000000011111111111 - - levee 000000011111111111 - - oneway 000000011111111111 - - tunnel 000000011111111111 - - {} - motorway_junction 000000000000011111 - - motorway_link 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - construction 000000000000111111 - - cycleway 000000000000111111 - - disused 000000000000111111 - - junction 000000000000111111 - - oneway 000000000000111111 - - tunnel 000000000111111111 - - {} - path 000000000000000111 + - alpine_hiking 000000000000000111 - - area 000000000000000111 - - area-bicycle 000000000000000111 - - area-horse 000000000000111111 - - bicycle 000000000000000111 - - bicycle-bridge 000000000000000111 - - bicycle-construction 000000000000001111 - - bicycle-disused 000000000000000111 - - bicycle-tunnel 000000000000111111 - - bridge 000000000000000111 - - bridge-horse 000000000000111111 - - construction 000000000000001111 - - construction-horse 000000000000111111 - - cutting 000000000000000111 - - demanding_alpine_hiking 000000000000000111 - - demanding_mountain_hiking 000000000000000111 - - destination 000000000000000111 - - difficult_alpine_hiking 000000000000000111 - - disused 000000000000000111 - - disused-horse 000000000000111111 - - dyke 000000000000000111 - - embankment 000000000000000111 - - hiking 000000000000000111 - - horse 000000000000111111 - - horse-tunnel 000000000000111111 - - levee 000000000000000111 - - mountain_hiking 000000000000000111 - - no-access 000000000000000111 - - permissive 000000000000000111 - - private 000000000000000111 - - tunnel 000000000000111111 - - {} - pedestrian 000000000000001111 + - area 000000000000001111 - - bridge 000000000000001111 - - construction 000000000000001111 - - cycleway 000000000000001111 - - disused 000000000000001111 - - junction 000000000000001111 - - tunnel 000000000000111111 - - {} - primary 000000011111111111 + - area 000000011111111111 - - bridge 000000011111111111 - - construction 000000011111111111 - - cycleway 000000011111111111 - - cycleway-motorroad 000000011111111111 - - disused 000000011111111111 - - junction 000000011111111111 - - motorroad 000000011111111111 - - oneway 000000011111111111 - - tunnel 000000011111111111 - - {} - primary_link 000000000001111111 + - area 000000000001111111 - - bridge 000000000001111111 - - construction 000000000001111111 - - cycleway 000000000001111111 - - cycleway-motorroad 000000000001111111 - - disused 000000000001111111 - - junction 000000000001111111 - - motorroad 000000000001111111 - - oneway 000000000001111111 - - tunnel 000000000001111111 - - {} - raceway 000000000000111111 + - dismantled 000000000000111111 - - disused 000000000001111111 - - {} - residential 000000000000011111 + - area 000000000000011111 - - bridge 000000000000011111 - - construction 000000000000111111 - - cycleway 000000000000011111 - - disused 000000000000011111 - - junction 000000000000011111 - - oneway 000000000000011111 - - private 000000000000011111 - - tunnel 000000000000111111 - - turning_circle 000000000000011111 - - {} - road 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - cycleway 000000000000111111 - - junction 000000000000111111 - - oneway 000000000000111111 - - tunnel 000000000000111111 - - turning_circle 000000000000111111 - - {} - secondary 000000000111111111 + - area 000000000111111111 - - bridge 000000000111111111 - - construction 000000000111111111 - - cycleway 000000000111111111 - - cycleway-motorroad 000000000111111111 - - disused 000000000111111111 - - junction 000000000111111111 - - motorroad 000000000111111111 - - oneway 000000000111111111 - - tunnel 000000000111111111 - - {} - secondary_link 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - construction 000000000000111111 - - cycleway 000000000000111111 - - cycleway-motorroad 000000000000111111 - - disused 000000000000111111 - - junction 000000000000111111 - - motorroad 000000000000111111 - - oneway 000000000000111111 - - tunnel 000000000000111111 - - {} - service 000000000000001111 + - area 000000000000001111 - - bridge 000000000000001111 - - construction 000000000000111111 - - cutting 000000000000001111 - - cycleway 000000000000001111 - - disused 000000000000001111 - - driveway 000000000000001111 + - area 000000000000001111 - - bridge 000000000000001111 - - tunnel 000000000000111111 - - {} - dyke 000000000000001111 - - embankment 000000000000001111 - - levee 000000000000001111 - - oneway 000000000000001111 - - parking_aisle 000000000000001111 + - area 000000000000001111 - - bridge 000000000000001111 - - tunnel 000000000000111111 - - {} - tunnel 000000000000111111 - - {} - steps 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - construction 000000000000111111 - - cutting 000000000000111111 - - disused 000000000000111111 - - dyke 000000000000111111 - - embankment 000000000000111111 - - levee 000000000000111111 - - tunnel 000000000000111111 - - {} - tertiary 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - construction 000000000000111111 - - cycleway 000000000000111111 - - cycleway-motorroad 000000000000111111 - - disused 000000000000111111 - - junction 000000000000111111 - - motorroad 000000000000111111 - - oneway 000000000000111111 - - tunnel 000000000000111111 - - {} - tertiary_link 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - construction 000000000000111111 - - cycleway 000000000000111111 - - cycleway-motorroad 000000000000111111 - - disused 000000000000111111 - - junction 000000000000111111 - - motorroad 000000000000111111 - - oneway 000000000000111111 - - tunnel 000000000000111111 - - {} - track 000000000000011111 + - area 000000000000011111 - - bridge 000000000000011111 - - construction 000000000000011111 - - cutting 000000000000011111 - - destination 000000000000011111 - - disused 000000000000011111 - - dyke 000000000000011111 - - embankment 000000000000011111 - - grade1 000000000000111111 + - area 000000000000111111 - - {} - grade2 000000000000111111 + - area 000000000000111111 - - {} - grade3 000000000000111111 + - area 000000000000111111 - - destination 000000000000111111 - - no-access 000000000000111111 - - permissive 000000000000111111 - - private 000000000000111111 - - {} - grade4 000000000000111111 + - area 000000000000111111 - - destination 000000000000111111 - - no-access 000000000000111111 - - permissive 000000000000111111 - - private 000000000000111111 - - {} - grade5 000000000000111111 + - area 000000000000111111 - - destination 000000000000111111 - - no-access 000000000000111111 - - permissive 000000000000111111 - - private 000000000000111111 - - {} - junction 000000000000011111 - - levee 000000000000011111 - - no-access 000000000000011111 - - oneway 000000000000011111 - - permissive 000000000000011111 - - private 000000000000011111 - - race 000000000000111111 - - racetrack 000000000000111111 - - tunnel 000000000001111111 - - {} - trunk 000000011111111111 + - area 000000011111111111 - - bridge 000000011111111111 - - construction 000000011111111111 - - cutting 000000011111111111 - - cycleway 000000011111111111 - - cycleway-motorroad 000000011111111111 - - disused 000000011111111111 - - dyke 000000011111111111 - - embankment 000000011111111111 - - junction 000000011111111111 - - levee 000000011111111111 - - motorroad 000000011111111111 - - oneway 000000011111111111 - - tunnel 000000011111111111 - - {} - trunk_link 000000000000000111 + - area 000000000000000111 - - bridge 000000000000000111 - - construction 000000000000111111 - - cycleway 000000000000000111 - - cycleway-motorroad 000000000000111111 - - disused 000000000000000111 - - junction 000000000000000111 - - motorroad 000000000000111111 - - oneway 000000000000000111 - - tunnel 000000000000000111 - - {} - unclassified 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - construction 000000000000111111 - - cycleway 000000000000111111 - - disused 000000000000111111 - - junction 000000000000111111 - - oneway 000000000000111111 - - tunnel 000000000001111111 - - turning_circle 000000000000111111 - - {} - unsurfaced 000000000000111111 + - area 000000000000111111 - - bridge 000000000000111111 - - construction 000000000000111111 - - cycleway 000000000000111111 - - destination 000000000000111111 - - disused 000000000000111111 - - junction 000000000000111111 - - no-access 000000000000111111 - - oneway 000000000000111111 - - permissive 000000000000111111 - - private 000000000000111111 - - tunnel 000000000011111111 - - {} - {} - historic 000000000000000000 + - archaeological_site 000000000000000011 - - battlefield 000000000000000011 - - castle 000000000000000011 - - memorial 000000000000000011 - - monument 000000000000000011 - - museum 000000000000000011 - - ruins 000000000000000011 - - {} - landuse 000000000000000000 + - allotments 000000000000111111 - - basin 000000000000111111 + - detention 000000000000111111 - - infiltration 000000000000111111 - - retention 000000000000111111 - - {} - brownfield 000000000000111111 - - cemetery 000000000000111111 + - christian 000000000000111111 - - {} - commercial 000000000000111111 - - conservation 000000000000111111 + - destination 000000000000111111 - - no-access 000000000000111111 - - permissive 000000000000111111 - - private 000000000000111111 - - {} - construction 000000000000111111 - - farm 000000000000111111 - - farmland 000000000000111111 - - farmyard 000000000000111111 - - field 000000000000111111 - - forest 000000000011111111 + - coniferous 000000000011111111 - - deciduous 000000000011111111 - - mixed 000000000011111111 - - {} - garages 000000000000000111 - - grass 000000000000111111 - - greenfield 000000000000111111 - - greenhouse_horticulture 000000000000000111 - - industrial 000000000000111111 - - landfill 000000000000011111 - - meadow 000000000000111111 - - military 000000000000110111 - - orchard 000000000000000111 - - quarry 000000000000111111 - - raceway 000000000000000000 + - dismantled 000000000000000000 - - disused 000000000000000000 - - {} - railway 000000000000111111 - - recreation_ground 000000000000111111 - - reservoir 000000000000111111 + - cooling 000000000000111111 - - evaporator 000000000000111111 - - sewage 000000000000111111 - - tailings 000000000000111111 - - water_storage 000000000000111111 - - {} - residential 000000000000111111 - - retail 000000000000111111 - - runway 000000000011111111 + - dismantled 000000000011111111 - - disused 000000000011111111 - - {} - salt_pond 000000000000000111 - - scrub 000000000000111111 + - coniferous 000000000000111111 - - deciduous 000000000000111111 - - mixed 000000000000111111 - - {} - street 000000000000000111 - - village_green 000000000000111111 - - vineyard 000000000000010111 - - wood 000000000000111111 + - coniferous 000000000000111111 - - deciduous 000000000000111111 - - mixed 000000000000111111 - - {} - {} - leisure 000000000000000000 + - common 000000000000111111 - - dog_park 000000000000111111 + - tennis 000000000000111111 - - {} - garden 000000000000011111 - - golf_course 000000000000111111 - - green 000000000000000000 - - landscape_reserve 000000000000000000 - - nature_reserve 000000000000000111 - - park 000000000000111111 + - destination 000000000000111111 - - no-access 000000000000111111 - - permissive 000000000000111111 - - private 000000000000111111 - - {} - pitch 000000000000111111 + - tennis 000000000000111111 - - {} - playground 000000000000111111 + - tennis 000000000000111111 - - {} - playing_fields 000000000000111111 + - tennis 000000000000111111 - - {} - recreation_ground 000000000000000000 + - destination 000000000000000000 - - no-access 000000000000000000 - - permissive 000000000000000000 - - private 000000000000000000 - - {} - slipway 000000000000000001 - - sports_centre 000000000000111111 - - stadium 000000000000111111 - - swimming_pool 000000000000011111 - - track 000000000000111111 + - area 000000000000111111 - - {} - water_park 000000000000011111 - - {} - man_made 000000000000000000 + - breakwater 000000000000000111 - - cairn 000000000000000001 - - cutline 000000000000111111 - - lighthouse 000000000000000001 - - pier 000000000000001111 - - pipeline 000000000000000011 + - gas 000000000000000011 + - overground 000000000000000011 - - {} - heat 000000000000000011 + - overground 000000000000000011 - - {} - hot_water 000000000000000011 + - overground 000000000000000011 - - {} - natural_gas 000000000000000011 + - overground 000000000000000011 - - {} - oil 000000000000000011 + - overground 000000000000000011 - - {} - overground 000000000000000011 - - sewage 000000000000000011 + - overground 000000000000000011 - - {} - water 000000000000000011 + - overground 000000000000000011 - - {} - {} - survey_point 000000000000000001 - - wastewater_plant 000000000000111111 - - windmill 000000000000000001 - - {} - mapswithme 000000000000000000 + - grid 000000000000111111 - - {} - military 000000000000000000 + - bunker 000000000000000001 - - {} - natural 000000000000000000 + - allotments 000000000000000111 - - basin 000000000000000111 - - bay 000000000000001111 - - beach 000000000000001111 - - brownfield 000000000000000111 - - cave_entrance 000000000000001111 - - cemetery 000000000000000111 - - coastline 111111111111111111 - - commercial 000000000000000111 - - construction 000000000000000111 - - farm 000000000000000111 - - farmland 000000000000000111 - - farmyard 000000000000000111 - - forest 000000111111111111 + - coniferous 000000111111111111 - - deciduous 000000111111111111 - - mixed 000000111111111111 - - {} - garages 000000000000000111 - - glacier 000000000000011111 - - grass 000000000000000111 - - greenfield 000000000000000111 - - greenhouse_horticulture 000000000000000111 - - heath 000000000000111111 - - industrial 000000000000000111 - - lake 000000111111111111 - - land 000000111111111111 - - landfill 000000000000000111 - - marsh 000000000000000000 - - meadow 000000000000000111 - - orchard 000000000000000111 - - peak 000000000000111111 - - pond 000000111111111111 - - quarry 000000000000000111 - - railway 000000000000000111 - - recreation_ground 000000000000000111 - - reservoir 000000000000000111 - - retail 000000000000000111 - - salt_pond 000000000000000111 - - scrub 000000000000111111 + - coniferous 000000000000111111 - - deciduous 000000000000111111 - - mixed 000000000000111111 - - {} - spring 000000000000001111 - - street 000000000000000111 - - tree 000000000000000011 - - village_green 000000000000000111 - - vineyard 000000000000000111 - - volcano 000000000000111111 - - water 000000111111111111 - - wetland 000000000000001111 + - bog 000000000000111111 - - {} - wood 000000000011111111 + - coniferous 000000000011111111 - - deciduous 000000000011111111 - - mixed 000000000011111111 - - {} - {} - noexit 000000000000000000 + - motor_vehicle 000000000000000000 - - motorcar 000000000000000000 - - {} - piste:lift 000000000000000000 + - j-bar 000000000000001111 - - magic_carpet 000000000000000111 - - platter 000000000000001111 - - rope_tow 000000000000000111 - - t-bar 000000000000001111 - - {} - piste:type 000000000000000000 + - downhill 000000000000011111 + - advanced 000000000000011111 - - easy 000000000000011111 - - expert 000000000000011111 - - freeride 000000000000011111 - - intermediate 000000000000011111 - - novice 000000000000011111 - - {} - nordic 000000000000011111 - - sled 000000000000011111 - - {} - place 000000000000000000 + - city 000001111111111100 + - capital 000011111111111100 - - {} - continent 111000000000000000 - - country 000111111100000000 - - county 000000000111100000 - - farm 000000000000001111 - - hamlet 000000000000001111 - - island 000000001111111111 - - islet 000000000000011111 - - locality 000000000000001111 - - region 000000001100000000 - - state 000000011100000000 + - USA 000011111100000000 - - {} - suburb 000000000000111111 - - town 000000000111111000 - - village 000000000000011111 - - {} - power 000000000000000000 + - generator 000000000000001111 + - hydro 000000000000001111 - - photovoltaic 000000000000001111 - - wind 000000000000001111 - - {} - line 000000000000001111 + - submarine 000000000000001111 - - underground 000000000000001111 - - {} - minor_line 000000000000000011 - - pole 000000000000000011 - - station 000000000000001111 - - sub_station 000000000000001111 - - tower 000000000000001111 - - {} - railway 000000000000000000 + - abandoned 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - construction 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - crossing 000000000000000011 - - dismantled 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - disused 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - funicular 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - halt 000000000000001111 - - incline 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - level_crossing 000000000000000011 - - light_rail 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - monorail 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - narrow_gauge 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - planned 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - platform 000000000000000011 - - preserved 000000000011111111 + - bridge 000000000011111111 - - tunnel 000000000011111111 - - {} - proposed 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - rail 000000000111111111 + - bridge 000000000111111111 - - tunnel 000000000111111111 - - {} - razed 000000000000000011 - - siding 000000000000011111 + - bridge 000000000000011111 - - tunnel 000000000000011111 - - {} - spur 000000000000001111 + - bridge 000000000000001111 - - tunnel 000000000000001111 - - {} - station 000000000000001111 + - subway 000000000000011111 - - {} - subway 000000000000000001 + - bridge 000000000000000011 - - tunnel 000000000000111111 - - {} - subway_entrance 000000000000000011 - - tram 000000000000001111 + - bridge 000000000000001111 - - tunnel 000000000000111111 - - {} - tram_stop 000000000000000111 - - yard 000000000000111111 + - bridge 000000000000111111 - - tunnel 000000000000111111 - - {} - {} - route 000000000000000000 + - ferry 000000011111111111 - - {} - shop 000000000000000000 + - bakery 000000000000000011 - - car 000000000000000000 - - car_repair 000000000000000011 - - clothes 000000000000000011 - - convenience 000000000000000011 - - hairdresser 000000000000000011 - - kiosk 000000000000000011 - - supermarket 000000000000000011 - - {} - sport 000000000000000000 + - american_football 000000000000000001 - - archery 000000000000000001 - - athletics 000000000000000001 - - australian_football 000000000000000001 - - baseball 000000000000000001 - - basketball 000000000000000001 - - bowls 000000000000000001 - - cricket 000000000000000001 - - curling 000000000000000001 - - diving 000000000000000001 - - equestrian 000000000000000001 - - football 000000000000000001 - - golf 000000000000000001 - - gymnastics 000000000000000001 - - handball 000000000000000001 - - multi 000000000000000001 - - scuba_diving 000000000000000001 - - shooting 000000000000000001 - - skiing 000000000000000001 - - soccer 000000000000000001 - - swimming 000000000000000001 - - tennis 000000000000000001 - - {} - tourism 000000000000000000 + - alpine_hut 000000000000001111 - - attraction 000000000011111111 - - camp_site 000000000011111111 - - caravan_site 000000000011111111 - - guest_house 000000000000000011 - - hostel 000000000000000011 - - hotel 000000000000000011 - - information 000000000000000001 + - guidepost 000000000000000001 - - office 000000000000000001 - - {} - motel 000000000000000011 - - museum 000000000000000011 - - picnic_site 000000000011111111 - - viewpoint 000000000000000111 - - zoo 000000000011111111 - - {} - waterway 000000000000000000 + - canal 000000000000111111 + - tunnel 000000000000111111 - - {} - dam 000000000000001111 - - ditch 000000000000111111 + - tunnel 000000000000111111 - - {} - dock 000000111111111111 - - drain 000000000000111111 + - tunnel 000000000000111111 - - {} - lock 000000000000001111 - - lock_gate 000000000000000000 - - river 000000000011111111 + - tunnel 000000000011111111 - - {} - riverbank 000000111111111111 - - stream 000000000000111111 + - ephemeral 000000000000111111 - - intermittent 000000000000111111 - - tunnel 000000000000111111 - - {} - weir 000000000000001111 - - {} - {} diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp index 19fa0cd5ec..ab8fbf27d9 100644 --- a/indexer/classificator.cpp +++ b/indexer/classificator.cpp @@ -436,25 +436,6 @@ void Classificator::PrintClassificator(char const * fPath) #endif } -void Classificator::ReadVisibility(istream & s) -{ - ClassifObject::VisLoadPolicy policy(&m_root); - tree::LoadTreeAsText(s, policy); -} - -void Classificator::PrintVisibility(char const * fPath) -{ -#ifndef OMIM_OS_BADA - ofstream file(fPath); - - ClassifObject::VisSavePolicy policy(&m_root); - tree::SaveTreeAsText(file, policy); - -#else - ASSERT ( false, ("PrintVisibility uses only in indexer_tool") ); -#endif -} - void Classificator::SortClassificator() { GetMutableRoot()->Sort(); diff --git a/indexer/classificator.hpp b/indexer/classificator.hpp index 117aa9f37b..43a4affdba 100644 --- a/indexer/classificator.hpp +++ b/indexer/classificator.hpp @@ -115,6 +115,7 @@ public: typedef bitset<18> visible_mask_t; visible_mask_t GetVisibilityMask() const { return m_visibility; } void SetVisibilityMask(visible_mask_t mask) { m_visibility = mask; } + void SetVisibilityOnScale(const bool isVisible, const int scale) { m_visibility[scale] = isVisible; } /// @name Policies for classificator tree serialization. //@{ @@ -213,9 +214,6 @@ public: void ReadClassificator(istream & s); void PrintClassificator(char const * fPath); - void ReadVisibility(istream & s); - void PrintVisibility(char const * fPath); - void ReadTypesMapping(istream & s); void SortClassificator(); diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp index 34cc1fdc75..5b16ac1caf 100644 --- a/indexer/classificator_loader.cpp +++ b/indexer/classificator_loader.cpp @@ -17,7 +17,6 @@ namespace classificator { void ReadCommon(Reader * classificator, - Reader * visibility, Reader * types) { Classificator & c = classif(); @@ -32,14 +31,6 @@ namespace classificator } { - //LOG(LINFO, ("Reading visibility")); - ReaderStreamBuf buffer(visibility); - - istream s(&buffer); - c.ReadVisibility(s); - } - - { //LOG(LINFO, ("Reading types mapping")); ReaderStreamBuf buffer(types); @@ -48,20 +39,13 @@ namespace classificator } } - void ReadVisibility(string const & fPath) - { - ifstream s(fPath.c_str()); - classif().ReadVisibility(s); - } - void Load() { LOG(LDEBUG, ("Reading of classificator started")); Platform & p = GetPlatform(); - ReadCommon(p.GetReader("classificator.txt"), - p.GetReader("visibility.txt"), + ReadCommon(p.GetReader("classificator.txt"), p.GetReader("types.txt")); //LOG(LINFO, ("Reading of drawing rules")); diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp index b381f5ca12..101bd9c912 100644 --- a/indexer/drawing_rules.cpp +++ b/indexer/drawing_rules.cpp @@ -322,6 +322,8 @@ namespace { size_t const i = m_holder.AddRule(scale, type, new TRule(rule)); Key k(scale, type, i); + + p->SetVisibilityOnScale(true, scale); k.SetPriority(rule.priority()); p->AddDrawRule(k); } diff --git a/installer/win/MapsWithMe.wxs b/installer/win/MapsWithMe.wxs index b44b3b8b7f..1e04a9b408 100644 --- a/installer/win/MapsWithMe.wxs +++ b/installer/win/MapsWithMe.wxs @@ -107,9 +107,6 @@ <Component Id='_classificator.txt' Guid='7f871bff-8d12-4eaf-ae76-3e2b3eb8c312'> <File Id='_classificator.txt' Name='classificator.txt' Source='..\..\data\classificator.txt' DiskId='1' KeyPath='yes' Checksum='no' /> </Component> - <Component Id='_visibility.txt' Guid='83a05519-c95f-4b36-84f0-bea8abadb020'> - <File Id='_visibility.txt' Name='visibility.txt' Source='..\..\data\visibility.txt' DiskId='1' KeyPath='yes' Checksum='no' /> - </Component> <Component Id='_drawing_rules.bin' Guid='bfc9e374-fdad-4864-a66b-3e252f94f3bb'> <File Id='_drawing_rules.bin' Name='drawing_rules.bin' Source='..\..\data\drawing_rules.bin' DiskId='1' KeyPath='yes' Checksum='no' /> </Component> @@ -167,7 +164,6 @@ <ComponentRef Id='_basic.skn' /> <ComponentRef Id='_symbols_24.png' /> <ComponentRef Id='_classificator.txt' /> - <ComponentRef Id='_visibility.txt' /> <ComponentRef Id='_drawing_rules.bin' /> <ComponentRef Id='_fonts_blacklist.txt' /> <ComponentRef Id='_fonts_whitelist.txt' /> diff --git a/installer/win/generator.pl b/installer/win/generator.pl index 533dce0633..963dcb85af 100644 --- a/installer/win/generator.pl +++ b/installer/win/generator.pl @@ -2,7 +2,7 @@ use strict; my @RESOURCES = ("01_dejavusans.ttf", "02_wqy-microhei.ttf", "03_jomolhari-id-a3d.ttf", "04_padauk.ttf", "05_khmeros.ttf", "06_code2000.ttf", "basic.skn", "symbols_24.png", - "classificator.txt", "visibility.txt", "drawing_rules.bin", + "classificator.txt", "drawing_rules.bin", "fonts_blacklist.txt", "fonts_whitelist.txt", "unicode_blocks.txt", "languages.txt", "maps.update", "countries.txt", "welcome.html", "about-travelguide-desktop.html", "eula.html", diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index e6de06889c..532677b707 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -177,7 +177,6 @@ FA459EB414327AF700B5BB3C /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */; }; FA46DA2C12D4166E00968C36 /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA46DA2B12D4166E00968C36 /* countries.txt */; }; FA4B0A1415136C4C00758203 /* World.mwm.nosearch in Resources */ = {isa = PBXBuildFile; fileRef = FA4B0A1315136C4C00758203 /* World.mwm.nosearch */; }; - FA500588128907F0002961F0 /* visibility.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA500587128907F0002961F0 /* visibility.txt */; }; FA5D4F191557F79900E7D8BB /* PlacePageVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA5D4F161557F79900E7D8BB /* PlacePageVC.mm */; }; FA5D4F1A1557F79900E7D8BB /* PlacePageVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA5D4F161557F79900E7D8BB /* PlacePageVC.mm */; }; FA64D9A913F975AD00350ECF /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA64D9A813F975AD00350ECF /* types.txt */; }; @@ -762,7 +761,6 @@ FAFB06B0151215EE0041901D /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FA065FFE1286167A00FEA989 /* Default.png */; }; FAFB06B1151215EE0041901D /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0660011286168700FEA989 /* Default-Portrait.png */; }; FAFB06B2151215EE0041901D /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0660021286168700FEA989 /* Default-Landscape.png */; }; - FAFB06B9151215EE0041901D /* visibility.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA500587128907F0002961F0 /* visibility.txt */; }; FAFB06BE151215EE0041901D /* unicode_blocks.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */; }; FAFB06BF151215EE0041901D /* fonts_blacklist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */; }; FAFB06C0151215EE0041901D /* fonts_whitelist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */; }; @@ -1501,7 +1499,6 @@ FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; name = WorldCoasts.mwm; path = ../../data/WorldCoasts.mwm; sourceTree = "<group>"; }; FA46DA2B12D4166E00968C36 /* countries.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = countries.txt; path = ../../data/countries.txt; sourceTree = SOURCE_ROOT; }; FA4B0A1315136C4C00758203 /* World.mwm.nosearch */ = {isa = PBXFileReference; lastKnownFileType = file; name = World.mwm.nosearch; path = ../../data/World.mwm.nosearch; sourceTree = "<group>"; }; - FA500587128907F0002961F0 /* visibility.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = visibility.txt; path = ../../data/visibility.txt; sourceTree = SOURCE_ROOT; }; FA5D4F151557F79900E7D8BB /* PlacePageVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlacePageVC.h; path = Bookmarks/PlacePageVC.h; sourceTree = SOURCE_ROOT; }; FA5D4F161557F79900E7D8BB /* PlacePageVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlacePageVC.mm; path = Bookmarks/PlacePageVC.mm; sourceTree = SOURCE_ROOT; }; FA64D9A813F975AD00350ECF /* types.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = types.txt; path = ../../data/types.txt; sourceTree = SOURCE_ROOT; }; @@ -2323,7 +2320,6 @@ EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */, FA46DA2B12D4166E00968C36 /* countries.txt */, FA85F632145DDDC20090E1A0 /* packed_polygons.bin */, - FA500587128907F0002961F0 /* visibility.txt */, EE026F0511D6AC0D00645242 /* classificator.txt */, ); name = "External Resources"; @@ -3108,7 +3104,6 @@ FA0660001286167A00FEA989 /* Default.png in Resources */, FA0660031286168700FEA989 /* Default-Portrait.png in Resources */, FA0660041286168700FEA989 /* Default-Landscape.png in Resources */, - FA500588128907F0002961F0 /* visibility.txt in Resources */, FA46DA2C12D4166E00968C36 /* countries.txt in Resources */, EE583CBB12F773F00042CBE3 /* unicode_blocks.txt in Resources */, EEFE7C1412F8C9E1006AF8C3 /* fonts_blacklist.txt in Resources */, @@ -3749,7 +3744,6 @@ FAFB06B0151215EE0041901D /* Default.png in Resources */, FAFB06B1151215EE0041901D /* Default-Portrait.png in Resources */, FAFB06B2151215EE0041901D /* Default-Landscape.png in Resources */, - FAFB06B9151215EE0041901D /* visibility.txt in Resources */, FAFB06BE151215EE0041901D /* unicode_blocks.txt in Resources */, FAFB06BF151215EE0041901D /* fonts_blacklist.txt in Resources */, FAFB06C0151215EE0041901D /* fonts_whitelist.txt in Resources */, diff --git a/qt/classificator_tree.cpp b/qt/classificator_tree.cpp deleted file mode 100644 index caac3ab274..0000000000 --- a/qt/classificator_tree.cpp +++ /dev/null @@ -1,294 +0,0 @@ -#include "../base/SRC_FIRST.hpp" -#include "classificator_tree.hpp" - -#include "../indexer/classificator_loader.hpp" -#include "../indexer/classificator.hpp" - -#include "../platform/platform.hpp" - -#include "../base/assert.hpp" - -#include "../std/bind.hpp" - -#include <QtGui/QTreeWidget> -#include <QtGui/QHBoxLayout> -#include <QtGui/QCheckBox> -#include <QtGui/QPushButton> -#include <QtGui/QToolBar> -#include <QtGui/QFileDialog> - - -namespace qt -{ - -typedef ClassifObject::visible_mask_t mask_t; - -/////////////////////////////////////////////////////////////////////////// -// QClassifTree implementation -/////////////////////////////////////////////////////////////////////////// - -class QClassifTree : public QTreeWidget -{ - typedef QTreeWidget base_type; - - ClassifTreeHolder * get_parent() - { - return dynamic_cast<ClassifTreeHolder *>(parentWidget()); - } - -public: - QClassifTree(ClassifTreeHolder * pParent) : base_type(pParent) {} - -protected: - virtual void contextMenuEvent(QContextMenuEvent * /*e*/) - { - int const col = currentColumn(); - if (col == 1) - get_parent()->EditItem(currentItem()); - } -}; - -/////////////////////////////////////////////////////////////////////////// -// QEditChecks implementation -/////////////////////////////////////////////////////////////////////////// - -QEditChecks::QEditChecks(QWidget * pParent) -: base_type(pParent) -{ - QVBoxLayout * pLayout = new QVBoxLayout(this); - - for (size_t i = 0; i < s_count; ++i) - { - m_arr[i] = new QCheckBox(QString::number(i), this); - pLayout->addWidget(m_arr[i]); - } - - QPushButton * p = new QPushButton(tr("OK"), this); - connect(p, SIGNAL(pressed()), this, SLOT(OnOK())); - pLayout->addWidget(p); - - setLayout(pLayout); -} - -void QEditChecks::Show(ClassifObject * p, QPoint const & pt) -{ - m_pObj = p; - mask_t mask = p->GetVisibilityMask(); - - for (size_t i = 0; i < s_count; ++i) - m_arr[i]->setChecked(mask[i]); - - show(); - move(pt); -} - -void QEditChecks::OnOK() -{ - mask_t mask; - for (size_t i = 0; i < s_count; ++i) - mask[i] = m_arr[i]->isChecked(); - - close(); - - m_pObj->SetVisibilityMask(mask); - emit applied(); -} - -/////////////////////////////////////////////////////////////////////////// -// QClassifTreeHolder implementation -/////////////////////////////////////////////////////////////////////////// - -ClassifTreeHolder::ClassifTreeHolder(QWidget * pParent, - QWidget * drawWidget, char const * drawSlot) -: base_type(pParent) -{ - QVBoxLayout * pLayout = new QVBoxLayout(this); - pLayout->setContentsMargins(0, 0, 0, 0); - - QToolBar * pToolBar = new QToolBar(this); - pToolBar->setIconSize(QSize(32, 32)); - pToolBar->addAction(QIcon(":/classif32/save.png"), tr("Save visibility settings"), this, SLOT(OnSave())); - pToolBar->addAction(QIcon(":/classif32/load.png"), tr("Load visibility settings"), this, SLOT(OnLoad())); - pToolBar->addAction(QIcon(":/classif32/select.png"), tr("Select all checks"), this, SLOT(OnSelectAll())); - pToolBar->addAction(QIcon(":/classif32/clear.png"), tr("Clear all checks"), this, SLOT(OnClearAll())); - - m_pTree = new QClassifTree(this); - m_pEditor = new QEditChecks(this); - - connect(m_pEditor, SIGNAL(applied()), this, SLOT(OnEditFinished())); - drawWidget->connect(m_pEditor, SIGNAL(applied()), drawWidget, drawSlot); - drawWidget->connect(this, SIGNAL(redraw_model()), drawWidget, drawSlot); - - m_pTree->setColumnCount(2); - - QStringList headers; - headers << tr("Type") << tr("Mask"); - m_pTree->setHeaderLabels(headers); - - pLayout->addWidget(pToolBar); - pLayout->addWidget(m_pTree); - setLayout(pLayout); -} - -namespace -{ - void to_item(QTreeWidgetItem * p, ClassifObject * pObj) - { - qulonglong ptr = reinterpret_cast<qulonglong>(pObj); - return p->setData(1, Qt::UserRole, QVariant(ptr)); - } - - ClassifObject * from_item(QTreeWidgetItem * p) - { - bool isOK; - qulonglong ptr = p->data(1, Qt::UserRole).toULongLong(&isOK); - ASSERT ( isOK, () ); - return reinterpret_cast<ClassifObject *>(ptr); - } -} - -void ClassifTreeHolder::Process(QTreeWidgetItem * pParent, ClassifObject * p) -{ - QTreeWidgetItem * pItem = 0; - - // do not add root item (leave more useful space) - if (p != m_pRoot) - { - QStringList values; - values << QString::fromStdString(p->GetName()) << GetMaskValue(p); - - if (pParent) - pItem = new QTreeWidgetItem(pParent, values); - else - pItem = new QTreeWidgetItem(m_pTree, values); - - to_item(pItem, p); - } - - p->ForEachObject(bind(&ClassifTreeHolder::Process, this, pItem, _1)); -} - -QString ClassifTreeHolder::GetMaskValue(ClassifObject const * p) const -{ - mask_t mask = p->GetVisibilityMask(); - size_t const count = mask.size(); - string str; - str.resize(count); - for (size_t i = 0; i < mask.size(); ++i) - str[i] = (mask[i] ? '1' : '0'); - - return QString::fromStdString(str); -} - -void ClassifTreeHolder::SetRoot(ClassifObject * pRoot) -{ - m_pTree->clear(); - - m_pRoot = pRoot; - Process(0, m_pRoot); - m_pTree->expandAll(); -} - -void ClassifTreeHolder::EditItem(QTreeWidgetItem * p) -{ - m_pCurrent = p; - ClassifObject * pObj = from_item(p); - - // find best position of edit-window newar the cursor - QPoint pt = QCursor::pos(); - int const h = m_pEditor->frameSize().height(); - pt.ry() -= (h / 2); - - pt.ry() = max(0, pt.y()); - pt.ry() = min(mapToGlobal(rect().bottomRight()).y() - h, pt.y()); - - // show window - m_pEditor->Show(pObj, pt); -} - -void ClassifTreeHolder::OnEditFinished() -{ - m_pCurrent->setText(1, GetMaskValue(from_item(m_pCurrent))); -} - -void ClassifTreeHolder::OnSave() -{ - QString const fName = QFileDialog::getSaveFileName(this, - tr("Save classificator visibility"), - QString::fromStdString(GetPlatform().WritableDir()), - tr("Text Files (*.txt)")); - - classif().PrintVisibility(fName.toAscii().constData()); -} - -void ClassifTreeHolder::OnLoad() -{ - QString const fName = QFileDialog::getOpenFileName(this, - tr("Open classificator visibility"), - QString::fromStdString(GetPlatform().WritableDir()), - tr("Text Files (*.txt)")); - - classificator::ReadVisibility(fName.toAscii().constData()); - - Rebuild(); -} - -namespace -{ - template <class ToDo> void ForEachRecursive(ClassifObject * p, ToDo & toDo) - { - toDo(p); - p->ForEachObject(bind(&ForEachRecursive<ToDo>, _1, ref(toDo))); - } - - class do_select - { - mask_t m_mask; - public: - do_select(mask_t mask) : m_mask(mask) {} - void operator() (ClassifObject * p) - { - p->SetVisibilityMask(m_mask); - } - }; -} - -template <class TMask> -void ClassifTreeHolder::OnSetMask(TMask mask) -{ - do_select doSelect(mask); - ForEachRecursive(GetRoot(), doSelect); - Rebuild(); -} - -void ClassifTreeHolder::OnSelectAll() -{ - mask_t mask; - mask.set(); - OnSetMask(mask); -} - -void ClassifTreeHolder::OnClearAll() -{ - mask_t mask; - mask.reset(); - OnSetMask(mask); -} - -ClassifObject * ClassifTreeHolder::GetRoot() -{ - return classif().GetMutableRoot(); -} - -void ClassifTreeHolder::Rebuild() -{ - SetRoot(GetRoot()); - Redraw(); -} - -void ClassifTreeHolder::Redraw() -{ - emit redraw_model(); -} - -} diff --git a/qt/classificator_tree.hpp b/qt/classificator_tree.hpp deleted file mode 100644 index 32cf70d158..0000000000 --- a/qt/classificator_tree.hpp +++ /dev/null @@ -1,83 +0,0 @@ -#pragma once - -#include <QtGui/QWidget> -#include <QtGui/QDialog> - -class ClassifObject; - -class QTreeWidget; -class QTreeWidgetItem; -class QCheckBox; -class QToolBar; - -namespace qt -{ - class QClassifTree; - - class QEditChecks : public QDialog - { - typedef QDialog base_type; - - static const int s_count = 18; - QCheckBox * m_arr[s_count]; - - ClassifObject * m_pObj; - - Q_OBJECT - - public: - QEditChecks(QWidget * pParent); - - void Show(ClassifObject * p, QPoint const & cursor); - - public Q_SLOTS: - void OnOK(); - - Q_SIGNALS: - void applied(); - }; - - class ClassifTreeHolder : public QWidget - { - typedef QWidget base_type; - - void Process(QTreeWidgetItem * pParent, ClassifObject * p); - - QString GetMaskValue(ClassifObject const * p) const; - - Q_OBJECT - - public: - ClassifTreeHolder(QWidget * pParent, - QWidget * drawWidget, char const * drawSlot); - - void SetRoot(ClassifObject * pRoot); - - void EditItem(QTreeWidgetItem * p); - - public Q_SLOTS: - void OnEditFinished(); - void OnSave(); - void OnLoad(); - void OnSelectAll(); - void OnClearAll(); - -Q_SIGNALS: - void redraw_model(); - - protected: - ClassifObject * GetRoot(); - void Rebuild(); - void Redraw(); - - private: - template <class TMask> void OnSetMask(TMask mask); - - QClassifTree * m_pTree; - QEditChecks * m_pEditor; - - ClassifObject * m_pRoot; - - QTreeWidgetItem * m_pCurrent; - }; -} diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index 9553a76855..0854cd5055 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -24,7 +24,6 @@ #ifndef NO_DOWNLOADER #include "update_dialog.hpp" -#include "classificator_tree.hpp" #include "info_dialog.hpp" #include "../indexer/classificator.hpp" @@ -45,11 +44,6 @@ MainWindow::MainWindow() CreateNavigationBar(); CreateSearchBarAndPanel(); -#ifndef NO_DOWNLOADER - CreateClassifPanel(); -// CreateGuidePanel(); -#endif // NO_DOWNLOADER - setCentralWidget(m_pDrawWidget); setWindowTitle(tr("MapsWithMe")); @@ -381,17 +375,6 @@ void MainWindow::ShowGuidePanel() m_Docks[1]->show(); } -void MainWindow::CreateClassifPanel() -{ - CreatePanelImpl(0, Qt::LeftDockWidgetArea, tr("Classificator Bar"), - QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C), SLOT(ShowClassifPanel())); - - ClassifTreeHolder * pCTree = new ClassifTreeHolder(m_Docks[0], m_pDrawWidget, SLOT(Repaint())); - pCTree->SetRoot(classif().GetMutableRoot()); - - m_Docks[0]->setWidget(pCTree); -} - //void MainWindow::CreateGuidePanel() //{ // CreatePanelImpl(1, Qt::LeftDockWidgetArea, tr("Guide Bar"), @@ -42,7 +42,7 @@ macx* { ../data/languages.txt ../data/categories.txt \ ../data/packed_polygons.bin CLASSIFICATOR_RES.path = Contents/Resources - CLASSIFICATOR_RES.files = ../data/classificator.txt ../data/visibility.txt \ + CLASSIFICATOR_RES.files = ../data/classificator.txt \ ../data/types.txt CONFIG(production) { CLASSIFICATOR_RES.files += ../data/drules_proto.bin @@ -96,10 +96,8 @@ RESOURCES += res/resources.qrc SOURCES += \ update_dialog.cpp \ - classificator_tree.cpp \ HEADERS += \ update_dialog.hpp \ - classificator_tree.hpp \ } diff --git a/qt/res/resources.qrc b/qt/res/resources.qrc index 4d87d25bb9..a7451afabd 100644 --- a/qt/res/resources.qrc +++ b/qt/res/resources.qrc @@ -1,10 +1,4 @@ <RCC> - <qresource prefix="/classif32"> - <file>save.png</file> - <file>load.png</file> - <file>select.png</file> - <file>clear.png</file> - </qresource> <qresource prefix="/navig64"> <file>search.png</file> <file>up.png</file> @@ -23,4 +17,4 @@ <file>busy.png</file> <file>x.png</file> </qresource> -</RCC>
\ No newline at end of file +</RCC> diff --git a/tools/android/update_assets_for_version.sh b/tools/android/update_assets_for_version.sh index 2b10a4c90f..d9a1202b02 100755 --- a/tools/android/update_assets_for_version.sh +++ b/tools/android/update_assets_for_version.sh @@ -10,7 +10,7 @@ mkdir $DST files=(about.html resources-ldpi resources-mdpi resources-hdpi resources-xhdpi categories.txt classificator.txt types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt \ - visibility.txt drules_proto.txt drules_proto.bin external_resources.txt packed_polygons.bin) + drules_proto.txt drules_proto.bin external_resources.txt packed_polygons.bin) for item in ${files[*]} do |