diff --git a/icons/aerodrome.p.16.png b/icons/aerodrome.p.16.png new file mode 100644 index 000000000..8f13cd76f Binary files /dev/null and b/icons/aerodrome.p.16.png differ diff --git a/icons/aerodrome.png b/icons/aerodrome.png new file mode 100644 index 000000000..8f13cd76f Binary files /dev/null and b/icons/aerodrome.png differ diff --git a/icons/aiga_parking1.png b/icons/aiga_parking1.png new file mode 100644 index 000000000..641a3c9c6 Binary files /dev/null and b/icons/aiga_parking1.png differ diff --git a/icons/airport.p.16.png b/icons/airport.p.16.png new file mode 100644 index 000000000..d10f5c398 Binary files /dev/null and b/icons/airport.p.16.png differ diff --git a/icons/airport.png b/icons/airport.png new file mode 100644 index 000000000..d10f5c398 Binary files /dev/null and b/icons/airport.png differ diff --git a/icons/allotments.png b/icons/allotments.png new file mode 100644 index 000000000..d5e27796c Binary files /dev/null and b/icons/allotments.png differ diff --git a/icons/alpinehut.p.16.png b/icons/alpinehut.p.16.png new file mode 100644 index 000000000..84b09771b Binary files /dev/null and b/icons/alpinehut.p.16.png differ diff --git a/icons/alpinehut.png b/icons/alpinehut.png new file mode 100644 index 000000000..84b09771b Binary files /dev/null and b/icons/alpinehut.png differ diff --git a/icons/amenity_court.p.20.png b/icons/amenity_court.p.20.png new file mode 100644 index 000000000..eed9852d7 Binary files /dev/null and b/icons/amenity_court.p.20.png differ diff --git a/icons/amenity_court.png b/icons/amenity_court.png new file mode 100644 index 000000000..eed9852d7 Binary files /dev/null and b/icons/amenity_court.png differ diff --git a/icons/amenity_prison.p.20.png b/icons/amenity_prison.p.20.png new file mode 100644 index 000000000..05425fb64 Binary files /dev/null and b/icons/amenity_prison.p.20.png differ diff --git a/icons/amenity_prison.png b/icons/amenity_prison.png new file mode 100644 index 000000000..05425fb64 Binary files /dev/null and b/icons/amenity_prison.png differ diff --git a/icons/arrow.png b/icons/arrow.png new file mode 100644 index 000000000..ffbb1df31 Binary files /dev/null and b/icons/arrow.png differ diff --git a/icons/arrow_back.png b/icons/arrow_back.png new file mode 100644 index 000000000..309ca5da4 Binary files /dev/null and b/icons/arrow_back.png differ diff --git a/icons/atm.png b/icons/atm.png new file mode 100644 index 000000000..9a1dd5d2d Binary files /dev/null and b/icons/atm.png differ diff --git a/icons/atm2.p.16.png b/icons/atm2.p.16.png new file mode 100644 index 000000000..62caf207e Binary files /dev/null and b/icons/atm2.p.16.png differ diff --git a/icons/atm2.png b/icons/atm2.png new file mode 100644 index 000000000..62caf207e Binary files /dev/null and b/icons/atm2.png differ diff --git a/icons/bandb.p.20.png b/icons/bandb.p.20.png new file mode 100644 index 000000000..eb7ebb9fe Binary files /dev/null and b/icons/bandb.p.20.png differ diff --git a/icons/bandb.png b/icons/bandb.png new file mode 100644 index 000000000..eb7ebb9fe Binary files /dev/null and b/icons/bandb.png differ diff --git a/icons/bank2.p.16.png b/icons/bank2.p.16.png new file mode 100644 index 000000000..a7d30e86d Binary files /dev/null and b/icons/bank2.p.16.png differ diff --git a/icons/bank2.png b/icons/bank2.png new file mode 100644 index 000000000..a7d30e86d Binary files /dev/null and b/icons/bank2.png differ diff --git a/icons/bar.p.20.png b/icons/bar.p.20.png new file mode 100644 index 000000000..9b0e48b96 Binary files /dev/null and b/icons/bar.p.20.png differ diff --git a/icons/bar.png b/icons/bar.png new file mode 100644 index 000000000..9b0e48b96 Binary files /dev/null and b/icons/bar.png differ diff --git a/icons/beach.png b/icons/beach.png new file mode 100644 index 000000000..ff9e3072f Binary files /dev/null and b/icons/beach.png differ diff --git a/icons/biergarten.p.16.png b/icons/biergarten.p.16.png new file mode 100644 index 000000000..241a4de1f Binary files /dev/null and b/icons/biergarten.p.16.png differ diff --git a/icons/biergarten.png b/icons/biergarten.png new file mode 100644 index 000000000..241a4de1f Binary files /dev/null and b/icons/biergarten.png differ diff --git a/icons/bollard.png b/icons/bollard.png new file mode 100644 index 000000000..1ea411827 Binary files /dev/null and b/icons/bollard.png differ diff --git a/icons/bus_station.n.16.png b/icons/bus_station.n.16.png new file mode 100644 index 000000000..5224dd119 Binary files /dev/null and b/icons/bus_station.n.16.png differ diff --git a/icons/bus_station.png b/icons/bus_station.png new file mode 100644 index 000000000..5224dd119 Binary files /dev/null and b/icons/bus_station.png differ diff --git a/icons/bus_stop.p.12.png b/icons/bus_stop.p.12.png new file mode 100644 index 000000000..f290dcb44 Binary files /dev/null and b/icons/bus_stop.p.12.png differ diff --git a/icons/bus_stop.png b/icons/bus_stop.png index 989e9c382..f290dcb44 100755 Binary files a/icons/bus_stop.png and b/icons/bus_stop.png differ diff --git a/icons/bus_stop_small.png b/icons/bus_stop_small.png new file mode 100644 index 000000000..6d8b655f6 Binary files /dev/null and b/icons/bus_stop_small.png differ diff --git a/icons/cable_car.png b/icons/cable_car.png new file mode 100644 index 000000000..b160f0c3d Binary files /dev/null and b/icons/cable_car.png differ diff --git a/icons/cafe.p.16.png b/icons/cafe.p.16.png new file mode 100644 index 000000000..836f8a540 Binary files /dev/null and b/icons/cafe.p.16.png differ diff --git a/icons/cafe.png b/icons/cafe.png index d5cc5a86f..836f8a540 100755 Binary files a/icons/cafe.png and b/icons/cafe.png differ diff --git a/icons/camping.n.16.png b/icons/camping.n.16.png new file mode 100644 index 000000000..b76912566 Binary files /dev/null and b/icons/camping.n.16.png differ diff --git a/icons/camping.png b/icons/camping.png new file mode 100644 index 000000000..b76912566 Binary files /dev/null and b/icons/camping.png differ diff --git a/icons/car_share.p.16.png b/icons/car_share.p.16.png new file mode 100644 index 000000000..1dcc537f6 Binary files /dev/null and b/icons/car_share.p.16.png differ diff --git a/icons/car_share.png b/icons/car_share.png new file mode 100644 index 000000000..1dcc537f6 Binary files /dev/null and b/icons/car_share.png differ diff --git a/icons/caravan_park.p.24.png b/icons/caravan_park.p.24.png new file mode 100644 index 000000000..751f5204b Binary files /dev/null and b/icons/caravan_park.p.24.png differ diff --git a/icons/caravan_park.png b/icons/caravan_park.png new file mode 100644 index 000000000..751f5204b Binary files /dev/null and b/icons/caravan_park.png differ diff --git a/icons/cemetery_jewish.18.png b/icons/cemetery_jewish.18.png new file mode 100644 index 000000000..316cdd847 Binary files /dev/null and b/icons/cemetery_jewish.18.png differ diff --git a/icons/cemetery_jewish.png b/icons/cemetery_jewish.png new file mode 100644 index 000000000..316cdd847 Binary files /dev/null and b/icons/cemetery_jewish.png differ diff --git a/icons/chair_lift.png b/icons/chair_lift.png new file mode 100644 index 000000000..ba0f4740e Binary files /dev/null and b/icons/chair_lift.png differ diff --git a/icons/chalet.p.16.png b/icons/chalet.p.16.png new file mode 100644 index 000000000..db5eb31cd Binary files /dev/null and b/icons/chalet.p.16.png differ diff --git a/icons/chalet.png b/icons/chalet.png new file mode 100644 index 000000000..db5eb31cd Binary files /dev/null and b/icons/chalet.png differ diff --git a/icons/christian3.p.14.png b/icons/christian3.p.14.png new file mode 100644 index 000000000..c420f7f50 Binary files /dev/null and b/icons/christian3.p.14.png differ diff --git a/icons/christian3.png b/icons/christian3.png new file mode 100644 index 000000000..c420f7f50 Binary files /dev/null and b/icons/christian3.png differ diff --git a/icons/cinema.p.24.png b/icons/cinema.p.24.png new file mode 100644 index 000000000..1a31e656e Binary files /dev/null and b/icons/cinema.p.24.png differ diff --git a/icons/cinema.png b/icons/cinema.png new file mode 100644 index 000000000..1a31e656e Binary files /dev/null and b/icons/cinema.png differ diff --git a/icons/cliff.png b/icons/cliff.png new file mode 100644 index 000000000..0fc0528bc Binary files /dev/null and b/icons/cliff.png differ diff --git a/icons/cliff2.png b/icons/cliff2.png new file mode 100644 index 000000000..790c7ff0e Binary files /dev/null and b/icons/cliff2.png differ diff --git a/icons/communications.p.20.png b/icons/communications.p.20.png new file mode 100644 index 000000000..100042180 Binary files /dev/null and b/icons/communications.p.20.png differ diff --git a/icons/communications.png b/icons/communications.png new file mode 100644 index 000000000..100042180 Binary files /dev/null and b/icons/communications.png differ diff --git a/icons/danger.png b/icons/danger.png new file mode 100644 index 000000000..2f7b943f9 Binary files /dev/null and b/icons/danger.png differ diff --git a/icons/department_store.p.16.png b/icons/department_store.p.16.png new file mode 100644 index 000000000..c42b9a2f0 Binary files /dev/null and b/icons/department_store.p.16.png differ diff --git a/icons/department_store.png b/icons/department_store.png new file mode 100644 index 000000000..c42b9a2f0 Binary files /dev/null and b/icons/department_store.png differ diff --git a/icons/embassy.png b/icons/embassy.png new file mode 100644 index 000000000..909e8dc12 Binary files /dev/null and b/icons/embassy.png differ diff --git a/icons/fast_food.png b/icons/fast_food.png index ad2c39cc4..99875e99c 100755 Binary files a/icons/fast_food.png and b/icons/fast_food.png differ diff --git a/icons/firestation.p.16.png b/icons/firestation.p.16.png new file mode 100644 index 000000000..cf2455922 Binary files /dev/null and b/icons/firestation.p.16.png differ diff --git a/icons/firestation.png b/icons/firestation.png new file mode 100644 index 000000000..cf2455922 Binary files /dev/null and b/icons/firestation.png differ diff --git a/icons/florist.p.16.png b/icons/florist.p.16.png new file mode 100644 index 000000000..3ed55a5bf Binary files /dev/null and b/icons/florist.p.16.png differ diff --git a/icons/florist.png b/icons/florist.png new file mode 100644 index 000000000..3ed55a5bf Binary files /dev/null and b/icons/florist.png differ diff --git a/icons/food_bar.p.16.png b/icons/food_bar.p.16.png new file mode 100644 index 000000000..da043fb93 Binary files /dev/null and b/icons/food_bar.p.16.png differ diff --git a/icons/food_bar.png b/icons/food_bar.png new file mode 100644 index 000000000..da043fb93 Binary files /dev/null and b/icons/food_bar.png differ diff --git a/icons/food_drinkingtap.p.20.png b/icons/food_drinkingtap.p.20.png new file mode 100644 index 000000000..0a4c25a17 Binary files /dev/null and b/icons/food_drinkingtap.p.20.png differ diff --git a/icons/food_drinkingtap.png b/icons/food_drinkingtap.png new file mode 100644 index 000000000..0a4c25a17 Binary files /dev/null and b/icons/food_drinkingtap.png differ diff --git a/icons/forest.png b/icons/forest.png new file mode 100644 index 000000000..540f200e7 Binary files /dev/null and b/icons/forest.png differ diff --git a/icons/fuel.p.16.png b/icons/fuel.p.16.png new file mode 100644 index 000000000..7bab32a4d Binary files /dev/null and b/icons/fuel.p.16.png differ diff --git a/icons/fuel.png b/icons/fuel.png new file mode 100644 index 000000000..7bab32a4d Binary files /dev/null and b/icons/fuel.png differ diff --git a/icons/gate.png b/icons/gate.png index b33e55625..5c5f3b683 100644 Binary files a/icons/gate.png and b/icons/gate.png differ diff --git a/icons/gate2.png b/icons/gate2.png new file mode 100644 index 000000000..b33e55625 Binary files /dev/null and b/icons/gate2.png differ diff --git a/icons/glacier.png b/icons/glacier.png new file mode 100644 index 000000000..05727512e Binary files /dev/null and b/icons/glacier.png differ diff --git a/icons/glacier2.png b/icons/glacier2.png new file mode 100644 index 000000000..90b18446d Binary files /dev/null and b/icons/glacier2.png differ diff --git a/icons/grave_yard.png b/icons/grave_yard.png new file mode 100644 index 000000000..74995335b Binary files /dev/null and b/icons/grave_yard.png differ diff --git a/icons/grave_yard_generic.png b/icons/grave_yard_generic.png new file mode 100644 index 000000000..9f91602e6 Binary files /dev/null and b/icons/grave_yard_generic.png differ diff --git a/icons/guest_house.p.16.png b/icons/guest_house.p.16.png new file mode 100644 index 000000000..c730b6989 Binary files /dev/null and b/icons/guest_house.p.16.png differ diff --git a/icons/guest_house.png b/icons/guest_house.png new file mode 100644 index 000000000..c730b6989 Binary files /dev/null and b/icons/guest_house.png differ diff --git a/icons/halt.png b/icons/halt.png new file mode 100644 index 000000000..408522689 Binary files /dev/null and b/icons/halt.png differ diff --git a/icons/helipad.p.16.png b/icons/helipad.p.16.png new file mode 100644 index 000000000..619513ca0 Binary files /dev/null and b/icons/helipad.p.16.png differ diff --git a/icons/helipad.png b/icons/helipad.png new file mode 100644 index 000000000..619513ca0 Binary files /dev/null and b/icons/helipad.png differ diff --git a/icons/hospital.p.16.png b/icons/hospital.p.16.png new file mode 100644 index 000000000..dd4febf2b Binary files /dev/null and b/icons/hospital.p.16.png differ diff --git a/icons/hospital.png b/icons/hospital.png new file mode 100644 index 000000000..dd4febf2b Binary files /dev/null and b/icons/hospital.png differ diff --git a/icons/hostel.p.20.png b/icons/hostel.p.20.png new file mode 100644 index 000000000..be58f6d37 Binary files /dev/null and b/icons/hostel.p.20.png differ diff --git a/icons/hostel.png b/icons/hostel.png new file mode 100644 index 000000000..be58f6d37 Binary files /dev/null and b/icons/hostel.png differ diff --git a/icons/hotel2.p.20.png b/icons/hotel2.p.20.png new file mode 100644 index 000000000..a4411346a Binary files /dev/null and b/icons/hotel2.p.20.png differ diff --git a/icons/hotel2.png b/icons/hotel2.png new file mode 100644 index 000000000..a4411346a Binary files /dev/null and b/icons/hotel2.png differ diff --git a/icons/information.p.16.png b/icons/information.p.16.png new file mode 100644 index 000000000..65d03dbdd Binary files /dev/null and b/icons/information.p.16.png differ diff --git a/icons/information.png b/icons/information.png new file mode 100644 index 000000000..65d03dbdd Binary files /dev/null and b/icons/information.png differ diff --git a/icons/islamic3.p.16.png b/icons/islamic3.p.16.png new file mode 100644 index 000000000..8746c31ed Binary files /dev/null and b/icons/islamic3.p.16.png differ diff --git a/icons/islamic3.png b/icons/islamic3.png new file mode 100644 index 000000000..8746c31ed Binary files /dev/null and b/icons/islamic3.png differ diff --git a/icons/jewish3.p.16.png b/icons/jewish3.p.16.png new file mode 100644 index 000000000..0a11447d1 Binary files /dev/null and b/icons/jewish3.p.16.png differ diff --git a/icons/jewish3.png b/icons/jewish3.png new file mode 100644 index 000000000..0a11447d1 Binary files /dev/null and b/icons/jewish3.png differ diff --git a/icons/landfill.png b/icons/landfill.png new file mode 100644 index 000000000..d08255f08 Binary files /dev/null and b/icons/landfill.png differ diff --git a/icons/level_crossing.png b/icons/level_crossing.png new file mode 100644 index 000000000..5002f6de9 Binary files /dev/null and b/icons/level_crossing.png differ diff --git a/icons/level_crossing2.png b/icons/level_crossing2.png new file mode 100644 index 000000000..eac7189e0 Binary files /dev/null and b/icons/level_crossing2.png differ diff --git a/icons/library.p.20.png b/icons/library.p.20.png new file mode 100644 index 000000000..b38c4d156 Binary files /dev/null and b/icons/library.p.20.png differ diff --git a/icons/library.png b/icons/library.png new file mode 100644 index 000000000..b38c4d156 Binary files /dev/null and b/icons/library.png differ diff --git a/icons/liftgate.png b/icons/liftgate.png new file mode 100644 index 000000000..bb4b7926c Binary files /dev/null and b/icons/liftgate.png differ diff --git a/icons/lighthouse.p.20.png b/icons/lighthouse.p.20.png new file mode 100644 index 000000000..f2e268fcb Binary files /dev/null and b/icons/lighthouse.p.20.png differ diff --git a/icons/lighthouse.png b/icons/lighthouse.png new file mode 100644 index 000000000..f2e268fcb Binary files /dev/null and b/icons/lighthouse.png differ diff --git a/icons/lock_gate.png b/icons/lock_gate.png new file mode 100644 index 000000000..4fb277e86 Binary files /dev/null and b/icons/lock_gate.png differ diff --git a/icons/london-tube-24.png b/icons/london-tube-24.png new file mode 100644 index 000000000..04c17956f Binary files /dev/null and b/icons/london-tube-24.png differ diff --git a/icons/london.png b/icons/london.png new file mode 100644 index 000000000..04c17956f Binary files /dev/null and b/icons/london.png differ diff --git a/icons/marsh.png b/icons/marsh.png new file mode 100644 index 000000000..4ff801eee Binary files /dev/null and b/icons/marsh.png differ diff --git a/icons/memorial.png b/icons/memorial.png new file mode 100644 index 000000000..9423e1052 Binary files /dev/null and b/icons/memorial.png differ diff --git a/icons/military_red.png b/icons/military_red.png new file mode 100644 index 000000000..8fba2fcac Binary files /dev/null and b/icons/military_red.png differ diff --git a/icons/military_red_hz2.png b/icons/military_red_hz2.png new file mode 100644 index 000000000..0722bfa78 Binary files /dev/null and b/icons/military_red_hz2.png differ diff --git a/icons/military_restraint2.png b/icons/military_restraint2.png new file mode 100644 index 000000000..744aa48bd Binary files /dev/null and b/icons/military_restraint2.png differ diff --git a/icons/mini_round.png b/icons/mini_round.png new file mode 100644 index 000000000..b9a7d2dfc Binary files /dev/null and b/icons/mini_round.png differ diff --git a/icons/mosque.png b/icons/mosque.png new file mode 100644 index 000000000..71b55fafd Binary files /dev/null and b/icons/mosque.png differ diff --git a/icons/mot_shield1.png b/icons/mot_shield1.png new file mode 100644 index 000000000..ce509fff2 Binary files /dev/null and b/icons/mot_shield1.png differ diff --git a/icons/mot_shield2.png b/icons/mot_shield2.png new file mode 100644 index 000000000..c9e196552 Binary files /dev/null and b/icons/mot_shield2.png differ diff --git a/icons/mot_shield3.png b/icons/mot_shield3.png new file mode 100644 index 000000000..9b27a6b6f Binary files /dev/null and b/icons/mot_shield3.png differ diff --git a/icons/mot_shield4.png b/icons/mot_shield4.png new file mode 100644 index 000000000..0c7ba6944 Binary files /dev/null and b/icons/mot_shield4.png differ diff --git a/icons/mot_shield5.png b/icons/mot_shield5.png new file mode 100644 index 000000000..2d0c1dd2a Binary files /dev/null and b/icons/mot_shield5.png differ diff --git a/icons/mot_shield6.png b/icons/mot_shield6.png new file mode 100644 index 000000000..0a97a3d39 Binary files /dev/null and b/icons/mot_shield6.png differ diff --git a/icons/mot_shield7.png b/icons/mot_shield7.png new file mode 100644 index 000000000..35a3dfc50 Binary files /dev/null and b/icons/mot_shield7.png differ diff --git a/icons/mot_shield8.png b/icons/mot_shield8.png new file mode 100644 index 000000000..8f0653d44 Binary files /dev/null and b/icons/mot_shield8.png differ diff --git a/icons/motel.p.20.png b/icons/motel.p.20.png new file mode 100644 index 000000000..56a96e50b Binary files /dev/null and b/icons/motel.p.20.png differ diff --git a/icons/motel.png b/icons/motel.png new file mode 100644 index 000000000..56a96e50b Binary files /dev/null and b/icons/motel.png differ diff --git a/icons/motorway_shield1.png b/icons/motorway_shield1.png new file mode 100644 index 000000000..40111a62a Binary files /dev/null and b/icons/motorway_shield1.png differ diff --git a/icons/motorway_shield2.png b/icons/motorway_shield2.png new file mode 100644 index 000000000..331c522ef Binary files /dev/null and b/icons/motorway_shield2.png differ diff --git a/icons/motorway_shield3.png b/icons/motorway_shield3.png new file mode 100644 index 000000000..0e4f5fdff Binary files /dev/null and b/icons/motorway_shield3.png differ diff --git a/icons/motorway_shield4.png b/icons/motorway_shield4.png new file mode 100644 index 000000000..56d7ab81c Binary files /dev/null and b/icons/motorway_shield4.png differ diff --git a/icons/motorway_shield5.png b/icons/motorway_shield5.png new file mode 100644 index 000000000..2cc5d35b1 Binary files /dev/null and b/icons/motorway_shield5.png differ diff --git a/icons/motorway_shield6.png b/icons/motorway_shield6.png new file mode 100644 index 000000000..3ece3f0a2 Binary files /dev/null and b/icons/motorway_shield6.png differ diff --git a/icons/mud.png b/icons/mud.png new file mode 100644 index 000000000..fe031f674 Binary files /dev/null and b/icons/mud.png differ diff --git a/icons/museum.p.16.png b/icons/museum.p.16.png new file mode 100644 index 000000000..c58d30683 Binary files /dev/null and b/icons/museum.p.16.png differ diff --git a/icons/museum.png b/icons/museum.png new file mode 100644 index 000000000..c58d30683 Binary files /dev/null and b/icons/museum.png differ diff --git a/icons/nature_reserve.png b/icons/nature_reserve.png new file mode 100644 index 000000000..da01ec8b6 Binary files /dev/null and b/icons/nature_reserve.png differ diff --git a/icons/nature_reserve2.png b/icons/nature_reserve2.png new file mode 100644 index 000000000..c804a8e79 Binary files /dev/null and b/icons/nature_reserve2.png differ diff --git a/icons/nature_reserve2T.png b/icons/nature_reserve2T.png new file mode 100644 index 000000000..7dd97287c Binary files /dev/null and b/icons/nature_reserve2T.png differ diff --git a/icons/nature_reserve5.png b/icons/nature_reserve5.png new file mode 100644 index 000000000..db28f5ee5 Binary files /dev/null and b/icons/nature_reserve5.png differ diff --git a/icons/nature_reserve6.png b/icons/nature_reserve6.png new file mode 100644 index 000000000..6768b56f3 Binary files /dev/null and b/icons/nature_reserve6.png differ diff --git a/icons/nature_reserveT.png b/icons/nature_reserveT.png new file mode 100644 index 000000000..4da4863ec Binary files /dev/null and b/icons/nature_reserveT.png differ diff --git a/icons/normalize.py b/icons/normalize.py new file mode 100644 index 000000000..b9b259679 --- /dev/null +++ b/icons/normalize.py @@ -0,0 +1,9 @@ +import glob, shutil, re + +s = re.compile(r"(?P\w+)") + +for f in glob.glob('*.png'): + simplename = s.match(f).groupdict() + sim = "%s.png" % simplename['icon'] + if sim != f: + shutil.copyfile(f, sim) diff --git a/icons/orchard.png b/icons/orchard.png new file mode 100644 index 000000000..a889a9e6f Binary files /dev/null and b/icons/orchard.png differ diff --git a/icons/parking.p.16.png b/icons/parking.p.16.png new file mode 100644 index 000000000..5860900cf Binary files /dev/null and b/icons/parking.p.16.png differ diff --git a/icons/parking.png b/icons/parking.png index a2675d018..5860900cf 100755 Binary files a/icons/parking.png and b/icons/parking.png differ diff --git a/icons/parking_private.p.16.png b/icons/parking_private.p.16.png new file mode 100644 index 000000000..756ff7c92 Binary files /dev/null and b/icons/parking_private.p.16.png differ diff --git a/icons/parking_private.png b/icons/parking_private.png new file mode 100644 index 000000000..756ff7c92 Binary files /dev/null and b/icons/parking_private.png differ diff --git a/icons/peak.png b/icons/peak.png new file mode 100644 index 000000000..161cf50cf Binary files /dev/null and b/icons/peak.png differ diff --git a/icons/pharmacy.p.16.png b/icons/pharmacy.p.16.png new file mode 100644 index 000000000..fb1c56c86 Binary files /dev/null and b/icons/pharmacy.p.16.png differ diff --git a/icons/pharmacy.png b/icons/pharmacy.png new file mode 100644 index 000000000..fb1c56c86 Binary files /dev/null and b/icons/pharmacy.png differ diff --git a/icons/picnic.p.16.png b/icons/picnic.p.16.png new file mode 100644 index 000000000..0eff097bf Binary files /dev/null and b/icons/picnic.p.16.png differ diff --git a/icons/picnic.png b/icons/picnic.png new file mode 100644 index 000000000..0eff097bf Binary files /dev/null and b/icons/picnic.png differ diff --git a/icons/pint.png b/icons/pint.png new file mode 100644 index 000000000..d426eead7 Binary files /dev/null and b/icons/pint.png differ diff --git a/icons/place_of_worship.png b/icons/place_of_worship.png new file mode 100644 index 000000000..95494f59c Binary files /dev/null and b/icons/place_of_worship.png differ diff --git a/icons/place_of_worship3.p.16.png b/icons/place_of_worship3.p.16.png new file mode 100644 index 000000000..d75bbf4d5 Binary files /dev/null and b/icons/place_of_worship3.p.16.png differ diff --git a/icons/place_of_worship3.png b/icons/place_of_worship3.png new file mode 100644 index 000000000..d75bbf4d5 Binary files /dev/null and b/icons/place_of_worship3.png differ diff --git a/icons/playground.p.20.png b/icons/playground.p.20.png new file mode 100644 index 000000000..42db81d15 Binary files /dev/null and b/icons/playground.p.20.png differ diff --git a/icons/playground.png b/icons/playground.png new file mode 100644 index 000000000..42db81d15 Binary files /dev/null and b/icons/playground.png differ diff --git a/icons/poi_cave.p.16.png b/icons/poi_cave.p.16.png new file mode 100644 index 000000000..aafddbb94 Binary files /dev/null and b/icons/poi_cave.p.16.png differ diff --git a/icons/poi_cave.png b/icons/poi_cave.png new file mode 100644 index 000000000..aafddbb94 Binary files /dev/null and b/icons/poi_cave.png differ diff --git a/icons/police.p.16.png b/icons/police.p.16.png new file mode 100644 index 000000000..2dd87aaf2 Binary files /dev/null and b/icons/police.p.16.png differ diff --git a/icons/police.png b/icons/police.png new file mode 100644 index 000000000..2dd87aaf2 Binary files /dev/null and b/icons/police.png differ diff --git a/icons/post_box.p.16.png b/icons/post_box.p.16.png new file mode 100644 index 000000000..3119cc135 Binary files /dev/null and b/icons/post_box.p.16.png differ diff --git a/icons/post_box.png b/icons/post_box.png index 8690ebb6e..3119cc135 100755 Binary files a/icons/post_box.png and b/icons/post_box.png differ diff --git a/icons/post_office.p.16.png b/icons/post_office.p.16.png new file mode 100644 index 000000000..743255eb0 Binary files /dev/null and b/icons/post_office.p.16.png differ diff --git a/icons/post_office.png b/icons/post_office.png new file mode 100644 index 000000000..743255eb0 Binary files /dev/null and b/icons/post_office.png differ diff --git a/icons/postoffice.png b/icons/postoffice.png new file mode 100644 index 000000000..d0434aa5f Binary files /dev/null and b/icons/postoffice.png differ diff --git a/icons/power_line.png b/icons/power_line.png new file mode 100644 index 000000000..ce94c8add Binary files /dev/null and b/icons/power_line.png differ diff --git a/icons/power_pole.png b/icons/power_pole.png new file mode 100644 index 000000000..ef18a39fd Binary files /dev/null and b/icons/power_pole.png differ diff --git a/icons/power_tower.png b/icons/power_tower.png new file mode 100644 index 000000000..2c963ad10 Binary files /dev/null and b/icons/power_tower.png differ diff --git a/icons/power_tower_3x3.png b/icons/power_tower_3x3.png new file mode 100644 index 000000000..4b1784ef8 Binary files /dev/null and b/icons/power_tower_3x3.png differ diff --git a/icons/power_tower_5x5.png b/icons/power_tower_5x5.png new file mode 100644 index 000000000..b3a6a2b9c Binary files /dev/null and b/icons/power_tower_5x5.png differ diff --git a/icons/power_wind.png b/icons/power_wind.png new file mode 100644 index 000000000..29aeb7a0b Binary files /dev/null and b/icons/power_wind.png differ diff --git a/icons/pri_shield1.png b/icons/pri_shield1.png new file mode 100644 index 000000000..1234b383d Binary files /dev/null and b/icons/pri_shield1.png differ diff --git a/icons/pri_shield2.png b/icons/pri_shield2.png new file mode 100644 index 000000000..880ab4a82 Binary files /dev/null and b/icons/pri_shield2.png differ diff --git a/icons/pri_shield3.png b/icons/pri_shield3.png new file mode 100644 index 000000000..a97846a03 Binary files /dev/null and b/icons/pri_shield3.png differ diff --git a/icons/pri_shield4.png b/icons/pri_shield4.png new file mode 100644 index 000000000..ee0361c82 Binary files /dev/null and b/icons/pri_shield4.png differ diff --git a/icons/pri_shield5.png b/icons/pri_shield5.png new file mode 100644 index 000000000..f68bc7da2 Binary files /dev/null and b/icons/pri_shield5.png differ diff --git a/icons/pri_shield6.png b/icons/pri_shield6.png new file mode 100644 index 000000000..32ac05c17 Binary files /dev/null and b/icons/pri_shield6.png differ diff --git a/icons/pri_shield7.png b/icons/pri_shield7.png new file mode 100644 index 000000000..7e4e2f126 Binary files /dev/null and b/icons/pri_shield7.png differ diff --git a/icons/pri_shield8.png b/icons/pri_shield8.png new file mode 100644 index 000000000..73fcb3bc4 Binary files /dev/null and b/icons/pri_shield8.png differ diff --git a/icons/primary_shield1.png b/icons/primary_shield1.png new file mode 100644 index 000000000..f7491b672 Binary files /dev/null and b/icons/primary_shield1.png differ diff --git a/icons/primary_shield2.png b/icons/primary_shield2.png new file mode 100644 index 000000000..520f8f48e Binary files /dev/null and b/icons/primary_shield2.png differ diff --git a/icons/primary_shield3.png b/icons/primary_shield3.png new file mode 100644 index 000000000..d4dd8e35d Binary files /dev/null and b/icons/primary_shield3.png differ diff --git a/icons/primary_shield4.png b/icons/primary_shield4.png new file mode 100644 index 000000000..378e737e4 Binary files /dev/null and b/icons/primary_shield4.png differ diff --git a/icons/primary_shield5.png b/icons/primary_shield5.png new file mode 100644 index 000000000..dc59c400b Binary files /dev/null and b/icons/primary_shield5.png differ diff --git a/icons/primary_shield6.png b/icons/primary_shield6.png new file mode 100644 index 000000000..606fc1238 Binary files /dev/null and b/icons/primary_shield6.png differ diff --git a/icons/primary_shield7.png b/icons/primary_shield7.png new file mode 100644 index 000000000..9282fc025 Binary files /dev/null and b/icons/primary_shield7.png differ diff --git a/icons/primary_shield8.png b/icons/primary_shield8.png new file mode 100644 index 000000000..3ccc5d1d6 Binary files /dev/null and b/icons/primary_shield8.png differ diff --git a/icons/pub.p.16.png b/icons/pub.p.16.png new file mode 100644 index 000000000..b452a7ead Binary files /dev/null and b/icons/pub.p.16.png differ diff --git a/icons/pub.png b/icons/pub.png index b03e915ba..b452a7ead 100644 Binary files a/icons/pub.png and b/icons/pub.png differ diff --git a/icons/quarry.png b/icons/quarry.png new file mode 100644 index 000000000..ab5088e23 Binary files /dev/null and b/icons/quarry.png differ diff --git a/icons/quarry2.png b/icons/quarry2.png new file mode 100644 index 000000000..38dcfac9a Binary files /dev/null and b/icons/quarry2.png differ diff --git a/icons/recycle.png b/icons/recycle.png new file mode 100644 index 000000000..4cf43a130 Binary files /dev/null and b/icons/recycle.png differ diff --git a/icons/recycling.p.16.png b/icons/recycling.p.16.png new file mode 100644 index 000000000..59eb331aa Binary files /dev/null and b/icons/recycling.p.16.png differ diff --git a/icons/recycling.png b/icons/recycling.png index aa613d510..59eb331aa 100755 Binary files a/icons/recycling.png and b/icons/recycling.png differ diff --git a/icons/rental_bicycle.p.20.png b/icons/rental_bicycle.p.20.png new file mode 100644 index 000000000..4bb10e00a Binary files /dev/null and b/icons/rental_bicycle.p.20.png differ diff --git a/icons/rental_bicycle.png b/icons/rental_bicycle.png new file mode 100644 index 000000000..4bb10e00a Binary files /dev/null and b/icons/rental_bicycle.png differ diff --git a/icons/restaurant.p.16.png b/icons/restaurant.p.16.png new file mode 100644 index 000000000..5c410087b Binary files /dev/null and b/icons/restaurant.p.16.png differ diff --git a/icons/restaurant.png b/icons/restaurant.png index 30682b2cf..5c410087b 100755 Binary files a/icons/restaurant.png and b/icons/restaurant.png differ diff --git a/icons/school.png b/icons/school.png index 1067beb88..4c919bfdd 100755 Binary files a/icons/school.png and b/icons/school.png differ diff --git a/icons/scrub.png b/icons/scrub.png new file mode 100644 index 000000000..7668027f1 Binary files /dev/null and b/icons/scrub.png differ diff --git a/icons/sec_shield1.png b/icons/sec_shield1.png new file mode 100644 index 000000000..3b22e6c54 Binary files /dev/null and b/icons/sec_shield1.png differ diff --git a/icons/sec_shield2.png b/icons/sec_shield2.png new file mode 100644 index 000000000..3a192248e Binary files /dev/null and b/icons/sec_shield2.png differ diff --git a/icons/sec_shield3.png b/icons/sec_shield3.png new file mode 100644 index 000000000..c7d72d71b Binary files /dev/null and b/icons/sec_shield3.png differ diff --git a/icons/sec_shield4.png b/icons/sec_shield4.png new file mode 100644 index 000000000..656817ae8 Binary files /dev/null and b/icons/sec_shield4.png differ diff --git a/icons/sec_shield5.png b/icons/sec_shield5.png new file mode 100644 index 000000000..2918b07e2 Binary files /dev/null and b/icons/sec_shield5.png differ diff --git a/icons/sec_shield6.png b/icons/sec_shield6.png new file mode 100644 index 000000000..4e1552b87 Binary files /dev/null and b/icons/sec_shield6.png differ diff --git a/icons/sec_shield7.png b/icons/sec_shield7.png new file mode 100644 index 000000000..04035ca4a Binary files /dev/null and b/icons/sec_shield7.png differ diff --git a/icons/sec_shield8.png b/icons/sec_shield8.png new file mode 100644 index 000000000..2c914687e Binary files /dev/null and b/icons/sec_shield8.png differ diff --git a/icons/secondary_shield1.png b/icons/secondary_shield1.png new file mode 100644 index 000000000..7f463cc37 Binary files /dev/null and b/icons/secondary_shield1.png differ diff --git a/icons/secondary_shield2.png b/icons/secondary_shield2.png new file mode 100644 index 000000000..fe7ebd665 Binary files /dev/null and b/icons/secondary_shield2.png differ diff --git a/icons/secondary_shield3.png b/icons/secondary_shield3.png new file mode 100644 index 000000000..f6c995af8 Binary files /dev/null and b/icons/secondary_shield3.png differ diff --git a/icons/secondary_shield4.png b/icons/secondary_shield4.png new file mode 100644 index 000000000..dd9131758 Binary files /dev/null and b/icons/secondary_shield4.png differ diff --git a/icons/secondary_shield5.png b/icons/secondary_shield5.png new file mode 100644 index 000000000..a9aa38fff Binary files /dev/null and b/icons/secondary_shield5.png differ diff --git a/icons/secondary_shield6.png b/icons/secondary_shield6.png new file mode 100644 index 000000000..e3dcb460a Binary files /dev/null and b/icons/secondary_shield6.png differ diff --git a/icons/secondary_shield7.png b/icons/secondary_shield7.png new file mode 100644 index 000000000..a90b58736 Binary files /dev/null and b/icons/secondary_shield7.png differ diff --git a/icons/secondary_shield8.png b/icons/secondary_shield8.png new file mode 100644 index 000000000..71feabff0 Binary files /dev/null and b/icons/secondary_shield8.png differ diff --git a/icons/shelter2.p.16.png b/icons/shelter2.p.16.png new file mode 100644 index 000000000..09ea53054 Binary files /dev/null and b/icons/shelter2.p.16.png differ diff --git a/icons/shelter2.png b/icons/shelter2.png new file mode 100644 index 000000000..09ea53054 Binary files /dev/null and b/icons/shelter2.png differ diff --git a/icons/shop_bakery.p.16.png b/icons/shop_bakery.p.16.png new file mode 100644 index 000000000..89de12eb5 Binary files /dev/null and b/icons/shop_bakery.p.16.png differ diff --git a/icons/shop_bakery.png b/icons/shop_bakery.png new file mode 100644 index 000000000..89de12eb5 Binary files /dev/null and b/icons/shop_bakery.png differ diff --git a/icons/shop_butcher.png b/icons/shop_butcher.png new file mode 100644 index 000000000..e31ca9d57 Binary files /dev/null and b/icons/shop_butcher.png differ diff --git a/icons/shop_clothes.p.16.png b/icons/shop_clothes.p.16.png new file mode 100644 index 000000000..b028a1cde Binary files /dev/null and b/icons/shop_clothes.p.16.png differ diff --git a/icons/shop_clothes.png b/icons/shop_clothes.png new file mode 100644 index 000000000..b028a1cde Binary files /dev/null and b/icons/shop_clothes.png differ diff --git a/icons/shop_convenience.p.16.png b/icons/shop_convenience.p.16.png new file mode 100644 index 000000000..2fc7584d5 Binary files /dev/null and b/icons/shop_convenience.p.16.png differ diff --git a/icons/shop_convenience.png b/icons/shop_convenience.png new file mode 100644 index 000000000..2fc7584d5 Binary files /dev/null and b/icons/shop_convenience.png differ diff --git a/icons/shop_diy.p.16.png b/icons/shop_diy.p.16.png new file mode 100644 index 000000000..b1954ab91 Binary files /dev/null and b/icons/shop_diy.p.16.png differ diff --git a/icons/shop_diy.png b/icons/shop_diy.png new file mode 100644 index 000000000..b1954ab91 Binary files /dev/null and b/icons/shop_diy.png differ diff --git a/icons/shop_hairdresser.p.16.png b/icons/shop_hairdresser.p.16.png new file mode 100644 index 000000000..aa783f260 Binary files /dev/null and b/icons/shop_hairdresser.p.16.png differ diff --git a/icons/shop_hairdresser.png b/icons/shop_hairdresser.png new file mode 100644 index 000000000..aa783f260 Binary files /dev/null and b/icons/shop_hairdresser.png differ diff --git a/icons/shop_supermarket.p.16.png b/icons/shop_supermarket.p.16.png new file mode 100644 index 000000000..3b4338a96 Binary files /dev/null and b/icons/shop_supermarket.p.16.png differ diff --git a/icons/shop_supermarket.png b/icons/shop_supermarket.png new file mode 100644 index 000000000..3b4338a96 Binary files /dev/null and b/icons/shop_supermarket.png differ diff --git a/icons/shopping_bicycle.p.16.png b/icons/shopping_bicycle.p.16.png new file mode 100644 index 000000000..d0b3680f0 Binary files /dev/null and b/icons/shopping_bicycle.p.16.png differ diff --git a/icons/shopping_bicycle.png b/icons/shopping_bicycle.png new file mode 100644 index 000000000..d0b3680f0 Binary files /dev/null and b/icons/shopping_bicycle.png differ diff --git a/icons/shopping_car.p.16.png b/icons/shopping_car.p.16.png new file mode 100644 index 000000000..e34715b3f Binary files /dev/null and b/icons/shopping_car.p.16.png differ diff --git a/icons/shopping_car.png b/icons/shopping_car.png new file mode 100644 index 000000000..e34715b3f Binary files /dev/null and b/icons/shopping_car.png differ diff --git a/icons/shopping_car_repair.p.16.png b/icons/shopping_car_repair.p.16.png new file mode 100644 index 000000000..9c3877756 Binary files /dev/null and b/icons/shopping_car_repair.p.16.png differ diff --git a/icons/shopping_car_repair.png b/icons/shopping_car_repair.png new file mode 100644 index 000000000..9c3877756 Binary files /dev/null and b/icons/shopping_car_repair.png differ diff --git a/icons/sikh.png b/icons/sikh.png new file mode 100644 index 000000000..a3ade805f Binary files /dev/null and b/icons/sikh.png differ diff --git a/icons/sikh3.p.16.png b/icons/sikh3.p.16.png new file mode 100644 index 000000000..9e8906e6e Binary files /dev/null and b/icons/sikh3.p.16.png differ diff --git a/icons/sikh3.png b/icons/sikh3.png new file mode 100644 index 000000000..9e8906e6e Binary files /dev/null and b/icons/sikh3.png differ diff --git a/icons/sosphone.png b/icons/sosphone.png new file mode 100644 index 000000000..0e5d0a26c Binary files /dev/null and b/icons/sosphone.png differ diff --git a/icons/spring.png b/icons/spring.png new file mode 100644 index 000000000..c2dceb4c2 Binary files /dev/null and b/icons/spring.png differ diff --git a/icons/station.png b/icons/station.png index 1e198259e..686ec106e 100755 Binary files a/icons/station.png and b/icons/station.png differ diff --git a/icons/station_disused.png b/icons/station_disused.png new file mode 100644 index 000000000..73be6f15b Binary files /dev/null and b/icons/station_disused.png differ diff --git a/icons/station_small.png b/icons/station_small.png new file mode 100644 index 000000000..d8e75f5d6 Binary files /dev/null and b/icons/station_small.png differ diff --git a/icons/synagogue.png b/icons/synagogue.png new file mode 100644 index 000000000..66ec7f1d2 Binary files /dev/null and b/icons/synagogue.png differ diff --git a/icons/telephone.p.16.png b/icons/telephone.p.16.png new file mode 100644 index 000000000..29378e44b Binary files /dev/null and b/icons/telephone.p.16.png differ diff --git a/icons/telephone.png b/icons/telephone.png index c2a2d6242..29378e44b 100755 Binary files a/icons/telephone.png and b/icons/telephone.png differ diff --git a/icons/ter_shield1.png b/icons/ter_shield1.png new file mode 100644 index 000000000..9fad53558 Binary files /dev/null and b/icons/ter_shield1.png differ diff --git a/icons/ter_shield2.png b/icons/ter_shield2.png new file mode 100644 index 000000000..3092a899b Binary files /dev/null and b/icons/ter_shield2.png differ diff --git a/icons/ter_shield3.png b/icons/ter_shield3.png new file mode 100644 index 000000000..0d42f6c72 Binary files /dev/null and b/icons/ter_shield3.png differ diff --git a/icons/ter_shield4.png b/icons/ter_shield4.png new file mode 100644 index 000000000..c30bb9ae6 Binary files /dev/null and b/icons/ter_shield4.png differ diff --git a/icons/ter_shield5.png b/icons/ter_shield5.png new file mode 100644 index 000000000..5bfbf4e40 Binary files /dev/null and b/icons/ter_shield5.png differ diff --git a/icons/ter_shield6.png b/icons/ter_shield6.png new file mode 100644 index 000000000..4561fb16e Binary files /dev/null and b/icons/ter_shield6.png differ diff --git a/icons/ter_shield7.png b/icons/ter_shield7.png new file mode 100644 index 000000000..80b4a1645 Binary files /dev/null and b/icons/ter_shield7.png differ diff --git a/icons/ter_shield8.png b/icons/ter_shield8.png new file mode 100644 index 000000000..a1eed495d Binary files /dev/null and b/icons/ter_shield8.png differ diff --git a/icons/tertiary_shield1.png b/icons/tertiary_shield1.png new file mode 100644 index 000000000..0ba901575 Binary files /dev/null and b/icons/tertiary_shield1.png differ diff --git a/icons/tertiary_shield2.png b/icons/tertiary_shield2.png new file mode 100644 index 000000000..4952fe73b Binary files /dev/null and b/icons/tertiary_shield2.png differ diff --git a/icons/tertiary_shield3.png b/icons/tertiary_shield3.png new file mode 100644 index 000000000..4e7233c28 Binary files /dev/null and b/icons/tertiary_shield3.png differ diff --git a/icons/tertiary_shield4.png b/icons/tertiary_shield4.png new file mode 100644 index 000000000..b5ddee2e0 Binary files /dev/null and b/icons/tertiary_shield4.png differ diff --git a/icons/tertiary_shield5.png b/icons/tertiary_shield5.png new file mode 100644 index 000000000..1c1617677 Binary files /dev/null and b/icons/tertiary_shield5.png differ diff --git a/icons/tertiary_shield6.png b/icons/tertiary_shield6.png new file mode 100644 index 000000000..87b8dad90 Binary files /dev/null and b/icons/tertiary_shield6.png differ diff --git a/icons/tertiary_shield7.png b/icons/tertiary_shield7.png new file mode 100644 index 000000000..8f3c4c54b Binary files /dev/null and b/icons/tertiary_shield7.png differ diff --git a/icons/tertiary_shield8.png b/icons/tertiary_shield8.png new file mode 100644 index 000000000..ace8d210f Binary files /dev/null and b/icons/tertiary_shield8.png differ diff --git a/icons/theatre.p.20.png b/icons/theatre.p.20.png new file mode 100644 index 000000000..36b918cb6 Binary files /dev/null and b/icons/theatre.p.20.png differ diff --git a/icons/theatre.png b/icons/theatre.png new file mode 100644 index 000000000..36b918cb6 Binary files /dev/null and b/icons/theatre.png differ diff --git a/icons/toilets.p.20.png b/icons/toilets.p.20.png new file mode 100644 index 000000000..80cf3aff3 Binary files /dev/null and b/icons/toilets.p.20.png differ diff --git a/icons/toilets.png b/icons/toilets.png new file mode 100644 index 000000000..80cf3aff3 Binary files /dev/null and b/icons/toilets.png differ diff --git a/icons/tourist_archaeological2.glow.16.png b/icons/tourist_archaeological2.glow.16.png new file mode 100644 index 000000000..90c61c3ba Binary files /dev/null and b/icons/tourist_archaeological2.glow.16.png differ diff --git a/icons/tourist_archaeological2.png b/icons/tourist_archaeological2.png new file mode 100644 index 000000000..90c61c3ba Binary files /dev/null and b/icons/tourist_archaeological2.png differ diff --git a/icons/tourist_memorial.p.20.png b/icons/tourist_memorial.p.20.png new file mode 100644 index 000000000..7fa8361db Binary files /dev/null and b/icons/tourist_memorial.p.20.png differ diff --git a/icons/tourist_memorial.png b/icons/tourist_memorial.png new file mode 100644 index 000000000..7fa8361db Binary files /dev/null and b/icons/tourist_memorial.png differ diff --git a/icons/tower.png b/icons/tower.png new file mode 100644 index 000000000..304727a8c Binary files /dev/null and b/icons/tower.png differ diff --git a/icons/tower_water.p.20.png b/icons/tower_water.p.20.png new file mode 100644 index 000000000..5ca78016d Binary files /dev/null and b/icons/tower_water.p.20.png differ diff --git a/icons/tower_water.png b/icons/tower_water.png new file mode 100644 index 000000000..5ca78016d Binary files /dev/null and b/icons/tower_water.png differ diff --git a/icons/traffic_light.png b/icons/traffic_light.png new file mode 100644 index 000000000..1c2b3ca7b Binary files /dev/null and b/icons/traffic_light.png differ diff --git a/icons/transport_ford.p.16.png b/icons/transport_ford.p.16.png new file mode 100644 index 000000000..dc1bfc299 Binary files /dev/null and b/icons/transport_ford.p.16.png differ diff --git a/icons/transport_ford.png b/icons/transport_ford.png new file mode 100644 index 000000000..dc1bfc299 Binary files /dev/null and b/icons/transport_ford.png differ diff --git a/icons/transport_slipway.p.20.png b/icons/transport_slipway.p.20.png new file mode 100644 index 000000000..45892de3c Binary files /dev/null and b/icons/transport_slipway.p.20.png differ diff --git a/icons/transport_slipway.png b/icons/transport_slipway.png new file mode 100644 index 000000000..45892de3c Binary files /dev/null and b/icons/transport_slipway.png differ diff --git a/icons/tree.png b/icons/tree.png new file mode 100644 index 000000000..7575bd63b Binary files /dev/null and b/icons/tree.png differ diff --git a/icons/tree2.png b/icons/tree2.png new file mode 100644 index 000000000..f0e3e1ff8 Binary files /dev/null and b/icons/tree2.png differ diff --git a/icons/tru_shield1.png b/icons/tru_shield1.png new file mode 100644 index 000000000..bbdd6fcc8 Binary files /dev/null and b/icons/tru_shield1.png differ diff --git a/icons/tru_shield2.png b/icons/tru_shield2.png new file mode 100644 index 000000000..e33d296b9 Binary files /dev/null and b/icons/tru_shield2.png differ diff --git a/icons/tru_shield3.png b/icons/tru_shield3.png new file mode 100644 index 000000000..1a47f9ab7 Binary files /dev/null and b/icons/tru_shield3.png differ diff --git a/icons/tru_shield4.png b/icons/tru_shield4.png new file mode 100644 index 000000000..443c3f326 Binary files /dev/null and b/icons/tru_shield4.png differ diff --git a/icons/tru_shield5.png b/icons/tru_shield5.png new file mode 100644 index 000000000..f53720b46 Binary files /dev/null and b/icons/tru_shield5.png differ diff --git a/icons/tru_shield6.png b/icons/tru_shield6.png new file mode 100644 index 000000000..092d0d9ff Binary files /dev/null and b/icons/tru_shield6.png differ diff --git a/icons/tru_shield7.png b/icons/tru_shield7.png new file mode 100644 index 000000000..49e9e03ef Binary files /dev/null and b/icons/tru_shield7.png differ diff --git a/icons/tru_shield8.png b/icons/tru_shield8.png new file mode 100644 index 000000000..587324a7c Binary files /dev/null and b/icons/tru_shield8.png differ diff --git a/icons/trunk_shield1.png b/icons/trunk_shield1.png new file mode 100644 index 000000000..bb849c22b Binary files /dev/null and b/icons/trunk_shield1.png differ diff --git a/icons/trunk_shield2.png b/icons/trunk_shield2.png new file mode 100644 index 000000000..eb81d8070 Binary files /dev/null and b/icons/trunk_shield2.png differ diff --git a/icons/trunk_shield3.png b/icons/trunk_shield3.png new file mode 100644 index 000000000..4e6e97637 Binary files /dev/null and b/icons/trunk_shield3.png differ diff --git a/icons/trunk_shield4.png b/icons/trunk_shield4.png new file mode 100644 index 000000000..733d5d0f8 Binary files /dev/null and b/icons/trunk_shield4.png differ diff --git a/icons/trunk_shield5.png b/icons/trunk_shield5.png new file mode 100644 index 000000000..d6700e74c Binary files /dev/null and b/icons/trunk_shield5.png differ diff --git a/icons/trunk_shield6.png b/icons/trunk_shield6.png new file mode 100644 index 000000000..053784ef5 Binary files /dev/null and b/icons/trunk_shield6.png differ diff --git a/icons/trunk_shield7.png b/icons/trunk_shield7.png new file mode 100644 index 000000000..3d8a555b9 Binary files /dev/null and b/icons/trunk_shield7.png differ diff --git a/icons/trunk_shield8.png b/icons/trunk_shield8.png new file mode 100644 index 000000000..3d8f1b1ba Binary files /dev/null and b/icons/trunk_shield8.png differ diff --git a/icons/turning_circle-livs-fill.12.png b/icons/turning_circle-livs-fill.12.png new file mode 100644 index 000000000..da6fcd6ad Binary files /dev/null and b/icons/turning_circle-livs-fill.12.png differ diff --git a/icons/turning_circle-livs-fill.14.png b/icons/turning_circle-livs-fill.14.png new file mode 100644 index 000000000..b6b378024 Binary files /dev/null and b/icons/turning_circle-livs-fill.14.png differ diff --git a/icons/turning_circle-livs-fill.16.png b/icons/turning_circle-livs-fill.16.png new file mode 100644 index 000000000..85c8625a2 Binary files /dev/null and b/icons/turning_circle-livs-fill.16.png differ diff --git a/icons/turning_circle-livs-fill.22.png b/icons/turning_circle-livs-fill.22.png new file mode 100644 index 000000000..5fc368baf Binary files /dev/null and b/icons/turning_circle-livs-fill.22.png differ diff --git a/icons/turning_circle-tert-casing.18.png b/icons/turning_circle-tert-casing.18.png new file mode 100644 index 000000000..c5b828caa Binary files /dev/null and b/icons/turning_circle-tert-casing.18.png differ diff --git a/icons/turning_circle-tert-casing.24.png b/icons/turning_circle-tert-casing.24.png new file mode 100644 index 000000000..d973c04a1 Binary files /dev/null and b/icons/turning_circle-tert-casing.24.png differ diff --git a/icons/turning_circle-tert-fill.16.png b/icons/turning_circle-tert-fill.16.png new file mode 100644 index 000000000..02c674e66 Binary files /dev/null and b/icons/turning_circle-tert-fill.16.png differ diff --git a/icons/turning_circle-tert-fill.22.png b/icons/turning_circle-tert-fill.22.png new file mode 100644 index 000000000..b03b84edc Binary files /dev/null and b/icons/turning_circle-tert-fill.22.png differ diff --git a/icons/turning_circle-uncl-casing.14.png b/icons/turning_circle-uncl-casing.14.png new file mode 100644 index 000000000..a7b6f043d Binary files /dev/null and b/icons/turning_circle-uncl-casing.14.png differ diff --git a/icons/turning_circle-uncl-casing.16.png b/icons/turning_circle-uncl-casing.16.png new file mode 100644 index 000000000..5eab23545 Binary files /dev/null and b/icons/turning_circle-uncl-casing.16.png differ diff --git a/icons/turning_circle-uncl-casing.18.png b/icons/turning_circle-uncl-casing.18.png new file mode 100644 index 000000000..d9c38f696 Binary files /dev/null and b/icons/turning_circle-uncl-casing.18.png differ diff --git a/icons/turning_circle-uncl-casing.24.png b/icons/turning_circle-uncl-casing.24.png new file mode 100644 index 000000000..cddd1550c Binary files /dev/null and b/icons/turning_circle-uncl-casing.24.png differ diff --git a/icons/turning_circle-uncl-fill.12.png b/icons/turning_circle-uncl-fill.12.png new file mode 100644 index 000000000..89af2683a Binary files /dev/null and b/icons/turning_circle-uncl-fill.12.png differ diff --git a/icons/turning_circle-uncl-fill.14.png b/icons/turning_circle-uncl-fill.14.png new file mode 100644 index 000000000..03cd5affb Binary files /dev/null and b/icons/turning_circle-uncl-fill.14.png differ diff --git a/icons/turning_circle-uncl-fill.16.png b/icons/turning_circle-uncl-fill.16.png new file mode 100644 index 000000000..84386c53c Binary files /dev/null and b/icons/turning_circle-uncl-fill.16.png differ diff --git a/icons/turning_circle-uncl-fill.18.png b/icons/turning_circle-uncl-fill.18.png new file mode 100644 index 000000000..7c32a1c53 Binary files /dev/null and b/icons/turning_circle-uncl-fill.18.png differ diff --git a/icons/turning_circle-uncl-fill.22.png b/icons/turning_circle-uncl-fill.22.png new file mode 100644 index 000000000..f337f47a1 Binary files /dev/null and b/icons/turning_circle-uncl-fill.22.png differ diff --git a/icons/turning_circle-uncl-fill.24.png b/icons/turning_circle-uncl-fill.24.png new file mode 100644 index 000000000..75ad0adfc Binary files /dev/null and b/icons/turning_circle-uncl-fill.24.png differ diff --git a/icons/turning_circle.13.png b/icons/turning_circle.13.png new file mode 100644 index 000000000..1317ef054 Binary files /dev/null and b/icons/turning_circle.13.png differ diff --git a/icons/turning_circle.15.png b/icons/turning_circle.15.png new file mode 100644 index 000000000..c4303a07a Binary files /dev/null and b/icons/turning_circle.15.png differ diff --git a/icons/turning_circle.17.png b/icons/turning_circle.17.png new file mode 100644 index 000000000..39e27af23 Binary files /dev/null and b/icons/turning_circle.17.png differ diff --git a/icons/turning_circle.19.png b/icons/turning_circle.19.png new file mode 100644 index 000000000..efc0451d3 Binary files /dev/null and b/icons/turning_circle.19.png differ diff --git a/icons/turning_circle.png b/icons/turning_circle.png new file mode 100644 index 000000000..efc0451d3 Binary files /dev/null and b/icons/turning_circle.png differ diff --git a/icons/view_point.p.16.png b/icons/view_point.p.16.png new file mode 100644 index 000000000..b18660c86 Binary files /dev/null and b/icons/view_point.p.16.png differ diff --git a/icons/view_point.png b/icons/view_point.png new file mode 100644 index 000000000..b18660c86 Binary files /dev/null and b/icons/view_point.png differ diff --git a/icons/vineyard.png b/icons/vineyard.png new file mode 100644 index 000000000..6498e3f8b Binary files /dev/null and b/icons/vineyard.png differ diff --git a/icons/volcano.png b/icons/volcano.png new file mode 100644 index 000000000..a713ca3a6 Binary files /dev/null and b/icons/volcano.png differ diff --git a/icons/walking.n.12.png b/icons/walking.n.12.png new file mode 100644 index 000000000..0902983e7 Binary files /dev/null and b/icons/walking.n.12.png differ diff --git a/icons/walking.png b/icons/walking.png new file mode 100644 index 000000000..0902983e7 Binary files /dev/null and b/icons/walking.png differ diff --git a/icons/windmill.png b/icons/windmill.png new file mode 100644 index 000000000..17229f39f Binary files /dev/null and b/icons/windmill.png differ diff --git a/icons/zoo.png b/icons/zoo.png new file mode 100644 index 000000000..ef7e65b9f Binary files /dev/null and b/icons/zoo.png differ diff --git a/index.html b/index.html index 27a06bf2c..a67969d84 100755 --- a/index.html +++ b/index.html @@ -25,6 +25,7 @@ + diff --git a/js/iD/renderer/Map.js b/js/iD/renderer/Map.js index 8ce67eb99..b220f5afd 100755 --- a/js/iD/renderer/Map.js +++ b/js/iD/renderer/Map.js @@ -123,39 +123,6 @@ iD.Map = function(obj) { }; } - var icons = { - tourism: ['hotel'], - shop: [ - 'convenience', - 'supermarket'], - amenity: - [ - 'atm', - 'bank', - 'cafe', - 'pub', - 'place', - 'parking', - 'bicycle_parking', - 'pharmacy', - 'pharmacy', - 'police', - 'post_box', - 'recycling', - 'restaurant', - 'school', - 'taxi', - 'telephone'] - }; - - function markerimage(d) { - for (var k in icons) { - if (d.tags[k] && icons[k].indexOf(d.tags[k]) !== -1) { - return 'icons/' + d.tags[k] + '.png'; - } - } - } - function deselectClick() { selection = []; drawVector(); @@ -226,7 +193,7 @@ iD.Map = function(obj) { strokes = layers[0].stroke.selectAll('path.stroke') .data(ways, key), markers = layers[0].hit.selectAll('image.marker') - .data(points.filter(markerimage), key); + .data(points.filter(iD.markerimage), key); var _id = selection[0]; var active_entity = all.filter(function(a) { @@ -264,7 +231,7 @@ iD.Map = function(obj) { .attr('class', classes('marker')) .on('click', selectClick) .attr({ width: 16, height: 16 }) - .attr('xlink:href', markerimage); + .attr('xlink:href', iD.markerimage); markers .attr('transform', function(d) { diff --git a/js/iD/renderer/markers.js b/js/iD/renderer/markers.js new file mode 100644 index 000000000..5828965f4 --- /dev/null +++ b/js/iD/renderer/markers.js @@ -0,0 +1,566 @@ +iD.markers = [ + // http://svn.openstreetmap.org/applications/rendering/mapnik/inc/layer-amenity-symbols.xml.inc + { + tags: { aeroway: 'helipad' }, + icon: 'helipad' + }, + { + tags: { aeroway: 'airport' }, + icon: 'airport' + }, + { + tags: { aeroway: 'aerodrome' }, + icon: 'aerodrome' + }, + { + tags: { railway: 'level_crossing' }, + icon: 'level_crossing' + }, + { + tags: { man_made: 'lighthouse' }, + icon: 'lighthouselevel_crossing' + }, + { + tags: { natural: 'peak' }, + icon: 'peak' + }, + { + tags: { natural: 'volcano' }, + icon: 'volcano' + }, + { + tags: { natural: 'cave_entrance' }, + icon: 'poi_cave' + }, + { + tags: { natural: 'spring' }, + icon: 'spring' + }, + { + tags: { natural: 'tree' }, + icon: 'tree' + }, + { + tags: { + power: 'generator', + 'generator:source': 'wind' + }, + icon: 'power_wind' + }, + { + tags: { + power: 'generator', + power_source: 'wind' + }, + icon: 'power_wind' + }, + { + tags: { + man_made: 'power_wind' + }, + icon: 'power_wind' + }, + { + tags: { + man_made: 'windmill' + }, + icon: 'windmill' + }, + { + tags: { + man_made: 'mast' + }, + icon: 'communications' + }, + { + tags: { + highway: 'mini_roundabout' + }, + icon: 'mini_roundabout' + }, + { + tags: { + highway: 'gate' + }, + icon: 'gate2' + }, + { + tags: { + barrier: 'gate' + }, + icon: 'gate2' + }, + { + tags: { + barrier: 'lift_gate' + }, + icon: 'liftgate' + }, + { + tags: { + barrier: 'bollard' + }, + icon: 'bollard' + }, + { + tags: { + barrier: 'block' + }, + icon: 'bollard' + }, + { + "icon": "alpinehut", + "tags": { + "tourism": "alpine_hut" + } + }, + { + "icon": "shelter2", + "tags": { + "amenity": "shelter" + } + }, + { + "icon": "atm2", + "tags": { + "amenity": "atm" + } + }, + { + "icon": "bank2", + "tags": { + "amenity": "bank" + } + }, + { + "icon": "bar", + "tags": { + "amenity": "bar" + } + }, + { + "icon": "rental_bicycle", + "tags": { + "amenity": "bicycle_rental" + } + }, + { + "icon": "bus_stop_small", + "tags": { + "amenity": "bus_stop" + } + }, + { + "icon": "bus_stop", + "tags": { + "amenity": "bus_stop" + } + }, + { + "icon": "bus_station", + "tags": { + "amenity": "bus_station" + } + }, + { + "icon": "traffic_light", + "tags": { + "highway": "traffic_signals" + } + }, + { + "icon": "cafe", + "tags": { + "amenity": "cafe" + } + }, + { + "icon": "camping", + "tags": { + "tourism": "camp_site" + } + }, + { + "icon": "transport_ford", + "tags": { + "highway": "ford" + } + }, + { + "icon": "caravan_park", + "tags": { + "tourism": "caravan_site" + } + }, + { + "icon": "car_share", + "tags": { + "amenity": "car_sharing" + } + }, + { + "icon": "chalet", + "tags": { + "tourism": "chalet" + } + }, + { + "icon": "cinema", + "tags": { + "amenity": "cinema" + } + }, + { + "icon": "firestation", + "tags": { + "amenity": "fire_station" + } + }, + { + "icon": "fuel", + "tags": { + "amenity": "fuel" + } + }, + { + "icon": "guest_house", + "tags": { + "tourism": "guest_house" + } + }, + { + "icon": "bandb", + "tags": { + "tourism": "bed_and_breakfast" + } + }, + { + "icon": "hospital", + "tags": { + "amenity": "hospital" + } + }, + { + "icon": "hostel", + "tags": { + "tourism": "hostel" + } + }, + { + "icon": "hotel2", + "tags": { + "tourism": "hotel" + } + }, + { + "icon": "motel", + "tags": { + "tourism": "motel" + } + }, + { + "icon": "information", + "tags": { + "tourism": "information" + } + }, + { + "icon": "embassy", + "tags": { + "amenity": "embassy" + } + }, + { + "icon": "library", + "tags": { + "amenity": "library" + } + }, + { + "icon": "amenity_court", + "tags": { + "amenity": "courthouse" + } + }, + { + "icon": "lock_gate", + "tags": { + "waterway": "lock" + } + }, + { + "icon": "communications", + "tags": { + "man_made": "mast" + } + }, + { + "icon": "museum", + "tags": { + "tourism": "museum" + } + }, + { + "icon": "parking", + "tags": { + "amenity": "parking" + } + }, + { + "icon": "parking_private", + "tags": { + "amenity": "parking" + } + }, + { + "icon": "pharmacy", + "tags": { + "amenity": "pharmacy" + } + }, + { + "icon": "christian3", + "tags": { + "amenity": "place_of_worship" + } + }, + { + "icon": "islamic3", + "tags": { + "amenity": "place_of_worship" + } + }, + { + "icon": "sikh3", + "tags": { + "amenity": "place_of_worship" + } + }, + { + "icon": "jewish3", + "tags": { + "amenity": "place_of_worship" + } + }, + { + "icon": "place_of_worship3", + "tags": { + "amenity": "place_of_worship" + } + }, + { + "icon": "police", + "tags": { + "amenity": "police" + } + }, + { + "icon": "post_box", + "tags": { + "amenity": "post_box" + } + }, + { + "icon": "post_office", + "tags": { + "amenity": "post_office" + } + }, + { + "icon": "pub", + "tags": { + "amenity": "pub" + } + }, + { + "icon": "biergarten", + "tags": { + "amenity": "biergarten" + } + }, + { + "icon": "recycling", + "tags": { + "amenity": "recycling" + } + }, + { + "icon": "restaurant", + "tags": { + "amenity": "restaurant" + } + }, + { + "icon": "fast_food", + "tags": { + "amenity": "fast_food" + } + }, + { + "icon": "telephone", + "tags": { + "amenity": "telephone" + } + }, + { + "icon": "sosphone", + "tags": { + "amenity": "emergency_phone" + } + }, + { + "icon": "theatre", + "tags": { + "amenity": "theatre" + } + }, + { + "icon": "toilets", + "tags": { + "amenity": "toilets" + } + }, + { + "icon": "food_drinkingtap", + "tags": { + "amenity": "drinking_water" + } + }, + { + "icon": "amenity_prison", + "tags": { + "amenity": "prison" + } + }, + { + "icon": "view_point", + "tags": { + "tourism": "viewpoint" + } + }, + { + "icon": "tower_water", + "tags": { + "man_made": "water_tower" + } + }, + { + "icon": "tourist_memorial", + "tags": { + "historic": "memorial" + } + }, + { + "icon": "tourist_archaeological2", + "tags": { + "historic": "archaeological_site" + } + }, + { + "icon": "shop_supermarket", + "tags": { + "shop": "supermarket" + } + }, + { + "icon": "shop_bakery", + "tags": { + "shop": "bakery" + } + }, + { + "icon": "shop_butcher", + "tags": { + "shop": "butcher" + } + }, + { + "icon": "shop_clothes", + "tags": { + "shop": "clothes" + } + }, + { + "icon": "shop_convenience", + "tags": { + "shop": "convenience" + } + }, + { + "icon": "department_store", + "tags": { + "shop": "department_store" + } + }, + { + "icon": "shop_diy", + "tags": { + "shop": "doityourself" + } + }, + { + "icon": "florist", + "tags": { + "shop": "florist" + } + }, + { + "icon": "shop_hairdresser", + "tags": { + "shop": "hairdresser" + } + }, + { + "icon": "shopping_car", + "tags": { + "shop": "car" + } + }, + { + "icon": "shopping_car_repair", + "tags": { + "shop": "car_repair" + } + }, + { + "icon": "shopping_bicycle", + "tags": { + "shop": "bicycle" + } + }, + { + "icon": "playground", + "tags": { + "leisure": "playground" + } + }, + { + "icon": "picnic", + "tags": { + "amenity": "picnic_site" + } + }, + { + "icon": "transport_slipway", + "tags": { + "leisure": "slipway" + } + } +]; + + +iD.markerimage = function(d) { + // TODO: optimize + for (var i = 0; i < iD.markers.length; i++) { + var tl = Object.keys(iD.markers[i].tags).length; + var tf = 0; + for (var k in iD.markers[i].tags) { + if (d.tags[k] && d.tags[k] == iD.markers[i].tags[k]) { + tf++; + } + } + if (tf == tl) { + return 'icons/' + iD.markers[i].icon + '.png'; + } + } +}; diff --git a/xmltojson.py b/xmltojson.py new file mode 100644 index 000000000..c3ea86b8f --- /dev/null +++ b/xmltojson.py @@ -0,0 +1,22 @@ +from xml.dom.minidom import parse, parseString +import re, json + +# this needs to strip xml entities first +doc = parse(open('tmp_markers.xml')) + +rules = [] + +b = re.compile(r"\[(?P\w+)\]\s*\=\s*\'(?P\w+)\'") +c = re.compile(r"\/(?P\w+)") +for s in doc.getElementsByTagName('Rule'): + filt = str(s.getElementsByTagName('Filter')[0].childNodes[0].wholeText) + sym = str(s.getElementsByTagName('PointSymbolizer')[0].getAttribute('file')) + gd = b.match(filt).groupdict() + ic = c.match(sym).groupdict() + rules.append({ + 'tags': { + gd['tag']: gd['value'] + }, + 'icon': ic['icon'] + }) +json.dump(rules, open('rules.js', 'w'), indent=4)