Add Potlatch 2 as an editor option
authorTom Hughes <tom@compton.nu>
Sun, 14 Nov 2010 14:44:35 +0000 (14:44 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 29 Nov 2010 12:20:21 +0000 (12:20 +0000)
287 files changed:
app/views/site/_potlatch2.html.erb [new file with mode: 0644]
config/locales/en.yml
lib/editors.rb
public/potlatch2/FontLibrary.swf [new file with mode: 0644]
public/potlatch2/features/barrier_generic.png [new file with mode: 0644]
public/potlatch2/features/barrier_generic.svg [new file with mode: 0644]
public/potlatch2/features/cycle__lcn.png [new file with mode: 0644]
public/potlatch2/features/cycle__ncn.png [new file with mode: 0644]
public/potlatch2/features/cycle__rcn.png [new file with mode: 0644]
public/potlatch2/features/highway__motorway.png [new file with mode: 0644]
public/potlatch2/features/highway__residential.png [new file with mode: 0644]
public/potlatch2/features/highway__service.png [new file with mode: 0644]
public/potlatch2/features/highway__trunk.png [new file with mode: 0644]
public/potlatch2/features/highway__unclassified.png [new file with mode: 0644]
public/potlatch2/features/oneway__-1.png [new file with mode: 0644]
public/potlatch2/features/oneway__no.png [new file with mode: 0644]
public/potlatch2/features/oneway__yes.png [new file with mode: 0644]
public/potlatch2/features/paths__bike.png [new file with mode: 0644]
public/potlatch2/features/paths__bike.svg [new file with mode: 0644]
public/potlatch2/features/paths__bridleway.png [new file with mode: 0644]
public/potlatch2/features/paths__bridleway.svg [new file with mode: 0644]
public/potlatch2/features/paths__footway.png [new file with mode: 0644]
public/potlatch2/features/paths__footway.svg [new file with mode: 0644]
public/potlatch2/features/paths__pedestrian.png [new file with mode: 0644]
public/potlatch2/features/paths__pedestrian.svg [new file with mode: 0644]
public/potlatch2/features/paths__steps.png [new file with mode: 0644]
public/potlatch2/features/paths__steps.svg [new file with mode: 0644]
public/potlatch2/features/paths__unknown.png [new file with mode: 0644]
public/potlatch2/features/paths__unknown.svg [new file with mode: 0644]
public/potlatch2/features/pois/accommodation_alpinehut.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/accommodation_camping.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/accommodation_caravan_park.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/accommodation_chalet.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/accommodation_hotel.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/accommodation_motel.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/amenity_firestation2.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/amenity_information.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/amenity_police2.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/amenity_post_box.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/amenity_recycling.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_blocks.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_bollard.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_cattle_grid.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_cycle_barrier.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_gate.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_generic.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_generic.svg [new file with mode: 0644]
public/potlatch2/features/pois/barrier_kissing_gate.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_lift_gate.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_stile.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/barrier_toll_booth.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/building_generic.png [new file with mode: 0644]
public/potlatch2/features/pois/education_school.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/education_university.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/food_bar.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/food_cafe.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/food_fastfood.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/food_pub.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/food_restaurant.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/health_hospital.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/health_pharmacy.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/landuse_grass.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/money_atm.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/money_bank2.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/poi_military_bunker.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/poi_mine.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_alcohol.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_bakery.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_bicycle.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_book.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_butcher.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_car.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_car_repair.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_clothes.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_confectionery.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_convenience.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_diy.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_fish.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_garden_centre.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_gift.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_greengrocer.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_hairdresser.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_hifi.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_jewelry.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_laundrette.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_motorcycle.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_music.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/shopping_supermarket.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/sport_golf.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/sport_leisure_centre.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_archaeological.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_art_gallery2.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_attraction.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_battlefield.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_castle.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_cinema.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_memorial.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_monument.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_museum.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_picnic.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_ruin.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_theatre.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_theme_park.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_view_point.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/tourist_zoo.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_aerodrome.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_airport_gate.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_airport_terminal.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_bus_station.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_bus_stop2.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_fuel.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_marina.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_parking_bicycle.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_parking_car.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_port.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_rental_bicycle.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_rental_car.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_taxi_rank.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_train_station.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_tram_stop.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/transport_turning_circle.n.24.png [new file with mode: 0644]
public/potlatch2/features/pois/water_generic.24.png [new file with mode: 0644]
public/potlatch2/features/pois/water_generic.svg [new file with mode: 0644]
public/potlatch2/features/power_high.png [new file with mode: 0644]
public/potlatch2/features/power_high.svg [new file with mode: 0644]
public/potlatch2/features/power_low.png [new file with mode: 0644]
public/potlatch2/features/power_low.svg [new file with mode: 0644]
public/potlatch2/features/restriction__no_left_turn.png [new file with mode: 0644]
public/potlatch2/features/restriction__no_right_turn.png [new file with mode: 0644]
public/potlatch2/features/restriction__no_straight_on.png [new file with mode: 0644]
public/potlatch2/features/restriction__no_u_turn.png [new file with mode: 0644]
public/potlatch2/features/restriction__only_left_turn.png [new file with mode: 0644]
public/potlatch2/features/restriction__only_right_turn.png [new file with mode: 0644]
public/potlatch2/features/restriction__only_straight_on.png [new file with mode: 0644]
public/potlatch2/features/transport__bus.png [new file with mode: 0644]
public/potlatch2/features/transport__railway.png [new file with mode: 0644]
public/potlatch2/features/transport__railway.svg [new file with mode: 0644]
public/potlatch2/features/transport__railway_abandoned.png [new file with mode: 0644]
public/potlatch2/features/transport__railway_disused.png [new file with mode: 0644]
public/potlatch2/features/transport__railway_platform.png [new file with mode: 0644]
public/potlatch2/features/transport__subway.png [new file with mode: 0644]
public/potlatch2/features/transport__subway.svg [new file with mode: 0644]
public/potlatch2/features/transport__tram.png [new file with mode: 0644]
public/potlatch2/features/transport__tram.svg [new file with mode: 0644]
public/potlatch2/features/waterway__canal.png [new file with mode: 0644]
public/potlatch2/features/waterway__canal.svg [new file with mode: 0644]
public/potlatch2/features/waterway__dam.png [new file with mode: 0644]
public/potlatch2/features/waterway__dam.svg [new file with mode: 0644]
public/potlatch2/features/waterway__river.png [new file with mode: 0644]
public/potlatch2/features/waterway__river.svg [new file with mode: 0644]
public/potlatch2/features/waterway__stream.png [new file with mode: 0644]
public/potlatch2/features/waterway__stream.svg [new file with mode: 0644]
public/potlatch2/fills/grass.jpg [new file with mode: 0644]
public/potlatch2/gpx.css [new file with mode: 0644]
public/potlatch2/icons/accommodation_alpinehut.n.16.png [new file with mode: 0644]
public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png [new file with mode: 0644]
public/potlatch2/icons/accommodation_blank.png [new file with mode: 0644]
public/potlatch2/icons/accommodation_camping.n.16.png [new file with mode: 0644]
public/potlatch2/icons/accommodation_caravan_park.n.16.png [new file with mode: 0644]
public/potlatch2/icons/accommodation_hotel.n.16.png [new file with mode: 0644]
public/potlatch2/icons/accommodation_youth_hostel.n.16.png [new file with mode: 0644]
public/potlatch2/icons/airport.png [new file with mode: 0644]
public/potlatch2/icons/amenity_firestation2.n.16.png [new file with mode: 0644]
public/potlatch2/icons/amenity_police2.n.16.png [new file with mode: 0644]
public/potlatch2/icons/amenity_post_box.n.16.png [new file with mode: 0644]
public/potlatch2/icons/amenity_recycling.n.16.png [new file with mode: 0644]
public/potlatch2/icons/atm.png [new file with mode: 0644]
public/potlatch2/icons/bank.png [new file with mode: 0644]
public/potlatch2/icons/bar.png [new file with mode: 0644]
public/potlatch2/icons/barrier_blocks.16.png [new file with mode: 0644]
public/potlatch2/icons/barrier_bollard.n.16.png [new file with mode: 0644]
public/potlatch2/icons/barrier_cattle_grid.16.png [new file with mode: 0644]
public/potlatch2/icons/barrier_cycle_barrier.16.png [new file with mode: 0644]
public/potlatch2/icons/barrier_gate.n.16.png [new file with mode: 0644]
public/potlatch2/icons/barrier_kissing_gate.16.png [new file with mode: 0644]
public/potlatch2/icons/barrier_lift_gate.n.16.png [new file with mode: 0644]
public/potlatch2/icons/barrier_stile.n.16.png [new file with mode: 0644]
public/potlatch2/icons/barrier_toll_booth.n.16.png [new file with mode: 0644]
public/potlatch2/icons/bollard.png [new file with mode: 0644]
public/potlatch2/icons/bus_stop.png [new file with mode: 0644]
public/potlatch2/icons/cafe.png [new file with mode: 0644]
public/potlatch2/icons/cattle_grid.png [new file with mode: 0644]
public/potlatch2/icons/cinema.png [new file with mode: 0644]
public/potlatch2/icons/convenience.png [new file with mode: 0644]
public/potlatch2/icons/education_school.n.16.png [new file with mode: 0644]
public/potlatch2/icons/fast_food.png [new file with mode: 0644]
public/potlatch2/icons/ferry_terminal.png [new file with mode: 0644]
public/potlatch2/icons/fire_station.png [new file with mode: 0644]
public/potlatch2/icons/food_bar.n.16.png [new file with mode: 0644]
public/potlatch2/icons/food_cafe.n.16.png [new file with mode: 0644]
public/potlatch2/icons/food_fastfood.n.16.png [new file with mode: 0644]
public/potlatch2/icons/food_pub.n.16.png [new file with mode: 0644]
public/potlatch2/icons/food_restaurant.n.16.png [new file with mode: 0644]
public/potlatch2/icons/gate.png [new file with mode: 0644]
public/potlatch2/icons/health_hospital.n.16.png [new file with mode: 0644]
public/potlatch2/icons/health_pharmacy.n.16.png [new file with mode: 0644]
public/potlatch2/icons/hospital.png [new file with mode: 0644]
public/potlatch2/icons/hotel.png [new file with mode: 0644]
public/potlatch2/icons/icons_grid.png [new file with mode: 0644]
public/potlatch2/icons/money_atm.n.16.png [new file with mode: 0644]
public/potlatch2/icons/money_bank2.n.16.png [new file with mode: 0644]
public/potlatch2/icons/museum.png [new file with mode: 0644]
public/potlatch2/icons/natural_blank.png [new file with mode: 0644]
public/potlatch2/icons/parking.png [new file with mode: 0644]
public/potlatch2/icons/parking_cycle.png [new file with mode: 0644]
public/potlatch2/icons/pharmacy.png [new file with mode: 0644]
public/potlatch2/icons/pharmacy_dispensing.png [new file with mode: 0644]
public/potlatch2/icons/place.png [new file with mode: 0644]
public/potlatch2/icons/place_of_worship.png [new file with mode: 0644]
public/potlatch2/icons/police.png [new file with mode: 0644]
public/potlatch2/icons/post_box.png [new file with mode: 0644]
public/potlatch2/icons/power_blank.png [new file with mode: 0644]
public/potlatch2/icons/power_pole_24.png [new file with mode: 0644]
public/potlatch2/icons/power_tower_24.png [new file with mode: 0644]
public/potlatch2/icons/pub.png [new file with mode: 0644]
public/potlatch2/icons/recycling.png [new file with mode: 0644]
public/potlatch2/icons/restaurant.png [new file with mode: 0644]
public/potlatch2/icons/restriction.png [new file with mode: 0644]
public/potlatch2/icons/school.png [new file with mode: 0644]
public/potlatch2/icons/shopping_alcohol.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_bakery.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_bicycle.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_book.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_butcher.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_car.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_car_repair.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_clothes.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_confectionery.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_convenience.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_diy.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_fish.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_garden_centre.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_gift.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_greengrocer.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_hairdresser.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_hifi.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_jewelry.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_laundrette.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_motorcycle.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_music.n.16.png [new file with mode: 0644]
public/potlatch2/icons/shopping_supermarket.n.16.png [new file with mode: 0644]
public/potlatch2/icons/speed_hump_16.png [new file with mode: 0644]
public/potlatch2/icons/station.png [new file with mode: 0644]
public/potlatch2/icons/supermarket.png [new file with mode: 0644]
public/potlatch2/icons/taxi.png [new file with mode: 0644]
public/potlatch2/icons/telephone.png [new file with mode: 0644]
public/potlatch2/icons/theatre.png [new file with mode: 0644]
public/potlatch2/icons/tourist_archaeological.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_battlefield.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_blank.png [new file with mode: 0644]
public/potlatch2/icons/tourist_castle.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_cinema.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_information.png [new file with mode: 0644]
public/potlatch2/icons/tourist_memorial.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_monument.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_museum.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_picnic.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_ruin.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_theatre.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_view_point.n.16.png [new file with mode: 0644]
public/potlatch2/icons/tourist_zoo.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_aerodrome.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_airport_48.png [new file with mode: 0644]
public/potlatch2/icons/transport_blank.png [new file with mode: 0644]
public/potlatch2/icons/transport_bus_station.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_bus_stop2.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_fuel.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_helipad_48.png [new file with mode: 0644]
public/potlatch2/icons/transport_marina.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_parking_bicycle.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_parking_car.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_port.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_rental_bicycle.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_rental_car.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_taxi_rank.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_train_station.n.16.png [new file with mode: 0644]
public/potlatch2/icons/transport_tram_stop.n.16.png [new file with mode: 0644]
public/potlatch2/imagery.xml [new file with mode: 0644]
public/potlatch2/map_features.xml [new file with mode: 0644]
public/potlatch2/opencyclemap.css [new file with mode: 0644]
public/potlatch2/potlatch.css [new file with mode: 0644]
public/potlatch2/potlatch2.swf [new file with mode: 0644]
public/potlatch2/stylesheets.xml [new file with mode: 0644]
public/potlatch2/wireframe.css [new file with mode: 0644]

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
new file mode 100644 (file)
index 0000000..705b913
--- /dev/null
@@ -0,0 +1,36 @@
+<div id="map">
+  <%= t 'site.edit.flash_player_required' %>
+</div>
+
+<%= javascript_include_tag 'swfobject.js' %>
+<script type="text/javascript" defer="defer">
+  var brokenContentSize = $("content").offsetWidth == 0;
+  var fo = new SWFObject("/potlatch2/potlatch2.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "9", "#FFFFFF");
+  // 700,600 for fixed size, 100%,100% for resizable
+  var changesaved=true;
+  
+  window.onbeforeunload=function() {
+    if (!changesaved) {
+      return '<%= escape_javascript(t('site.edit.potlatch_unsaved_changes')) %>';
+    }
+  }
+
+  function markChanged(a) { changesaved=a; }
+
+  function doSWF(lat,lon,zoom) {
+    fo.addParam("base","/potlatch2");
+    if (lat) { fo.addVariable("lat",lat); }
+    if (lon) { fo.addVariable("lon",lon); }
+    fo.addVariable("zoom",zoom);
+    fo.addVariable("api","/api/<%= API_VERSION %>/");
+    fo.addVariable("policy","/api/crossdomain.xml");
+    fo.addVariable("connection","XML");
+    fo.write("map");
+  }
+
+  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+
+  function setPosition(lat, lon, zoom) {
+    doSWF(lat, lon, zoom || 15);
+  }
+</script>
index d5c82a7a27793080f95d3835f50356c4012bfed0..cfaa07bf1abede545253b37730a2772edc19f6ec 100644 (file)
@@ -1659,8 +1659,9 @@ en:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
       editor:
-        potlatch: "Potlatch (in-browser editor)"
-        josm:     "JOSM (via remote-control plugin)"
+        potlatch: "Potlatch 1 (in-browser editor)"
+        potlatch2: "Potlatch 2 (in-browser editor)"
+        josm: "JOSM (via remote-control plugin)"
     confirm:
       heading: Confirm a user account
       press confirm button: "Press the confirm button below to activate your account."
index e3e17e535315b837234f087076246e16d2aa3bde..efd10aef9636819bda03d49aa9445a13c9f1d359 100644 (file)
@@ -1,3 +1,3 @@
 module Editors 
-  ALL_EDITORS = [ "potlatch", "josm" ]
+  ALL_EDITORS = [ "potlatch", "potlatch2", "josm" ]
 end
diff --git a/public/potlatch2/FontLibrary.swf b/public/potlatch2/FontLibrary.swf
new file mode 100644 (file)
index 0000000..104c8c9
Binary files /dev/null and b/public/potlatch2/FontLibrary.swf differ
diff --git a/public/potlatch2/features/barrier_generic.png b/public/potlatch2/features/barrier_generic.png
new file mode 100644 (file)
index 0000000..fe72ab4
Binary files /dev/null and b/public/potlatch2/features/barrier_generic.png differ
diff --git a/public/potlatch2/features/barrier_generic.svg b/public/potlatch2/features/barrier_generic.svg
new file mode 100644 (file)
index 0000000..eaefcb1
--- /dev/null
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3646"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="barrier_generic.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/power_high.png"
+   inkscape:export-xdpi="66.09375"
+   inkscape:export-ydpi="66.09375">
+  <defs
+     id="defs3648">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3654" />
+    <inkscape:perspective
+       id="perspective4207"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4277"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4305"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4327"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4327-8"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.375"
+     inkscape:cx="-31.684888"
+     inkscape:cy="-6.6968199"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3651">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3656"
+       width="64.363632"
+       height="64"
+       x="0"
+       y="0"
+       ry="8.0227919"
+       rx="6.6013985"
+       inkscape:export-xdpi="33.75"
+       inkscape:export-ydpi="33.75"
+       inkscape:export-filename="/home/andy/src/potlatch2/resources/features/pois/barrier_generic.24.png" />
+    <path
+       style="fill:#d0d0d0;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 22.299999,14.663637 57.306901,27.14564 57.699998,45.651763 22.845454,54.063636 22.299999,14.663637 z"
+       id="rect4392"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="fill:#d0d0d0;fill-opacity:1;stroke:#060502;stroke-width:2.97073364000000018;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4395"
+       width="15.840281"
+       height="40.567558"
+       x="6.0798597"
+       y="14.26168"
+       rx="0" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/cycle__lcn.png b/public/potlatch2/features/cycle__lcn.png
new file mode 100644 (file)
index 0000000..b46ab05
Binary files /dev/null and b/public/potlatch2/features/cycle__lcn.png differ
diff --git a/public/potlatch2/features/cycle__ncn.png b/public/potlatch2/features/cycle__ncn.png
new file mode 100644 (file)
index 0000000..49456c4
Binary files /dev/null and b/public/potlatch2/features/cycle__ncn.png differ
diff --git a/public/potlatch2/features/cycle__rcn.png b/public/potlatch2/features/cycle__rcn.png
new file mode 100644 (file)
index 0000000..ed79223
Binary files /dev/null and b/public/potlatch2/features/cycle__rcn.png differ
diff --git a/public/potlatch2/features/highway__motorway.png b/public/potlatch2/features/highway__motorway.png
new file mode 100644 (file)
index 0000000..0a12e18
Binary files /dev/null and b/public/potlatch2/features/highway__motorway.png differ
diff --git a/public/potlatch2/features/highway__residential.png b/public/potlatch2/features/highway__residential.png
new file mode 100644 (file)
index 0000000..d481aab
Binary files /dev/null and b/public/potlatch2/features/highway__residential.png differ
diff --git a/public/potlatch2/features/highway__service.png b/public/potlatch2/features/highway__service.png
new file mode 100644 (file)
index 0000000..0fdd441
Binary files /dev/null and b/public/potlatch2/features/highway__service.png differ
diff --git a/public/potlatch2/features/highway__trunk.png b/public/potlatch2/features/highway__trunk.png
new file mode 100644 (file)
index 0000000..b8e1e0b
Binary files /dev/null and b/public/potlatch2/features/highway__trunk.png differ
diff --git a/public/potlatch2/features/highway__unclassified.png b/public/potlatch2/features/highway__unclassified.png
new file mode 100644 (file)
index 0000000..9359af2
Binary files /dev/null and b/public/potlatch2/features/highway__unclassified.png differ
diff --git a/public/potlatch2/features/oneway__-1.png b/public/potlatch2/features/oneway__-1.png
new file mode 100644 (file)
index 0000000..2a80e9f
Binary files /dev/null and b/public/potlatch2/features/oneway__-1.png differ
diff --git a/public/potlatch2/features/oneway__no.png b/public/potlatch2/features/oneway__no.png
new file mode 100644 (file)
index 0000000..b768ab0
Binary files /dev/null and b/public/potlatch2/features/oneway__no.png differ
diff --git a/public/potlatch2/features/oneway__yes.png b/public/potlatch2/features/oneway__yes.png
new file mode 100644 (file)
index 0000000..e62054c
Binary files /dev/null and b/public/potlatch2/features/oneway__yes.png differ
diff --git a/public/potlatch2/features/paths__bike.png b/public/potlatch2/features/paths__bike.png
new file mode 100644 (file)
index 0000000..75d98be
Binary files /dev/null and b/public/potlatch2/features/paths__bike.png differ
diff --git a/public/potlatch2/features/paths__bike.svg b/public/potlatch2/features/paths__bike.svg
new file mode 100644 (file)
index 0000000..a222482
--- /dev/null
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="paths__footway.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/paths__footway.png"
+   inkscape:export-xdpi="8.3623695"
+   inkscape:export-ydpi="8.3623695">
+  <defs
+     id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective2825" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3609"
+       id="linearGradient3615"
+       x1="215"
+       y1="188.25"
+       x2="215"
+       y2="430.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
+    <inkscape:perspective
+       id="perspective2916"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.8"
+     inkscape:cx="-194.58464"
+     inkscape:cy="251.7971"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview2820"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="0"
+       y="188.75" />
+    <rect
+       style="fill:url(#linearGradient3625);fill-opacity:1"
+       id="rect3617"
+       width="428.125"
+       height="188.75"
+       x="0"
+       y="-6.5955419e-10" />
+    <g
+       id="g2319"
+       transform="translate(641.02874,-121.48949)"
+       style="fill:#000000;fill-opacity:1;stroke:#e6f708;stroke-opacity:1">
+      <path
+         id="path2323"
+         style="fill:#000000;stroke:#e6f708;fill-opacity:1;stroke-opacity:1"
+         d="" />
+    </g>
+    <g
+       id="g2325"
+       transform="translate(641.02874,-121.48949)"
+       style="fill:#000000;fill-opacity:1;stroke:#e6f708;stroke-opacity:1">
+      <path
+         id="path2329"
+         style="fill:#000000;stroke:#e6f708;fill-opacity:1;stroke-opacity:1"
+         d="" />
+    </g>
+    <g
+       id="g3757"
+       transform="matrix(0.81866272,0,0,0.81866272,168.38354,110.75723)">
+      <path
+         d="m 278.91286,461.96271 c 0,43.28842 -35.0922,78.38061 -78.38062,78.38061 -43.28842,0 -78.38061,-35.09219 -78.38061,-78.38061 0,-43.28842 35.09219,-78.38062 78.38061,-78.38062 43.28842,0 78.38062,35.0922 78.38062,78.38062 z"
+         id="path596"
+         sodipodi:cx="200.53224"
+         sodipodi:cy="461.96271"
+         sodipodi:rx="78.380615"
+         sodipodi:ry="78.380615"
+         sodipodi:type="arc"
+         style="font-size:12px;fill:none;stroke:#4a4a4a;stroke-width:26;stroke-opacity:1"
+         transform="matrix(-0.983459,0,0,0.983459,85.159738,-260.18659)" />
+      <path
+         d="m 278.91286,461.96271 c 0,43.28842 -35.0922,78.38061 -78.38062,78.38061 -43.28842,0 -78.38061,-35.09219 -78.38061,-78.38061 0,-43.28842 35.09219,-78.38062 78.38061,-78.38062 43.28842,0 78.38062,35.0922 78.38062,78.38062 z"
+         id="path595"
+         sodipodi:cx="200.53224"
+         sodipodi:cy="461.96271"
+         sodipodi:rx="78.380615"
+         sodipodi:ry="78.380615"
+         sodipodi:type="arc"
+         style="font-size:12px;fill:none;stroke:#4a4a4a;stroke-width:26;stroke-opacity:1"
+         transform="matrix(-0.983459,0,0,0.983459,415.52074,-261.68759)" />
+      <path
+         d="m 157.23838,61.490482 -198.216442,1.00111 -70.076498,130.142098 134.146488,0 140.153012,-95.103825"
+         id="path594"
+         sodipodi:nodetypes="ccccc"
+         style="font-size:12px;fill:none;stroke:#4a4a4a;stroke-width:20.52969933;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         d="m 149.62164,-16.503568 c 10.76679,0 18.90504,-0.24023 27.24667,12.5033196 2.40112,4.24812997 3.49891,9.43507 2.61231,14.5982204 -1.06358,5.87102 -4.53943,11.6392 -8.63703,15.05385 -5.4259,4.52159 -10.57524,4.17279 -9.74304,8.23745 1.06778,5.21545 4.32649,12.463 7.84807,24.23155 3.57467,11.94585 7.81937,26.566463 11.98592,40.967243 4.16655,14.400745 8.2566,28.589435 11.49416,39.645695 1.61883,5.5281 3.0326,10.27493 4.11828,13.8299 1.05776,3.46359 1.99166,6.15402 1.90542,5.96221 3.37308,5.93469 3.83222,9.80168 9.48991,14.85291 6.34352,5.55178 11.50835,9.65313 13.30083,10.90597 4.55283,3.30733 6.6694,10.28705 4.26519,13.73578 -3.0299,4.70007 -9.28742,5.42104 -13.86085,4.01492 -4.34258,-1.37853 -11.21684,-3.74643 -19.18802,-10.34857 l -0.0615,-0.0922 -0.0922,-0.0615 c -11.09146,-9.51363 -15.19483,-21.0602 -15.61239,-21.72827 l -0.58395,-0.89127 -0.39954,-0.98346 c -0.96107,-2.36581 -1.53677,-4.45189 -2.67376,-8.17502 -1.13702,-3.72312 -2.5784,-8.53309 -4.21046,-14.10649 -3.26407,-11.14676 -7.33336,-25.35702 -11.49416,-39.73789 -4.16083,-14.380855 -8.39513,-28.927018 -11.92445,-40.721368 -3.52934,-11.79434 -5.75905,-21.48095 -6.58328,-23.54157 -2.00615,-5.01532 -3.03104,-10.42981 -1.65961,-15.85829 1.37142,-5.42846 5.46959,-9.80971 9.14835,-10.82817 8.39707,-2.34923 6.16904,-8.3891804 1.873,-8.3979404 l -36.0005,-0.0733 -0.0887,-22.9932596 c 2.3e-4,-5e-4 23.36782,-5e-4 37.52535,-5e-4 z"
+         id="path593"
+         sodipodi:nodetypes="ccccscccccsscsccccccccccccssccc"
+         style="font-size:12px;fill:#4a4a4a;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         d="M 20.523428,188.5589 -47.433032,22.207192"
+         id="path599"
+         style="font-size:12px;fill:none;stroke:#4a4a4a;stroke-width:24.58650017;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         d="M 43.884728,146.0842 2.825168,241.65182"
+         id="path600"
+         style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#4a4a4a;stroke-width:8.9740696;stroke-linecap:round;stroke-opacity:1" />
+      <path
+         d="m 278.91286,461.96271 c 0,43.28842 -35.0922,78.38061 -78.38062,78.38061 -43.28842,0 -78.38061,-35.09219 -78.38061,-78.38061 0,-43.28842 35.09219,-78.38062 78.38061,-78.38062 43.28842,0 78.38062,35.0922 78.38062,78.38062 z"
+         id="path597"
+         sodipodi:cx="200.53224"
+         sodipodi:cy="461.96271"
+         sodipodi:rx="78.380615"
+         sodipodi:ry="78.380615"
+         sodipodi:type="arc"
+         style="font-size:12px;fill:#4a4a4a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         transform="matrix(-0.277291,0,0,0.244915,77.946738,79.741412)" />
+      <path
+         d="m 62.163838,146.12777 -36.26994,0.33246"
+         id="path601"
+         sodipodi:nodetypes="cc"
+         style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#4a4a4a;stroke-width:12.53960037;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         d="m 21.314628,240.27904 -36.26994,0.33247"
+         id="path602"
+         sodipodi:nodetypes="cc"
+         style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#4a4a4a;stroke-width:12.53909969;stroke-linecap:round;stroke-opacity:1" />
+      <path
+         d="m -80.703712,7.3411716 85.29957,0 c 3.18547,0 7.29693,5.6348704 3.18547,9.3794104 -4.44674,4.23206 -44.4195,12.9188 -44.4195,12.9188 0,0 -10.97213,3.00849 -16.81217,2.30063 -5.84,-0.70788 -26.01458,-2.47758 -27.25337,-24.5988404 z"
+         id="path603"
+         sodipodi:nodetypes="cssccc"
+         style="font-size:12px;fill:#4a4a4a;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/public/potlatch2/features/paths__bridleway.png b/public/potlatch2/features/paths__bridleway.png
new file mode 100644 (file)
index 0000000..79b3874
Binary files /dev/null and b/public/potlatch2/features/paths__bridleway.png differ
diff --git a/public/potlatch2/features/paths__bridleway.svg b/public/potlatch2/features/paths__bridleway.svg
new file mode 100644 (file)
index 0000000..8688699
--- /dev/null
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective2825" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3609"
+       id="linearGradient3615"
+       x1="215"
+       y1="188.25"
+       x2="215"
+       y2="430.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.8"
+     inkscape:cx="256.88645"
+     inkscape:cy="210"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview2820"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="0"
+       y="188.75" />
+    <rect
+       style="fill:url(#linearGradient3625);fill-opacity:1"
+       id="rect3617"
+       width="427.5"
+       height="188.75"
+       x="1.25"
+       y="0" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#c9c9c9;fill-opacity:1;stroke:#252525;stroke-width:6.25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:AlArabiya;-inkscape-font-specification:AlArabiya;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 369.45207,213.25233 c 0.18987,-19.53568 -1.94101,-38.91836 -6.31128,-57.29252 C 351.48675,106.96205 324.81421,65.392665 287.92068,40.76116 214.13363,-8.501849 123.09905,20.805383 79.863235,114.45988 58.245333,161.28712 53.955156,217.54242 65.609196,266.54018 c 11.65404,48.99776 24.576584,60.56714 56.470114,90.19865 l 37.03982,-37.00768 c -27.16569,-18.13684 -44.05003,-46.51028 -51.06982,-76.02401 -7.0198,-29.51372 -5.10163,-60.34816 8.84437,-90.55705 27.892,-60.417779 98.40581,-86.654908 152.73718,-50.38125 27.16569,18.13684 44.05003,46.51028 51.06982,76.02401 7.01979,29.51372 5.10163,60.34816 -8.84437,90.55705 -9.90297,21.45116 -25.53118,40.09075 -45.23082,52.31899 l 30.94501,37.68589 c 28.05712,-17.89009 32.06564,-21.48829 51.31625,-51.31467 17.48058,-27.08394 20.24887,-62.22831 20.56532,-94.78778 z"
+       id="path3627"
+       sodipodi:nodetypes="cssssccsssssccsc" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/paths__footway.png b/public/potlatch2/features/paths__footway.png
new file mode 100644 (file)
index 0000000..082cfff
Binary files /dev/null and b/public/potlatch2/features/paths__footway.png differ
diff --git a/public/potlatch2/features/paths__footway.svg b/public/potlatch2/features/paths__footway.svg
new file mode 100644 (file)
index 0000000..b218d1a
--- /dev/null
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="paths__footway.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/paths__footway.png"
+   inkscape:export-xdpi="8.3623695"
+   inkscape:export-ydpi="8.3623695">
+  <defs
+     id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective2825" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3609"
+       id="linearGradient3615"
+       x1="215"
+       y1="188.25"
+       x2="215"
+       y2="430.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.6"
+     inkscape:cx="132.44999"
+     inkscape:cy="194.75636"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview2820"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="0"
+       y="188.75" />
+    <rect
+       style="fill:url(#linearGradient3625);fill-opacity:1"
+       id="rect3617"
+       width="428.125"
+       height="188.75"
+       x="0"
+       y="-6.5955419e-10" />
+    <path
+       style="fill:#53dd51;fill-opacity:1;stroke:#4a4a4a;stroke-width:114.11499786;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 212.1875,104.1875 c -10.2939,0 -18.625,25.12042 -18.625,56.125 0,14.26614 1.77703,27.28377 4.6875,37.1875 l 27.875,0 c 2.91047,-9.90373 4.6875,-22.92136 4.6875,-37.1875 0,-31.00458 -8.3311,-56.125 -18.625,-56.125 z"
+       id="rect3858" />
+    <path
+       style="fill:#4a4a4a;fill-opacity:1;stroke:none"
+       d="m 161.25,276.875 c -12.11732,10.32046 -6.03125,26.63817 -6.03125,43.4375 0,31.10997 26.21316,56.34375 58.53125,56.34375 32.31809,0 58.53125,-25.23378 58.53125,-56.34375 0,-16.79933 6.71107,-31.86704 -5.40625,-42.1875 l -105.625,-1.25 z"
+       id="rect3861"
+       sodipodi:nodetypes="cssscc" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/paths__pedestrian.png b/public/potlatch2/features/paths__pedestrian.png
new file mode 100644 (file)
index 0000000..7348ed9
Binary files /dev/null and b/public/potlatch2/features/paths__pedestrian.png differ
diff --git a/public/potlatch2/features/paths__pedestrian.svg b/public/potlatch2/features/paths__pedestrian.svg
new file mode 100644 (file)
index 0000000..55ce9d6
--- /dev/null
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="paths__footway.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/paths__footway.png"
+   inkscape:export-xdpi="8.3623695"
+   inkscape:export-ydpi="8.3623695">
+  <defs
+     id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective2825" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3609"
+       id="linearGradient3615"
+       x1="215"
+       y1="188.25"
+       x2="215"
+       y2="430.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.1313709"
+     inkscape:cx="85.306552"
+     inkscape:cy="201.90418"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview2820"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="0"
+       y="188.75" />
+    <rect
+       style="fill:url(#linearGradient3625);fill-opacity:1"
+       id="rect3617"
+       width="428.125"
+       height="188.75"
+       x="0"
+       y="-6.5955419e-10" />
+    <path
+       style="fill:#b8b8b8;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 138.125,188.75 0.625,425 428.75,426.25 285,188.75 l -146.875,0 z"
+       id="path3886" />
+    <path
+       style="fill:#53dd51;fill-opacity:1;stroke:#4a4a4a;stroke-width:114.11499786;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 212.1875,104.1875 c -10.2939,0 -18.625,25.12042 -18.625,56.125 0,14.26614 1.77703,27.28377 4.6875,37.1875 l 27.875,0 c 2.91047,-9.90373 4.6875,-22.92136 4.6875,-37.1875 0,-31.00458 -8.3311,-56.125 -18.625,-56.125 z"
+       id="rect3858" />
+    <path
+       style="fill:#4a4a4a;fill-opacity:1;stroke:none"
+       d="m 161.25,276.875 c -12.11732,10.32046 -6.03125,26.63817 -6.03125,43.4375 0,31.10997 26.21316,56.34375 58.53125,56.34375 32.31809,0 58.53125,-25.23378 58.53125,-56.34375 0,-16.79933 6.71107,-31.86704 -5.40625,-42.1875 l -105.625,-1.25 z"
+       id="rect3861"
+       sodipodi:nodetypes="cssscc" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/paths__steps.png b/public/potlatch2/features/paths__steps.png
new file mode 100644 (file)
index 0000000..1590b29
Binary files /dev/null and b/public/potlatch2/features/paths__steps.png differ
diff --git a/public/potlatch2/features/paths__steps.svg b/public/potlatch2/features/paths__steps.svg
new file mode 100644 (file)
index 0000000..ebbe956
--- /dev/null
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="paths__unknown.svg">
+  <defs
+     id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective2825" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3609"
+       id="linearGradient3615"
+       x1="215"
+       y1="188.25"
+       x2="215"
+       y2="430.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.6"
+     inkscape:cx="266.82499"
+     inkscape:cy="119.75636"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview2820"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="720"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="0"
+       y="188.75" />
+    <rect
+       style="fill:url(#linearGradient3625);fill-opacity:1"
+       id="rect3617"
+       width="428.125"
+       height="188.75"
+       x="0"
+       y="-6.5955419e-10" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:27.25000000000000000;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 66.875,383.125 0,-115 160,0 0,-126.875 148.125,0"
+       id="path3780" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/paths__unknown.png b/public/potlatch2/features/paths__unknown.png
new file mode 100644 (file)
index 0000000..b050bc3
Binary files /dev/null and b/public/potlatch2/features/paths__unknown.png differ
diff --git a/public/potlatch2/features/paths__unknown.svg b/public/potlatch2/features/paths__unknown.svg
new file mode 100644 (file)
index 0000000..3283169
--- /dev/null
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="paths__bridleway.svg">
+  <defs
+     id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective2825" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3609"
+       id="linearGradient3615"
+       x1="215"
+       y1="188.25"
+       x2="215"
+       y2="430.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.6"
+     inkscape:cx="132.44999"
+     inkscape:cy="194.75636"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview2820"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="0"
+       y="188.75" />
+    <rect
+       style="fill:url(#linearGradient3625);fill-opacity:1"
+       id="rect3617"
+       width="428.125"
+       height="188.75"
+       x="0"
+       y="-6.5955419e-10" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:29.5175;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 158.47151,82.606455 c 181.33464,-72.601854 153.00069,81.768265 31.55906,116.334585 -21.23621,6.04453 0,148.80004 0,148.80004"
+       id="path3038"
+       sodipodi:nodetypes="csc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#999999;stroke:#010101;stroke-width:29.51749991999999878;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3812"
+       sodipodi:cx="200"
+       sodipodi:cy="392.5"
+       sodipodi:rx="8.75"
+       sodipodi:ry="7.5"
+       d="m 208.75,392.5 a 8.75,7.5 0 1 1 -17.5,0 8.75,7.5 0 1 1 17.5,0 z" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/pois/accommodation_alpinehut.n.24.png b/public/potlatch2/features/pois/accommodation_alpinehut.n.24.png
new file mode 100644 (file)
index 0000000..2a6ec57
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_alpinehut.n.24.png differ
diff --git a/public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png b/public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png
new file mode 100644 (file)
index 0000000..e40e3d8
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_bed_and_breakfast.n.24.png differ
diff --git a/public/potlatch2/features/pois/accommodation_camping.n.24.png b/public/potlatch2/features/pois/accommodation_camping.n.24.png
new file mode 100644 (file)
index 0000000..926bd4a
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_camping.n.24.png differ
diff --git a/public/potlatch2/features/pois/accommodation_caravan_park.n.24.png b/public/potlatch2/features/pois/accommodation_caravan_park.n.24.png
new file mode 100644 (file)
index 0000000..6a0c952
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_caravan_park.n.24.png differ
diff --git a/public/potlatch2/features/pois/accommodation_chalet.n.24.png b/public/potlatch2/features/pois/accommodation_chalet.n.24.png
new file mode 100644 (file)
index 0000000..57d531e
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_chalet.n.24.png differ
diff --git a/public/potlatch2/features/pois/accommodation_hotel.n.24.png b/public/potlatch2/features/pois/accommodation_hotel.n.24.png
new file mode 100644 (file)
index 0000000..129a44c
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_hotel.n.24.png differ
diff --git a/public/potlatch2/features/pois/accommodation_motel.n.24.png b/public/potlatch2/features/pois/accommodation_motel.n.24.png
new file mode 100644 (file)
index 0000000..d7a85b7
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_motel.n.24.png differ
diff --git a/public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png b/public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png
new file mode 100644 (file)
index 0000000..13f18df
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_youth_hostel.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_firestation2.n.24.png b/public/potlatch2/features/pois/amenity_firestation2.n.24.png
new file mode 100644 (file)
index 0000000..443189f
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_firestation2.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_information.n.24.png b/public/potlatch2/features/pois/amenity_information.n.24.png
new file mode 100644 (file)
index 0000000..c7fddf7
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_information.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_police2.n.24.png b/public/potlatch2/features/pois/amenity_police2.n.24.png
new file mode 100644 (file)
index 0000000..a9d6566
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_police2.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_post_box.n.24.png b/public/potlatch2/features/pois/amenity_post_box.n.24.png
new file mode 100644 (file)
index 0000000..4b5eb86
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_post_box.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_recycling.n.24.png b/public/potlatch2/features/pois/amenity_recycling.n.24.png
new file mode 100644 (file)
index 0000000..d608f7d
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_recycling.n.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_blocks.24.png b/public/potlatch2/features/pois/barrier_blocks.24.png
new file mode 100644 (file)
index 0000000..b667147
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_blocks.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_bollard.n.24.png b/public/potlatch2/features/pois/barrier_bollard.n.24.png
new file mode 100644 (file)
index 0000000..3000661
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_bollard.n.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_cattle_grid.24.png b/public/potlatch2/features/pois/barrier_cattle_grid.24.png
new file mode 100644 (file)
index 0000000..102da89
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_cattle_grid.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_cycle_barrier.24.png b/public/potlatch2/features/pois/barrier_cycle_barrier.24.png
new file mode 100644 (file)
index 0000000..474efd6
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_cycle_barrier.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_gate.n.24.png b/public/potlatch2/features/pois/barrier_gate.n.24.png
new file mode 100644 (file)
index 0000000..0c18c5e
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_gate.n.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_generic.24.png b/public/potlatch2/features/pois/barrier_generic.24.png
new file mode 100644 (file)
index 0000000..a57de17
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_generic.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_generic.svg b/public/potlatch2/features/pois/barrier_generic.svg
new file mode 100644 (file)
index 0000000..2473955
--- /dev/null
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3646"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="barrier_generic.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/pois/barrier_generic.24.png"
+   inkscape:export-xdpi="33.75"
+   inkscape:export-ydpi="33.75">
+  <defs
+     id="defs3648">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3654" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-0.27272727"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3651">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#666666;fill-opacity:1;stroke:none"
+       id="rect3656"
+       width="64.363632"
+       height="64"
+       x="0"
+       y="0"
+       ry="8.0227919"
+       rx="6.6013985" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/pois/barrier_kissing_gate.24.png b/public/potlatch2/features/pois/barrier_kissing_gate.24.png
new file mode 100644 (file)
index 0000000..a2c3e55
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_kissing_gate.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_lift_gate.n.24.png b/public/potlatch2/features/pois/barrier_lift_gate.n.24.png
new file mode 100644 (file)
index 0000000..a41a367
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_lift_gate.n.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_stile.n.24.png b/public/potlatch2/features/pois/barrier_stile.n.24.png
new file mode 100644 (file)
index 0000000..9e04ae2
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_stile.n.24.png differ
diff --git a/public/potlatch2/features/pois/barrier_toll_booth.n.24.png b/public/potlatch2/features/pois/barrier_toll_booth.n.24.png
new file mode 100644 (file)
index 0000000..302492a
Binary files /dev/null and b/public/potlatch2/features/pois/barrier_toll_booth.n.24.png differ
diff --git a/public/potlatch2/features/pois/building_generic.png b/public/potlatch2/features/pois/building_generic.png
new file mode 100644 (file)
index 0000000..669fb02
Binary files /dev/null and b/public/potlatch2/features/pois/building_generic.png differ
diff --git a/public/potlatch2/features/pois/education_school.n.24.png b/public/potlatch2/features/pois/education_school.n.24.png
new file mode 100644 (file)
index 0000000..40abf2b
Binary files /dev/null and b/public/potlatch2/features/pois/education_school.n.24.png differ
diff --git a/public/potlatch2/features/pois/education_university.n.24.png b/public/potlatch2/features/pois/education_university.n.24.png
new file mode 100644 (file)
index 0000000..6293634
Binary files /dev/null and b/public/potlatch2/features/pois/education_university.n.24.png differ
diff --git a/public/potlatch2/features/pois/food_bar.n.24.png b/public/potlatch2/features/pois/food_bar.n.24.png
new file mode 100644 (file)
index 0000000..a63a09d
Binary files /dev/null and b/public/potlatch2/features/pois/food_bar.n.24.png differ
diff --git a/public/potlatch2/features/pois/food_cafe.n.24.png b/public/potlatch2/features/pois/food_cafe.n.24.png
new file mode 100644 (file)
index 0000000..9e9b317
Binary files /dev/null and b/public/potlatch2/features/pois/food_cafe.n.24.png differ
diff --git a/public/potlatch2/features/pois/food_fastfood.n.24.png b/public/potlatch2/features/pois/food_fastfood.n.24.png
new file mode 100644 (file)
index 0000000..96f5e77
Binary files /dev/null and b/public/potlatch2/features/pois/food_fastfood.n.24.png differ
diff --git a/public/potlatch2/features/pois/food_pub.n.24.png b/public/potlatch2/features/pois/food_pub.n.24.png
new file mode 100644 (file)
index 0000000..714914f
Binary files /dev/null and b/public/potlatch2/features/pois/food_pub.n.24.png differ
diff --git a/public/potlatch2/features/pois/food_restaurant.n.24.png b/public/potlatch2/features/pois/food_restaurant.n.24.png
new file mode 100644 (file)
index 0000000..e7813ea
Binary files /dev/null and b/public/potlatch2/features/pois/food_restaurant.n.24.png differ
diff --git a/public/potlatch2/features/pois/health_hospital.n.24.png b/public/potlatch2/features/pois/health_hospital.n.24.png
new file mode 100644 (file)
index 0000000..e9b114a
Binary files /dev/null and b/public/potlatch2/features/pois/health_hospital.n.24.png differ
diff --git a/public/potlatch2/features/pois/health_pharmacy.n.24.png b/public/potlatch2/features/pois/health_pharmacy.n.24.png
new file mode 100644 (file)
index 0000000..4fe2fc7
Binary files /dev/null and b/public/potlatch2/features/pois/health_pharmacy.n.24.png differ
diff --git a/public/potlatch2/features/pois/landuse_grass.n.24.png b/public/potlatch2/features/pois/landuse_grass.n.24.png
new file mode 100644 (file)
index 0000000..f65bde3
Binary files /dev/null and b/public/potlatch2/features/pois/landuse_grass.n.24.png differ
diff --git a/public/potlatch2/features/pois/money_atm.n.24.png b/public/potlatch2/features/pois/money_atm.n.24.png
new file mode 100644 (file)
index 0000000..e081dd5
Binary files /dev/null and b/public/potlatch2/features/pois/money_atm.n.24.png differ
diff --git a/public/potlatch2/features/pois/money_bank2.n.24.png b/public/potlatch2/features/pois/money_bank2.n.24.png
new file mode 100644 (file)
index 0000000..873adc7
Binary files /dev/null and b/public/potlatch2/features/pois/money_bank2.n.24.png differ
diff --git a/public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png b/public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png
new file mode 100644 (file)
index 0000000..2f91691
Binary files /dev/null and b/public/potlatch2/features/pois/place_of_worship_unknown3.n.24.png differ
diff --git a/public/potlatch2/features/pois/poi_military_bunker.n.24.png b/public/potlatch2/features/pois/poi_military_bunker.n.24.png
new file mode 100644 (file)
index 0000000..3bcc77a
Binary files /dev/null and b/public/potlatch2/features/pois/poi_military_bunker.n.24.png differ
diff --git a/public/potlatch2/features/pois/poi_mine.n.24.png b/public/potlatch2/features/pois/poi_mine.n.24.png
new file mode 100644 (file)
index 0000000..57c6d94
Binary files /dev/null and b/public/potlatch2/features/pois/poi_mine.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_alcohol.n.24.png b/public/potlatch2/features/pois/shopping_alcohol.n.24.png
new file mode 100644 (file)
index 0000000..c22cc3b
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_alcohol.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_bakery.n.24.png b/public/potlatch2/features/pois/shopping_bakery.n.24.png
new file mode 100644 (file)
index 0000000..f588a19
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_bakery.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_bicycle.n.24.png b/public/potlatch2/features/pois/shopping_bicycle.n.24.png
new file mode 100644 (file)
index 0000000..dce1d15
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_bicycle.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_book.n.24.png b/public/potlatch2/features/pois/shopping_book.n.24.png
new file mode 100644 (file)
index 0000000..51441ea
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_book.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_butcher.n.24.png b/public/potlatch2/features/pois/shopping_butcher.n.24.png
new file mode 100644 (file)
index 0000000..8efbb3f
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_butcher.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_car.n.24.png b/public/potlatch2/features/pois/shopping_car.n.24.png
new file mode 100644 (file)
index 0000000..cefb912
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_car.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_car_repair.n.24.png b/public/potlatch2/features/pois/shopping_car_repair.n.24.png
new file mode 100644 (file)
index 0000000..6abdcb7
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_car_repair.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_clothes.n.24.png b/public/potlatch2/features/pois/shopping_clothes.n.24.png
new file mode 100644 (file)
index 0000000..e5c7089
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_clothes.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_confectionery.n.24.png b/public/potlatch2/features/pois/shopping_confectionery.n.24.png
new file mode 100644 (file)
index 0000000..2e1dbae
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_confectionery.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_convenience.n.24.png b/public/potlatch2/features/pois/shopping_convenience.n.24.png
new file mode 100644 (file)
index 0000000..7a35633
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_convenience.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_diy.n.24.png b/public/potlatch2/features/pois/shopping_diy.n.24.png
new file mode 100644 (file)
index 0000000..c8236cb
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_diy.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_fish.n.24.png b/public/potlatch2/features/pois/shopping_fish.n.24.png
new file mode 100644 (file)
index 0000000..fe5ecce
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_fish.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_garden_centre.n.24.png b/public/potlatch2/features/pois/shopping_garden_centre.n.24.png
new file mode 100644 (file)
index 0000000..416247f
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_garden_centre.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_gift.n.24.png b/public/potlatch2/features/pois/shopping_gift.n.24.png
new file mode 100644 (file)
index 0000000..a816178
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_gift.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_greengrocer.n.24.png b/public/potlatch2/features/pois/shopping_greengrocer.n.24.png
new file mode 100644 (file)
index 0000000..ad402d5
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_greengrocer.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_hairdresser.n.24.png b/public/potlatch2/features/pois/shopping_hairdresser.n.24.png
new file mode 100644 (file)
index 0000000..e844989
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_hairdresser.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_hifi.n.24.png b/public/potlatch2/features/pois/shopping_hifi.n.24.png
new file mode 100644 (file)
index 0000000..66ec0b9
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_hifi.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_jewelry.n.24.png b/public/potlatch2/features/pois/shopping_jewelry.n.24.png
new file mode 100644 (file)
index 0000000..c3e8a51
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_jewelry.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_laundrette.n.24.png b/public/potlatch2/features/pois/shopping_laundrette.n.24.png
new file mode 100644 (file)
index 0000000..55a0ca2
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_laundrette.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_motorcycle.n.24.png b/public/potlatch2/features/pois/shopping_motorcycle.n.24.png
new file mode 100644 (file)
index 0000000..cf4248f
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_motorcycle.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_music.n.24.png b/public/potlatch2/features/pois/shopping_music.n.24.png
new file mode 100644 (file)
index 0000000..17df5c5
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_music.n.24.png differ
diff --git a/public/potlatch2/features/pois/shopping_supermarket.n.24.png b/public/potlatch2/features/pois/shopping_supermarket.n.24.png
new file mode 100644 (file)
index 0000000..fd25846
Binary files /dev/null and b/public/potlatch2/features/pois/shopping_supermarket.n.24.png differ
diff --git a/public/potlatch2/features/pois/sport_golf.n.24.png b/public/potlatch2/features/pois/sport_golf.n.24.png
new file mode 100644 (file)
index 0000000..ad42a4e
Binary files /dev/null and b/public/potlatch2/features/pois/sport_golf.n.24.png differ
diff --git a/public/potlatch2/features/pois/sport_leisure_centre.n.24.png b/public/potlatch2/features/pois/sport_leisure_centre.n.24.png
new file mode 100644 (file)
index 0000000..dd6d636
Binary files /dev/null and b/public/potlatch2/features/pois/sport_leisure_centre.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_archaeological.n.24.png b/public/potlatch2/features/pois/tourist_archaeological.n.24.png
new file mode 100644 (file)
index 0000000..a75a358
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_archaeological.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_art_gallery2.n.24.png b/public/potlatch2/features/pois/tourist_art_gallery2.n.24.png
new file mode 100644 (file)
index 0000000..5cd89b6
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_art_gallery2.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_attraction.n.24.png b/public/potlatch2/features/pois/tourist_attraction.n.24.png
new file mode 100644 (file)
index 0000000..2f849d8
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_attraction.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_battlefield.n.24.png b/public/potlatch2/features/pois/tourist_battlefield.n.24.png
new file mode 100644 (file)
index 0000000..b502bfc
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_battlefield.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_castle.n.24.png b/public/potlatch2/features/pois/tourist_castle.n.24.png
new file mode 100644 (file)
index 0000000..75734d6
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_castle.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_cinema.n.24.png b/public/potlatch2/features/pois/tourist_cinema.n.24.png
new file mode 100644 (file)
index 0000000..4207e84
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_cinema.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_memorial.n.24.png b/public/potlatch2/features/pois/tourist_memorial.n.24.png
new file mode 100644 (file)
index 0000000..2729e68
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_memorial.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_monument.n.24.png b/public/potlatch2/features/pois/tourist_monument.n.24.png
new file mode 100644 (file)
index 0000000..853632b
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_monument.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_museum.n.24.png b/public/potlatch2/features/pois/tourist_museum.n.24.png
new file mode 100644 (file)
index 0000000..3cdea51
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_museum.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_picnic.n.24.png b/public/potlatch2/features/pois/tourist_picnic.n.24.png
new file mode 100644 (file)
index 0000000..6943ab4
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_picnic.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_ruin.n.24.png b/public/potlatch2/features/pois/tourist_ruin.n.24.png
new file mode 100644 (file)
index 0000000..d8650c1
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_ruin.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_theatre.n.24.png b/public/potlatch2/features/pois/tourist_theatre.n.24.png
new file mode 100644 (file)
index 0000000..a5db00b
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_theatre.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_theme_park.n.24.png b/public/potlatch2/features/pois/tourist_theme_park.n.24.png
new file mode 100644 (file)
index 0000000..733f03f
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_theme_park.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_view_point.n.24.png b/public/potlatch2/features/pois/tourist_view_point.n.24.png
new file mode 100644 (file)
index 0000000..a2dde9e
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_view_point.n.24.png differ
diff --git a/public/potlatch2/features/pois/tourist_zoo.n.24.png b/public/potlatch2/features/pois/tourist_zoo.n.24.png
new file mode 100644 (file)
index 0000000..f33b9d8
Binary files /dev/null and b/public/potlatch2/features/pois/tourist_zoo.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_aerodrome.n.24.png b/public/potlatch2/features/pois/transport_aerodrome.n.24.png
new file mode 100644 (file)
index 0000000..83b7ecc
Binary files /dev/null and b/public/potlatch2/features/pois/transport_aerodrome.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_airport_gate.n.24.png b/public/potlatch2/features/pois/transport_airport_gate.n.24.png
new file mode 100644 (file)
index 0000000..455a311
Binary files /dev/null and b/public/potlatch2/features/pois/transport_airport_gate.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_airport_terminal.n.24.png b/public/potlatch2/features/pois/transport_airport_terminal.n.24.png
new file mode 100644 (file)
index 0000000..33bbd54
Binary files /dev/null and b/public/potlatch2/features/pois/transport_airport_terminal.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_bus_station.n.24.png b/public/potlatch2/features/pois/transport_bus_station.n.24.png
new file mode 100644 (file)
index 0000000..e9cdc7e
Binary files /dev/null and b/public/potlatch2/features/pois/transport_bus_station.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_bus_stop2.n.24.png b/public/potlatch2/features/pois/transport_bus_stop2.n.24.png
new file mode 100644 (file)
index 0000000..d81484a
Binary files /dev/null and b/public/potlatch2/features/pois/transport_bus_stop2.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_fuel.n.24.png b/public/potlatch2/features/pois/transport_fuel.n.24.png
new file mode 100644 (file)
index 0000000..736e943
Binary files /dev/null and b/public/potlatch2/features/pois/transport_fuel.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_marina.n.24.png b/public/potlatch2/features/pois/transport_marina.n.24.png
new file mode 100644 (file)
index 0000000..5024e3e
Binary files /dev/null and b/public/potlatch2/features/pois/transport_marina.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_parking_bicycle.n.24.png b/public/potlatch2/features/pois/transport_parking_bicycle.n.24.png
new file mode 100644 (file)
index 0000000..42f2e54
Binary files /dev/null and b/public/potlatch2/features/pois/transport_parking_bicycle.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_parking_car.n.24.png b/public/potlatch2/features/pois/transport_parking_car.n.24.png
new file mode 100644 (file)
index 0000000..6aa900c
Binary files /dev/null and b/public/potlatch2/features/pois/transport_parking_car.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_port.n.24.png b/public/potlatch2/features/pois/transport_port.n.24.png
new file mode 100644 (file)
index 0000000..6e5f6e1
Binary files /dev/null and b/public/potlatch2/features/pois/transport_port.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_rental_bicycle.n.24.png b/public/potlatch2/features/pois/transport_rental_bicycle.n.24.png
new file mode 100644 (file)
index 0000000..773ac43
Binary files /dev/null and b/public/potlatch2/features/pois/transport_rental_bicycle.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_rental_car.n.24.png b/public/potlatch2/features/pois/transport_rental_car.n.24.png
new file mode 100644 (file)
index 0000000..5570e70
Binary files /dev/null and b/public/potlatch2/features/pois/transport_rental_car.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_taxi_rank.n.24.png b/public/potlatch2/features/pois/transport_taxi_rank.n.24.png
new file mode 100644 (file)
index 0000000..8fd3073
Binary files /dev/null and b/public/potlatch2/features/pois/transport_taxi_rank.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_train_station.n.24.png b/public/potlatch2/features/pois/transport_train_station.n.24.png
new file mode 100644 (file)
index 0000000..6e1cb10
Binary files /dev/null and b/public/potlatch2/features/pois/transport_train_station.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_tram_stop.n.24.png b/public/potlatch2/features/pois/transport_tram_stop.n.24.png
new file mode 100644 (file)
index 0000000..edf5348
Binary files /dev/null and b/public/potlatch2/features/pois/transport_tram_stop.n.24.png differ
diff --git a/public/potlatch2/features/pois/transport_turning_circle.n.24.png b/public/potlatch2/features/pois/transport_turning_circle.n.24.png
new file mode 100644 (file)
index 0000000..47736bc
Binary files /dev/null and b/public/potlatch2/features/pois/transport_turning_circle.n.24.png differ
diff --git a/public/potlatch2/features/pois/water_generic.24.png b/public/potlatch2/features/pois/water_generic.24.png
new file mode 100644 (file)
index 0000000..c04dd77
Binary files /dev/null and b/public/potlatch2/features/pois/water_generic.24.png differ
diff --git a/public/potlatch2/features/pois/water_generic.svg b/public/potlatch2/features/pois/water_generic.svg
new file mode 100644 (file)
index 0000000..fcfbc24
--- /dev/null
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective3602"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3602-1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="259.38208"
+     inkscape:cy="445.21264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#6fc3ff;fill-opacity:1;stroke:none"
+       id="rect3590"
+       width="274.28571"
+       height="274.28571"
+       x="152.85715"
+       y="240.93361"
+       ry="32.857143" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:14.30000000000000071;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 191.42857,353.79075 c 0,0 27.14285,-52.85714 62.85714,-51.42857 42.85714,1.42857 50.00001,55.71429 85.71429,57.14286 34.28572,0 44.28571,-54.28571 44.28571,-54.28571"
+       id="path3592"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:14.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 196.42857,400.94783 c 0,0 27.14285,-52.85714 62.85714,-51.42857 42.85714,1.42857 50.00001,55.71429 85.71429,57.14286 34.28572,0 44.28571,-54.28571 44.28571,-54.28571"
+       id="path3592-8"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:14.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 200.71429,446.66212 c 0,0 27.14285,-52.85714 62.85714,-51.42857 42.85714,1.42857 50.00001,55.71429 85.71429,57.14286 34.28572,0 44.28571,-54.28571 44.28571,-54.28571"
+       id="path3592-9"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/power_high.png b/public/potlatch2/features/power_high.png
new file mode 100644 (file)
index 0000000..c8b102d
Binary files /dev/null and b/public/potlatch2/features/power_high.png differ
diff --git a/public/potlatch2/features/power_high.svg b/public/potlatch2/features/power_high.svg
new file mode 100644 (file)
index 0000000..619562f
--- /dev/null
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3646"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="power_high.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/power_low.png"
+   inkscape:export-xdpi="66.09375"
+   inkscape:export-ydpi="66.09375">
+  <defs
+     id="defs3648">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3654" />
+    <inkscape:perspective
+       id="perspective4207"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4277"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4305"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4327"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4327-8"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-9.928737"
+     inkscape:cy="27.153396"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3651">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#fecb00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3656"
+       width="64.363632"
+       height="64"
+       x="0"
+       y="0"
+       ry="8.0227919"
+       rx="6.6013985"
+       inkscape:export-xdpi="33.75"
+       inkscape:export-ydpi="33.75"
+       inkscape:export-filename="/home/andy/src/potlatch2/resources/features/pois/barrier_generic.24.png" />
+    <path
+       style="fill:none;stroke:#a3a3a3;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 4.2760698,18.390932 C 17.693215,29.541568 47.802016,24.335727 52.269385,22.230116"
+       id="path4197-3"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.2727273,44.727273 5.6363636,-29.636364 3.0909091,0 6,29.454546"
+       id="path4263" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.8181818,18.727273 13.7727272,-1e-6"
+       id="path4265"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.0909091,23.363636 15.4999999,0"
+       id="path4267"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.40356085px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 51.843338,32.843675 2.274616,-11.960077 1.247369,0 2.421366,11.886703"
+       id="path4263-3" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.40356085px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 52.063462,22.351093 5.558134,-10e-7"
+       id="path4265-9"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.40356085px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 51.769963,24.222148 6.255194,0"
+       id="path4267-3"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#a3a3a3;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 4.0942516,23.730029 C 17.511397,34.880665 47.529289,26.311188 51.996658,24.205577"
+       id="path4197-3-9"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#a3a3a3;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 14.912433,18.548211 c 13.417145,11.150636 37.616855,5.853886 42.084224,3.748275"
+       id="path4197-3-9-2"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#a3a3a3;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.457888,23.63912 c 13.417145,11.150636 36.980491,2.672068 41.44786,0.566457"
+       id="path4197-3-9-6"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/power_low.png b/public/potlatch2/features/power_low.png
new file mode 100644 (file)
index 0000000..e45f405
Binary files /dev/null and b/public/potlatch2/features/power_low.png differ
diff --git a/public/potlatch2/features/power_low.svg b/public/potlatch2/features/power_low.svg
new file mode 100644 (file)
index 0000000..0cec276
--- /dev/null
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3646"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="barrier_generic.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/pois/barrier_generic.24.png"
+   inkscape:export-xdpi="33.75"
+   inkscape:export-ydpi="33.75">
+  <defs
+     id="defs3648">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3654" />
+    <inkscape:perspective
+       id="perspective4207"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="1.1920149"
+     inkscape:cy="24.791019"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3651">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#fecb00;fill-opacity:1;stroke:none"
+       id="rect3656"
+       width="64.363632"
+       height="64"
+       x="0"
+       y="0"
+       ry="8.0227919"
+       rx="6.6013985"
+       inkscape:export-xdpi="33.75"
+       inkscape:export-ydpi="33.75"
+       inkscape:export-filename="/home/andy/src/potlatch2/resources/features/pois/barrier_generic.24.png" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 50.727273,26.181818 5.818182,0"
+       id="path4195" />
+    <path
+       style="fill:none;stroke:#453a1b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 53.454545,40.545455 10e-7,-15.909091"
+       id="path4193"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#a3a3a3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.818182,18.181818 c 13.469645,7.863274 29.696969,9.939394 41.454545,8"
+       id="path4197"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#a3a3a3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4.1818185,18.296681 C 17.651463,26.159955 41.696969,30.145166 51.999999,25.933045"
+       id="path4197-3"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#453a1b;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 9.8181818,50.496516 1e-7,-37.138302"
+       id="path4189"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 0.72591841,19.144162 19.27543559,0"
+       id="path4191" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/restriction__no_left_turn.png b/public/potlatch2/features/restriction__no_left_turn.png
new file mode 100644 (file)
index 0000000..9d16952
Binary files /dev/null and b/public/potlatch2/features/restriction__no_left_turn.png differ
diff --git a/public/potlatch2/features/restriction__no_right_turn.png b/public/potlatch2/features/restriction__no_right_turn.png
new file mode 100644 (file)
index 0000000..1cd51f0
Binary files /dev/null and b/public/potlatch2/features/restriction__no_right_turn.png differ
diff --git a/public/potlatch2/features/restriction__no_straight_on.png b/public/potlatch2/features/restriction__no_straight_on.png
new file mode 100644 (file)
index 0000000..9cc6628
Binary files /dev/null and b/public/potlatch2/features/restriction__no_straight_on.png differ
diff --git a/public/potlatch2/features/restriction__no_u_turn.png b/public/potlatch2/features/restriction__no_u_turn.png
new file mode 100644 (file)
index 0000000..2dba9bb
Binary files /dev/null and b/public/potlatch2/features/restriction__no_u_turn.png differ
diff --git a/public/potlatch2/features/restriction__only_left_turn.png b/public/potlatch2/features/restriction__only_left_turn.png
new file mode 100644 (file)
index 0000000..0c71faf
Binary files /dev/null and b/public/potlatch2/features/restriction__only_left_turn.png differ
diff --git a/public/potlatch2/features/restriction__only_right_turn.png b/public/potlatch2/features/restriction__only_right_turn.png
new file mode 100644 (file)
index 0000000..d4ed162
Binary files /dev/null and b/public/potlatch2/features/restriction__only_right_turn.png differ
diff --git a/public/potlatch2/features/restriction__only_straight_on.png b/public/potlatch2/features/restriction__only_straight_on.png
new file mode 100644 (file)
index 0000000..d62b111
Binary files /dev/null and b/public/potlatch2/features/restriction__only_straight_on.png differ
diff --git a/public/potlatch2/features/transport__bus.png b/public/potlatch2/features/transport__bus.png
new file mode 100644 (file)
index 0000000..b779706
Binary files /dev/null and b/public/potlatch2/features/transport__bus.png differ
diff --git a/public/potlatch2/features/transport__railway.png b/public/potlatch2/features/transport__railway.png
new file mode 100644 (file)
index 0000000..e50b186
Binary files /dev/null and b/public/potlatch2/features/transport__railway.png differ
diff --git a/public/potlatch2/features/transport__railway.svg b/public/potlatch2/features/transport__railway.svg
new file mode 100644 (file)
index 0000000..efd37fe
--- /dev/null
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="railway.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.75"
+     inkscape:cx="32"
+     inkscape:cy="37.16129"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="725"
+     inkscape:window-x="0"
+     inkscape:window-y="25" />
+  <defs
+     id="defs2385">
+    <inkscape:perspective
+       id="perspective2391"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3435" />
+  </defs>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <path
+       id="rect3379"
+       d="M 23.571591,39.957736 C 23.571591,39.957736 22.991727,41.082003 22.991727,41.082003 C 22.991727,41.082003 18.939671,41.098329 18.939671,41.098329 C 18.939671,41.098329 18.472115,41.721646 18.472115,41.721646 C 18.472115,41.721646 22.670357,41.705088 22.670357,41.705088 C 22.670357,41.705088 21.97468,43.053896 21.97468,43.053896 C 21.97468,43.053896 17.460053,43.070868 17.460053,43.070868 C 17.460053,43.070868 16.877085,43.848045 16.877085,43.848045 C 16.877085,43.848045 21.573929,43.830888 21.573929,43.830888 C 21.573929,43.830888 20.694917,45.535159 20.694917,45.535159 C 20.694917,45.535159 15.598495,45.552586 15.598495,45.552586 C 15.598495,45.552586 14.851436,46.548521 14.851436,46.548521 C 14.851436,46.548521 20.181279,46.531023 20.181279,46.531023 C 20.181279,46.531023 19.035543,48.752427 19.035543,48.752427 C 19.035543,48.752427 13.185195,48.769855 13.185195,48.769855 C 13.185195,48.769855 12.193568,50.091833 12.193568,50.091833 C 12.193568,50.091833 18.353605,50.074599 18.353605,50.074599 C 18.353605,50.074599 16.798242,53.090207 16.798242,53.090207 C 16.798242,53.090207 9.9321837,53.10658 9.9321837,53.10658 C 9.9321837,53.10658 8.552778,54.945523 8.552778,54.945523 C 8.552778,54.945523 15.849349,54.929964 15.849349,54.929964 C 15.849349,54.929964 13.617428,59.257309 13.617428,59.257309 C 13.617428,59.257309 5.30888,59.270095 5.30888,59.270095 C 5.30888,59.270095 3.2601077,62.001395 3.2601077,62.001395 C 3.2601077,62.001395 12.207481,61.990982 12.207481,61.990982 C 12.207481,61.990982 8.736787,68.72012 8.736787,68.72012 C 8.736787,68.72012 -1.7815572,68.722644 -1.7815572,68.722644 C -1.7815572,68.722644 -5.138518,73.197946 -5.138518,73.197946 C -5.138518,73.197946 6.425013,73.202294 6.425013,73.202294 C 6.425013,73.202294 -0.25238634,86.148731 -0.25238634,86.148731 C -0.25238634,86.148731 6.816882,86.163981 6.816882,86.163981 C 6.816882,86.163981 12.02938,73.204401 12.02938,73.204401 C 12.02938,73.204401 51.374154,73.219196 51.374154,73.219196 C 51.374154,73.219196 56.526317,86.271215 56.526317,86.271215 C 56.526317,86.271215 63.706495,86.286704 63.706495,86.286704 C 63.706495,86.286704 57.048006,73.221329 57.048006,73.221329 C 57.048006,73.221329 67.063135,73.225095 67.063135,73.225095 C 67.063135,73.225095 63.844385,68.706901 63.844385,68.706901 C 63.844385,68.706901 54.748436,68.709083 54.748436,68.709083 C 54.748436,68.709083 51.30151,61.945483 51.30151,61.945483 C 51.30151,61.945483 59.021167,61.936499 59.021167,61.936499 C 59.021167,61.936499 57.064887,59.190447 57.064887,59.190447 C 57.064887,59.190447 49.903082,59.201469 49.903082,59.201469 C 49.903082,59.201469 47.691599,54.862065 47.691599,54.862065 C 47.691599,54.862065 53.971816,54.848673 53.971816,54.848673 C 53.971816,54.848673 52.658173,53.004697 52.658173,53.004697 C 52.658173,53.004697 46.752207,53.01878 46.752207,53.01878 C 46.752207,53.01878 45.21347,49.99945 45.21347,49.99945 C 45.21347,49.99945 50.506692,49.98464 50.506692,49.98464 C 50.506692,49.98464 49.56408,48.661485 49.56408,48.661485 C 49.56408,48.661485 44.539234,48.676454 44.539234,48.676454 C 44.539234,48.676454 43.406998,46.454768 43.406998,46.454768 C 43.406998,46.454768 47.981321,46.43975 47.981321,46.43975 C 47.981321,46.43975 47.272147,45.444277 47.272147,45.444277 C 47.272147,45.444277 42.899644,45.459229 42.899644,45.459229 C 42.899644,45.459229 42.03171,43.756159 42.03171,43.756159 C 42.03171,43.756159 46.059057,43.741448 46.059057,43.741448 C 46.059057,43.741448 45.50623,42.965436 45.50623,42.965436 C 45.50623,42.965436 41.636149,42.979985 41.636149,42.979985 C 41.636149,42.979985 40.949688,41.632998 40.949688,41.632998 C 40.949688,41.632998 44.546895,41.618812 44.546895,41.618812 C 44.546895,41.618812 44.103877,40.99694 44.103877,40.99694 C 44.103877,40.99694 40.632662,41.010926 40.632662,41.010926 C 40.632662,41.010926 40.060774,39.888763 40.060774,39.888763 C 40.060774,39.888763 38.220316,39.896462 38.220316,39.896462 C 38.220316,39.896462 38.663374,41.018861 38.663374,41.018861 C 38.663374,41.018861 24.952577,41.074102 24.952577,41.074102 C 24.952577,41.074102 25.404679,39.950068 25.404679,39.950068 C 25.404679,39.950068 23.571591,39.957736 23.571591,39.957736 C 23.571591,39.957736 23.571591,39.957736 23.571591,39.957736 M 24.702011,41.697076 C 24.702011,41.697076 38.908974,41.641047 38.908974,41.641047 C 38.908974,41.641047 39.440765,42.988238 39.440765,42.988238 C 39.440765,42.988238 24.159583,43.045683 24.159583,43.045683 C 24.159583,43.045683 24.702011,41.697076 24.702011,41.697076 C 24.702011,41.697076 24.702011,41.697076 24.702011,41.697076 M 23.847105,43.822585 C 23.847105,43.822585 39.74719,43.764504 39.74719,43.764504 C 39.74719,43.764504 40.419515,45.46771 40.419515,45.46771 C 40.419515,45.46771 23.161679,45.526724 23.161679,45.526724 C 23.161679,45.526724 23.847105,43.822585 23.847105,43.822585 C 23.847105,43.822585 23.847105,43.822585 23.847105,43.822585 M 22.761145,46.522553 C 22.761145,46.522553 40.812508,46.463287 40.812508,46.463287 C 40.812508,46.463287 41.689487,48.684943 41.689487,48.684943 C 41.689487,48.684943 21.867655,48.743991 21.867655,48.743991 C 21.867655,48.743991 22.761145,46.522553 22.761145,46.522553 C 22.761145,46.522553 22.761145,46.522553 22.761145,46.522553 M 21.335824,50.066255 C 21.335824,50.066255 42.211691,50.007848 42.211691,50.007848 C 42.211691,50.007848 43.403381,53.026766 43.403381,53.026766 C 43.403381,53.026766 20.122743,53.08228 20.122743,53.08228 C 20.122743,53.08228 21.335824,50.066255 21.335824,50.066255 C 21.335824,50.066255 21.335824,50.066255 21.335824,50.066255 M 19.382612,54.92243 C 19.382612,54.92243 44.130844,54.869658 44.130844,54.869658 C 44.130844,54.869658 45.843253,59.207716 45.843253,59.207716 C 45.843253,59.207716 17.641561,59.251116 17.641561,59.251116 C 17.641561,59.251116 19.382612,54.92243 19.382612,54.92243 C 19.382612,54.92243 19.382612,54.92243 19.382612,54.92243 M 16.541581,61.985937 C 16.541581,61.985937 46.92597,61.950576 46.92597,61.950576 C 46.92597,61.950576 49.594317,68.710319 49.594317,68.710319 C 49.594317,68.710319 13.833504,68.718898 13.833504,68.718898 C 13.833504,68.718898 16.541581,61.985937 16.541581,61.985937 C 16.541581,61.985937 16.541581,61.985937 16.541581,61.985937"
+       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccsssccsssc"
+       id="rect4085"
+       d="M 21.261305,4.032258 L 21.261305,7.170507 L 25.478326,7.170507 L 25.478326,10.308756 L 21.947797,10.308756 C 17.635055,10.308756 14.200245,13.841633 14.200245,18.154378 L 14.200245,34.139833 C 14.200245,37.590027 16.399084,40.468265 19.49604,41.495104 L 19.49604,47.967742 L 22.242007,47.967742 L 22.242007,41.985455 L 41.465189,41.985455 L 41.465189,47.967742 L 44.209749,47.967742 L 44.209749,41.593174 C 47.444587,40.639397 49.799761,37.694267 49.799755,34.139833 L 49.799755,18.154378 C 49.799755,13.841637 46.364941,10.308756 42.052203,10.308756 L 38.031322,10.308756 L 38.031322,7.170507 L 42.738695,7.170507 L 42.738695,4.032258 L 21.261305,4.032258 z M 28.616575,7.170507 L 34.893074,7.170507 L 34.893074,10.308756 L 28.616575,10.308756 L 28.616575,7.170507 z M 20.182532,14.133496 L 43.229047,14.133496 C 44.869472,14.133496 46.269225,15.435186 46.269225,17.075605 L 46.269225,23.940524 C 46.269219,25.580947 44.869465,26.882632 43.229047,26.882632 L 20.182532,26.882632 C 18.542113,26.882639 17.142353,25.580947 17.142353,23.940524 L 17.142353,17.075605 C 17.142353,15.435186 18.542113,14.133496 20.182532,14.133496 z M 42.542555,31.491935 C 44.292382,31.491939 45.680803,32.880354 45.680803,34.630184 C 45.680801,36.380025 44.292389,37.768434 42.542555,37.768434 C 40.792717,37.76843 39.306236,36.380019 39.306236,34.630184 C 39.306242,32.880356 40.792721,31.491935 42.542555,31.491935 z M 21.359375,31.590005 C 23.109206,31.589999 24.595694,32.978424 24.595694,34.728254 C 24.595694,36.478086 23.109209,37.866504 21.359375,37.866504 C 19.609541,37.866504 18.221126,36.478089 18.221126,34.728254 C 18.221123,32.97842 19.609541,31.590005 21.359375,31.590005 z"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/transport__railway_abandoned.png b/public/potlatch2/features/transport__railway_abandoned.png
new file mode 100644 (file)
index 0000000..81717b8
Binary files /dev/null and b/public/potlatch2/features/transport__railway_abandoned.png differ
diff --git a/public/potlatch2/features/transport__railway_disused.png b/public/potlatch2/features/transport__railway_disused.png
new file mode 100644 (file)
index 0000000..347b1c3
Binary files /dev/null and b/public/potlatch2/features/transport__railway_disused.png differ
diff --git a/public/potlatch2/features/transport__railway_platform.png b/public/potlatch2/features/transport__railway_platform.png
new file mode 100644 (file)
index 0000000..f1a5628
Binary files /dev/null and b/public/potlatch2/features/transport__railway_platform.png differ
diff --git a/public/potlatch2/features/transport__subway.png b/public/potlatch2/features/transport__subway.png
new file mode 100644 (file)
index 0000000..2989d3e
Binary files /dev/null and b/public/potlatch2/features/transport__subway.png differ
diff --git a/public/potlatch2/features/transport__subway.svg b/public/potlatch2/features/transport__subway.svg
new file mode 100644 (file)
index 0000000..4dcd213
--- /dev/null
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="subway.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.75"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="725"
+     inkscape:window-x="0"
+     inkscape:window-y="25" />
+  <defs
+     id="defs2385">
+    <inkscape:perspective
+       id="perspective2391"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3435" />
+  </defs>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 25.46875,18.3125 L 21.9375,18.3125 C 17.624757,18.3125 14.1875,21.843505 14.1875,26.15625 L 14.1875,42.125 C 14.1875,45.575195 16.403044,48.473161 19.5,49.5 L 19.5,51.96875 L 22.25,51.96875 L 22.25,50 L 41.46875,50 L 41.46875,51.96875 L 44.21875,51.96875 L 44.21875,49.59375 C 47.45359,48.639973 49.812506,45.679434 49.8125,42.125 L 49.8125,26.15625 C 49.8125,21.843508 46.375238,18.3125 42.0625,18.3125 L 38.03125,18.3125 L 25.46875,18.3125 z M 34.90625,18.3125 L 28.625,18.3125 L 34.90625,18.3125 z M 20.1875,22.125 L 43.21875,22.125 C 44.859176,22.125001 46.28125,23.422081 46.28125,25.0625 L 46.28125,35.9375 C 46.281243,37.577922 44.859168,38.875 43.21875,38.875 L 20.1875,38.875 C 18.547082,38.875006 17.15625,37.577923 17.15625,35.9375 L 17.15625,25.0625 C 17.15625,23.422081 18.547081,22.125 20.1875,22.125 z M 21.03125,41.09375 C 22.38454,41.093751 23.46875,42.20921 23.46875,43.5625 C 23.46875,44.91579 22.38454,46 21.03125,46 C 19.67796,45.999999 18.59375,44.91579 18.59375,43.5625 C 18.59375,42.20921 19.67796,41.09375 21.03125,41.09375 z M 42.375,41.09375 C 43.728289,41.093751 44.84375,42.20921 44.84375,43.5625 C 44.843751,44.91579 43.72829,46 42.375,46 C 41.021708,45.999999 39.9375,44.91579 39.9375,43.5625 C 39.9375,42.20921 41.02171,41.09375 42.375,41.09375 z"
+       id="rect4085"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccsssccsssc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3478"
+       sodipodi:cx="31.870968"
+       sodipodi:cy="29.290323"
+       sodipodi:rx="24.774193"
+       sodipodi:ry="24.774193"
+       d="M 56.645161,29.290323 A 24.774193,24.774193 0 1 1 7.0967751,29.290323 A 24.774193,24.774193 0 1 1 56.645161,29.290323 z"
+       transform="translate(0.1290321,6)" />
+    <rect
+       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3480"
+       width="60"
+       height="5"
+       x="2"
+       y="1.2903225" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/transport__tram.png b/public/potlatch2/features/transport__tram.png
new file mode 100644 (file)
index 0000000..e676eab
Binary files /dev/null and b/public/potlatch2/features/transport__tram.png differ
diff --git a/public/potlatch2/features/transport__tram.svg b/public/potlatch2/features/transport__tram.svg
new file mode 100644 (file)
index 0000000..6651874
--- /dev/null
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="tram.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.75"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="725"
+     inkscape:window-x="0"
+     inkscape:window-y="25" />
+  <defs
+     id="defs2385">
+    <inkscape:perspective
+       id="perspective2391"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3435" />
+  </defs>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path3446"
+       d="M 51.618364,66.685745 L 45.651403,65.483871 L 40.59365,44.351457 L 42.98465,44.817898 L 51.618364,66.685745 z"
+       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2342611;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2342611;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 11.968523,65.395422 L 17.677419,64.83871 L 23.037461,44.860302 L 20.816077,44.902706 L 11.968523,65.395422 z"
+       id="path3444"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="opacity:1;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2342611;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 30.53125 44.875 L 30.34375 49.28125 L 33.375 49.28125 L 32.90625 45.34375 L 30.53125 44.875 z M 30.25 51.21875 L 29.96875 57.28125 L 34.34375 57.28125 L 33.625 51.21875 L 30.25 51.21875 z M 29.8125 60.90625 L 29.59375 66 L 35.5625 67.1875 L 34.8125 60.90625 L 29.8125 60.90625 z "
+       id="path3448" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 25.359198,4.6875 L 25.375,7.03125 L 25.59375,7.03125 L 19.53125,10.6875 L 25.46875,14.3125 L 21.9375,14.3125 C 17.624757,14.3125 14.1875,17.843505 14.1875,22.15625 L 14.1875,38.125 C 14.1875,41.575195 16.403044,44.473161 19.5,45.5 L 19.5,47.96875 L 22.25,47.96875 L 22.25,46 L 41.46875,46 L 41.46875,47.96875 L 44.21875,47.96875 L 44.21875,45.59375 C 47.45359,44.639973 49.812506,41.679434 49.8125,38.125 L 49.8125,22.15625 C 49.8125,17.843508 46.375238,14.3125 42.0625,14.3125 L 38.03125,14.3125 L 44.09375,10.6875 L 38.15625,7.03125 L 38.424619,7.03125 L 38.408817,4.6875 L 25.359198,4.6875 z M 28.75,7.03125 L 35.03125,7.03125 L 40.96875,10.6875 L 34.90625,14.3125 L 28.625,14.3125 L 22.6875,10.6875 L 28.75,7.03125 z M 20.1875,18.125 L 43.21875,18.125 C 44.859176,18.125001 46.28125,19.422081 46.28125,21.0625 L 46.28125,31.9375 C 46.281243,33.577922 44.859168,34.875 43.21875,34.875 L 20.1875,34.875 C 18.547082,34.875006 17.15625,33.577923 17.15625,31.9375 L 17.15625,21.0625 C 17.15625,19.422081 18.547081,18.125 20.1875,18.125 z M 21.03125,37.09375 C 22.38454,37.093751 23.46875,38.20921 23.46875,39.5625 C 23.46875,40.91579 22.38454,42 21.03125,42 C 19.67796,41.999999 18.59375,40.91579 18.59375,39.5625 C 18.59375,38.20921 19.67796,37.09375 21.03125,37.09375 z M 42.375,37.09375 C 43.728289,37.093751 44.84375,38.20921 44.84375,39.5625 C 44.843751,40.91579 43.72829,42 42.375,42 C 41.021708,41.999999 39.9375,40.91579 39.9375,39.5625 C 39.9375,38.20921 41.02171,37.09375 42.375,37.09375 z"
+       id="rect4085"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccsssccsssc" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/waterway__canal.png b/public/potlatch2/features/waterway__canal.png
new file mode 100644 (file)
index 0000000..6425642
Binary files /dev/null and b/public/potlatch2/features/waterway__canal.png differ
diff --git a/public/potlatch2/features/waterway__canal.svg b/public/potlatch2/features/waterway__canal.svg
new file mode 100644 (file)
index 0000000..57c4ee3
--- /dev/null
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg3001"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="New document 8">
+  <defs
+     id="defs3003">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective3010" />
+    <inkscape:perspective
+       id="perspective2961"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       y2="0"
+       x2="215"
+       y1="188.75"
+       x1="215"
+       gradientTransform="matrix(1.001462,0,0,1,-0.314327,-0.625)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2970"
+       xlink:href="#linearGradient3619"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3039"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       gradientTransform="translate(150.71429,368.70147)"
+       y2="430.5"
+       x2="215"
+       y1="188.25"
+       x1="215"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2932"
+       xlink:href="#linearGradient3609"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <linearGradient
+       y2="430.5"
+       x2="215"
+       y1="188.25"
+       x1="215"
+       gradientTransform="translate(1.250011,-1.87501)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3048"
+       xlink:href="#linearGradient3609"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3077"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.6"
+     inkscape:cx="180.09249"
+     inkscape:cy="197.39958"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview3005"
+     showgrid="false"
+     inkscape:window-width="1294"
+     inkscape:window-height="851"
+     inkscape:window-x="1660"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3007">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient2970);fill-opacity:1"
+       id="rect3617"
+       width="428.125"
+       height="188.75"
+       x="0.9375"
+       y="-0.625" />
+    <rect
+       style="fill:url(#linearGradient3048);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="1.25"
+       y="186.875" />
+    <path
+       style="fill:#3144d6;fill-opacity:1;stroke:#000000;stroke-width:1.2310518px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.9270183,310.47891 427.8949617,2.84307 -0.62467,-94.76896 -429.1442841,1.89539 1.8739924,90.0305 z"
+       id="path2904"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#5e1400;fill-opacity:1;stroke:#000000;stroke-width:1.2688756px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 71.049006,265.24391 282.115414,0.87164 36.07613,-59.27301 -320.356112,-0.87166 2.164568,59.27303 z"
+       id="path3091" />
+    <path
+       style="fill:#942406;fill-opacity:1;stroke:#000000;stroke-width:1.2688756px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 120.11255,163.25945 0,41.83977 246.7608,1.74332 -0.72151,-42.71145 -246.03929,-0.87164 z"
+       id="path3093" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/waterway__dam.png b/public/potlatch2/features/waterway__dam.png
new file mode 100644 (file)
index 0000000..477ad3a
Binary files /dev/null and b/public/potlatch2/features/waterway__dam.png differ
diff --git a/public/potlatch2/features/waterway__dam.svg b/public/potlatch2/features/waterway__dam.svg
new file mode 100644 (file)
index 0000000..dd6d242
--- /dev/null
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg3001"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="waterway__dam.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/waterway__dam.png"
+   inkscape:export-xdpi="8.3623695"
+   inkscape:export-ydpi="8.3623695">
+  <defs
+     id="defs3003">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective3010" />
+    <inkscape:perspective
+       id="perspective2961"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       y2="0"
+       x2="215"
+       y1="188.75"
+       x1="215"
+       gradientTransform="matrix(1.001462,0,0,1,-0.314327,-0.625)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2970"
+       xlink:href="#linearGradient3619"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3039"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       gradientTransform="translate(150.71429,368.70147)"
+       y2="430.5"
+       x2="215"
+       y1="188.25"
+       x1="215"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2932"
+       xlink:href="#linearGradient3609"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <linearGradient
+       y2="430.5"
+       x2="215"
+       y1="188.25"
+       x1="215"
+       gradientTransform="translate(1.250011,-1.87501)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3048"
+       xlink:href="#linearGradient3609"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3077"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.6"
+     inkscape:cx="180.09249"
+     inkscape:cy="257.80126"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview3005"
+     showgrid="false"
+     inkscape:window-width="1294"
+     inkscape:window-height="851"
+     inkscape:window-x="1660"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3007">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient2970);fill-opacity:1"
+       id="rect3617"
+       width="428.125"
+       height="188.75"
+       x="0.9375"
+       y="-0.625" />
+    <rect
+       style="fill:url(#linearGradient3048);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="1.25"
+       y="186.875" />
+    <path
+       style="fill:#3144d6;fill-opacity:1;stroke:#000000;stroke-width:0.93578964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.9848899,310.61768 163.9847201,-0.27307 82.14017,-91.93922 -247.20438518,1.90129 1.07949508,90.311 z"
+       id="path2904"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;stroke:#1132ad;stroke-width:16.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 238.75,360 c 13.14501,18.17231 41.04017,34.91936 62.5,38.125 34.43943,0.89692 30.76389,-7.98309 36.875,-28.125 23.35511,-28.27989 76.0228,-14.6102 91.25,-0.625"
+       id="path3890"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#898381;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 165.625,310.625 210,404.375 271.25,340.625 247.5,218.75 165.625,310.625 z"
+       id="path3888" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/waterway__river.png b/public/potlatch2/features/waterway__river.png
new file mode 100644 (file)
index 0000000..ad17f6b
Binary files /dev/null and b/public/potlatch2/features/waterway__river.png differ
diff --git a/public/potlatch2/features/waterway__river.svg b/public/potlatch2/features/waterway__river.svg
new file mode 100644 (file)
index 0000000..ec31e83
--- /dev/null
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="waterway__river.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/waterway__river.png"
+   inkscape:export-xdpi="8.3623695"
+   inkscape:export-ydpi="8.3623695">
+  <defs
+     id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective2825" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3609"
+       id="linearGradient3615"
+       x1="215"
+       y1="188.25"
+       x2="215"
+       y2="430.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-2.5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001462,0,0,1,-0.0018275,-0.625)" />
+    <inkscape:perspective
+       id="perspective3729"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3729-4"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3729-8"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3729-0"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3729-2"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3729-48"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3729-44"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3729-6"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3729-05"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3729-85"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.6"
+     inkscape:cx="91.10182"
+     inkscape:cy="194.75636"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview2820"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient3615);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="0"
+       y="186.25" />
+    <rect
+       style="fill:url(#linearGradient3625);fill-opacity:1"
+       id="rect3617"
+       width="428.125"
+       height="188.75"
+       x="1.25"
+       y="-0.625" />
+    <path
+       style="fill:#3144d6;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 41.875,191.875 85,232.5 266.25,-0.625 L 166.25,193.125 41.875,191.875 z"
+       id="path2904"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#7a4904;fill-opacity:1;stroke:#000000;stroke-width:0.38667664px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 40.291649,266.84233 C 28.178526,237.91216 28.178526,237.91216 28.178526,237.91216 L 26.482688,156.42551 0.31833832,155.94334 0.56060088,267.80666 40.291649,266.84233 z"
+       id="path3694" />
+    <path
+       style="fill:#2ada1d;fill-opacity:1;stroke:#000000;stroke-width:0.38667664px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.3773,157.67551 c -6.4980285,7.30337 3.8298071,12.67656 20.291087,14.90267 8.165341,19.03627 15.724976,12.15392 23.257199,4.09845 13.924562,6.18583 31.035446,-15.30505 28.920887,-28.91104 3.970801,-12.24305 -60.648305,-54.218797 -73.357125,-21.19725"
+       id="path3698"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.47905955px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 320.09905,232.13448 c -0.0909,0.21902 -0.0909,0.54774 -0.27279,0.65731 -0.98403,0.59277 -0.6024,-0.58881 -1.36388,0.32864 -0.14369,0.17309 -0.12902,0.48408 -0.27278,0.65728 -0.1437,0.17309 -0.36371,0.21902 -0.54555,0.32867 -0.18194,0.10951 -0.35268,0.25108 -0.54557,0.32864 -0.15382,0.0617 -0.63909,0 -0.81833,0 -0.0909,0 -0.20849,0.0775 -0.27278,0 -0.12859,-0.1549 0.12861,-0.50236 0,-0.65731 -0.12859,-0.15489 -0.41698,0.15489 -0.54555,0 -0.12861,-0.15489 0.12859,-0.50236 0,-0.65728 -0.0643,-0.0775 -0.2085,0.0775 -0.27278,0 -0.1286,-0.15489 0.0813,-0.46133 0,-0.65728 -0.0575,-0.13859 -0.21529,-0.19022 -0.27279,-0.32867 -0.0541,-0.13016 0.0558,-0.91875 0,-0.98592 -0.0643,-0.0775 -0.2085,0.0775 -0.27278,0 -0.12859,-0.1549 0.12861,-0.50236 0,-0.65731 -0.0643,-0.0775 -0.20849,0.0775 -0.27278,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.21526,-0.19022 -0.27277,-0.32864 -0.0416,-0.1 0,-0.83793 0,-0.98595 0,-0.10951 0,-0.21902 0,-0.32864 0,-0.10951 -0.0408,-0.23071 0,-0.32864 0.0575,-0.13859 0.15775,-0.25924 0.27277,-0.32864 0.0986,-0.0595 1.17418,0 1.36389,0 0.18195,0 0.36371,0 0.54557,0 0.091,0 0.27277,-0.10951 0.27277,0 0,0.10951 -0.20849,0.0775 -0.27277,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.21527,-0.19022 -0.27278,-0.32867 -0.0408,-0.0981 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.23212,-0.18152 -0.27279,-0.32864 -0.0575,-0.20788 0.044,-0.44473 0,-0.65728 -0.0494,-0.23777 -0.20847,-0.42492 -0.27276,-0.65731 -0.0288,-0.1038 0,-0.21902 0,-0.32864 0,-0.21902 0,-0.43821 0,-0.65728 0,-1.20505 0,-2.41008 0,-3.61513 0,-0.13831 -0.0405,-1.87409 0,-1.97187 0.0574,-0.13858 0.21527,-0.18994 0.27276,-0.32864 0.0408,-0.0981 -0.0408,-0.2307 0,-0.32864 0.0575,-0.13859 0.18195,-0.21902 0.27279,-0.32867 0.091,-0.10951 0.15776,-0.25924 0.27278,-0.32864 0.0813,-0.0489 0.18649,0.0348 0.27277,0 0.1929,-0.0775 0.34832,-0.26929 0.54556,-0.32864 0.35286,-0.10625 0.73826,0.10625 1.09112,0 0.19724,-0.0595 0.34831,-0.26929 0.54555,-0.32864 0.24354,-0.0734 1.04815,0 1.3639,0 0.091,0 0.20847,-0.0775 0.27278,0 0.0643,0.0775 -0.0408,0.23071 0,0.32864 0.56762,1.36775 -0.0186,-0.35133 0.54556,0.32864 0.0643,0.0775 -0.0643,0.25109 0,0.32864 0.0643,0.0775 0.20848,-0.0775 0.27277,0 0.12861,0.15489 -0.1286,0.50237 0,0.65731 0.0643,0.0775 0.20849,-0.0775 0.27277,0 0.16251,0.19593 -0.27224,0.98592 0.2728,0.98592 0.025,0 -0.0314,-0.92926 0,-0.98592 0.14266,-0.25788 0.39124,-0.40942 0.54556,-0.65731 0.12199,-0.19592 0.16003,-0.45347 0.27277,-0.65728 0.15693,-0.28358 0.60527,-0.72924 0.81834,-0.98595 0.0909,-0.10951 0.18194,-0.21902 0.27276,-0.32864 0.091,-0.10951 0.15776,-0.25924 0.2728,-0.32864 0.0831,-0.05 0.69549,0 0.81834,0 0.21959,0 0.91989,-0.0688 1.09111,0 0.1929,0.0775 0.34831,0.2693 0.54556,0.32864 0.44105,0.13289 0.91808,-0.10734 1.36387,0 0.19932,0.0481 0.34502,0.28837 0.54557,0.32864 0.35876,0.072 0.72741,0 1.09111,0 0.27279,0 0.54557,0 0.81834,0 0.18194,0 0.36914,-0.0533 0.54556,0 0.39449,0.11875 0.69662,0.53849 1.0911,0.65731 0.17637,0.0533 0.36374,0 0.54557,0 0.0909,0 0.19146,-0.0489 0.2728,0 0.11494,0.0693 0.15774,0.25924 0.27276,0.32864 0.0813,0.0489 0.19146,-0.0489 0.27277,0 0.11494,0.0693 0.18196,0.21902 0.2728,0.32864 0.091,0.10951 0.21525,0.19022 0.27277,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.21902 0.0575,0.44943 0,0.65728 -0.0643,0.23234 -0.20849,0.42492 -0.27277,0.65728 -0.0288,0.10408 0.0408,0.23071 0,0.32867 -0.0575,0.13858 -0.21527,0.18995 -0.2728,0.32864 -0.0408,0.0981 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 -0.0643,0.40611 0,0.32864 0.1437,-0.17309 0.12902,-0.48407 0.2728,-0.65728 0.1437,-0.1731 0.3637,-0.21902 0.54555,-0.32864 0.36369,-0.21902 0.71357,-0.47535 1.09112,-0.65731 0.26697,-0.12853 0.54554,-0.21902 0.81834,-0.32864 0.27277,-0.10951 0.55135,-0.19999 0.81834,-0.32864 0.18876,-0.0911 0.34829,-0.26929 0.54553,-0.32864 0.24731,-0.0745 1.04703,0 1.3639,0 0.18195,0 0.36371,0 0.54557,0 0.18174,0 0.37303,-0.0693 0.54554,0 0.244,0.0981 0.33158,0.48541 0.54557,0.65728 0.16912,0.13588 0.34831,0.2693 0.54556,0.32864 0.17636,0.0533 0.39424,-0.12146 0.54554,0 0.16914,0.13588 0.10364,0.52142 0.2728,0.65731 1.29645,1.04133 -0.22931,-1.26222 1.0911,0.32864 0.1437,0.1731 0.15073,0.46134 0.2728,0.65728 0.15424,0.24782 0.3398,0.47138 0.54555,0.65731 0.59077,0.53384 0.63556,0.0712 1.09112,0.98592 0.52154,1.88517 -0.0805,0.19973 0.81834,1.64326 0.12198,0.19592 0.15072,0.46131 0.27277,0.65728 0.15424,0.24782 0.43054,0.38017 0.54556,0.65728 0.0813,0.19593 -0.0813,0.46134 0,0.65731 0.0408,0.0981 0.20849,-0.0775 0.27277,0 0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.3541,0.0489 -0.27277,0 0.25719,-0.15489 0.55135,-0.2 0.81834,-0.32864 0.37755,-0.18207 0.69662,-0.53848 1.0911,-0.65731 0.17637,-0.0533 0.36914,0.0533 0.54557,0 0.39449,-0.11875 0.71355,-0.47533 1.09111,-0.65728 0.86522,-0.41698 1.08287,-0.32864 1.90946,-0.32864 0.12282,0 0.7353,-0.05 0.81834,0 0.11494,0.0693 0.16581,0.24267 0.27276,0.32864 0.16913,0.13587 0.37638,0.19266 0.54557,0.32864 0.21397,0.17174 0.31553,0.51872 0.54555,0.65731 0.0813,0.0489 0.19145,-0.0489 0.27278,0 0.11494,0.0693 0.18196,0.21902 0.27278,0.32864 0.0909,0.10951 0.21528,0.18995 0.27277,0.32864 0.0408,0.0981 -0.0408,0.23071 0,0.32864 0.0575,0.13858 0.23212,0.18179 0.2728,0.32864 0.0248,0.0897 0.0211,1.86986 0,1.9719 -0.0493,0.2375 -0.16003,0.45348 -0.2728,0.65728 -0.14266,0.25788 -0.40288,0.39948 -0.54555,0.65728 -0.11284,0.20381 -0.16002,0.45348 -0.27278,0.65731 -0.25018,0.45212 -0.42082,0.33799 -0.81835,0.65728 -0.1069,0.0859 -0.14803,0.29109 -0.27277,0.32864 -2.04329,0.61546 0.18713,-0.60567 -1.36389,0.32867 -0.18195,0.10951 -0.35267,0.25108 -0.54554,0.32864 -0.16376,0.0658 -1.14624,0 -1.36391,0 -0.0909,0 -0.18194,0 -0.27277,0 -0.0909,0 -0.20849,-0.0775 -0.27279,0 -0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.27277,0.10951 -0.27277,0 0,-0.10951 0.20848,-0.0775 0.27277,0 0.56439,0.67997 -0.86246,-0.0272 0.27279,0.65728 0.67284,0.40535 -0.16375,-0.92019 0.27277,0.65731 0.0813,0.29394 0.46423,0.36334 0.54555,0.65728 0.0575,0.20788 -0.0575,0.44946 0,0.65731 0.0408,0.14701 0.21529,0.19022 0.27279,0.32864 0.0354,0.0851 0.0337,1.85032 0,1.97187 -0.0643,0.23234 -0.16003,0.45348 -0.27279,0.65731 -0.14266,0.25788 -0.36371,0.43817 -0.54555,0.65728 -0.18194,0.21902 -0.36369,0.4382 -0.54556,0.65728 -0.091,0.10951 -0.16582,0.24266 -0.27277,0.32867 -0.16913,0.13586 -0.3764,0.19266 -0.54557,0.32864 -0.1069,0.0859 -0.15072,0.27964 -0.27277,0.32864 -0.17243,0.0693 -0.3767,-0.0813 -0.54556,0 -0.30439,0.14674 -0.50731,0.53238 -0.81834,0.65728 -0.0448,0.019 -1.54917,-0.0163 -1.63667,0 -2.15424,0.43258 0.49104,0.32867 -1.63667,0.32867 -0.17553,0 -1.72486,0.0557 -1.90947,0 -0.19724,-0.0595 -0.36369,-0.21902 -0.54554,-0.32867 -0.27277,-0.10951 -0.53639,-0.2606 -0.81833,-0.32864 -0.17843,-0.043 -0.37305,0.0693 -0.54556,0 -0.122,-0.0489 -0.16583,-0.24266 -0.27278,-0.32864 -0.16913,-0.13587 -0.3764,-0.19267 -0.54557,-0.32864 -0.10713,-0.0859 -0.15775,-0.25924 -0.27277,-0.32864 -0.0813,-0.0489 -0.19145,0.0489 -0.27278,0 -0.14163,-0.0853 -0.73368,-0.98595 -0.81835,-0.98595 -0.0909,0 -0.0408,0.23071 0,0.32864 0.0575,0.13858 0.21528,0.19022 0.2728,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.10951 0.0408,0.23071 0,0.32864 -0.12488,0.30081 -0.619,0.57722 -0.81833,0.65728 -0.0862,0.0348 -0.19146,-0.0489 -0.2728,0 -0.83186,0.50111 0.4989,0.2606 -0.81834,0.65731 -0.17635,0.0533 -0.3637,0 -0.54554,0 -0.63649,0 -1.27297,0 -1.90947,0 -0.23759,0 -1.53598,0.0606 -1.63666,0 -0.11494,-0.0693 -0.16582,-0.24266 -0.27277,-0.32867 -0.33836,-0.27174 -0.7658,-0.36332 -1.09113,-0.65728 -0.0269,-0.0245 -0.99383,-1.13878 -1.09112,-1.31459 -0.11284,-0.2038 -0.12901,-0.48408 -0.27277,-0.65728 -0.14369,-0.1731 -0.43277,-0.12474 -0.54556,-0.32864 -0.10084,-0.18234 0.044,-0.44476 0,-0.65731 0.49396,-1.37497 -0.43055,-0.38017 -0.54557,-0.65728 -0.0813,-0.19593 0.0813,-0.46133 0,-0.65731 -0.0407,-0.0981 -0.18173,0 -0.27276,0 0,-0.21902 0,-0.43818 0,-0.65728 0,-0.10951 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 0.0408,0.23071 0,0.32867 -0.0565,0.13586 -0.70272,0.89307 -0.81834,0.98592 -0.16912,0.13586 -0.35268,0.25108 -0.54556,0.32864 -0.16106,0.0647 -1.21148,0 -1.36388,0 -0.23096,0 -0.94448,0.059 -1.09114,0 -0.12198,-0.0489 -0.18194,-0.21902 -0.27276,-0.32864 -0.091,-0.10951 -0.16582,-0.24266 -0.27279,-0.32864 -0.16912,-0.13587 -0.40179,-0.15544 -0.54555,-0.32864 -1.394,-1.67951 1.14375,0.45836 -0.81833,-1.31459 -0.16272,-0.14701 -0.43278,-0.12473 -0.54557,-0.32864 -0.10085,-0.18234 0.0575,-0.44946 0,-0.65731 -0.0813,-0.29394 -0.46422,-0.36334 -0.54556,-0.65728 -0.0575,-0.20788 0.0575,-0.44946 0,-0.65731 -0.0408,-0.14701 -0.23211,-0.18152 -0.27277,-0.32864 -0.0575,-0.20788 0.0813,-0.4613 0,-0.65728 -0.0408,-0.0981 -0.31957,0.0941 -0.27278,0 0.29955,-0.60149 0.72741,-1.09549 0,-0.65731 z"
+       id="path2906-6" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 319.57051,238.94927 c 0,0.29756 0,0.59514 0,0.89269 0,1.48038 0.0968,-0.31562 -0.20531,0.66954 -0.065,0.21168 0,0.44635 0,0.66953 0,0.52074 0,1.0415 0,1.56222 0,0.0541 0.006,0.66237 0,0.66954 -0.0483,0.0527 -0.15693,-0.0527 -0.20531,0 -0.0483,0.0527 0,0.14892 0,0.2231 0,0.44636 0,0.89271 0,1.33907 0,0.0745 -0.0483,0.17066 0,0.2231 0.0483,0.0527 0.15693,-0.0527 0.20531,0 0.0483,0.0527 0,0.14891 0,0.2231 0,0.0745 0,0.14891 0,0.2231"
+       id="path2908-8" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 322.85504,240.06514 c 0,0.0745 -0.0306,0.15652 0,0.2231 0.0432,0.094 0.1621,0.12907 0.2053,0.2231 0.0457,0.0995 -0.0312,0.79062 0,0.89271 0.0306,0.0998 0.17471,0.12337 0.20531,0.2231 0.0378,0.12337 0,1.11428 0,1.33904 0,0.9671 0,1.93421 0,2.9013"
+       id="path2910-7" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 338.25128,242.74325 c 0,0.44636 0,0.89272 0,1.33908 0,0.0745 0,0.14865 0,0.2231 0,0.0745 0.0306,0.15652 0,0.22309 -0.0432,0.0941 -0.16209,0.12908 -0.2053,0.2231 -0.0306,0.0666 0,0.14891 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.15516 0.037,1.03519 0,1.1159 -0.0432,0.094 -0.1621,0.12907 -0.20531,0.22308 -0.0821,0.17855 0.0821,0.49099 0,0.66954 -0.0432,0.0941 -0.16209,0.12909 -0.20531,0.2231 -0.0312,0.068 0,0.56902 0,0.66952"
+       id="path2912-8" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 335.78788,243.18961 c 0,0.37196 0,0.74392 0,1.1159 0,0.44635 0,0.89269 0,1.33905 0,0.0745 0,0.14891 0,0.2231 0,0.0745 0.0306,0.15651 0,0.22309 -0.0432,0.094 -0.16209,0.12908 -0.2053,0.2231 -0.0709,0.15407 0.0722,1.03755 0,1.11589 -0.0483,0.0527 -0.15693,-0.0527 -0.20532,0 -0.0491,0.0536 0.0467,0.89269 0,0.89269 -0.0685,0 0,-0.14891 0,-0.22309"
+       id="path2914-4" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 315.46483,218.86335 c -0.21236,0 -0.28373,0.0527 -0.41058,-0.2231 -0.0306,-0.0666 0.0485,-0.17065 0,-0.2231 -0.0483,-0.0527 -0.1441,0.0332 -0.2053,0 -0.0866,-0.047 -0.11867,-0.17608 -0.20531,-0.2231 -0.16416,-0.0894 -0.45163,0.0892 -0.61586,0 -0.0866,-0.047 -0.11868,-0.17608 -0.2053,-0.2231 -0.12902,-0.0701 -0.69211,0.0701 -0.82115,0 -0.0866,-0.047 -0.11354,-0.18994 -0.20532,-0.22309 -0.19476,-0.0707 -0.41054,0 -0.61583,0 -0.54742,0 -1.09486,0 -1.64228,0 -0.41056,0 -0.82112,0 -1.23169,0 -0.13688,0 -0.28816,-0.0666 -0.41056,0 -0.0611,0.0332 0.0484,0.17065 0,0.22309 -0.0483,0.0527 -0.14411,-0.0332 -0.20531,0 -0.0866,0.047 -0.11868,0.17609 -0.20531,0.2231 -0.0815,0.0443 -0.57389,-0.0457 -0.61583,0 -0.0483,0.0527 0.0483,0.17065 0,0.2231 -0.0483,0.0527 -0.15693,-0.0527 -0.20531,0 -0.0483,0.0527 0.0483,0.17065 0,0.2231 -0.42475,0.46176 0.0165,-0.70563 -0.41057,0.2231 -0.0306,0.0666 0.0306,0.15651 0,0.2231 -0.0432,0.094 -0.1621,0.12907 -0.20532,0.22308 -0.0306,0.0666 0.0306,0.15653 0,0.2231 -0.0432,0.094 -0.1621,0.12908 -0.2053,0.2231 -0.0306,0.0666 0,0.14864 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.37196 0,0.74391 0,1.11586 0,0.0745 0,0.14891 0,0.2231 0,0.0745 0.0306,0.15652 0,0.2231 -0.0432,0.094 -0.1621,0.12908 -0.20531,0.2231 -0.0373,0.0807 0,0.96068 0,1.1159 0,0.11683 -0.0271,0.83401 0,0.89271 0.42716,0.9288 -0.0144,-0.23859 0.41055,0.22309 0.0968,0.10517 -0.0968,0.34115 0,0.44634 0.0483,0.0527 0.17472,-0.0666 0.20531,0 0.0613,0.13314 -0.0611,0.31328 0,0.44636 0.0306,0.0666 0.15692,-0.0527 0.20531,0 0.0483,0.0527 -0.0306,0.15678 0,0.22308 0.0432,0.0941 0.1621,0.12909 0.2053,0.2231 0.0306,0.0666 -0.0306,0.15653 0,0.2231 0.0548,0.1193 0.50777,0.55204 0.61585,0.66954 0.10807,0.11739 0.50621,0.60992 0.61586,0.66953 0.1224,0.0666 0.28815,-0.0666 0.41054,0 0.85436,0.46441 -0.21943,-0.0163 0.20532,0.44633 0.0484,0.0527 0.1441,-0.0332 0.2053,0 0.0866,0.047 0.11869,0.17609 0.20531,0.2231 0.0611,0.0332 0.15693,-0.0527 0.2053,0 0.0485,0.0527 -0.0483,0.17065 0,0.2231 0.0485,0.0527 0.14412,-0.0332 0.20532,0 0.0866,0.047 0.11867,0.17609 0.2053,0.2231 0.0815,0.0443 0.57389,-0.0457 0.61587,0 0.0483,0.0527 -0.0483,0.17065 0,0.2231 0.0483,0.0527 0.15692,-0.0527 0.2053,0 0.0483,0.0527 -0.0484,0.17065 0,0.2231 0.0968,0.10516 0.28073,-0.047 0.41056,0 0.14514,0.0527 0.26541,0.17064 0.41057,0.22309 0.0649,0.0245 0.14411,-0.0332 0.20531,0 0.0866,0.047 0.11868,0.17609 0.2053,0.22309 0.0742,0.0402 0.88363,0 1.02642,0 0.34214,0 0.68427,0 1.02642,0 0.13686,0 0.27369,0 0.41054,0 0.0685,0 0.20532,-0.0745 0.20532,0 0,0.0217 -0.68083,0.0245 0,-0.22309 0.12984,-0.047 0.27371,0 0.41056,0 0.0685,0 0.14411,0.0332 0.20532,0 0.50733,-0.27579 -0.0709,-0.22309 0.41054,-0.22309"
+       id="path2916-88" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.47905955px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 386.00217,296.67237 c -0.0909,0.21902 -0.0909,0.54774 -0.2728,0.65731 -0.98402,0.59276 -0.60239,-0.58881 -1.36387,0.32864 -0.14369,0.17309 -0.12902,0.48407 -0.27279,0.65728 -0.1437,0.17309 -0.36371,0.21902 -0.54554,0.32867 -0.18195,0.10951 -0.35269,0.25108 -0.54557,0.32864 -0.15382,0.0617 -0.63911,0 -0.81833,0 -0.091,0 -0.2085,0.0775 -0.27278,0 -0.12859,-0.1549 0.1286,-0.50237 0,-0.65731 -0.12859,-0.15489 -0.41698,0.15488 -0.54557,0 -0.12859,-0.15489 0.12861,-0.50237 0,-0.65728 -0.0643,-0.0775 -0.20848,0.0775 -0.27276,0 -0.12861,-0.1549 0.0813,-0.46134 0,-0.65728 -0.0575,-0.1386 -0.21529,-0.19022 -0.2728,-0.32867 -0.0541,-0.13017 0.0558,-0.91875 0,-0.98592 -0.0643,-0.0775 -0.20849,0.0775 -0.27277,0 -0.1286,-0.1549 0.12861,-0.50237 0,-0.65731 -0.0643,-0.0775 -0.20849,0.0775 -0.2728,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.1386 -0.21524,-0.19022 -0.27276,-0.32864 -0.0416,-0.10001 0,-0.83793 0,-0.98595 0,-0.10951 0,-0.21902 0,-0.32864 0,-0.10951 -0.0408,-0.23071 0,-0.32864 0.0575,-0.13859 0.15775,-0.25924 0.27276,-0.32864 0.0986,-0.0595 1.1742,0 1.36391,0 0.18195,0 0.3637,0 0.54557,0 0.0909,0 0.27277,-0.10951 0.27277,0 0,0.10951 -0.20849,0.0775 -0.27277,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.21528,-0.19022 -0.27278,-0.32867 -0.0408,-0.0981 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.23212,-0.18152 -0.27279,-0.32864 -0.0575,-0.20789 0.044,-0.44473 0,-0.65728 -0.0494,-0.23778 -0.20847,-0.42493 -0.27278,-0.65731 -0.0288,-0.1038 0,-0.21902 0,-0.32864 0,-0.21902 0,-0.43821 0,-0.65728 0,-1.20505 0,-2.41008 0,-3.61513 0,-0.13831 -0.0405,-1.8741 0,-1.97187 0.0575,-0.13859 0.21528,-0.18995 0.27278,-0.32864 0.0408,-0.0981 -0.0408,-0.23071 0,-0.32864 0.0575,-0.13859 0.18195,-0.21902 0.27279,-0.32867 0.091,-0.10951 0.15776,-0.25924 0.27278,-0.32864 0.0813,-0.0489 0.18649,0.0348 0.27277,0 0.1929,-0.0775 0.34831,-0.2693 0.54556,-0.32864 0.35285,-0.10625 0.73826,0.10625 1.09111,0 0.19725,-0.0595 0.34832,-0.2693 0.54556,-0.32864 0.24353,-0.0734 1.04815,0 1.3639,0 0.091,0 0.20847,-0.0775 0.27277,0 0.0643,0.0775 -0.0408,0.23071 0,0.32864 0.56763,1.36773 -0.0186,-0.35133 0.54556,0.32864 0.0643,0.0775 -0.0643,0.25108 0,0.32864 0.0643,0.0775 0.20847,-0.0775 0.27278,0 0.1286,0.15489 -0.1286,0.50236 0,0.65731 0.0643,0.0775 0.20849,-0.0775 0.27277,0 0.16251,0.19593 -0.27224,0.98592 0.2728,0.98592 0.025,0 -0.0315,-0.92927 0,-0.98592 0.14266,-0.25788 0.39123,-0.40943 0.54555,-0.65731 0.122,-0.19593 0.16003,-0.45348 0.27278,-0.65728 0.15693,-0.28359 0.60527,-0.72924 0.81834,-0.98595 0.091,-0.10951 0.18194,-0.21902 0.27276,-0.32864 0.091,-0.10951 0.15776,-0.25924 0.2728,-0.32864 0.0831,-0.05 0.69549,0 0.81833,0 0.2196,0 0.9199,-0.0688 1.09111,0 0.1929,0.0775 0.34832,0.2693 0.54556,0.32864 0.44106,0.13288 0.91809,-0.10734 1.36388,0 0.19932,0.0481 0.34502,0.28837 0.54557,0.32864 0.35876,0.072 0.72741,0 1.0911,0 0.2728,0 0.54557,0 0.81835,0 0.18194,0 0.36913,-0.0533 0.54556,0 0.39448,0.11875 0.69661,0.53847 1.0911,0.65731 0.17636,0.0533 0.36372,0 0.54557,0 0.0909,0 0.19146,-0.0489 0.27278,0 0.11494,0.0693 0.15776,0.25924 0.27278,0.32864 0.0813,0.0489 0.19145,-0.0489 0.27277,0 0.11494,0.0693 0.18194,0.21902 0.2728,0.32864 0.0909,0.10951 0.21524,0.19022 0.27277,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.21902 0.0575,0.44943 0,0.65728 -0.0643,0.23234 -0.20849,0.42491 -0.27277,0.65728 -0.0288,0.10407 0.0408,0.23071 0,0.32867 -0.0575,0.13858 -0.21527,0.18994 -0.2728,0.32864 -0.0408,0.0981 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 -0.0643,0.40611 0,0.32864 0.1437,-0.17309 0.12902,-0.48408 0.2728,-0.65728 0.14369,-0.1731 0.36369,-0.21902 0.54554,-0.32864 0.3637,-0.21902 0.71358,-0.47535 1.09113,-0.65731 0.26696,-0.12854 0.54554,-0.21902 0.81833,-0.32864 0.27278,-0.10951 0.55136,-0.2 0.81833,-0.32864 0.18878,-0.0911 0.34831,-0.2693 0.54555,-0.32864 0.24731,-0.0745 1.04703,0 1.3639,0 0.18194,0 0.36371,0 0.54557,0 0.18173,0 0.37303,-0.0693 0.54554,0 0.24399,0.0981 0.33158,0.48541 0.54557,0.65728 0.16912,0.13587 0.34831,0.26929 0.54555,0.32864 0.17637,0.0533 0.39425,-0.12147 0.54555,0 0.16913,0.13587 0.10364,0.52141 0.2728,0.65731 1.29645,1.04132 -0.22932,-1.26223 1.0911,0.32864 0.1437,0.17309 0.15072,0.46133 0.2728,0.65728 0.15424,0.24782 0.3398,0.47138 0.54553,0.65731 0.59079,0.53382 0.63558,0.0712 1.09113,0.98592 0.52155,1.88515 -0.0805,0.19972 0.81834,1.64326 0.12198,0.19591 0.15072,0.4613 0.27278,0.65728 0.15423,0.24782 0.43054,0.38015 0.54555,0.65728 0.0813,0.19592 -0.0813,0.46133 0,0.65731 0.0408,0.0981 0.2085,-0.0775 0.27278,0 0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.35411,0.0489 -0.27278,0 0.25718,-0.1549 0.55136,-0.20001 0.81835,-0.32864 0.37755,-0.18207 0.69661,-0.53848 1.0911,-0.65731 0.17636,-0.0533 0.36914,0.0533 0.54556,0 0.3945,-0.11875 0.71356,-0.47533 1.09111,-0.65728 0.86523,-0.41699 1.08288,-0.32864 1.90946,-0.32864 0.12281,0 0.73531,-0.05 0.81835,0 0.11493,0.0693 0.16581,0.24266 0.27276,0.32864 0.16913,0.13586 0.37638,0.19265 0.54557,0.32864 0.21396,0.17173 0.31552,0.51872 0.54554,0.65731 0.0813,0.0489 0.19146,-0.0489 0.27279,0 0.11494,0.0693 0.18194,0.21902 0.27277,0.32864 0.0909,0.10951 0.21527,0.18994 0.27278,0.32864 0.0408,0.0981 -0.0408,0.2307 0,0.32864 0.0575,0.13858 0.23212,0.18179 0.27279,0.32864 0.0248,0.0897 0.0211,1.86985 0,1.9719 -0.0493,0.23749 -0.16004,0.45347 -0.27279,0.65728 -0.14267,0.25788 -0.40289,0.39948 -0.54555,0.65728 -0.11284,0.2038 -0.16003,0.45347 -0.27279,0.65731 -0.25018,0.45211 -0.42081,0.33798 -0.81834,0.65728 -0.1069,0.0859 -0.14803,0.29108 -0.27277,0.32864 -2.0433,0.61546 0.18711,-0.60569 -1.3639,0.32867 -0.18194,0.10951 -0.35266,0.25108 -0.54554,0.32864 -0.16375,0.0658 -1.14623,0 -1.3639,0 -0.091,0 -0.18194,0 -0.27277,0 -0.0909,0 -0.20849,-0.0775 -0.2728,0 -0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.27277,0.10951 -0.27277,0 0,-0.10951 0.20849,-0.0775 0.27277,0 0.5644,0.67997 -0.86245,-0.0272 0.2728,0.65728 0.67284,0.40535 -0.16375,-0.92019 0.27277,0.65731 0.0813,0.29394 0.46423,0.36334 0.54555,0.65728 0.0575,0.20787 -0.0575,0.44945 0,0.65731 0.0408,0.14701 0.21529,0.19021 0.27278,0.32864 0.0354,0.0851 0.0337,1.85032 0,1.97187 -0.0643,0.23233 -0.16002,0.45347 -0.27278,0.65731 -0.14267,0.25787 -0.36371,0.43817 -0.54555,0.65728 -0.18194,0.21902 -0.36371,0.4382 -0.54557,0.65728 -0.091,0.10951 -0.16581,0.24266 -0.27277,0.32867 -0.16912,0.13586 -0.37639,0.19265 -0.54556,0.32864 -0.1069,0.0859 -0.15072,0.27964 -0.27277,0.32864 -0.17243,0.0693 -0.37671,-0.0813 -0.54556,0 -0.30439,0.14673 -0.50732,0.53238 -0.81834,0.65727 -0.0448,0.019 -1.54918,-0.0163 -1.63668,0 -2.15423,0.43259 0.49105,0.32867 -1.63666,0.32867 -0.17554,0 -1.72486,0.0557 -1.90947,0 -0.19724,-0.0595 -0.3637,-0.21903 -0.54555,-0.32867 -0.27276,-0.10951 -0.53638,-0.26059 -0.81833,-0.32864 -0.17842,-0.043 -0.37305,0.0693 -0.54557,0 -0.12198,-0.0489 -0.16581,-0.24266 -0.27276,-0.32863 -0.16913,-0.13588 -0.3764,-0.19267 -0.54557,-0.32864 -0.10713,-0.0859 -0.15775,-0.25924 -0.27277,-0.32864 -0.0813,-0.0489 -0.19146,0.0489 -0.27279,0 -0.14162,-0.0853 -0.73367,-0.98595 -0.81834,-0.98595 -0.091,0 -0.0408,0.2307 0,0.32864 0.0575,0.13858 0.21527,0.19021 0.2728,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.10951 0.0408,0.23069 0,0.32864 -0.12488,0.3008 -0.61901,0.57722 -0.81835,0.65727 -0.0862,0.0348 -0.19144,-0.0489 -0.27278,0 -0.83186,0.50112 0.4989,0.2606 -0.81834,0.65731 -0.17636,0.0533 -0.3637,0 -0.54554,0 -0.63649,0 -1.27298,0 -1.90947,0 -0.2376,0 -1.53598,0.0606 -1.63667,0 -0.11494,-0.0693 -0.16582,-0.24266 -0.27276,-0.32867 -0.33836,-0.27174 -0.76581,-0.36332 -1.09113,-0.65727 -0.0269,-0.0245 -0.99384,-1.13878 -1.09112,-1.31459 -0.11284,-0.20381 -0.12901,-0.48408 -0.27277,-0.65728 -0.14369,-0.17311 -0.43278,-0.12474 -0.54556,-0.32864 -0.10085,-0.18234 0.044,-0.44476 0,-0.65731 0.49396,-1.37498 -0.43055,-0.38017 -0.54557,-0.65728 -0.0813,-0.19593 0.0813,-0.46134 0,-0.65731 -0.0408,-0.0981 -0.18173,0 -0.27277,0 0,-0.21902 0,-0.43818 0,-0.65728 0,-0.10951 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 0.0408,0.2307 0,0.32867 -0.0565,0.13586 -0.70271,0.89306 -0.81833,0.98592 -0.16912,0.13586 -0.35269,0.25108 -0.54556,0.32864 -0.16106,0.0647 -1.21149,0 -1.36389,0 -0.23096,0 -0.94447,0.059 -1.09113,0 -0.12198,-0.0489 -0.18194,-0.21902 -0.27276,-0.32864 -0.0909,-0.10951 -0.16583,-0.24267 -0.2728,-0.32864 -0.16913,-0.13588 -0.40179,-0.15544 -0.54554,-0.32864 -1.39401,-1.67951 1.14375,0.45836 -0.81833,-1.31459 -0.16272,-0.14701 -0.43279,-0.12474 -0.54557,-0.32864 -0.10085,-0.18234 0.0575,-0.44946 0,-0.65731 -0.0813,-0.29394 -0.46423,-0.36334 -0.54556,-0.65728 -0.0575,-0.20789 0.0575,-0.44946 0,-0.65731 -0.0408,-0.14701 -0.23211,-0.18152 -0.27278,-0.32864 -0.0575,-0.20789 0.0813,-0.46131 0,-0.65728 -0.0408,-0.0981 -0.31956,0.094 -0.27277,0 0.29955,-0.6015 0.72741,-1.09549 0,-0.65731 z"
+       id="path2906-9" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 385.47363,303.48716 c 0,0.29755 0,0.59514 0,0.89268 0,1.48038 0.0968,-0.31562 -0.20532,0.66954 -0.0649,0.21168 0,0.44636 0,0.66954 0,0.52073 0,1.04149 0,1.56222 0,0.0541 0.006,0.66237 0,0.66954 -0.0483,0.0527 -0.15693,-0.0527 -0.2053,0 -0.0484,0.0527 0,0.14892 0,0.22309 0,0.44636 0,0.89272 0,1.33908 0,0.0745 -0.0484,0.17065 0,0.2231 0.0483,0.0527 0.15693,-0.0527 0.2053,0 0.0485,0.0527 0,0.14891 0,0.2231 0,0.0745 0,0.1489 0,0.22309"
+       id="path2908-9" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 388.75815,304.60302 c 0,0.0745 -0.0306,0.15653 0,0.2231 0.0432,0.094 0.16209,0.12908 0.20531,0.2231 0.0456,0.0995 -0.0312,0.79062 0,0.89272 0.0306,0.0997 0.17471,0.12336 0.20531,0.2231 0.0378,0.12336 0,1.11428 0,1.33904 0,0.96708 0,1.93421 0,2.90129"
+       id="path2910-4" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 404.1544,307.28114 c 0,0.44636 0,0.89271 0,1.33907 0,0.0745 0,0.14865 0,0.2231 0,0.0745 0.0306,0.15653 0,0.2231 -0.0432,0.0941 -0.1621,0.12907 -0.2053,0.2231 -0.0306,0.0666 0,0.14891 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.15515 0.037,1.03518 0,1.11589 -0.0432,0.094 -0.1621,0.12908 -0.20532,0.22309 -0.0821,0.17854 0.0821,0.49099 0,0.66954 -0.0432,0.094 -0.16208,0.12907 -0.2053,0.2231 -0.0312,0.068 0,0.56902 0,0.6695"
+       id="path2912-4" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 401.691,307.7275 c 0,0.37196 0,0.74391 0,1.11589 0,0.44636 0,0.8927 0,1.33905 0,0.0745 0,0.14891 0,0.22309 0,0.0745 0.0306,0.15653 0,0.2231 -0.0432,0.094 -0.1621,0.12908 -0.20531,0.2231 -0.0709,0.15408 0.0722,1.03756 0,1.1159 -0.0483,0.0527 -0.15692,-0.0527 -0.20531,0 -0.0491,0.0535 0.0467,0.89268 0,0.89268 -0.0685,0 0,-0.14891 0,-0.22309"
+       id="path2914-40" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 381.36795,283.40123 c -0.21236,0 -0.28373,0.0527 -0.41058,-0.2231 -0.0306,-0.0666 0.0484,-0.17065 0,-0.22309 -0.0483,-0.0527 -0.14411,0.0332 -0.2053,0 -0.0866,-0.047 -0.11868,-0.1761 -0.20532,-0.2231 -0.16416,-0.0894 -0.45163,0.0892 -0.61586,0 -0.0866,-0.047 -0.11867,-0.17609 -0.2053,-0.2231 -0.12901,-0.0701 -0.69211,0.0701 -0.82115,0 -0.0866,-0.047 -0.11354,-0.18994 -0.20531,-0.2231 -0.19476,-0.0707 -0.41055,0 -0.61584,0 -0.54742,0 -1.09485,0 -1.64227,0 -0.41056,0 -0.82113,0 -1.23171,0 -0.13686,0 -0.28814,-0.0666 -0.41054,0 -0.0613,0.0332 0.0483,0.17065 0,0.2231 -0.0483,0.0527 -0.14411,-0.0332 -0.20532,0 -0.0866,0.047 -0.11867,0.17609 -0.2053,0.2231 -0.0815,0.0443 -0.57389,-0.0457 -0.61585,0 -0.0483,0.0527 0.0485,0.17065 0,0.2231 -0.0483,0.0527 -0.15691,-0.0527 -0.2053,0 -0.0484,0.0527 0.0483,0.17065 0,0.22309 -0.42474,0.46177 0.0165,-0.70562 -0.41057,0.2231 -0.0306,0.0666 0.0306,0.15652 0,0.22309 -0.0432,0.094 -0.1621,0.12909 -0.20531,0.2231 -0.0306,0.0666 0.0306,0.15653 0,0.2231 -0.0432,0.094 -0.1621,0.12907 -0.2053,0.2231 -0.0306,0.0666 0,0.14864 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.37194 0,0.7439 0,1.11586 0,0.0745 0,0.14891 0,0.2231 0,0.0745 0.0306,0.15652 0,0.2231 -0.0432,0.094 -0.1621,0.12907 -0.20532,0.22309 -0.0373,0.0807 0,0.96067 0,1.11589 0,0.11685 -0.0271,0.83402 0,0.89272 0.42716,0.9288 -0.0144,-0.23859 0.41056,0.2231 0.0968,0.10516 -0.0968,0.34114 0,0.44633 0.0483,0.0527 0.17471,-0.0666 0.2053,0 0.0613,0.13315 -0.0611,0.31329 0,0.44636 0.0306,0.0666 0.15693,-0.0527 0.20532,0 0.0483,0.0527 -0.0306,0.15679 0,0.22309 0.0432,0.0941 0.16208,0.12907 0.2053,0.2231 0.0306,0.0666 -0.0306,0.15653 0,0.2231 0.0548,0.11929 0.50777,0.55204 0.61585,0.66953 0.10806,0.11739 0.50621,0.60992 0.61586,0.66954 0.1224,0.0666 0.28815,-0.0666 0.41054,0 0.85436,0.4644 -0.21945,-0.0163 0.20531,0.44633 0.0483,0.0527 0.14411,-0.0332 0.20531,0 0.0866,0.047 0.11868,0.17609 0.20531,0.2231 0.0611,0.0332 0.15693,-0.0527 0.2053,0 0.0485,0.0527 -0.0483,0.17065 0,0.2231 0.0485,0.0527 0.14411,-0.0332 0.20532,0 0.0866,0.047 0.11867,0.17608 0.2053,0.22309 0.0815,0.0443 0.57389,-0.0457 0.61586,0 0.0484,0.0527 -0.0483,0.17066 0,0.2231 0.0484,0.0527 0.15692,-0.0527 0.20531,0 0.0484,0.0527 -0.0483,0.17066 0,0.2231 0.0968,0.10516 0.28073,-0.047 0.41056,0 0.14513,0.0527 0.2654,0.17065 0.41057,0.22309 0.065,0.0245 0.1441,-0.0332 0.20531,0 0.0866,0.047 0.11867,0.17609 0.2053,0.2231 0.0742,0.0402 0.88363,0 1.02642,0 0.34213,0 0.68427,0 1.02641,0 0.13687,0 0.2737,0 0.41055,0 0.0685,0 0.20531,-0.0745 0.20531,0 0,0.0217 -0.68082,0.0245 0,-0.2231 0.12984,-0.047 0.27372,0 0.41057,0 0.0685,0 0.14411,0.0332 0.20532,0 0.50732,-0.27578 -0.0709,-0.22309 0.41054,-0.22309"
+       id="path2916-76" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.47905955px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 239.98155,252.51487 c -0.0909,0.21902 -0.0909,0.54774 -0.2728,0.65731 -0.98403,0.59276 -0.6024,-0.58881 -1.36388,0.32864 -0.1437,0.17309 -0.12901,0.48407 -0.27279,0.65728 -0.14369,0.17309 -0.3637,0.21902 -0.54555,0.32867 -0.18194,0.10951 -0.35268,0.25108 -0.54556,0.32864 -0.15383,0.0617 -0.6391,0 -0.81834,0 -0.091,0 -0.20848,0.0775 -0.27276,0 -0.12861,-0.1549 0.12859,-0.50237 0,-0.65731 -0.12861,-0.15489 -0.41699,0.15488 -0.54557,0 -0.1286,-0.15489 0.12861,-0.50237 0,-0.65728 -0.0643,-0.0775 -0.20849,0.0775 -0.27277,0 -0.1286,-0.1549 0.0813,-0.46134 0,-0.65728 -0.0575,-0.1386 -0.2153,-0.19022 -0.27279,-0.32867 -0.0542,-0.13017 0.0558,-0.91875 0,-0.98592 -0.0643,-0.0775 -0.20849,0.0775 -0.27277,0 -0.12861,-0.1549 0.12859,-0.50237 0,-0.65731 -0.0643,-0.0775 -0.2085,0.0775 -0.2728,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.1386 -0.21525,-0.19022 -0.27277,-0.32864 -0.0416,-0.10001 0,-0.83793 0,-0.98595 0,-0.10951 0,-0.21902 0,-0.32864 0,-0.10951 -0.0408,-0.23071 0,-0.32864 0.0575,-0.1386 0.15775,-0.25924 0.27277,-0.32864 0.0986,-0.0595 1.17418,0 1.3639,0 0.18194,0 0.3637,0 0.54556,0 0.0909,0 0.27277,-0.10951 0.27277,0 0,0.10951 -0.20849,0.0775 -0.27277,0 -0.0643,-0.0775 0.0408,-0.23071 0,-0.32864 -0.0575,-0.1386 -0.21527,-0.19022 -0.27276,-0.32867 -0.0408,-0.0981 0.0408,-0.23071 0,-0.32864 -0.0575,-0.13859 -0.23213,-0.18152 -0.2728,-0.32864 -0.0575,-0.20789 0.044,-0.44473 0,-0.65728 -0.0494,-0.23778 -0.20847,-0.42493 -0.27277,-0.65731 -0.0288,-0.1038 0,-0.21902 0,-0.32864 0,-0.21902 0,-0.43821 0,-0.65728 0,-1.20505 0,-2.41008 0,-3.61513 0,-0.13831 -0.0405,-1.8741 0,-1.97187 0.0575,-0.13859 0.21527,-0.18995 0.27277,-0.32864 0.0408,-0.0981 -0.0408,-0.23071 0,-0.32864 0.0575,-0.13859 0.18194,-0.21902 0.2728,-0.32867 0.0909,-0.10951 0.15774,-0.25924 0.27276,-0.32864 0.0813,-0.0489 0.18649,0.0348 0.27277,0 0.19291,-0.0775 0.34833,-0.2693 0.54557,-0.32864 0.35285,-0.10625 0.73826,0.10625 1.09111,0 0.19724,-0.0595 0.34832,-0.2693 0.54557,-0.32864 0.24353,-0.0734 1.04813,0 1.3639,0 0.0909,0 0.20847,-0.0775 0.27276,0 0.0643,0.0775 -0.0408,0.23071 0,0.32864 0.56762,1.36773 -0.0186,-0.35133 0.54557,0.32864 0.0643,0.0775 -0.0643,0.25108 0,0.32864 0.0643,0.0775 0.20847,-0.0775 0.27277,0 0.1286,0.15489 -0.12861,0.50236 0,0.65731 0.0643,0.0775 0.20849,-0.0775 0.27278,0 0.1625,0.19592 -0.27224,0.98592 0.27278,0.98592 0.025,0 -0.0314,-0.92927 0,-0.98592 0.14266,-0.25788 0.39125,-0.40943 0.54557,-0.65731 0.12198,-0.19593 0.16003,-0.45348 0.27277,-0.65728 0.15693,-0.28358 0.60528,-0.72924 0.81833,-0.98595 0.0909,-0.10951 0.18195,-0.21902 0.27278,-0.32864 0.0909,-0.10951 0.15775,-0.25924 0.27279,-0.32864 0.0831,-0.05 0.69548,0 0.81833,0 0.2196,0 0.9199,-0.0688 1.09111,0 0.1929,0.0775 0.34833,0.2693 0.54557,0.32864 0.44104,0.13288 0.91807,-0.10734 1.36388,0 0.19931,0.0481 0.345,0.28837 0.54555,0.32864 0.35878,0.072 0.72741,0 1.09112,0 0.27279,0 0.54556,0 0.81833,0 0.18194,0 0.36914,-0.0533 0.54557,0 0.39449,0.11875 0.69662,0.53847 1.09111,0.65731 0.17636,0.0533 0.36372,0 0.54555,0 0.0909,0 0.19146,-0.0489 0.2728,0 0.11494,0.0693 0.15776,0.25924 0.27277,0.32864 0.0813,0.0489 0.19146,-0.0489 0.27278,0 0.11493,0.0693 0.18194,0.21902 0.27278,0.32864 0.0909,0.10951 0.21526,0.19022 0.27277,0.32864 0.0408,0.0981 0,0.21902 0,0.32867 0,0.21902 0.0575,0.44943 0,0.65728 -0.0643,0.23233 -0.20849,0.42491 -0.27277,0.65728 -0.0288,0.10407 0.0408,0.23071 0,0.32867 -0.0575,0.13858 -0.21527,0.18994 -0.27278,0.32864 -0.0408,0.0981 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 -0.0643,0.40611 0,0.32864 0.14368,-0.17309 0.12901,-0.48408 0.27278,-0.65728 0.1437,-0.1731 0.36371,-0.21902 0.54555,-0.32864 0.36371,-0.21902 0.71357,-0.47535 1.09113,-0.65731 0.26696,-0.12854 0.54554,-0.21902 0.81834,-0.32864 0.27276,-0.10951 0.55134,-0.2 0.81833,-0.32864 0.18877,-0.0911 0.3483,-0.2693 0.54555,-0.32864 0.24729,-0.0745 1.04702,0 1.3639,0 0.18194,0 0.36369,0 0.54556,0 0.18174,0 0.37302,-0.0693 0.54554,0 0.24399,0.0981 0.33157,0.48541 0.54556,0.65728 0.16913,0.13587 0.34833,0.26929 0.54557,0.32864 0.17636,0.0533 0.39424,-0.12147 0.54555,0 0.16912,0.13587 0.10364,0.52141 0.27278,0.65731 1.29647,1.04132 -0.2293,-1.26223 1.09112,0.32864 0.14368,0.17309 0.15072,0.46133 0.27278,0.65728 0.15424,0.24782 0.3398,0.47138 0.54555,0.65731 0.59077,0.53382 0.63556,0.0712 1.09113,0.98592 0.52153,1.88515 -0.0805,0.19972 0.81833,1.64326 0.12199,0.19591 0.15073,0.4613 0.27277,0.65728 0.15424,0.24782 0.43055,0.38015 0.54557,0.65728 0.0813,0.19592 -0.0813,0.46133 0,0.65731 0.0408,0.0981 0.20849,-0.0775 0.27277,0 0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.35411,0.0489 -0.27277,0 0.25718,-0.1549 0.55135,-0.20001 0.81833,-0.32864 0.37756,-0.18207 0.69662,-0.53849 1.09111,-0.65731 0.17636,-0.0533 0.36914,0.0533 0.54557,0 0.39448,-0.11875 0.71354,-0.47533 1.0911,-0.65728 0.86523,-0.41699 1.08288,-0.32864 1.90947,-0.32864 0.12281,0 0.7353,-0.05 0.81833,0 0.11494,0.0693 0.16581,0.24266 0.27277,0.32864 0.16913,0.13586 0.37638,0.19265 0.54556,0.32864 0.21398,0.17173 0.31554,0.51872 0.54555,0.65731 0.0813,0.0489 0.19145,-0.0489 0.2728,0 0.11493,0.0693 0.18194,0.21902 0.27277,0.32864 0.0909,0.10951 0.21527,0.18994 0.27277,0.32864 0.0408,0.0981 -0.0408,0.2307 0,0.32864 0.0575,0.13858 0.23212,0.18179 0.27279,0.32864 0.0248,0.0897 0.0211,1.86985 0,1.9719 -0.0491,0.23749 -0.16003,0.45347 -0.27279,0.65728 -0.14266,0.25788 -0.40288,0.39948 -0.54554,0.65728 -0.11284,0.2038 -0.16003,0.45347 -0.2728,0.65731 -0.25017,0.45211 -0.42081,0.33798 -0.81833,0.65728 -0.1069,0.0859 -0.14805,0.29108 -0.27278,0.32864 -2.04329,0.61546 0.18712,-0.60568 -1.3639,0.32867 -0.18194,0.10951 -0.35265,0.25108 -0.54554,0.32864 -0.16374,0.0658 -1.14622,0 -1.3639,0 -0.0909,0 -0.18195,0 -0.27277,0 -0.0909,0 -0.20849,-0.0775 -0.27279,0 -0.0643,0.0775 0.0643,0.25108 0,0.32864 -0.0643,0.0775 -0.27277,0.10951 -0.27277,0 0,-0.10951 0.20849,-0.0775 0.27277,0 0.5644,0.67997 -0.86246,-0.0272 0.27279,0.65728 0.67284,0.40534 -0.16375,-0.92019 0.27277,0.65731 0.0813,0.29394 0.46423,0.36334 0.54554,0.65728 0.0575,0.20788 -0.0575,0.44945 0,0.65731 0.0408,0.14701 0.2153,0.19021 0.2728,0.32864 0.0354,0.0851 0.0336,1.85032 0,1.97187 -0.0643,0.23233 -0.16003,0.45347 -0.2728,0.65731 -0.14266,0.25787 -0.36369,0.43817 -0.54554,0.65728 -0.18195,0.21902 -0.3637,0.4382 -0.54556,0.65727 -0.091,0.10951 -0.16582,0.24267 -0.27277,0.32867 -0.16913,0.13587 -0.37641,0.19266 -0.54557,0.32864 -0.10691,0.0859 -0.15073,0.27965 -0.27277,0.32864 -0.17244,0.0693 -0.37671,-0.0813 -0.54557,0 -0.30437,0.14674 -0.50731,0.53239 -0.81833,0.65728 -0.0448,0.019 -1.54917,-0.0163 -1.63667,0 -2.15424,0.43259 0.49103,0.32867 -1.63668,0.32867 -0.17553,0 -1.72485,0.0557 -1.90945,0 -0.19725,-0.0595 -0.36371,-0.21903 -0.54555,-0.32867 -0.27277,-0.10951 -0.53638,-0.26059 -0.81833,-0.32864 -0.17844,-0.043 -0.37305,0.0693 -0.54557,0 -0.12198,-0.0489 -0.16582,-0.24266 -0.27277,-0.32864 -0.16913,-0.13587 -0.3764,-0.19266 -0.54556,-0.32864 -0.10714,-0.0859 -0.15776,-0.25923 -0.27278,-0.32864 -0.0813,-0.0489 -0.19145,0.0489 -0.27279,0 -0.14163,-0.0853 -0.73367,-0.98594 -0.81833,-0.98594 -0.091,0 -0.0408,0.2307 0,0.32864 0.0575,0.13858 0.21527,0.19021 0.27278,0.32863 0.0408,0.0981 0,0.21902 0,0.32867 0,0.10951 0.0408,0.2307 0,0.32864 -0.12487,0.30081 -0.619,0.57723 -0.81833,0.65728 -0.0862,0.0348 -0.19146,-0.0489 -0.2728,0 -0.83185,0.50112 0.49891,0.2606 -0.81833,0.65731 -0.17636,0.0533 -0.3637,0 -0.54554,0 -0.6365,0 -1.27297,0 -1.90946,0 -0.23761,0 -1.53598,0.0606 -1.63668,0 -0.11493,-0.0693 -0.16581,-0.24266 -0.27277,-0.32867 -0.33836,-0.27174 -0.7658,-0.36332 -1.09113,-0.65728 -0.0269,-0.0245 -0.99383,-1.13877 -1.0911,-1.31458 -0.11284,-0.20381 -0.12902,-0.48408 -0.27278,-0.65728 -0.1437,-0.17311 -0.43277,-0.12474 -0.54557,-0.32864 -0.10084,-0.18234 0.044,-0.44476 0,-0.65731 0.49396,-1.37498 -0.43054,-0.38017 -0.54555,-0.65728 -0.0813,-0.19593 0.0813,-0.46134 0,-0.65731 -0.0408,-0.0981 -0.18175,0 -0.27278,0 0,-0.21902 0,-0.43818 0,-0.65728 0,-0.10951 0,0.21902 0,0.32864 0,0.10951 0,0.21902 0,0.32864 0,0.10951 0.0408,0.2307 0,0.32867 -0.0565,0.13586 -0.70272,0.89306 -0.81833,0.98592 -0.16913,0.13586 -0.35268,0.25108 -0.54557,0.32864 -0.16106,0.0647 -1.21148,0 -1.36388,0 -0.23096,0 -0.94448,0.059 -1.09112,0 -0.12198,-0.0489 -0.18194,-0.21902 -0.27278,-0.32864 -0.0909,-0.10951 -0.16581,-0.24267 -0.27279,-0.32864 -0.16912,-0.13588 -0.40178,-0.15544 -0.54554,-0.32864 -1.394,-1.67951 1.14374,0.45836 -0.81834,-1.31459 -0.16272,-0.14701 -0.43278,-0.12474 -0.54556,-0.32864 -0.10096,-0.18234 0.0575,-0.44946 0,-0.65731 -0.0813,-0.29394 -0.46423,-0.36334 -0.54557,-0.65728 -0.0575,-0.20789 0.0575,-0.44946 0,-0.65731 -0.0408,-0.14701 -0.23209,-0.18152 -0.27277,-0.32864 -0.0575,-0.20789 0.0813,-0.46131 0,-0.65728 -0.0408,-0.0981 -0.31955,0.094 -0.27276,0 0.29954,-0.6015 0.72739,-1.09549 0,-0.65731 z"
+       id="path2906-0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 239.45299,259.32966 c 0,0.29755 0,0.59514 0,0.89268 0,1.48038 0.0968,-0.31562 -0.2053,0.66954 -0.065,0.21168 0,0.44636 0,0.66954 0,0.52073 0,1.04149 0,1.56222 0,0.0541 0.006,0.66237 0,0.66954 -0.0484,0.0527 -0.15693,-0.0527 -0.20531,0 -0.0483,0.0527 0,0.14892 0,0.22309 0,0.44636 0,0.89272 0,1.33908 0,0.0745 -0.0483,0.17065 0,0.2231 0.0484,0.0527 0.15692,-0.0527 0.20531,0 0.0483,0.0527 0,0.14891 0,0.2231 0,0.0745 0,0.1489 0,0.22309"
+       id="path2908-80" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 242.73752,260.44552 c 0,0.0745 -0.0306,0.15653 0,0.2231 0.0432,0.094 0.1621,0.12908 0.20531,0.2231 0.0457,0.0995 -0.0312,0.79062 0,0.89272 0.0306,0.0997 0.17471,0.12336 0.2053,0.2231 0.0378,0.12336 0,1.11428 0,1.33904 0,0.96708 0,1.93421 0,2.90129"
+       id="path2910-9" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 258.13377,263.12364 c 0,0.44636 0,0.89271 0,1.33907 0,0.0745 0,0.14865 0,0.2231 0,0.0745 0.0306,0.15653 0,0.2231 -0.0432,0.0941 -0.16209,0.12907 -0.20531,0.2231 -0.0306,0.0666 0,0.14891 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.15515 0.037,1.03518 0,1.11589 -0.0432,0.094 -0.16209,0.12908 -0.2053,0.22309 -0.0821,0.17854 0.0821,0.49099 0,0.66954 -0.0432,0.094 -0.1621,0.12908 -0.20531,0.2231 -0.0312,0.068 0,0.56902 0,0.6695"
+       id="path2912-84" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 255.67037,263.57 c 0,0.37196 0,0.74391 0,1.11589 0,0.44636 0,0.8927 0,1.33905 0,0.0745 0,0.14891 0,0.22309 0,0.0745 0.0306,0.15653 0,0.2231 -0.0432,0.094 -0.1621,0.12908 -0.20531,0.2231 -0.0709,0.15408 0.0722,1.03756 0,1.1159 -0.0483,0.0527 -0.15693,-0.0527 -0.2053,0 -0.0493,0.0536 0.0467,0.89268 0,0.89268 -0.0685,0 0,-0.14891 0,-0.22309"
+       id="path2914-8" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.34246901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 235.34731,239.24373 c -0.21235,0 -0.28373,0.0527 -0.41056,-0.2231 -0.0306,-0.0666 0.0483,-0.17065 0,-0.22309 -0.0485,-0.0527 -0.14411,0.0332 -0.20532,0 -0.0866,-0.047 -0.11867,-0.1761 -0.2053,-0.2231 -0.16416,-0.0894 -0.45164,0.0892 -0.61586,0 -0.0866,-0.047 -0.11869,-0.17609 -0.20531,-0.2231 -0.12902,-0.0701 -0.69211,0.0701 -0.82115,0 -0.0866,-0.047 -0.11354,-0.18994 -0.2053,-0.2231 -0.19477,-0.0707 -0.41056,0 -0.61584,0 -0.54743,0 -1.09485,0 -1.64227,0 -0.41056,0 -0.82114,0 -1.23171,0 -0.13688,0 -0.28816,-0.0666 -0.41056,0 -0.0613,0.0332 0.0484,0.17065 0,0.2231 -0.0483,0.0527 -0.14411,-0.0332 -0.2053,0 -0.0866,0.047 -0.11867,0.17609 -0.20531,0.2231 -0.0815,0.0443 -0.57388,-0.0457 -0.61584,0 -0.0484,0.0527 0.0484,0.17065 0,0.2231 -0.0484,0.0527 -0.15693,-0.0527 -0.2053,0 -0.0485,0.0527 0.0483,0.17065 0,0.22309 -0.42474,0.46177 0.0165,-0.70562 -0.41058,0.2231 -0.0306,0.0666 0.0306,0.15652 0,0.22309 -0.0432,0.094 -0.1621,0.12909 -0.2053,0.2231 -0.0306,0.0666 0.0306,0.15653 0,0.2231 -0.0432,0.0941 -0.1621,0.12907 -0.20532,0.2231 -0.0306,0.0666 0,0.14864 0,0.2231 0,0.0745 0,0.14864 0,0.2231 0,0.37194 0,0.7439 0,1.11586 0,0.0745 0,0.14891 0,0.2231 0,0.0745 0.0306,0.15652 0,0.2231 -0.0432,0.094 -0.1621,0.12907 -0.2053,0.22309 -0.0373,0.0807 0,0.96068 0,1.11589 0,0.11685 -0.0271,0.83402 0,0.89272 0.42715,0.9288 -0.0144,-0.23859 0.41055,0.2231 0.0968,0.10516 -0.0968,0.34114 0,0.44633 0.0484,0.0527 0.17471,-0.0666 0.20531,0 0.0611,0.13315 -0.0613,0.31329 0,0.44636 0.0306,0.0666 0.15693,-0.0527 0.2053,0 0.0484,0.0527 -0.0306,0.15679 0,0.22309 0.0432,0.094 0.1621,0.12907 0.20532,0.2231 0.0306,0.0666 -0.0306,0.15653 0,0.2231 0.0547,0.11929 0.50776,0.55204 0.61583,0.66953 0.10818,0.11739 0.50622,0.60992 0.61586,0.66954 0.1224,0.0666 0.28816,-0.0666 0.41056,0 0.85435,0.4644 -0.21945,-0.0163 0.2053,0.44633 0.0484,0.0527 0.14412,-0.0332 0.20531,0 0.0866,0.047 0.11868,0.17609 0.2053,0.2231 0.0613,0.0332 0.15693,-0.0527 0.20532,0 0.0484,0.0527 -0.0485,0.17065 0,0.2231 0.0484,0.0527 0.14411,-0.0332 0.2053,0 0.0866,0.047 0.11869,0.17608 0.20531,0.22309 0.0815,0.0443 0.57389,-0.0457 0.61586,0 0.0485,0.0527 -0.0484,0.17066 0,0.2231 0.0485,0.0527 0.15693,-0.0527 0.20532,0 0.0483,0.0527 -0.0484,0.17066 0,0.2231 0.0968,0.10516 0.28072,-0.047 0.41054,0 0.14515,0.0527 0.26542,0.17065 0.41058,0.22309 0.0649,0.0245 0.14411,-0.0332 0.2053,0 0.0866,0.047 0.11868,0.17609 0.20532,0.2231 0.0742,0.0402 0.88362,0 1.0264,0 0.34214,0 0.68429,0 1.02642,0 0.13687,0 0.2737,0 0.41056,0 0.0685,0 0.2053,-0.0745 0.2053,0 0,0.0217 -0.68082,0.0245 0,-0.2231 0.12984,-0.047 0.27373,0 0.41058,0 0.0685,0 0.14411,0.0332 0.2053,0 0.50734,-0.27578 -0.0709,-0.22309 0.41056,-0.22309"
+       id="path2916-3" />
+  </g>
+</svg>
diff --git a/public/potlatch2/features/waterway__stream.png b/public/potlatch2/features/waterway__stream.png
new file mode 100644 (file)
index 0000000..1772d46
Binary files /dev/null and b/public/potlatch2/features/waterway__stream.png differ
diff --git a/public/potlatch2/features/waterway__stream.svg b/public/potlatch2/features/waterway__stream.svg
new file mode 100644 (file)
index 0000000..3380ca1
--- /dev/null
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="343pt"
+   height="340pt"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="waterway__stream.svg"
+   inkscape:export-filename="/home/andy/src/potlatch2/resources/features/waterway__stream.png"
+   inkscape:export-xdpi="8.3623695"
+   inkscape:export-ydpi="8.3623695">
+  <defs
+     id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3619">
+      <stop
+         style="stop-color:#00ffff;stop-opacity:1;"
+         offset="0"
+         id="stop3621" />
+      <stop
+         style="stop-color:#00ffff;stop-opacity:0;"
+         offset="1"
+         id="stop3623" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3609">
+      <stop
+         style="stop-color:#008000;stop-opacity:1;"
+         offset="0"
+         id="stop3611" />
+      <stop
+         style="stop-color:#008000;stop-opacity:0;"
+         offset="1"
+         id="stop3613" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 212.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="428.75 : 212.5 : 1"
+       inkscape:persp3d-origin="214.375 : 141.66667 : 1"
+       id="perspective2825" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3609"
+       id="linearGradient3615"
+       x1="215"
+       y1="188.25"
+       x2="215"
+       y2="430.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3619"
+       id="linearGradient3625"
+       x1="215"
+       y1="188.75"
+       x2="215"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001462,0,0,1,-1.2518275,0)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.6"
+     inkscape:cx="187.35182"
+     inkscape:cy="219.75636"
+     inkscape:document-units="pt"
+     inkscape:current-layer="layer1"
+     id="namedview2820"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1026"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:url(#linearGradient3615);fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       id="rect2827"
+       width="430"
+       height="241.25"
+       x="0"
+       y="188.75" />
+    <rect
+       style="fill:url(#linearGradient3625);fill-opacity:1"
+       id="rect3617"
+       width="428.125"
+       height="188.75"
+       x="0"
+       y="-6.5955419e-10" />
+    <path
+       style="fill:#3144d6;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 125,193.125 137.5,230.625 130.625,0 -226.875,-230.625 -41.25,0 z"
+       id="path2904"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.39884067px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 289.73421,231.54044 c -0.27683,0.61358 -0.27683,1.53394 -0.8305,1.84073 -2.99595,1.66007 -1.83405,-1.64894 -4.15247,0.92036 -0.43771,0.48507 -0.39279,1.35566 -0.8305,1.84073 -0.4377,0.48507 -1.10732,0.61358 -1.66099,0.92036 -0.55367,0.30679 -1.07374,0.70344 -1.66099,0.92037 -0.46856,0.17308 -1.94576,0 -2.49148,0 -0.27683,0 -0.63475,0.21692 -0.8305,0 -0.3915,-0.43387 0.3915,-1.40686 0,-1.84073 -0.3915,-0.43387 -1.26949,0.43387 -1.66099,0 -0.3915,-0.43387 0.3915,-1.40686 0,-1.84073 -0.19574,-0.21693 -0.63475,0.21693 -0.83049,0 -0.3915,-0.43387 0.2476,-1.29192 0,-1.84073 -0.17508,-0.38805 -0.65542,-0.53231 -0.8305,-0.92036 -0.16464,-0.36492 0.16978,-2.57294 0,-2.76109 -0.19574,-0.21693 -0.63475,0.21692 -0.83049,0 -0.3915,-0.43387 0.3915,-1.40686 0,-1.84073 -0.19575,-0.21693 -0.63475,0.21693 -0.8305,0 -0.19574,-0.21693 0.12385,-0.64596 0,-0.92036 -0.17508,-0.38806 -0.65541,-0.53231 -0.83049,-0.92037 -0.12637,-0.2801 0,-2.3466 0,-2.76109 0,-0.30678 0,-0.61358 0,-0.92036 0,-0.30679 -0.12385,-0.64597 0,-0.92037 0.17508,-0.38805 0.48033,-0.72633 0.83049,-0.92036 0.30034,-0.16642 3.57484,0 4.15248,0 0.55366,0 1.10732,0 1.66099,0 0.27682,0 0.83049,-0.30678 0.83049,0 0,0.30678 -0.63475,0.21693 -0.83049,0 -0.19575,-0.21693 0.12384,-0.64596 0,-0.92036 -0.17508,-0.38806 -0.65542,-0.53231 -0.8305,-0.92037 -0.12384,-0.2744 0.12385,-0.64596 0,-0.92036 -0.17508,-0.38806 -0.70669,-0.50876 -0.83049,-0.92037 -0.17508,-0.58208 0.13428,-1.24546 0,-1.84072 -0.15013,-0.66552 -0.63475,-1.18994 -0.8305,-1.84073 -0.0876,-0.29104 0,-0.61358 0,-0.92036 0,-0.61359 0,-1.22715 0,-1.84073 0,-3.37467 0,-6.74933 0,-10.124 0,-0.38716 -0.12358,-5.2484 0,-5.52219 0.17508,-0.38805 0.65542,-0.53231 0.8305,-0.92036 0.12384,-0.2744 -0.12385,-0.64596 0,-0.92036 0.17508,-0.38806 0.55366,-0.61359 0.83049,-0.92037 0.27683,-0.30678 0.48033,-0.72633 0.8305,-0.92036 0.2476,-0.13725 0.56787,0.097 0.83049,0 0.58725,-0.21693 1.06046,-0.75399 1.66099,-0.92037 1.07426,-0.29762 2.24772,0.29763 3.32198,0 0.60054,-0.16637 1.06046,-0.75399 1.66099,-0.92036 0.74145,-0.20543 3.19116,0 4.15248,0 0.27682,0 0.63475,-0.21693 0.83049,0 0.19575,0.21693 -0.12384,0.64596 0,0.92036 1.72816,3.83034 -0.0574,-0.9839 1.66099,0.92037 0.19575,0.21692 -0.19574,0.70344 0,0.92036 0.19575,0.21693 0.63475,-0.21692 0.8305,0 0.3915,0.43387 -0.39151,1.40686 0,1.84073 0.19574,0.21693 0.63475,-0.21693 0.83049,0 0.49483,0.54837 -0.82889,2.76109 0.8305,2.76109 0.0764,0 -0.0954,-2.60241 0,-2.76109 0.43433,-0.72199 1.19119,-1.14655 1.66099,-1.84073 0.37141,-0.5488 0.48712,-1.26994 0.83049,-1.84073 0.47776,-0.79417 1.8428,-2.0422 2.49149,-2.76109 0.27682,-0.30678 0.55366,-0.61358 0.83049,-0.92036 0.27683,-0.30678 0.48033,-0.72634 0.8305,-0.92037 0.25275,-0.14004 2.11747,0 2.49148,0 0.66858,0 2.80072,-0.19255 3.32198,0 0.58725,0.21693 1.06046,0.754 1.66099,0.92037 1.34284,0.37203 2.79519,-0.30084 4.15248,0 0.60699,0.13459 1.05039,0.80759 1.66099,0.92036 1.09225,0.20175 2.21465,0 3.32198,0 0.83049,0 1.66099,0 2.49148,0 0.55367,0 1.12385,-0.14882 1.66099,0 1.20107,0.33276 2.12091,1.50797 3.32198,1.84073 0.53714,0.14882 1.10732,0 1.66099,0 0.27683,0 0.58289,-0.13724 0.8305,0 0.35016,0.19403 0.48033,0.72634 0.83049,0.92036 0.24761,0.13725 0.58289,-0.13724 0.8305,0 0.35016,0.19403 0.55366,0.61358 0.83049,0.92037 0.27683,0.30678 0.65541,0.53231 0.8305,0.92036 0.12384,0.2744 0,0.61358 0,0.92037 0,0.61358 0.17508,1.25864 0,1.84072 -0.19575,0.6508 -0.63476,1.18994 -0.8305,1.84073 -0.0876,0.29104 0.12384,0.64596 0,0.92036 -0.17508,0.38806 -0.65541,0.53231 -0.83049,0.92037 -0.12385,0.2744 0,0.61358 0,0.92036 0,0.30679 0,0.61358 0,0.92037 0,0.30678 -0.19575,1.13729 0,0.92036 0.4377,-0.48507 0.39279,-1.35566 0.83049,-1.84073 0.4377,-0.48507 1.10732,-0.61358 1.66099,-0.92036 1.10732,-0.61358 2.1725,-1.33119 3.32198,-1.84073 0.81281,-0.36031 1.66099,-0.61358 2.49149,-0.92036 0.83049,-0.30679 1.67867,-0.56006 2.49148,-0.92037 0.57474,-0.25477 1.06046,-0.75399 1.66099,-0.92036 0.75288,-0.20859 3.18772,0 4.15248,0 0.55366,0 1.10732,0 1.66099,0 0.55366,0 1.13574,-0.19403 1.66098,0 0.74283,0.2744 1.0095,1.3594 1.66099,1.84073 0.51506,0.38053 1.06046,0.75399 1.66099,0.92036 0.53714,0.14882 1.20032,-0.34036 1.66099,0 0.51506,0.38053 0.31545,1.4602 0.8305,1.84073 3.94716,2.9162 -0.69816,-3.5348 3.32198,0.92036 0.4377,0.48507 0.45908,1.29193 0.83049,1.84073 0.4698,0.69417 1.0346,1.3201 1.66099,1.84073 1.79866,1.49496 1.93502,0.19933 3.32198,2.76109 1.58792,5.27926 -0.24452,0.55905 2.49149,4.60182 0.37141,0.5488 0.45908,1.29192 0.83049,1.84073 0.4698,0.69417 1.31083,1.0646 1.66099,1.84072 0.24761,0.54881 -0.2476,1.29193 0,1.84073 0.12385,0.2744 0.63476,-0.21693 0.8305,0 0.19574,0.21693 0.19574,0.70344 0,0.92036 -0.19574,0.21693 -1.0781,0.13725 -0.8305,0 0.78301,-0.43386 1.67868,-0.56005 2.49149,-0.92036 1.14948,-0.50954 2.12091,-1.50797 3.32198,-1.84073 0.53714,-0.14882 1.12385,0.14882 1.66099,0 1.20107,-0.33276 2.17249,-1.33118 3.32198,-1.84072 2.63425,-1.16773 3.29688,-0.92037 5.81346,-0.92037 0.37402,0 2.23874,-0.14004 2.49149,0 0.35016,0.19403 0.50474,0.6797 0.83049,0.92037 0.51506,0.38053 1.14594,0.53983 1.66099,0.92036 0.6515,0.48133 0.96065,1.45267 1.66099,1.84073 0.24761,0.13724 0.58289,-0.13725 0.8305,0 0.35016,0.19402 0.55367,0.61358 0.83049,0.92036 0.27683,0.30678 0.65542,0.53231 0.8305,0.92036 0.12384,0.27441 -0.12384,0.64597 0,0.92037 0.17508,0.38805 0.70669,0.50876 0.83049,0.92036 0.0756,0.25139 0.0645,5.23647 0,5.52219 -0.15012,0.66551 -0.48712,1.26994 -0.83049,1.84072 -0.43433,0.722 -1.22666,1.11874 -1.66099,1.84073 -0.34337,0.57079 -0.48712,1.26994 -0.8305,1.84073 -0.76167,1.26614 -1.28122,0.94657 -2.49148,1.84073 -0.32575,0.24066 -0.45069,0.81513 -0.8305,0.92036 -6.22099,1.72354 0.56976,-1.69625 -4.15247,0.92036 -0.55367,0.30679 -1.07374,0.70344 -1.66099,0.92037 -0.49824,0.18406 -3.48978,0 -4.15248,0 -0.27682,0 -0.55366,0 -0.83049,0 -0.27683,0 -0.63475,-0.21693 -0.8305,0 -0.19574,0.21692 0.19575,0.70343 0,0.92036 -0.19574,0.21693 -0.83049,0.30678 -0.83049,0 0,-0.30678 0.63475,-0.21693 0.83049,0 1.71833,1.90427 -2.62582,-0.0744 0.8305,1.84073 2.04856,1.13511 -0.4983,-2.57702 0.83049,1.84073 0.24761,0.8232 1.41339,1.01752 1.66099,1.84072 0.17509,0.58209 -0.17508,1.25865 0,1.84073 0.12385,0.4116 0.65542,0.53231 0.8305,0.92037 0.10737,0.23807 0.10232,5.18178 0,5.52218 -0.19575,0.65079 -0.48712,1.26994 -0.8305,1.84073 -0.43432,0.72199 -1.10732,1.22714 -1.66099,1.84072 -0.55366,0.61358 -1.10732,1.22715 -1.66099,1.84073 -0.27682,0.30678 -0.50474,0.6797 -0.83049,0.92036 -0.51505,0.38053 -1.14594,0.53984 -1.66099,0.92037 -0.32575,0.24066 -0.45909,0.78316 -0.8305,0.92036 -0.52524,0.19403 -1.14692,-0.22788 -1.66099,0 -0.92674,0.41081 -1.54457,1.49093 -2.49148,1.84073 -0.13685,0.0505 -4.71659,-0.0492 -4.98297,0 -6.55872,1.21141 1.49501,0.92036 -4.98297,0.92036 -0.53443,0 -5.25143,0.15571 -5.81347,0 -0.60053,-0.16637 -1.10732,-0.61358 -1.66099,-0.92036 -0.83049,-0.30678 -1.63307,-0.73011 -2.49148,-0.92036 -0.54292,-0.12031 -1.13575,0.19402 -1.66099,0 -0.37141,-0.13725 -0.50474,-0.6797 -0.83049,-0.92037 -0.51506,-0.38053 -1.14594,-0.53983 -1.66099,-0.92036 -0.32576,-0.24067 -0.48034,-0.72634 -0.8305,-0.92037 -0.24761,-0.13724 -0.58289,0.13725 -0.83049,0 -0.43089,-0.23874 -2.23373,-2.76109 -2.49149,-2.76109 -0.27683,0 -0.12384,0.64597 0,0.92037 0.17508,0.38805 0.65541,0.53231 0.8305,0.92036 0.12384,0.2744 0,0.61358 0,0.92036 0,0.30679 0.12384,0.64597 0,0.92037 -0.38009,0.84243 -1.88458,1.61653 -2.49149,1.84073 -0.26262,0.097 -0.58289,-0.13725 -0.83049,0 -2.53266,1.40335 1.51892,0.72963 -2.49149,1.84072 -0.53714,0.14882 -1.10732,0 -1.66099,0 -1.93782,0 -3.87565,0 -5.81346,0 -0.72343,0 -4.67644,0.16985 -4.98297,0 -0.35017,-0.19402 -0.50475,-0.6797 -0.8305,-0.92036 -1.03011,-0.76104 -2.33155,-1.01752 -3.32198,-1.84073 -0.0818,-0.068 -3.0258,-3.18912 -3.32198,-3.68145 -0.34337,-0.57079 -0.39279,-1.35566 -0.83049,-1.84073 -0.43771,-0.48507 -1.31762,-0.34958 -1.66099,-0.92036 -0.30713,-0.51053 0.13428,-1.24547 0,-1.84073 1.5039,-3.85058 -1.31083,-1.06461 -1.66099,-1.84073 -0.24761,-0.5488 0.2476,-1.29193 0,-1.84073 -0.12385,-0.2744 -0.55367,0 -0.8305,0 0,-0.61358 0,-1.22714 0,-1.84072 0,-0.30679 0,0.61358 0,0.92036 0,0.30678 0,0.61358 0,0.92036 0,0.30679 0.12384,0.64597 0,0.92037 -0.17181,0.38079 -2.13947,2.50102 -2.49148,2.76109 -0.51506,0.38053 -1.07375,0.70344 -1.66099,0.92036 -0.4901,0.18104 -3.68846,0 -4.15248,0 -0.70314,0 -2.8755,0.16493 -3.32198,0 -0.37141,-0.13724 -0.55367,-0.61358 -0.83049,-0.92036 -0.27683,-0.30678 -0.50475,-0.6797 -0.8305,-0.92037 -0.51505,-0.38053 -1.22328,-0.43529 -1.66099,-0.92036 -4.24415,-4.70341 3.48225,1.28367 -2.49148,-3.68145 -0.49522,-0.41161 -1.31762,-0.34958 -1.66099,-0.92037 -0.30713,-0.51053 0.17508,-1.25864 0,-1.84073 -0.24761,-0.8232 -1.41339,-1.01752 -1.66099,-1.84072 -0.17508,-0.58209 0.17508,-1.25865 0,-1.84073 -0.12385,-0.4116 -0.70669,-0.50876 -0.8305,-0.92037 -0.17508,-0.58208 0.24761,-1.29192 0,-1.84072 -0.12384,-0.2744 -0.97293,0.26306 -0.83049,0 0.91199,-1.68446 2.21465,-3.06788 0,-1.84073 z"
+       id="path2906" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 288.125,250.625 c 0,0.83333 0,1.66667 0,2.5 0,4.14573 0.29463,-0.88388 -0.625,1.875 -0.19764,0.59293 0,1.25 0,1.875 0,1.45833 0,2.91667 0,4.375 0,0.15158 0.0201,1.8549 0,1.875 -0.14731,0.14731 -0.47769,-0.14731 -0.625,0 -0.14731,0.14731 0,0.41667 0,0.625 0,1.25 0,2.5 0,3.75 0,0.20833 -0.14731,0.47769 0,0.625 0.14731,0.14731 0.47769,-0.14731 0.625,0 0.14731,0.14731 0,0.41667 0,0.625 0,0.20833 0,0.41667 0,0.625"
+       id="path2908" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 298.125,253.75 c 0,0.20833 -0.0932,0.43866 0,0.625 0.13176,0.26352 0.49324,0.36148 0.625,0.625 0.13906,0.27811 -0.0953,2.21413 0,2.5 0.0932,0.27951 0.53183,0.34549 0.625,0.625 0.11521,0.34564 0,3.12059 0,3.75 0,2.70833 0,5.41667 0,8.125"
+       id="path2910" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 345,261.25 c 0,1.25 0,2.5 0,3.75 0,0.20833 0,0.41667 0,0.625 0,0.20833 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.0932,0.18634 0,0.41667 0,0.625 0,0.20833 0,0.41667 0,0.625 0,0.43471 0.11301,2.89898 0,3.125 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.25,0.5 0.25,1.375 0,1.875 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.0951,0.19021 0,1.59353 0,1.875"
+       id="path2912" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 337.5,262.5 c 0,1.04167 0,2.08333 0,3.125 0,1.25 0,2.5 0,3.75 0,0.20833 0,0.41667 0,0.625 0,0.20833 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.21585,0.43171 0.21939,2.90561 0,3.125 -0.14731,0.14731 -0.47769,-0.14731 -0.625,0 -0.14964,0.14964 0.14208,2.5 0,2.5 -0.20833,0 0,-0.41667 0,-0.625"
+       id="path2914" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 275.625,194.375 c -0.64657,0 -0.86384,0.14731 -1.25,-0.625 -0.0932,-0.18634 0.14731,-0.47769 0,-0.625 -0.14731,-0.14731 -0.43866,0.0932 -0.625,0 -0.26352,-0.13176 -0.36148,-0.49324 -0.625,-0.625 -0.5,-0.25 -1.375,0.25 -1.875,0 -0.26352,-0.13176 -0.36148,-0.49324 -0.625,-0.625 -0.39283,-0.19641 -2.10717,0.19641 -2.5,0 -0.26352,-0.13176 -0.34549,-0.53183 -0.625,-0.625 -0.59293,-0.19764 -1.25,0 -1.875,0 -1.66667,0 -3.33333,0 -5,0 -1.25,0 -2.5,0 -3.75,0 -0.41667,0 -0.87732,-0.18634 -1.25,0 -0.18634,0.0932 0.14731,0.47769 0,0.625 -0.14731,0.14731 -0.43866,-0.0932 -0.625,0 -0.26352,0.13176 -0.36148,0.49324 -0.625,0.625 -0.24781,0.1239 -1.74723,-0.12777 -1.875,0 -0.14731,0.14731 0.14731,0.47769 0,0.625 -0.14731,0.14731 -0.47769,-0.14731 -0.625,0 -0.14731,0.14731 0.14731,0.47769 0,0.625 -1.29315,1.29315 0.0505,-1.9761 -1.25,0.625 -0.0932,0.18634 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.0932,0.18634 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.0932,0.18634 0,0.41667 0,0.625 0,0.20833 0,0.41667 0,0.625 0,1.04167 0,2.08333 0,3.125 0,0.20833 0,0.41667 0,0.625 0,0.20833 0.0932,0.43866 0,0.625 -0.13176,0.26352 -0.49324,0.36148 -0.625,0.625 -0.11301,0.22602 0,2.69029 0,3.125 0,0.32683 -0.0822,2.33566 0,2.5 1.30055,2.6011 -0.0431,-0.66815 1.25,0.625 0.29463,0.29463 -0.29463,0.95537 0,1.25 0.14731,0.14731 0.53183,-0.18634 0.625,0 0.18634,0.37268 -0.18634,0.87732 0,1.25 0.0932,0.18634 0.47769,-0.14731 0.625,0 0.14731,0.14731 -0.0932,0.43866 0,0.625 0.13176,0.26352 0.49324,0.36148 0.625,0.625 0.0932,0.18634 -0.0932,0.43866 0,0.625 0.1669,0.3338 1.54596,1.54596 1.875,1.875 0.32904,0.32904 1.5412,1.7081 1.875,1.875 0.37268,0.18634 0.87732,-0.18634 1.25,0 2.6011,1.30055 -0.66815,-0.0431 0.625,1.25 0.14731,0.14731 0.43866,-0.0932 0.625,0 0.26352,0.13176 0.36148,0.49324 0.625,0.625 0.18634,0.0932 0.47769,-0.14731 0.625,0 0.14731,0.14731 -0.14731,0.47769 0,0.625 0.14731,0.14731 0.43866,-0.0932 0.625,0 0.26352,0.13176 0.36148,0.49324 0.625,0.625 0.24781,0.1239 1.74723,-0.12777 1.875,0 0.14731,0.14731 -0.14731,0.47769 0,0.625 0.14731,0.14731 0.47769,-0.14731 0.625,0 0.14731,0.14731 -0.14731,0.47769 0,0.625 0.29463,0.29463 0.85472,-0.13176 1.25,0 0.44194,0.14731 0.80806,0.47769 1.25,0.625 0.19764,0.0659 0.43866,-0.0932 0.625,0 0.26352,0.13176 0.36148,0.49324 0.625,0.625 0.22602,0.11301 2.69029,0 3.125,0 1.04167,0 2.08333,0 3.125,0 0.41667,0 0.83333,0 1.25,0 0.20833,0 0.625,-0.20833 0.625,0 0,0.0575 -2.07286,0.0659 0,-0.625 0.39528,-0.13176 0.83333,0 1.25,0 0.20833,0 0.43866,0.0932 0.625,0 1.54463,-0.77231 -0.21574,-0.625 1.25,-0.625"
+       id="path2916" />
+    <path
+       style="fill:#7a4904;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 103.125,287.5 c -31.25,-75 -31.25,-75 -31.25,-75 L 67.5,1.25 0,0 l 0.625,290 102.5,-2.5 z"
+       id="path3694" />
+    <path
+       style="fill:#2ada1d;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 35.625,1.25 C 18.861084,20.183648 10.032426,37.353905 52.5,43.125 c 21.065323,49.350537 40.568025,31.508402 60,10.625 35.92323,16.036466 62.33024,20.272833 56.875,-15 58.2311,-0.685821 44.48212,-18.308128 18.75,-38.75"
+       id="path3698"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
diff --git a/public/potlatch2/fills/grass.jpg b/public/potlatch2/fills/grass.jpg
new file mode 100644 (file)
index 0000000..26dcd2f
Binary files /dev/null and b/public/potlatch2/fills/grass.jpg differ
diff --git a/public/potlatch2/gpx.css b/public/potlatch2/gpx.css
new file mode 100644 (file)
index 0000000..fe08e31
--- /dev/null
@@ -0,0 +1,12 @@
+/*
+
+       Wireframe stylesheet for GPS tracks
+       
+*/
+
+way { z-index: 2; width: 1; color: cyan; } 
+node :poi { z-index: 2; 
+                       icon-image: circle; icon-width: 4; color: orange; 
+                       casing-color: red; casing-width: 1; 
+                       text-offset: 10; font-family: DejaVu; text: name; font-size: 9; text_color: red; }
+
diff --git a/public/potlatch2/icons/accommodation_alpinehut.n.16.png b/public/potlatch2/icons/accommodation_alpinehut.n.16.png
new file mode 100644 (file)
index 0000000..2fdad62
Binary files /dev/null and b/public/potlatch2/icons/accommodation_alpinehut.n.16.png differ
diff --git a/public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png b/public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png
new file mode 100644 (file)
index 0000000..ab2d3be
Binary files /dev/null and b/public/potlatch2/icons/accommodation_bed_and_breakfast.n.16.png differ
diff --git a/public/potlatch2/icons/accommodation_blank.png b/public/potlatch2/icons/accommodation_blank.png
new file mode 100644 (file)
index 0000000..d12f23e
Binary files /dev/null and b/public/potlatch2/icons/accommodation_blank.png differ
diff --git a/public/potlatch2/icons/accommodation_camping.n.16.png b/public/potlatch2/icons/accommodation_camping.n.16.png
new file mode 100644 (file)
index 0000000..b2e7a24
Binary files /dev/null and b/public/potlatch2/icons/accommodation_camping.n.16.png differ
diff --git a/public/potlatch2/icons/accommodation_caravan_park.n.16.png b/public/potlatch2/icons/accommodation_caravan_park.n.16.png
new file mode 100644 (file)
index 0000000..aeae7df
Binary files /dev/null and b/public/potlatch2/icons/accommodation_caravan_park.n.16.png differ
diff --git a/public/potlatch2/icons/accommodation_hotel.n.16.png b/public/potlatch2/icons/accommodation_hotel.n.16.png
new file mode 100644 (file)
index 0000000..4c3bb70
Binary files /dev/null and b/public/potlatch2/icons/accommodation_hotel.n.16.png differ
diff --git a/public/potlatch2/icons/accommodation_youth_hostel.n.16.png b/public/potlatch2/icons/accommodation_youth_hostel.n.16.png
new file mode 100644 (file)
index 0000000..d2ca4fe
Binary files /dev/null and b/public/potlatch2/icons/accommodation_youth_hostel.n.16.png differ
diff --git a/public/potlatch2/icons/airport.png b/public/potlatch2/icons/airport.png
new file mode 100644 (file)
index 0000000..b104403
Binary files /dev/null and b/public/potlatch2/icons/airport.png differ
diff --git a/public/potlatch2/icons/amenity_firestation2.n.16.png b/public/potlatch2/icons/amenity_firestation2.n.16.png
new file mode 100644 (file)
index 0000000..8a980be
Binary files /dev/null and b/public/potlatch2/icons/amenity_firestation2.n.16.png differ
diff --git a/public/potlatch2/icons/amenity_police2.n.16.png b/public/potlatch2/icons/amenity_police2.n.16.png
new file mode 100644 (file)
index 0000000..b2a4aab
Binary files /dev/null and b/public/potlatch2/icons/amenity_police2.n.16.png differ
diff --git a/public/potlatch2/icons/amenity_post_box.n.16.png b/public/potlatch2/icons/amenity_post_box.n.16.png
new file mode 100644 (file)
index 0000000..f72efcf
Binary files /dev/null and b/public/potlatch2/icons/amenity_post_box.n.16.png differ
diff --git a/public/potlatch2/icons/amenity_recycling.n.16.png b/public/potlatch2/icons/amenity_recycling.n.16.png
new file mode 100644 (file)
index 0000000..567779b
Binary files /dev/null and b/public/potlatch2/icons/amenity_recycling.n.16.png differ
diff --git a/public/potlatch2/icons/atm.png b/public/potlatch2/icons/atm.png
new file mode 100644 (file)
index 0000000..6a953d3
Binary files /dev/null and b/public/potlatch2/icons/atm.png differ
diff --git a/public/potlatch2/icons/bank.png b/public/potlatch2/icons/bank.png
new file mode 100644 (file)
index 0000000..6a953d3
Binary files /dev/null and b/public/potlatch2/icons/bank.png differ
diff --git a/public/potlatch2/icons/bar.png b/public/potlatch2/icons/bar.png
new file mode 100644 (file)
index 0000000..13f97e3
Binary files /dev/null and b/public/potlatch2/icons/bar.png differ
diff --git a/public/potlatch2/icons/barrier_blocks.16.png b/public/potlatch2/icons/barrier_blocks.16.png
new file mode 100644 (file)
index 0000000..f8fda70
Binary files /dev/null and b/public/potlatch2/icons/barrier_blocks.16.png differ
diff --git a/public/potlatch2/icons/barrier_bollard.n.16.png b/public/potlatch2/icons/barrier_bollard.n.16.png
new file mode 100644 (file)
index 0000000..989feae
Binary files /dev/null and b/public/potlatch2/icons/barrier_bollard.n.16.png differ
diff --git a/public/potlatch2/icons/barrier_cattle_grid.16.png b/public/potlatch2/icons/barrier_cattle_grid.16.png
new file mode 100644 (file)
index 0000000..117bb80
Binary files /dev/null and b/public/potlatch2/icons/barrier_cattle_grid.16.png differ
diff --git a/public/potlatch2/icons/barrier_cycle_barrier.16.png b/public/potlatch2/icons/barrier_cycle_barrier.16.png
new file mode 100644 (file)
index 0000000..8afe098
Binary files /dev/null and b/public/potlatch2/icons/barrier_cycle_barrier.16.png differ
diff --git a/public/potlatch2/icons/barrier_gate.n.16.png b/public/potlatch2/icons/barrier_gate.n.16.png
new file mode 100644 (file)
index 0000000..f8c2f58
Binary files /dev/null and b/public/potlatch2/icons/barrier_gate.n.16.png differ
diff --git a/public/potlatch2/icons/barrier_kissing_gate.16.png b/public/potlatch2/icons/barrier_kissing_gate.16.png
new file mode 100644 (file)
index 0000000..7acc519
Binary files /dev/null and b/public/potlatch2/icons/barrier_kissing_gate.16.png differ
diff --git a/public/potlatch2/icons/barrier_lift_gate.n.16.png b/public/potlatch2/icons/barrier_lift_gate.n.16.png
new file mode 100644 (file)
index 0000000..80ef74b
Binary files /dev/null and b/public/potlatch2/icons/barrier_lift_gate.n.16.png differ
diff --git a/public/potlatch2/icons/barrier_stile.n.16.png b/public/potlatch2/icons/barrier_stile.n.16.png
new file mode 100644 (file)
index 0000000..3b18ae7
Binary files /dev/null and b/public/potlatch2/icons/barrier_stile.n.16.png differ
diff --git a/public/potlatch2/icons/barrier_toll_booth.n.16.png b/public/potlatch2/icons/barrier_toll_booth.n.16.png
new file mode 100644 (file)
index 0000000..cc78d87
Binary files /dev/null and b/public/potlatch2/icons/barrier_toll_booth.n.16.png differ
diff --git a/public/potlatch2/icons/bollard.png b/public/potlatch2/icons/bollard.png
new file mode 100644 (file)
index 0000000..7714a3f
Binary files /dev/null and b/public/potlatch2/icons/bollard.png differ
diff --git a/public/potlatch2/icons/bus_stop.png b/public/potlatch2/icons/bus_stop.png
new file mode 100644 (file)
index 0000000..989e9c3
Binary files /dev/null and b/public/potlatch2/icons/bus_stop.png differ
diff --git a/public/potlatch2/icons/cafe.png b/public/potlatch2/icons/cafe.png
new file mode 100644 (file)
index 0000000..d9c1f77
Binary files /dev/null and b/public/potlatch2/icons/cafe.png differ
diff --git a/public/potlatch2/icons/cattle_grid.png b/public/potlatch2/icons/cattle_grid.png
new file mode 100644 (file)
index 0000000..b5e4ddc
Binary files /dev/null and b/public/potlatch2/icons/cattle_grid.png differ
diff --git a/public/potlatch2/icons/cinema.png b/public/potlatch2/icons/cinema.png
new file mode 100644 (file)
index 0000000..f43caba
Binary files /dev/null and b/public/potlatch2/icons/cinema.png differ
diff --git a/public/potlatch2/icons/convenience.png b/public/potlatch2/icons/convenience.png
new file mode 100644 (file)
index 0000000..ad6cd2c
Binary files /dev/null and b/public/potlatch2/icons/convenience.png differ
diff --git a/public/potlatch2/icons/education_school.n.16.png b/public/potlatch2/icons/education_school.n.16.png
new file mode 100644 (file)
index 0000000..a93e2d3
Binary files /dev/null and b/public/potlatch2/icons/education_school.n.16.png differ
diff --git a/public/potlatch2/icons/fast_food.png b/public/potlatch2/icons/fast_food.png
new file mode 100644 (file)
index 0000000..ad2c39c
Binary files /dev/null and b/public/potlatch2/icons/fast_food.png differ
diff --git a/public/potlatch2/icons/ferry_terminal.png b/public/potlatch2/icons/ferry_terminal.png
new file mode 100644 (file)
index 0000000..f387c03
Binary files /dev/null and b/public/potlatch2/icons/ferry_terminal.png differ
diff --git a/public/potlatch2/icons/fire_station.png b/public/potlatch2/icons/fire_station.png
new file mode 100644 (file)
index 0000000..897c526
Binary files /dev/null and b/public/potlatch2/icons/fire_station.png differ
diff --git a/public/potlatch2/icons/food_bar.n.16.png b/public/potlatch2/icons/food_bar.n.16.png
new file mode 100644 (file)
index 0000000..fadd3e2
Binary files /dev/null and b/public/potlatch2/icons/food_bar.n.16.png differ
diff --git a/public/potlatch2/icons/food_cafe.n.16.png b/public/potlatch2/icons/food_cafe.n.16.png
new file mode 100644 (file)
index 0000000..d5cc5a8
Binary files /dev/null and b/public/potlatch2/icons/food_cafe.n.16.png differ
diff --git a/public/potlatch2/icons/food_fastfood.n.16.png b/public/potlatch2/icons/food_fastfood.n.16.png
new file mode 100644 (file)
index 0000000..075fc80
Binary files /dev/null and b/public/potlatch2/icons/food_fastfood.n.16.png differ
diff --git a/public/potlatch2/icons/food_pub.n.16.png b/public/potlatch2/icons/food_pub.n.16.png
new file mode 100644 (file)
index 0000000..c3d339d
Binary files /dev/null and b/public/potlatch2/icons/food_pub.n.16.png differ
diff --git a/public/potlatch2/icons/food_restaurant.n.16.png b/public/potlatch2/icons/food_restaurant.n.16.png
new file mode 100644 (file)
index 0000000..30682b2
Binary files /dev/null and b/public/potlatch2/icons/food_restaurant.n.16.png differ
diff --git a/public/potlatch2/icons/gate.png b/public/potlatch2/icons/gate.png
new file mode 100644 (file)
index 0000000..b33e556
Binary files /dev/null and b/public/potlatch2/icons/gate.png differ
diff --git a/public/potlatch2/icons/health_hospital.n.16.png b/public/potlatch2/icons/health_hospital.n.16.png
new file mode 100644 (file)
index 0000000..41ad28d
Binary files /dev/null and b/public/potlatch2/icons/health_hospital.n.16.png differ
diff --git a/public/potlatch2/icons/health_pharmacy.n.16.png b/public/potlatch2/icons/health_pharmacy.n.16.png
new file mode 100644 (file)
index 0000000..ffc1256
Binary files /dev/null and b/public/potlatch2/icons/health_pharmacy.n.16.png differ
diff --git a/public/potlatch2/icons/hospital.png b/public/potlatch2/icons/hospital.png
new file mode 100644 (file)
index 0000000..6cc0380
Binary files /dev/null and b/public/potlatch2/icons/hospital.png differ
diff --git a/public/potlatch2/icons/hotel.png b/public/potlatch2/icons/hotel.png
new file mode 100644 (file)
index 0000000..f951247
Binary files /dev/null and b/public/potlatch2/icons/hotel.png differ
diff --git a/public/potlatch2/icons/icons_grid.png b/public/potlatch2/icons/icons_grid.png
new file mode 100644 (file)
index 0000000..9b6d628
Binary files /dev/null and b/public/potlatch2/icons/icons_grid.png differ
diff --git a/public/potlatch2/icons/money_atm.n.16.png b/public/potlatch2/icons/money_atm.n.16.png
new file mode 100644 (file)
index 0000000..8656f0c
Binary files /dev/null and b/public/potlatch2/icons/money_atm.n.16.png differ
diff --git a/public/potlatch2/icons/money_bank2.n.16.png b/public/potlatch2/icons/money_bank2.n.16.png
new file mode 100644 (file)
index 0000000..7264bcb
Binary files /dev/null and b/public/potlatch2/icons/money_bank2.n.16.png differ
diff --git a/public/potlatch2/icons/museum.png b/public/potlatch2/icons/museum.png
new file mode 100644 (file)
index 0000000..79346ab
Binary files /dev/null and b/public/potlatch2/icons/museum.png differ
diff --git a/public/potlatch2/icons/natural_blank.png b/public/potlatch2/icons/natural_blank.png
new file mode 100644 (file)
index 0000000..33e76fb
Binary files /dev/null and b/public/potlatch2/icons/natural_blank.png differ
diff --git a/public/potlatch2/icons/parking.png b/public/potlatch2/icons/parking.png
new file mode 100644 (file)
index 0000000..a2675d0
Binary files /dev/null and b/public/potlatch2/icons/parking.png differ
diff --git a/public/potlatch2/icons/parking_cycle.png b/public/potlatch2/icons/parking_cycle.png
new file mode 100644 (file)
index 0000000..a2675d0
Binary files /dev/null and b/public/potlatch2/icons/parking_cycle.png differ
diff --git a/public/potlatch2/icons/pharmacy.png b/public/potlatch2/icons/pharmacy.png
new file mode 100644 (file)
index 0000000..5254d93
Binary files /dev/null and b/public/potlatch2/icons/pharmacy.png differ
diff --git a/public/potlatch2/icons/pharmacy_dispensing.png b/public/potlatch2/icons/pharmacy_dispensing.png
new file mode 100644 (file)
index 0000000..9e3a4c5
Binary files /dev/null and b/public/potlatch2/icons/pharmacy_dispensing.png differ
diff --git a/public/potlatch2/icons/place.png b/public/potlatch2/icons/place.png
new file mode 100644 (file)
index 0000000..488218c
Binary files /dev/null and b/public/potlatch2/icons/place.png differ
diff --git a/public/potlatch2/icons/place_of_worship.png b/public/potlatch2/icons/place_of_worship.png
new file mode 100644 (file)
index 0000000..3ef2b43
Binary files /dev/null and b/public/potlatch2/icons/place_of_worship.png differ
diff --git a/public/potlatch2/icons/police.png b/public/potlatch2/icons/police.png
new file mode 100644 (file)
index 0000000..da271d3
Binary files /dev/null and b/public/potlatch2/icons/police.png differ
diff --git a/public/potlatch2/icons/post_box.png b/public/potlatch2/icons/post_box.png
new file mode 100644 (file)
index 0000000..8690ebb
Binary files /dev/null and b/public/potlatch2/icons/post_box.png differ
diff --git a/public/potlatch2/icons/power_blank.png b/public/potlatch2/icons/power_blank.png
new file mode 100644 (file)
index 0000000..32ee9af
Binary files /dev/null and b/public/potlatch2/icons/power_blank.png differ
diff --git a/public/potlatch2/icons/power_pole_24.png b/public/potlatch2/icons/power_pole_24.png
new file mode 100644 (file)
index 0000000..9259040
Binary files /dev/null and b/public/potlatch2/icons/power_pole_24.png differ
diff --git a/public/potlatch2/icons/power_tower_24.png b/public/potlatch2/icons/power_tower_24.png
new file mode 100644 (file)
index 0000000..0aa2720
Binary files /dev/null and b/public/potlatch2/icons/power_tower_24.png differ
diff --git a/public/potlatch2/icons/pub.png b/public/potlatch2/icons/pub.png
new file mode 100644 (file)
index 0000000..b03e915
Binary files /dev/null and b/public/potlatch2/icons/pub.png differ
diff --git a/public/potlatch2/icons/recycling.png b/public/potlatch2/icons/recycling.png
new file mode 100644 (file)
index 0000000..aa613d5
Binary files /dev/null and b/public/potlatch2/icons/recycling.png differ
diff --git a/public/potlatch2/icons/restaurant.png b/public/potlatch2/icons/restaurant.png
new file mode 100644 (file)
index 0000000..5b6da14
Binary files /dev/null and b/public/potlatch2/icons/restaurant.png differ
diff --git a/public/potlatch2/icons/restriction.png b/public/potlatch2/icons/restriction.png
new file mode 100644 (file)
index 0000000..45671d4
Binary files /dev/null and b/public/potlatch2/icons/restriction.png differ
diff --git a/public/potlatch2/icons/school.png b/public/potlatch2/icons/school.png
new file mode 100644 (file)
index 0000000..1067beb
Binary files /dev/null and b/public/potlatch2/icons/school.png differ
diff --git a/public/potlatch2/icons/shopping_alcohol.n.16.png b/public/potlatch2/icons/shopping_alcohol.n.16.png
new file mode 100644 (file)
index 0000000..2051002
Binary files /dev/null and b/public/potlatch2/icons/shopping_alcohol.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_bakery.n.16.png b/public/potlatch2/icons/shopping_bakery.n.16.png
new file mode 100644 (file)
index 0000000..76a52d2
Binary files /dev/null and b/public/potlatch2/icons/shopping_bakery.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_bicycle.n.16.png b/public/potlatch2/icons/shopping_bicycle.n.16.png
new file mode 100644 (file)
index 0000000..ef5b366
Binary files /dev/null and b/public/potlatch2/icons/shopping_bicycle.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_book.n.16.png b/public/potlatch2/icons/shopping_book.n.16.png
new file mode 100644 (file)
index 0000000..172bd28
Binary files /dev/null and b/public/potlatch2/icons/shopping_book.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_butcher.n.16.png b/public/potlatch2/icons/shopping_butcher.n.16.png
new file mode 100644 (file)
index 0000000..b488591
Binary files /dev/null and b/public/potlatch2/icons/shopping_butcher.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_car.n.16.png b/public/potlatch2/icons/shopping_car.n.16.png
new file mode 100644 (file)
index 0000000..d800760
Binary files /dev/null and b/public/potlatch2/icons/shopping_car.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_car_repair.n.16.png b/public/potlatch2/icons/shopping_car_repair.n.16.png
new file mode 100644 (file)
index 0000000..78c578d
Binary files /dev/null and b/public/potlatch2/icons/shopping_car_repair.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_clothes.n.16.png b/public/potlatch2/icons/shopping_clothes.n.16.png
new file mode 100644 (file)
index 0000000..d467b78
Binary files /dev/null and b/public/potlatch2/icons/shopping_clothes.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_confectionery.n.16.png b/public/potlatch2/icons/shopping_confectionery.n.16.png
new file mode 100644 (file)
index 0000000..b293dfd
Binary files /dev/null and b/public/potlatch2/icons/shopping_confectionery.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_convenience.n.16.png b/public/potlatch2/icons/shopping_convenience.n.16.png
new file mode 100644 (file)
index 0000000..40fa49d
Binary files /dev/null and b/public/potlatch2/icons/shopping_convenience.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_diy.n.16.png b/public/potlatch2/icons/shopping_diy.n.16.png
new file mode 100644 (file)
index 0000000..045696c
Binary files /dev/null and b/public/potlatch2/icons/shopping_diy.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_fish.n.16.png b/public/potlatch2/icons/shopping_fish.n.16.png
new file mode 100644 (file)
index 0000000..f49d4e9
Binary files /dev/null and b/public/potlatch2/icons/shopping_fish.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_garden_centre.n.16.png b/public/potlatch2/icons/shopping_garden_centre.n.16.png
new file mode 100644 (file)
index 0000000..37d2ecc
Binary files /dev/null and b/public/potlatch2/icons/shopping_garden_centre.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_gift.n.16.png b/public/potlatch2/icons/shopping_gift.n.16.png
new file mode 100644 (file)
index 0000000..2d11d04
Binary files /dev/null and b/public/potlatch2/icons/shopping_gift.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_greengrocer.n.16.png b/public/potlatch2/icons/shopping_greengrocer.n.16.png
new file mode 100644 (file)
index 0000000..7d60e35
Binary files /dev/null and b/public/potlatch2/icons/shopping_greengrocer.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_hairdresser.n.16.png b/public/potlatch2/icons/shopping_hairdresser.n.16.png
new file mode 100644 (file)
index 0000000..bcb07fd
Binary files /dev/null and b/public/potlatch2/icons/shopping_hairdresser.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_hifi.n.16.png b/public/potlatch2/icons/shopping_hifi.n.16.png
new file mode 100644 (file)
index 0000000..f55ad66
Binary files /dev/null and b/public/potlatch2/icons/shopping_hifi.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_jewelry.n.16.png b/public/potlatch2/icons/shopping_jewelry.n.16.png
new file mode 100644 (file)
index 0000000..49ee19c
Binary files /dev/null and b/public/potlatch2/icons/shopping_jewelry.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_laundrette.n.16.png b/public/potlatch2/icons/shopping_laundrette.n.16.png
new file mode 100644 (file)
index 0000000..266660a
Binary files /dev/null and b/public/potlatch2/icons/shopping_laundrette.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_motorcycle.n.16.png b/public/potlatch2/icons/shopping_motorcycle.n.16.png
new file mode 100644 (file)
index 0000000..8f7ddff
Binary files /dev/null and b/public/potlatch2/icons/shopping_motorcycle.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_music.n.16.png b/public/potlatch2/icons/shopping_music.n.16.png
new file mode 100644 (file)
index 0000000..8e875c7
Binary files /dev/null and b/public/potlatch2/icons/shopping_music.n.16.png differ
diff --git a/public/potlatch2/icons/shopping_supermarket.n.16.png b/public/potlatch2/icons/shopping_supermarket.n.16.png
new file mode 100644 (file)
index 0000000..f4dc6d1
Binary files /dev/null and b/public/potlatch2/icons/shopping_supermarket.n.16.png differ
diff --git a/public/potlatch2/icons/speed_hump_16.png b/public/potlatch2/icons/speed_hump_16.png
new file mode 100644 (file)
index 0000000..4107692
Binary files /dev/null and b/public/potlatch2/icons/speed_hump_16.png differ
diff --git a/public/potlatch2/icons/station.png b/public/potlatch2/icons/station.png
new file mode 100644 (file)
index 0000000..1e19825
Binary files /dev/null and b/public/potlatch2/icons/station.png differ
diff --git a/public/potlatch2/icons/supermarket.png b/public/potlatch2/icons/supermarket.png
new file mode 100644 (file)
index 0000000..04944d1
Binary files /dev/null and b/public/potlatch2/icons/supermarket.png differ
diff --git a/public/potlatch2/icons/taxi.png b/public/potlatch2/icons/taxi.png
new file mode 100644 (file)
index 0000000..42c6f92
Binary files /dev/null and b/public/potlatch2/icons/taxi.png differ
diff --git a/public/potlatch2/icons/telephone.png b/public/potlatch2/icons/telephone.png
new file mode 100644 (file)
index 0000000..c2a2d62
Binary files /dev/null and b/public/potlatch2/icons/telephone.png differ
diff --git a/public/potlatch2/icons/theatre.png b/public/potlatch2/icons/theatre.png
new file mode 100644 (file)
index 0000000..897a1e1
Binary files /dev/null and b/public/potlatch2/icons/theatre.png differ
diff --git a/public/potlatch2/icons/tourist_archaeological.n.16.png b/public/potlatch2/icons/tourist_archaeological.n.16.png
new file mode 100644 (file)
index 0000000..87c4976
Binary files /dev/null and b/public/potlatch2/icons/tourist_archaeological.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_battlefield.n.16.png b/public/potlatch2/icons/tourist_battlefield.n.16.png
new file mode 100644 (file)
index 0000000..d966889
Binary files /dev/null and b/public/potlatch2/icons/tourist_battlefield.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_blank.png b/public/potlatch2/icons/tourist_blank.png
new file mode 100644 (file)
index 0000000..35d4888
Binary files /dev/null and b/public/potlatch2/icons/tourist_blank.png differ
diff --git a/public/potlatch2/icons/tourist_castle.n.16.png b/public/potlatch2/icons/tourist_castle.n.16.png
new file mode 100644 (file)
index 0000000..bd9a42b
Binary files /dev/null and b/public/potlatch2/icons/tourist_castle.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_cinema.n.16.png b/public/potlatch2/icons/tourist_cinema.n.16.png
new file mode 100644 (file)
index 0000000..42f2815
Binary files /dev/null and b/public/potlatch2/icons/tourist_cinema.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_information.png b/public/potlatch2/icons/tourist_information.png
new file mode 100644 (file)
index 0000000..ccfbe7e
Binary files /dev/null and b/public/potlatch2/icons/tourist_information.png differ
diff --git a/public/potlatch2/icons/tourist_memorial.n.16.png b/public/potlatch2/icons/tourist_memorial.n.16.png
new file mode 100644 (file)
index 0000000..944e27b
Binary files /dev/null and b/public/potlatch2/icons/tourist_memorial.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_monument.n.16.png b/public/potlatch2/icons/tourist_monument.n.16.png
new file mode 100644 (file)
index 0000000..8b7e7f8
Binary files /dev/null and b/public/potlatch2/icons/tourist_monument.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_museum.n.16.png b/public/potlatch2/icons/tourist_museum.n.16.png
new file mode 100644 (file)
index 0000000..36a4c45
Binary files /dev/null and b/public/potlatch2/icons/tourist_museum.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_picnic.n.16.png b/public/potlatch2/icons/tourist_picnic.n.16.png
new file mode 100644 (file)
index 0000000..f529236
Binary files /dev/null and b/public/potlatch2/icons/tourist_picnic.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_ruin.n.16.png b/public/potlatch2/icons/tourist_ruin.n.16.png
new file mode 100644 (file)
index 0000000..65ad843
Binary files /dev/null and b/public/potlatch2/icons/tourist_ruin.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_theatre.n.16.png b/public/potlatch2/icons/tourist_theatre.n.16.png
new file mode 100644 (file)
index 0000000..c0c82df
Binary files /dev/null and b/public/potlatch2/icons/tourist_theatre.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_view_point.n.16.png b/public/potlatch2/icons/tourist_view_point.n.16.png
new file mode 100644 (file)
index 0000000..781e749
Binary files /dev/null and b/public/potlatch2/icons/tourist_view_point.n.16.png differ
diff --git a/public/potlatch2/icons/tourist_zoo.n.16.png b/public/potlatch2/icons/tourist_zoo.n.16.png
new file mode 100644 (file)
index 0000000..2a9ecb0
Binary files /dev/null and b/public/potlatch2/icons/tourist_zoo.n.16.png differ
diff --git a/public/potlatch2/icons/transport_aerodrome.n.16.png b/public/potlatch2/icons/transport_aerodrome.n.16.png
new file mode 100644 (file)
index 0000000..a86124b
Binary files /dev/null and b/public/potlatch2/icons/transport_aerodrome.n.16.png differ
diff --git a/public/potlatch2/icons/transport_airport_48.png b/public/potlatch2/icons/transport_airport_48.png
new file mode 100644 (file)
index 0000000..fc38eab
Binary files /dev/null and b/public/potlatch2/icons/transport_airport_48.png differ
diff --git a/public/potlatch2/icons/transport_blank.png b/public/potlatch2/icons/transport_blank.png
new file mode 100644 (file)
index 0000000..6fa7955
Binary files /dev/null and b/public/potlatch2/icons/transport_blank.png differ
diff --git a/public/potlatch2/icons/transport_bus_station.n.16.png b/public/potlatch2/icons/transport_bus_station.n.16.png
new file mode 100644 (file)
index 0000000..aa93c11
Binary files /dev/null and b/public/potlatch2/icons/transport_bus_station.n.16.png differ
diff --git a/public/potlatch2/icons/transport_bus_stop2.n.16.png b/public/potlatch2/icons/transport_bus_stop2.n.16.png
new file mode 100644 (file)
index 0000000..81fe31f
Binary files /dev/null and b/public/potlatch2/icons/transport_bus_stop2.n.16.png differ
diff --git a/public/potlatch2/icons/transport_fuel.n.16.png b/public/potlatch2/icons/transport_fuel.n.16.png
new file mode 100644 (file)
index 0000000..1571502
Binary files /dev/null and b/public/potlatch2/icons/transport_fuel.n.16.png differ
diff --git a/public/potlatch2/icons/transport_helipad_48.png b/public/potlatch2/icons/transport_helipad_48.png
new file mode 100644 (file)
index 0000000..362bc9a
Binary files /dev/null and b/public/potlatch2/icons/transport_helipad_48.png differ
diff --git a/public/potlatch2/icons/transport_marina.n.16.png b/public/potlatch2/icons/transport_marina.n.16.png
new file mode 100644 (file)
index 0000000..7960056
Binary files /dev/null and b/public/potlatch2/icons/transport_marina.n.16.png differ
diff --git a/public/potlatch2/icons/transport_parking_bicycle.n.16.png b/public/potlatch2/icons/transport_parking_bicycle.n.16.png
new file mode 100644 (file)
index 0000000..dfd7f83
Binary files /dev/null and b/public/potlatch2/icons/transport_parking_bicycle.n.16.png differ
diff --git a/public/potlatch2/icons/transport_parking_car.n.16.png b/public/potlatch2/icons/transport_parking_car.n.16.png
new file mode 100644 (file)
index 0000000..567c4f5
Binary files /dev/null and b/public/potlatch2/icons/transport_parking_car.n.16.png differ
diff --git a/public/potlatch2/icons/transport_port.n.16.png b/public/potlatch2/icons/transport_port.n.16.png
new file mode 100644 (file)
index 0000000..471c4da
Binary files /dev/null and b/public/potlatch2/icons/transport_port.n.16.png differ
diff --git a/public/potlatch2/icons/transport_rental_bicycle.n.16.png b/public/potlatch2/icons/transport_rental_bicycle.n.16.png
new file mode 100644 (file)
index 0000000..6659d1e
Binary files /dev/null and b/public/potlatch2/icons/transport_rental_bicycle.n.16.png differ
diff --git a/public/potlatch2/icons/transport_rental_car.n.16.png b/public/potlatch2/icons/transport_rental_car.n.16.png
new file mode 100644 (file)
index 0000000..0c9f7b4
Binary files /dev/null and b/public/potlatch2/icons/transport_rental_car.n.16.png differ
diff --git a/public/potlatch2/icons/transport_taxi_rank.n.16.png b/public/potlatch2/icons/transport_taxi_rank.n.16.png
new file mode 100644 (file)
index 0000000..23e6f1b
Binary files /dev/null and b/public/potlatch2/icons/transport_taxi_rank.n.16.png differ
diff --git a/public/potlatch2/icons/transport_train_station.n.16.png b/public/potlatch2/icons/transport_train_station.n.16.png
new file mode 100644 (file)
index 0000000..29ddcc1
Binary files /dev/null and b/public/potlatch2/icons/transport_train_station.n.16.png differ
diff --git a/public/potlatch2/icons/transport_tram_stop.n.16.png b/public/potlatch2/icons/transport_tram_stop.n.16.png
new file mode 100644 (file)
index 0000000..ddbbc4c
Binary files /dev/null and b/public/potlatch2/icons/transport_tram_stop.n.16.png differ
diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
new file mode 100644 (file)
index 0000000..24c3f47
--- /dev/null
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<imagery>
+       <set>
+               <name>OSM - Mapnik</name>
+               <url>http://tile.openstreetmap.org/$z/$x/$y.png</url>
+       </set>
+       <set>
+               <name>OSM - Osmarender</name>
+               <url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url>
+       </set>
+       <set>
+               <name>OS OpenData Streetview</name>
+               <url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url>
+               <sourcetag>OS OpenData StreetView</sourcetag>
+       </set>
+       <set>
+               <name>OS OpenData Locator</name>
+               <url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url>
+               <sourcetag>OS OpenData Locator</sourcetag>
+       </set>
+       <set>
+               <name>OS 1:25k historic</name>
+               <url>http://ooc.openstreetmap.org/os1/$z/$x/$y.png</url>
+               <sourcetag>OS 1:25k</sourcetag>
+       </set>
+       <set>
+               <name>OS 7th Series historic</name>
+               <url>http://ooc.openstreetmap.org/os7/$z/$x/$y.png</url>
+               <sourcetag>OS7</sourcetag>
+       </set>
+       <set>
+               <name>OS New Popular Edition historic</name>
+               <url>http://ooc.openstreetmap.org/npe/$z/$x/$y.png</url>
+               <sourcetag>NPE</sourcetag>
+       </set>
+       <set>
+               <name>OS Scottish Popular historic</name>
+               <url>http://gibin.geog.ucl.ac.uk/~ollie/scotland/tiles/$z/$x/$y.jpg</url>
+               <sourcetag>NPE</sourcetag>
+       </set>
+       <set>
+               <name>Surrey aerial</name>
+               <url>http://gravitystorm.dev.openstreetmap.org/surrey/$z/$x/$y.png</url>
+               <sourcetag>Surrey aerial</sourcetag>
+       </set>
+       <set>
+               <name>NearMap aerial</name>
+               <url>http://www.nearmap.com/maps/nml=Vert&amp;zxy=$z,$x,$y</url>
+               <sourcetag>NearMap</sourcetag>
+       </set>
+       <set>
+               <name>Haiti - GeoEye Jan 13</name>
+               <url>http://gravitystorm.dev.openstreetmap.org/imagery/haiti/$z/$x/$y.jpg</url>
+               <sourcetag>Haiti GeoEye</sourcetag>
+       </set>
+       <set>
+               <name>Haiti - GeoEye Jan 13+</name>
+               <url>http://maps.nypl.org/tilecache/1/geoeye/$z/$x/$y.jpg</url>
+               <sourcetag>Haiti GeoEye</sourcetag>
+       </set>
+       <set>
+               <name>Haiti - DigitalGlobe</name>
+               <url>http://maps.nypl.org/tilecache/1/dg_crisis/$z/$x/$y.jpg</url>
+               <sourcetag>Haiti DigitalGlobe</sourcetag>
+       </set>
+       <set>
+               <name>Haiti - Street names</name>
+               <url>http://hypercube.telascience.org/tiles/1.0.0/haiti-city/$z/$x/$y.jpg</url>
+               <sourcetag>Haiti streetnames</sourcetag>
+       </set>
+</imagery>
diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
new file mode 100644 (file)
index 0000000..c262122
--- /dev/null
@@ -0,0 +1,3312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Quick documentation:
+
+<category> the categories that features belong to. This includes both nodes (icons on left) and ways/areas (drop-down list that appears when a way/area is selected)
+  name: Shown in GUI
+  id: internal reference (a feature refers to this with category=xxx)
+
+<feature> a pre-defined group of tags that make up a feature
+  category: [ctext] corresponding to category id
+  icon
+    @image: path to .png file
+    @background: colour spec
+    @foreground: colour spec
+    (general html goes here?) Variables substituted with ${ref}
+  help: [ctext] URL, shown as a linked ? icon. Should (?) usually be an OSM wiki page.
+  description: Not currently used?
+  line/point/area: any or all of these are allowed. Determines whether this feature is shown in the corresponding situations. None is equivalent to all three.
+  tag - one or more of these required, defines the tags that make up the feature.
+    @k - key
+    @v - value
+  input
+    @ref=xxx
+  inputSet
+    @ref=xxx
+</feature>
+
+<inputSet>: a reusable group of properties for a feature.
+  @id="internal id"
+  input...
+</inputSet>
+
+<input>
+  @type: choice/freetext/turn/checkbox/slider/route/speed/number - the different types of supported input dialogs.
+  @presence: always/onTagMatch/withCategory - Whether it always appears on the basic page, appears only when the tag is already set, or only ever show on the category page.
+  @category: which tab it appears on
+  @description: mouse-over text
+  @name: The text shown as the label of the property
+  @key: The actual OSM key (tag) that will be saved
+  @priority: highest/high/normal/low/lowest (default=>normal) - controls the order that different features show up in a panel.
+  match: for turn|route inputs, the tags to be considered on the relation as indicating a match.
+    @k: key
+    @v: value
+  icon: see above
+-->
+
+<mapFeatures>
+
+  <!-- Categories -->
+
+  <category name="Roads" id="roads">
+  </category>
+
+  <category name="Paths" id="paths">
+  </category>
+
+  <category name="Shopping" id="shopping">
+  </category>
+
+  <category name="Food and Drink" id="foodanddrink">
+  </category>
+
+  <category name="Amenity" id="amenity">
+  </category>
+
+  <category name="Tourism" id="tourism">
+  </category>
+
+  <category name="Accommodation" id="accommodation">
+  </category>
+
+  <category name="Transport" id="transport">
+  </category>
+
+  <category name="Water" id="water">
+  </category>
+
+  <category name="Natural" id="natural">
+  </category>
+
+  <category name="Barrier" id="barrier">
+  </category>
+
+  <category name="Power" id="power">
+  </category>
+
+  <category name="Admin" id="admin">
+  </category>
+
+  <category name="Buildings" id="buildings">
+  </category>
+
+  <category name="Landuse" id="landuse">
+  </category>
+
+  <category name="Agriculture" id="agriculture">
+  </category>
+
+  <category name="Advanced" id="advanced">
+  </category>
+
+  <category name="Misc" id="misc">
+  </category>
+
+  <!-- Common input sets -->
+
+  <inputSet id="simpleName">
+    <input type="freetext" presence="always" name="Name" key="name" description="The name" priority="highest"/>
+  </inputSet>
+
+  <inputSet id="source">
+    <!-- Can you do a combined freetext/dropdown? -->
+    <!-- Also need to make sure every object gets this -->
+    <input type="freetext" category="Misc" presence="always" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, nearmap...)" priority="high"/>
+  </inputSet>
+
+  <inputSet id="common">
+    <inputSet ref="source"/>
+  </inputSet>
+
+  <inputSet id="names">
+    <input type="freetext" presence="always"
+        name="Name" category="Naming" priority="highest"
+        key="name" description="The most common name"/>
+    <input type="freetext" presence="onTagMatch"
+        name="International Name" category="Naming"
+        key="int_name" description="The internationally recognised name"/>
+    <input type="freetext" presence="onTagMatch"
+        name="Historical Name" category="Naming" priority="low"
+        key="old_name" description="The historic or previous name"/>
+  </inputSet>
+
+  <inputSet id="wifi">
+    <input type="choice" presence="onTagMatch" category="Eating" name="Wifi" key="wifi">
+      <choice value="free" text="Free"/>
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+  </inputSet>
+
+  <inputSet id="buildingAddress">
+    <input type="freetext" presence="onTagMatch" category="Address" description="The number of the house, e.g. 156 or 10-12" name="House Number" key="addr:housenumber"/>
+    <input type="freetext" presence="onTagMatch" category="Address" description="The name of the house, e.g. Riverbank Cottage" name="Building Name" key="addr:housename"/>
+    <input type="freetext" presence="onTagMatch" category="Address" description="The Street Name (optional)" name="Street Name" key="addr:street"/>
+    <input type="freetext" presence="onTagMatch" category="Address" description="The postcode" name="Postcode" key="addr:postcode"/>
+  </inputSet>
+
+  <inputSet id="web">
+    <input type="freetext" presence="onTagMatch" category="Web" description="The URL of the website" name="Website" key="website"/>
+  </inputSet>
+
+  <inputSet id="cuisine">
+    <input type="choice" presence="always" name="Cuisine" category="Eating" description="The type of food that they serve" key="cuisine">
+      <choice value="burger" text="Burger"/>
+      <choice value="chicken" text="Chicken"/>
+      <choice value="chinese" text="Chinese"/>
+      <choice value="coffee_shop" text="Coffee Shop"/>
+      <choice value="greek" text="Greek"/>
+      <choice value="pizza" text="Pizza"/>
+      <choice value="sandwich" text="Sandwich"/>
+      <choice value="sea_food" text="Sea Food"/>
+      <help>http://wiki.openstreetmap.org/wiki/Key:cuisine</help>
+    </input>
+  </inputSet>
+
+  <!-- Roads -->
+
+  <inputSet id="majorRoad">
+    <inputSet ref="names"/>
+    <inputSet ref="roadRefs"/>
+    <inputSet ref="roadRestrictions"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="cycle"/>
+    <inputSet ref="bicycle-lane"/>
+    <inputSet ref="bus-route"/>
+    <inputSet ref="pedestrians"/>
+    <inputSet ref="roadLanes"/>
+    <inputSet ref="roadRoundabout"/>
+    <inputSet ref="permissions"/>
+  </inputSet>
+
+  <inputSet id="minorRoad">
+    <inputSet ref="names"/>
+    <inputSet ref="roadRestrictions"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="cycle"/>
+    <inputSet ref="bicycle-lane"/>
+    <inputSet ref="bus-route"/>
+    <inputSet ref="pedestrians"/>
+    <inputSet ref="roadLanes"/>
+    <inputSet ref="roadRoundabout"/>
+    <inputSet ref="permissions"/>
+  </inputSet>
+
+  <inputSet id="path">
+    <inputSet ref="simpleName"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="cycle"/>
+    <inputSet ref="ldp"/>
+    <inputSet ref="pedestrians"/>
+    <inputSet ref="permissions"/>
+  </inputSet>
+
+  <inputSet id="junctionNode">
+    <inputSet ref="turnRestrictions"/>
+  </inputSet>
+
+  <inputSet id="roadRefs">
+    <input type="freetext" presence="always"
+        name="Reference" category="Naming" priority="high"
+        key="ref" description="The official reference number"/>
+    <input type="freetext" presence="onTagMatch"
+        name="International Reference" category="Naming"
+        key="int_ref" description="The official international reference number"/>
+    <input type="freetext" presence="onTagMatch"
+        name="Old Reference" category="Naming" priority="low"
+        key="old_ref" description="The historic or previous reference number"/>
+  </inputSet>
+
+  <inputSet id="roadPhysical">
+    <input type="freetext" presence="onTagMatch"
+        name="Width" category="Physical"
+        key="width" description="Width of the road" layout="horizontal"/>
+    <input type="choice" presence="onTagMatch"
+        name="Surface" category="Physical" description="Type of road surface"
+        key="surface" layout="horizontal">
+      <choice value="unpaved" text="Unpaved" description="Road surface is unsealed"/>
+      <choice value="paved" text="Paved" description="Road surface is sealed"/>
+      <choice value="asphalt" text="Asphalt"/>
+      <choice value="concrete" text="Concrete"/>
+      <choice value="paving_stones" text="Paving stones"/>
+      <choice value="cobblestone" text="Cobblestone"/>
+      <choice value="sand" text="Sand"/>
+      <choice value="gravel" text="Gravel"/>
+      <choice value="dirt" text="Dirt"/>
+      <choice value="grass" text="Grass"/>
+    </input>
+    <inputSet ref="bridge"/>
+    <inputSet ref="tunnel"/>
+    <inputSet ref="embankment-cutting"/>
+  </inputSet>
+
+  <inputSet id="roadLanes">
+    <input presence="onTagMatch" type="number" name="Lanes" category="Physical" description="Total number of lanes, counting both directions"
+           key="lanes" minimum="1" maximum="10" layout="horizontal"/>
+  </inputSet>
+
+  <inputSet id="bridge">
+    <input type="choice" presence="onTagMatch"
+        name="Bridge" category="Physical" description="Road goes over a bridge"
+        key="bridge" layout="horizontal">
+      <choice value="yes" text="Generic Bridge" description="Generic bridge -- type unknown"/>
+      <choice value="viaduct" text="Viaduct" description="Viaduct"/>
+      <choice value="suspension" text="Suspension bridge"/>
+    </input>
+    <input type="slider" presence="onTagMatch"
+        name="Layer" category="Physical" description="Relative vertical positions (-5 lowest, +5 highest)"
+        key="layer" minimum="-5" maximum="5" default="0" snapInterval="1" labels="Lowest,Ground,Highest"
+        defaultName="Ground"/>
+  </inputSet>
+  <inputSet id="tunnel">
+    <!-- Not ideal, used for non-roads too. -->  
+    <input type="choice" presence="onTagMatch"
+        name="Tunnel" category="Physical" description="Road goes into a tunnel"
+        key="tunnel" layout="horizontal">
+      <choice value="yes" text="Tunnel" description="Generic tunnel"/>
+    </input>
+  </inputSet>
+
+  <inputSet id="embankment-cutting">
+    <input type="choice"
+           name="Embankment" category="Physical" description="Road supported on a raised bed of earth and rock."
+           key="embankment" layout="horizontal">
+      <choice value="yes" text="Embankment"/>
+    </input>
+    <input type="choice"
+           name="Cutting" category="Physical" description="Road carved out of hill on one or both sides."
+           key="cutting" layout="horizontal">
+      <choice value="yes" text="Cutting"/>
+    </input>
+
+  </inputSet>
+
+  <inputSet id="rail-electrification">
+    <input type="choice" name="Electrified" category="Electrification" description="Is the track electrified (whether by 3rd rail, overhead wires, etc)?"
+           key="electrified">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" name="Voltage" category="Electrification" description="Nominal voltage of electric wires"
+           key="voltage" presence="withCategory">
+      <choice value="600" text="600V"/>
+      <choice value="750" text="750V"/>
+      <choice value="1500" text="1500V"/>
+      <choice value="3000" text="3000V"/>
+      <choice value="15000" text="15kV"/>
+      <choice value="25000" text="25kV"/>
+    </input>
+    <input type="choice" name="Frequency" category="Electrification" description="Frequency in Hertz of alternating current power supply"
+           key="frequency" presence="withCategory">
+      <choice value="0" text="DC"/>
+      <choice value="16.67" text="16.67 Hz"/>
+      <choice value="16.7" text="16.7 Hz"/>
+      <choice value="25" text="25 Hz"/>
+      <choice value="50" text="50 Hz"/>
+      <choice value="60" text="60 Hz"/>
+    </input>
+  </inputSet>
+
+  <inputSet id="rail-usage">
+    <input type="choice" name="Usage" category="Usage" description="Main use of the line" key="usage">
+      <choice value="main" text="Main line" description="The principal artery of a rail system."/>
+      <choice value="branch" text="Branch line" description="A secondary line, branching off a main line."/>
+      <choice value="industrial" text="Industrial"/>
+      <choice value="tourism" text="Tourism" />
+      <choice value="military" text="Military"/>
+    </input>
+  </inputSet>
+
+  <inputSet id="fee">
+    <input type="freetext" presence="onTagMatch" category="Restrictions" description="The charge/cost of using this amenity" name="Fee" key="fee"/>
+  </inputSet>
+
+  <inputSet id="roadRestrictions">
+    <input type="choice" presence="always"
+        name="Oneway" category="Restrictions" description="Oneway roads"
+        key="oneway">
+      <choice value="yes" match="yes|true|1" text="One way"
+        description="Road can only be travelled in direction of way" icon="features/oneway__yes.png"/>
+      <choice value="no" match="no|false|0" text="Two way"
+        description="Road can be travelled in both directions" icon="features/oneway__no.png"/>
+      <choice value="-1" match="-1|reverse" text="One way reverse"
+        description="Road can be travelled in opposite direction to way" icon="features/oneway__-1.png"/>
+    </input>
+    <input type="speed" presence="onTagMatch"
+        name="Speed Limit" category="Restrictions" description="Maximum permitted speed on this road"
+        key="maxspeed"/>
+  </inputSet>
+
+  <inputSet id="roadRoundabout">
+    <!-- review the choice of category -->
+    <input type="choice" presence="onTagMatch" name="Roundabout" category="Restrictions" description="Whether this road is a roundabout. Make the way face the direction appropriate for the country."
+           key="junction">
+      <choice value="roundabout" text="Yes"/>
+    </input>
+  </inputSet>
+
+  <inputSet id="turnRestrictions">
+    <input type="turn" name="Turn restriction" description="Turn restriction" category="Restrictions" priority="normal" presence="onTagMatch">
+      <match k="type" v="restriction"/>
+      <role role="via"/>
+    </input>
+  </inputSet>
+
+  <inputSet id="pedestrians">
+    <input type="choice" name="Pedestrians" description="Can pedestrians use this road, including footpaths if any?" category="Walking" key="foot">
+      <choice value="yes" text="Allowed"/>
+      <choice value="no" text="Prohibited"/>
+      <choice value="designated" text="Designated"/>
+    </input>
+  </inputSet>
+
+  <inputSet id="naptan">
+    <input type="freetext" presence="onTagMatch" category="Naptan" description="12 character internal Naptan ID" name="Atco Code" key="naptan:AtcoCode"/>
+    <input type="choice" presence="onTagMatch" category="Naptan" description="The eight-point compass bearning" name="Naptan Bearing" key="naptan:Bearing" >
+      <choice value="N"  match="N"  text="N"  description=""/>
+      <choice value="NE" match="NE" text="NE" description=""/>
+      <choice value="E"  match="E"  text="E"  description=""/>
+      <choice value="SE" match="SE" text="SE" description=""/>
+      <choice value="S"  match="S"  text="S"  description=""/>
+      <choice value="SW" match="SW" text="SW" description=""/>
+      <choice value="W"  match="W"  text="W"  description=""/>
+      <choice value="NW" match="NW" text="NW" description=""/>
+    </input>
+    <input type="freetext" presence="onTagMatch" category="Naptan" description="The naptan common name" name="Naptan Common Name (read-only)" key="naptan:CommonName"/>
+    <input type="freetext" presence="onTagMatch" category="Naptan" description="" name="Naptan Indicator (read-only)" key="naptan:Indicator"/>
+    <input type="freetext" presence="onTagMatch" category="Naptan" description="" name="Naptan Street (read-only)" key="naptan:Street"/>
+    <input type="freetext" presence="onTagMatch" category="Naptan" description="Delete this when the details have been verified on-the-ground" name="Naptan Verified?" key="naptan:verified"/>
+  </inputSet>
+
+  <inputSet id="buses">
+    <input type="freetext" presence="always" category="Bus Stop" name="Stop Name" key="name" description="The name of the bus stop"/>
+    <input type="freetext" presence="always" category="Bus Stop" name="Local Ref" key="local_ref" description="The local reference of the stop, usually one or two letters above the main flag, used at bus interchanges, e.g. L, BX"/>
+    <inputSet ref="naptan"/>
+  </inputSet>
+
+  <inputSet id="bus-route">
+    <input type="route" name="Bus Route" description="Bus route" category="Transport" priority="low" presence="onTagMatch">
+      <match k="type" v="route"/>
+      <match k="route" v="bus"/>
+      <icon image="features/transport__bus.png">
+        <font size="12pt">${operator} <b>${ref}</b></font>
+      </icon>
+    </input>
+  </inputSet>
+
+  <inputSet id="tram-route">
+    <input type="route" name="Tram Route" description="Tram route" category="Transport" priority="low" presence="onTagMatch">
+      <match k="type" v="route"/>
+      <match k="route" v="tram"/>
+      <icon image="features/transport__tram.png">
+        <font size="12pt">${operator} <b>${ref}</b></font>
+      </icon>
+    </input>
+  </inputSet>
+
+  <inputSet id="cycle">
+    <inputSet ref="bicycle-permission"/>
+    <input type="route" name="National Cycle Routes" description="A signposted route in a National Cycle Network, or nearest equivalent." category="Cycle" priority="low">
+      <match k="type" v="route"/>
+      <match k="route" v="bicycle"/>
+      <match k="network" v="ncn"/>
+      <icon image="features/cycle__ncn.png" background="#ff6f7a" foreground="white">
+        <font size="14pt"><b>${ref}</b></font><br/>
+        <font size="12pt">${name}</font>
+      </icon>
+    </input>
+    <input type="route" name="Regional Cycle Routes" description="A signposted route in a Regional Cycle Network, or nearest equivalent." category="Cycle" priority="low">
+      <match k="type" v="route"/>
+      <match k="route" v="bicycle"/>
+      <match k="network" v="rcn"/>
+      <icon image="features/cycle__rcn.png" background="#6ff7ff" foreground="white">
+        <font size="14pt"><b>${ref}</b></font><br/>
+        <font size="12pt">${name}</font>
+      </icon>
+    </input>
+    <input type="route" name="Local Cycle Routes" description="A signposted route in a Local Cycle Network, or nearest equivalent." category="Cycle" priority="lowest">
+      <match k="type" v="route"/>
+      <match k="route" v="bicycle"/>
+      <match k="network" v="lcn"/>
+      <icon image="features/cycle__lcn.png" background="#7d6fff" foreground="white">
+        <font size="14pt"><b>${ref}</b></font><br/>
+        <font size="12pt">${name}</font>
+      </icon>
+    </input>
+  </inputSet>
+
+  <inputSet id="bicycle-permission">
+    <input type="choice"
+           name="Bicycles permitted" category="Cycle" description="Are bicyles allowed to use this road (regardless of physical suitability)?"
+           key="bicycle">
+      <choice value="no" text="Prohibited"/>
+      <choice value="yes" text="Allowed"/>
+      <choice value="designated" text="Designated"/>
+      <choice value="private" text="Private"/>
+      <help>http://wiki.openstreetmap.org/wiki/Key:access</help>
+    </input>
+  </inputSet>
+
+  <inputSet id="bicycle-lane">
+    <input type="choice"
+        name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface"
+        key="cycleway" layout="horizontal">
+      <choice value="no" text="No bike lanes"/>
+      <choice value="opposite" text="No, but two-way bicycle traffic permitted" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane. Common in Belgium, Netherlands, Denmark."/>
+      <choice value="lane" text="Standard bike lane" description="Separated by painted line"/>
+      <choice value="track" text="Copenhagen-style bike lane" description="Separated by kerb or parked cars"/>
+      <choice value="opposite_lane" text="Two-way bike lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
+      <choice value="opposite_track" text="Two-way Copenhagen-style bike lane" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
+      <help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help>
+    </input>
+  </inputSet>
+
+  <inputSet id="ldp">
+    <input type="route" name="National Walking Route" description="National walking route" category="Walking" priority="normal">
+      <match k="type" v="route"/>
+      <match k="network" v="nwn"/>
+      <icon background="red" foreground="white">
+        <font size="14pt"><b>${ref}</b></font><br/>
+        <font size="12pt">${name}</font>
+      </icon>
+    </input>
+    <input type="route" name="Regional Walking Route" description="Regional walking route" category="Walking" priority="low">
+      <match k="type" v="route"/>
+      <match k="network" v="rwn"/>
+      <icon background="cyan" foreground="white">
+        <font size="14pt"><b>${ref}</b></font><br/>
+        <font size="12pt">${name}</font>
+      </icon>
+    </input>
+    <input type="route" name="Local Walking Route" description="Local walking route" category="Walking" priority="lowest">
+      <match k="type" v="route"/>
+      <match k="network" v="lwn"/>
+      <icon background="blue" foreground="white">
+        <font size="14pt"><b>${ref}</b></font><br/>
+        <font size="12pt">${name}</font>
+      </icon>
+    </input>
+  </inputSet>
+
+  <inputSet id="route">
+    <inputSet ref="names"/>
+    <inputSet ref="roadRefs"/>
+  </inputSet>
+
+  <inputSet id="waterways">
+    <input type="freetext" presence="always" name="Name" category="Naming" key="name" description="The name"/>
+    <input type="freetext" presence="always" name="Width" category="Properties" key="width" description="The width in metres"/>
+    <inputSet ref="boatPermissions"/>
+  </inputSet>
+<!-- Would be good to have a dedicated 'access' type of input -->
+  <!-- all the description fields are identical at the moment for ease of maintenance, should be tailored in future. -->
+  <inputSet id="boatPermissions">
+    <input type="choice" name="Boat permission" category="Permission" key="boat" description="Are boats allowed to use this waterway?">
+      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
+      <choice value="yes" text="Allowed" description="General right of way."/>
+      <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
+      <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
+      <choice value="no" text="Prohibited" description="No access to the public."/>
+    </input>
+  </inputSet>
+
+  <inputSet id="permissions">
+    <input type="choice" name="General access" category="Permission" key="access" description="Is there a general right of access, regardless of mode of transport?">
+      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
+      <choice value="yes" text="Allowed" description="General right of way."/>
+      <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
+      <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
+      <choice value="no" text="Prohibited" description="No access to the public."/>
+    </input>
+
+    <input type="choice" name="Motor vehicles" category="Permission" key="motor_vehicle" description="Are cars and other private vehicles allowed?">
+      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
+      <choice value="yes" text="Allowed" description="General right of way."/>
+      <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
+      <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
+      <choice value="no" text="Prohibited" description="No access to the public."/>
+    </input>
+
+    <input type="choice" name="Horses" category="Permission" key="horse" description="Are cars and other private vehicles allowed?">
+      <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
+      <choice value="yes" text="Allowed" description="General right of way."/>
+      <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
+      <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
+      <choice value="no" text="Prohibited" description="No access to the public."/>
+    </input>
+
+  </inputSet>
+
+  <!-- ************************************************************************
+       Roads
+       ************************************************************************ -->
+
+  <feature name="Motorway">
+    <category>roads</category>
+    <icon image="features/highway__motorway.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmotorway</help>
+
+    <line/>
+    <tag k="highway" v="motorway"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Motorway link" icon="features/motorway_link.png">
+    <category>roads</category>
+    <icon image="features/highway__motorway.png"/>
+    <line/>
+    <tag k="highway" v="motorway_link"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Trunk road">
+    <category>roads</category>
+    <icon image="features/highway__trunk.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtrunk</help>
+
+    <line/>
+    <tag k="highway" v="trunk"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Trunk link" icon="features/motorway_link.png">
+    <category>roads</category>
+    <icon image="features/highway__trunk.png"/>
+    <line/>
+    <tag k="highway" v="trunk_link"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Primary road">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary</help>
+
+    <line/>
+    <tag k="highway" v="primary"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Primary road link">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary_link</help>
+
+    <line/>
+    <tag k="highway" v="primary_link"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Secondary road">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="16pt"><b>${ref}</b></font><br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary</help>
+
+    <line/>
+    <tag k="highway" v="secondary"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Secondary road link">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="16pt">
+        <b>${ref}</b>
+      </font>
+      <br/>
+      <font size="10pt">${name}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary_link</help>
+
+    <line/>
+    <tag k="highway" v="secondary_link"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <feature name="Tertiary road">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="14pt"><b>${name}</b></font><br/>
+      <font size="10pt">${ref}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary</help>
+
+    <line/>
+    <tag k="highway" v="tertiary"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Tertiary road link">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="14pt"><b>${name}</b></font><br/>
+      <font size="10pt">${ref}</font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary_link</help>
+
+    <line/>
+    <tag k="highway" v="tertiary_link"/>
+
+    <inputSet ref="majorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Minor road">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified</help>
+
+    <line/>
+    <tag k="highway" v="unclassified"/>
+
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Residential road">
+    <category>roads</category>
+    <icon image="features/highway__residential.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+      <br/>
+      <font size="8pt">${postal_code}</font>
+      <br/>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dresidential</help>
+
+    <line/>
+    <tag k="highway" v="residential"/>
+
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Service road">
+    <category>roads</category>
+    <icon image="features/highway__service.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dservice</help>
+    <description>
+      Access roads
+    </description>
+
+    <line/>
+    <tag k="highway" v="service"/>
+
+    <inputSet ref="minorRoad"/>
+    <input type="choice" presence="always" name="Type of service road" key="service" category="">
+      <choice value="alley" text="Alleyway/laneway"/>
+      <choice value="parking_aisle" text="Parking aisle" description="The path that cars drive on through a parking lot."/>
+      <choice value="driveway" text="Driveway"/>
+      <choice value="drive-through" text="Drive-through" description="For drive-through restaurants, bottle shops etc."/>
+      <choice value="emergency_access" text="Emergency access" description="For firefighters and other emergency services."/>
+    </input>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Unknown road">
+    <category>roads</category>
+    <icon image="features/highway__service.png">
+      <font size="10pt">This road has not been given a specific type. It's a road, and that's all that's known.</font>
+    </icon>
+
+    <line/>
+    <tag k="highway" v="road"/>
+
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Living Street">
+    <category>roads</category>
+    <icon image="features/highway__residential.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dliving_street</help>
+
+    <line/>
+    <tag k="highway" v="living_street"/>
+
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Track">
+    <category>roads</category>
+    <icon image="features/highway__unclassified.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="highway" v="track"/>
+
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- ************************************************************************
+       Paths
+       ************************************************************************ -->
+
+  <feature name="Footpath">
+    <category>paths</category>
+    <icon image="features/paths__footway.png">
+      ${name} <i>${ref}</i>
+    </icon>
+
+    <line/>
+    <tag k="highway" v="footway"/>
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Cycle path">
+    <category>paths</category>
+    <icon image="features/paths__bike.png">
+      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
+    </icon>
+
+    <line/>
+    <tag k="highway" v="cycleway"/>
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Pedestrian Street">
+    <category>paths</category>
+    <icon image="features/paths__pedestrian.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <tag k="highway" v="pedestrian"/>
+    <!-- pedestrian roads can be lines or areas, with different tags -->
+    <!-- TODO - implement this! -->
+    <line>
+      <tag k="highway" v="pedestrian"/>
+    </line>
+    <area>
+      <tag k="highway" v="pedestrian"/>
+      <tag k="area" v="yes"/>
+    </area>
+    <inputSet ref="minorRoad"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Bridleway">
+    <category>paths</category>
+    <icon image="features/paths__bridleway.png">
+    </icon>
+
+    <line/>
+    <tag k="highway" v="bridleway"/>
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Steps">
+    <category>paths</category>
+    <icon image="features/paths__steps.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps</help>
+
+    <line/>
+    <tag k="highway" v="steps"/>
+    <inputSet ref="path"/>
+    <input type="freetext" presence="always" category="Naming" name="Number of steps" key="step_count" description="The number of steps in the way" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- ************************************************************************
+       Natural
+       ************************************************************************ -->
+
+  <feature name="Park">
+    <category>natural</category>
+    <icon image="icons/natural_blank.png">
+      <b>${name}</b>
+      <br/>
+    </icon>
+
+    <area/>
+    <tag k="leisure" v="park"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Forest">
+    <category>natural</category>
+    <icon image="icons/natural_blank.png"/>
+
+    <area/>
+    <tag k="landuse" v="forest"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Meadow">
+    <category>natural</category>
+    <icon image="icons/natural_blank.png"/>
+
+    <area/>
+    <tag k="landuse" v="meadow"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- ************************************************************************
+       Barrier
+       ************************************************************************ -->
+
+  <feature name="Wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help>
+
+    <line/>
+    <tag k="barrier" v="wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Ditch">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
+
+    <line/>
+    <tag k="barrier" v="ditch"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Retaining wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help>
+
+    <line/>
+    <tag k="barrier" v="retaining_wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="City wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help>
+
+    <line/>
+    <tag k="barrier" v="city_wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Fence">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help>
+
+    <line/>
+    <tag k="barrier" v="fence"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hedge">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help>
+
+    <line/>
+    <tag k="barrier" v="hedge"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <!-- ************************************************************************
+       Waterways
+       ************************************************************************ -->
+
+  <feature name="Stream">
+    <category>water</category>
+    <description>A very narrow river.</description>
+    <icon image="features/waterway__stream.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="waterway" v="stream"/>
+    <inputSet ref="waterways"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="River">
+    <category>water</category>
+    <icon image="features/waterway__river.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="waterway" v="river"/>
+    <inputSet ref="waterways"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Canal">
+    <category>water</category>
+    <icon image="features/waterway__canal.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="waterway" v="canal"/>
+    <inputSet ref="waterways"/>
+    <inputSet ref="tunnel"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Drain">
+    <category>water</category>
+    <icon image="features/pois/water_generic.24.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="waterway" v="drain"/>
+    <inputSet ref="tunnel"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Dam">
+    <!-- Moved to "barrier" because this describes the dam wall, not the water. -->
+    <category>barrier</category>
+    <icon image="features/waterway__dam.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <area/>
+    <tag k="waterway" v="dam"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Riverbank">
+    <category>water</category>
+    <icon image="features/pois/water_generic.24.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <area/>
+    <tag k="waterway" v="riverbank"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Reservoir">
+    <category>water</category>
+    <icon image="features/pois/water_generic.24.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <area/>
+    <tag k="landuse" v="reservoir"/>
+    <inputSet ref="boatPermissions"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Lake">
+    <category>water</category>
+    <icon image="features/pois/water_generic.24.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+    <area/>
+    <tag k="natural" v="water"/>
+    <inputSet ref="names"/>
+    <inputSet ref="boatPermissions"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Basin">
+    <category>water</category>
+    <icon image="features/pois/water_generic.24.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <area/>
+    <tag k="landuse" v="basin"/>
+    <inputSet ref="boatPermissions"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Weir">
+    <category>water</category>
+    <icon image="features/pois/water_generic.24.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <point/>
+    <tag k="waterway" v="weir"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+
+  <feature name="Dock">
+    <category>water</category>
+    <icon image="features/pois/water_generic.24.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <area/>
+    <tag k="waterway" v="dock"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Marina">
+    <category>water</category>
+    <icon image="features/pois/transport_marina.n.24.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <area/>
+    <point/>
+    <tag k="leisure" v="marina"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Slipway">
+    <category>water</category>
+    <icon image="features/pois/water_generic.24.png"/>
+    <line/>
+    <tag k="leisure" v="slipway"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <area/>
+
+  <!-- ************************************************************************
+       Transport
+       ************************************************************************ -->
+
+  <feature name="Railway line">
+    <category>transport</category>
+    <icon image="features/transport__railway.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="rail"/>
+    <inputSet ref="bridge"/>
+    <inputSet ref="tunnel"/>
+    <inputSet ref="embankment-cutting"/>
+    <inputSet ref="rail-electrification"/>
+    <inputSet ref="rail-usage"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Railway spur">
+    <category>transport</category>
+    <icon image="features/transport__railway.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="rail"/>
+    <tag k="service" v="spur"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Railway siding">
+    <category>transport</category>
+    <icon image="features/transport__railway.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="rail"/>
+    <tag k="service" v="siding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Preserved line">
+    <category>transport</category>
+    <icon image="features/transport__railway.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="preserved"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Disused tracks">
+    <category>transport</category>
+    <icon image="features/transport__railway_disused.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="disused"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Old trackbed">
+    <category>transport</category>
+    <icon image="features/transport__railway_abandoned.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="abandoned"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Light rail line">
+    <category>transport</category>
+    <icon image="features/transport__tram.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="light_rail"/>
+    <inputSet ref="bridge"/>
+    <inputSet ref="tunnel"/>
+    <inputset ref="embankment-cutting"/>
+    <inputSet ref="rail-electrification"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Tram line">
+    <category>transport</category>
+    <icon image="features/transport__tram.png">
+      <font size="14pt"><b>${name}</b></font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="tram"/>
+    <input ref="tram-route"/>
+    <inputSet ref="bridge"/>
+    <inputSet ref="tunnel"/>
+    <inputset ref="embankment-cutting"/>
+    <inputSet ref="rail-electrification"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Subway line">
+    <category>transport</category>
+    <icon image="features/transport__subway.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <line/>
+    <tag k="railway" v="subway"/>
+    <inputSet ref="bridge"/>
+    <inputSet ref="tunnel"/>
+    <inputset ref="embankment-cutting"/>
+    <inputSet ref="rail-electrification"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Railway platform">
+    <category>transport</category>
+    <icon image="features/transport__railway_platform.png"/>
+    <line/>
+    <area/>
+    <tag k="railway" v="platform"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The number of the platform" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bus station">
+    <category>transport</category>
+    <icon image="icons/transport_blank.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="bus_station"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Airport">
+    <category>transport</category>
+    <icon image="icons/transport_airport_48.png"/>
+    <tag k="aeroway" v="aerodrome"/>
+    <area/>
+    <point/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="always" category="Naming" name="International Air Transport Association (IATA) airport code" key="ref"/>
+    <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Airport terminal">
+    <category>transport</category>
+    <icon image="features/pois/transport_airport_terminal.n.24.png"/>
+    <tag k="aeroway" v="terminal"/>
+    <area/>
+    <point/>
+    <inputSet ref="names"/>
+    <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Helipad">
+    <category>transport</category>
+    <icon image="icons/transport_helipad_48.png"/>
+    <tag k="aeroway" v="helipad"/>
+    <area/>
+    <point/>
+    <inputSet ref="names"/>
+    <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Airport runway">
+    <category>transport</category>
+    <icon image="icons/transport_blank.png"/>
+    <tag k="aeroway" v="runway"/>
+    <line/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="always" category="Naming" name="Runway number (01-36)" key="ref"/>
+    <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Airport taxiway">
+    <category>transport</category>
+    <icon image="icons/transport_blank.png"/>
+    <tag k="aeroway" v="taxiway"/>
+    <line/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="always" category="Naming" name="Taxiway number" key="ref" />
+    <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Airport apron">
+    <category>transport</category>
+    <icon image="icons/transport_blank.png"/>
+    <tag k="aeroway" v="apron"/>
+    <area/>
+    <inputSet ref="names"/>
+    <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Airport gate">
+    <category>transport</category>
+    <icon image="features/pois/transport_airport_gate.n.24.png"/>
+    <tag k="aeroway" v="gate"/>
+    <point/>
+    <input type="freetext" presence="always" category="Naming" name="Gate number" key="ref"/>
+    <help>http://wiki.openstreetmap.org/wiki/Key:aeroway</help>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- ************************************************************************
+       Buildings
+       ************************************************************************ -->
+
+  <feature name="School">
+    <category>buildings</category>
+    <icon image="features/pois/education_school.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="school"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="College">
+    <category>buildings</category>
+    <icon image="features/pois/education_university.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="college"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Supermarket">
+    <category>buildings</category>
+    <icon image="features/pois/shopping_supermarket.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="shop" v="supermarket"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Place of worship">
+    <category>buildings</category>
+    <icon image="icons/place_of_worship.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="place_of_worship"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <input type="choice" category="Religion" name="Religion" key="religion" description="The religion to which this place of worship belongs.">
+      <choice value="christian" text="Christianity (church)"/>
+      <choice value="jewish" text="Judaism (synagogue)"/>
+    </input>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Public building">
+    <category>buildings</category>
+    <icon image="features/pois/building_generic.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="public_building"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hospital">
+    <category>buildings</category>
+    <icon image="features/pois/health_hospital.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="hospital"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="University">
+    <category>buildings</category>
+    <icon image="features/pois/education_university.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="university"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Attraction">
+    <category>buildings</category>
+    <icon image="features/pois/tourist_attraction.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="tourism" v="attraction"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Museum">
+    <category>buildings</category>
+    <icon image="features/pois/tourist_museum.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="tourism" v="museum"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Zoo">
+    <category>buildings</category>
+    <icon image="features/pois/tourist_zoo.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="tourism" v="zoo"/>
+    <tag k="building" v="yes"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Stadium">
+    <category>buildings</category>
+    <icon image="icons/tourist_blank.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="leisure" v="stadium"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Building">
+    <category>buildings</category>
+    <icon image="features/pois/building_generic.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="building" v="*"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Sports centre">
+    <category>buildings</category>
+    <icon >
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <point/>
+    <tag k="leisure" v="sports_centre"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="pitchSport"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <!-- ************************************************************************
+       Landuse
+       ************************************************************************ -->
+
+  <feature name="Industry">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="industrial"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Offices">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="commercial"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Residential">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="residential"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Retail">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="retail"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Marketplace">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/shopping_greengrocer.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="amenity" v="marketplace"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Cemetery">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/place_of_worship_unknown3.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="cemetery"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Quarry">
+    <category>landuse</category>
+    <icon image="features/pois/poi_mine.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="quarry"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Military">
+    <category>landuse</category>
+    <icon image="features/pois/poi_military_bunker.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="military"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Conservation">
+    <category>natural</category>
+    <icon image="icons/natural_blank.png"/>
+    <area/>
+    <tag k="landuse" v="conservation"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+
+
+  <feature name="Playground">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="leisure" v="playground"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Golf course">
+    <category>landuse</category>
+    <area/>
+    <icon  image="features/pois/sport_golf.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="leisure" v="golf_course"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Recreation ground">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="leisure" v="recreation_ground"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Sports pitch">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="leisure" v="pitch"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="pitchSport"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <inputSet id="pitchSport">
+    <input name="Sport" presence="always" category="Sport" key="sport" type="choice" description="The sport that is predominantly played here.">
+      <choice value="9pin" text="9 pin bowling"/>
+      <choice value="10pin" text="10 pin bowling"/>
+      <choice value="american_football" text="American football"/>
+      <choice value="archery" text="Archery"/>
+      <choice value="athletics" text="Athletics"/>
+      <choice value="australian_football" text="Australian Rules Football"/>
+      <choice value="baseball" text="Baseball"/>
+      <choice value="basketball" text="Basketball"/>
+      <choice value="beachvolleyball" text="Beach volleyball"/>
+      <choice value="boules" text="Boules/petanque/bocci"/>
+      <choice value="bowls" text="Lawn bowls"/>
+      <choice value="canadian_football" text="Canadian football"/>
+      <choice value="chess" text="Chess"/>
+      <choice value="cricket" text="Cricket"/>
+      <choice value="cricket_nets" text="Cricket nets"/>
+      <choice value="croquet" text="Croquet"/>
+      <choice value="equestrian" text="Equestrian"/>
+      <choice value="gaelic_football" text="Gaelic football"/>
+      <choice value="gymnastics" text="Gymnastics"/>
+      <choice value="team_handball" text="(Team) handball"/>
+      <choice value="hockey" text="(Field) hockey"/>
+      <choice value="korfball" text="Korball"/>
+      <choice value="pelota" text="Pelota"/>
+      <choice value="rugby_league" text="Rugby league"/>
+      <choice value="rugby_union" text="Rugby union"/>
+      <choice value="shooting" text="Shooting"/>
+      <choice value="skating" text="Ice skating"/>
+      <choice value="skateboard" text="Skateboarding"/>
+      <choice value="soccer" text="Soccer/football"/>
+      <choice value="swimming" text="Swimming"/>
+      <choice value="table_tennis" text="Table tennis"/>
+      <choice value="tennis" text="Tennis"/>
+      <choice value="volleyball" text="Volleyball"/>
+    </input>
+  </inputSet>
+
+  <feature name="Sports track">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="leisure" v="track"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- ************************************************************************
+       Power
+       ************************************************************************ -->
+
+  <feature name="High-voltage line">
+    <category>power</category>
+    <icon image="features/power_high.png"/>
+    <line/>
+    <tag k="power" v="line"/>
+    <inputSet ref="powerCables"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Low-voltage line">
+    <category>power</category>
+    <icon image="features/power_low.png"/>
+    <line/>
+    <tag k="power" v="minor_line"/>
+    <inputSet ref="powerCables"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="High-voltage pylon">
+    <category>power</category>
+    <icon image="icons/power_tower_24.png"/>
+    <point/>
+    <tag k="power" v="tower"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Power pole">
+    <category>power</category>
+    <icon image="icons/power_pole_24.png"/>
+    <point/>
+    <tag k="power" v="pole"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Plant (station)">
+    <category>power</category>
+    <icon image="icons/power_blank.png"/>
+    <area/>
+    <point/>
+    <tag k="power" v="generator"/>
+    <inputSet ref="names"/>
+    <input type="choice" presence="always"  name="Energy source" key="power_source" category="Power">
+      <choice value="coal" text="Coal"/>
+      <choice value="gas" text="Gas"/>
+      <choice value="oil" text="Oil"/>
+      <choice value="fossil" text="Unspecified fossil fuel"/>
+      <choice value="hydro" text="Hydroelectric"/>
+      <choice value="geothermal" text="Geothermal"/>
+      <choice value="nuclear" text="Nuclear"/>
+      <choice value="wind" text="Wind"/>
+      <choice value="photovoltaic" text="Solar PV"/>
+      <choice value="solar_thermal" text="Solar thermal"/>
+      <choice value="biofuel" text="Biofuel"/>
+    </input>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Substation">
+    <category>power</category>
+    <icon image="icons/power_blank.png"/>"
+    <area/>
+    <point/>
+    <tag k="power" v="station"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Transformer">
+    <category>power</category>
+    <icon image="icons/power_blank.png"/>
+    <area/>
+    <point/>
+    <tag k="power" v="sub_station"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <inputSet id="powerCables">
+    <input type="choice" name="Cables" key="cables" presence="always" category="Power">
+      <choice value="2" text="2"/>
+      <choice value="3" text="3"/>
+      <choice value="4" text="4"/>
+      <choice value="6" text="6"/>
+      <choice value="8" text="8"/>
+      <choice value="10" text="10"/>
+      <choice value="12" text="12"/>
+    </input>
+    <input type="choice" name="Voltage" key="voltage" presence="always" category="Power">
+      <!-- choices based on http://osmdoc.com/en/tag/voltage/#values-->
+      <choice value="400" text="400 V"/>
+      <choice value="600" text="600 V"/>
+      <choice value="750" text="750 V"/>
+      <choice value="1500" text="1500 V"/>
+      <choice value="3000" text="3000 V"/>
+      <choice value="15000" text="15 kV"/>
+      <choice value="20000" text="20 kV"/>
+      <choice value="35000" text="35 kV"/>
+      <choice value="110000" text="110 kV"/>
+      <choice value="132000" text="132 kV"/>
+      <choice value="138000" text="238 kV"/>
+      <choice value="220000" text="220 kV"/>
+      <choice value="380000" text="380 kV"/>
+    </input>
+  </inputSet>
+
+  <!-- Places -->
+  <feature name="Place">
+    <category>misc</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <!-- TODO: make this work -->
+    <tag k="place" v="*"/>
+    <inputSet ref="names"/>
+    <input type="choice" name="Type of place name" presence="always" key="place">
+      <choice value="locality" text="Locality"/>
+      <choice value="hamlet" text="Hamlet"/>
+      <choice value="village" text="Village"/>
+      <choice value="suburb" text="Suburb"/>
+      <choice value="county" text="County"/>
+      <choice value="city" text="City"/>
+      <choice value="region" text="Region"/>
+      <choice value="state" text="State"/>
+      <choice value="country" text="Country"/>
+      <choice value="continent" text="Continent"/>
+      <choice value="island" text="Island"/>
+      <choice value="islet" text="Islet"/>
+    </input>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+
+  <!-- ************************************************************************
+       POIs
+       ************************************************************************ -->
+
+  <!-- =========== Amenity ============ -->
+
+  <feature name="Fire station">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_firestation2.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station</help>
+    <point/>
+    <tag k="amenity" v="fire_station"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Police Station">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_police2.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice</help>
+    <point/>
+    <tag k="amenity" v="police"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hospital">
+    <category>amenity</category>
+    <icon image="features/pois/health_hospital.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital</help>
+    <point/>
+    <tag k="amenity" v="hospital"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Place of Worship">
+    <category>amenity</category>
+    <icon image="icons/place_of_worship.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dplace_of_worship</help>
+    <point/>
+    <tag k="amenity" v="place_of_worship"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of it." priority="low"/>
+    <input type="choice" presence="always" category="" name="Religion" key="religion" description="The religion worshipped here.">
+      <choice value="christian" text="Christianity (church)"/>
+      <choice value="jewish" text="Judaism (synagogue)"/>
+      <choice value="muslim" text="Islam (mosque)"/>
+      <choice value="hindu" text="Hinduism (temple)"/>
+      <choice value="buddhist" text="Buddhism (temple)"/>
+      <choice value="sikh" text="Sikhism (gurdwara)"/>
+      <choice value="shinto" text="Shinto (shrine)"/>
+    </input>
+
+    <input type="freetext" presence="always" category="" name="denomination" key="denomination" description="The denomination of the religion worshiped here." priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="ATM">
+    <category>amenity</category>
+    <icon image="features/pois/money_atm.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Atm</help>
+    <point/>
+    <tag k="amenity" v="atm"/>
+    <input type="freetext" presence="always" category="Banking" name="Operator" key="operator" description="The organisation that provides this ATM" priority="low"/>
+    <input type="freetext" presence="always" category="Banking" name="Fee" key="fee" description="Is there a charge for using this ATM? If so how much?"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bank">
+    <category>amenity</category>
+    <icon image="features/pois/money_bank2.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbank</help>
+    <point/>
+    <tag k="amenity" v="bank"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <input type="choice" presence="always" category="Bank" name="Public ATM available" key="atm" description="Is there a public ATM available?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Recycling">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_recycling.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>
+    <point/>
+    <tag k="amenity" v="recycling"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="School">
+    <category>amenity</category>
+    <icon image="features/pois/education_school.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool</help>
+    <point/>
+    <tag k="amenity" v="school"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Post Box">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_post_box.n.24.png">
+      ${ref}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Post_box</help>
+    <point/>
+    <tag k="amenity" v="post_box"/>
+    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post box"/>
+    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- ========= Accommodation ========= -->
+  <!-- Split off from tourism by Steve Bennett, can be remerged if it doesn't work out. -->
+  <feature name="Hotel">
+    <category>accommodation</category>
+    <icon image="features/pois/accommodation_hotel.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dhotel</help>
+    <point/>
+    <area/>
+    <tag k="tourism" v="hotel"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Motel">
+    <category>accommodation</category>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmotel</help>
+    <point/>
+    <area/>
+    <icon image="features/pois/accommodation_motel.n.24.png"/>
+    <tag k="tourism" v="motel"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <feature name="Hostel">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_youth_hostel.n.24.png"/>
+    <tag k="tourism" v="hostel"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- Note that tourism=bed_and_breakfast also gets some use. -->
+  <feature name="Guesthouse (B&amp;B)">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_bed_and_breakfast.n.24.png"/>
+    <tag k="tourism" v="guest_house"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Campsite">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_camping.n.24.png"/>
+    <tag k="tourism" v="camp_site"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Caravan park">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_caravan_park.n.24.png"/>
+    <tag k="tourism" v="caravan_site"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Alpine hut">
+    <category>accommodation</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/accommodation_alpinehut.n.24.png"/>
+    <tag k="tourism" v="alpine_hut"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Chalet">
+    <category>accommodation</category>
+    <icon image="features/pois/accommodation_chalet.n.24.png"/>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <tag k="tourism" v="chalet"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <!-- ========= Tourism ========= -->
+
+  <!-- This is a very popular tag, can't be left out -->
+  <feature name="Attraction">
+    <category>tourism</category>
+    <icon image="icons/tourist_blank.png"/>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <tag k="tourism" v="attraction"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+
+  <feature name="Museum">
+    <category>tourism</category>
+    <icon image="features/pois/tourist_museum.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmuseum</help>
+    <point/>
+    <area/>
+    <tag k="tourism" v="museum"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Archaeological">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_archaeological.n.24.png"/>
+    <tag k="historic" v="archaeological_site"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Battlefield">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_battlefield.n.24.png"/>
+    <tag k="historic" v="battlefield"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Castle">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_castle.n.24.png"/>
+    <tag k="historic" v="castle"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Memorial">
+    <category>tourism</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_memorial.n.24.png"/>
+    <tag k="historic" v="memorial"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Monument">
+    <category>tourism</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_monument.n.24.png"/>
+    <tag k="historic" v="monument"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Picnic site">
+    <category>tourism</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_picnic.n.24.png"/>
+    <tag k="tourism" v="picnic_site"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Ruin">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_ruin.n.24.png"/>
+    <tag k="historic" v="ruin"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Cinema">
+    <category>tourism</category>
+    <icon image="features/pois/tourist_cinema.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcinema</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="cinema"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the cinema" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Theatre">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_theatre.n.24.png"/>
+    <tag k="amenity" v="theatre"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Viewpoint">
+    <category>tourism</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_view_point.n.24.png"/>
+    <tag k="tourism" v="viewpoint"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Zoo">
+    <category>tourism</category>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/tourist_zoo.n.24.png"/>
+    <tag k="tourism" v="zoo"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- icons needed-->
+  <feature name="Information">
+    <category>tourism</category>
+    <icon image="features/pois/amenity_information.n.24.png"/>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <tag k="tourism" v="information"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Artwork">
+    <category>tourism</category>
+    <icon image="features/pois/tourist_art_gallery2.n.24.png"/>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <tag k="tourism" v="artwork"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <feature name="Theme park">
+    <category>tourism</category>
+    <icon image="features/pois/tourist_theme_park.n.24.png"/>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <tag k="tourism" v="theme_park"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <!-- ========= Transport ========= -->
+
+  <feature name="Aerodrome">
+    <category>aeroway</category>
+    <icon image="features/pois/transport_aerodrome.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome</help>
+    <point/>
+    <tag k="aeroway" v="aerodrome"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the aerodrome/airport" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bus Stop">
+    <category>transport</category>
+    <icon image="features/pois/transport_bus_stop2.n.24.png">
+      ${name} ${local_ref}
+    </icon>
+    <point/>
+    <tag k="highway" v="bus_stop"/>
+    <inputSet ref="buses"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Car Parking">
+    <category>transport</category>
+    <icon image="features/pois/transport_parking_car.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dparking</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="parking"/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
+    <inputSet ref="fee"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bicycle Parking">
+    <category>transport</category>
+    <icon image="features/pois/transport_parking_bicycle.n.24.png">
+      ${name} ${capacity}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_parking</help>
+    <point/>
+    <tag k="amenity" v="bicycle_parking"/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <input type="number" minimum="0" maximum="99999" stepSize="1"
+        presence="always" category="Cycle" name="Capacity" key="capacity"
+        description="The number of bicycles that can be parked in the group of bicycle parking racks"/>
+    <inputSet ref="fee"/>
+    <input type="choice" presence="always" category="Cycle" name="Covered" key="covered" description="Is the cycle parking covered, so that the bikes are kept dry?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Railway station">
+    <category>transport</category>
+    <icon image="features/pois/transport_train_station.n.24.png">
+      <font size="14pt">
+        <b>${name}</b>
+      </font>
+    </icon>
+
+    <point/>
+    <tag k="railway" v="station"/>
+    <inputSet ref="names"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Reference" key="ref" description="The shortcode/reference for the station" priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the service" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Fuel">
+    <category>transport</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/transport_fuel.n.24.png"/>
+    <tag k="amenity" v="fuel"/>
+    <input type="freetext" category="Naming" name="Operator" key="operator" description="The provider of the service"/>
+    <input type="choice" category="Fuels" name="Diesel" key="diesel" description="Is diesel fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 95" key="octane_95" description="Is octane 95 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 98" key="octane_98" description="Is octane 98 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 100" key="octane_100" description="Is octane 100 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Ethanol" key="ethanol" description="Is ethanol sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="LPG" key="lpg" description="Is LPG (liquid petroleum gas) sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Bio-diesel" key="biodiesel" description="Is biodiesel unleaded fuel sold here?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+
+
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bus station">
+    <category>transport</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/transport_bus_station.n.24.png"/>
+    <tag k="amenity" v="bus_station"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Taxi rank">
+    <category>transport</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/transport_taxi_rank.n.24.png"/>
+    <tag k="amenity" v="taxi"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Tram stop">
+    <category>transport</category><point/><inputSet ref="simpleName" />
+    <icon image="features/pois/transport_tram_stop.n.24.png"/>
+    <tag k="railway" v="tram_stop"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bicycle rental">
+    <category>transport</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/transport_rental_bicycle.n.24.png"/>
+    <tag k="amenity" v="bicycle_rental"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Car rental">
+    <category>transport</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <icon image="features/pois/transport_rental_car.n.24.png"/>
+    <tag k="amenity" v="car_rental"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Ferry Terminal">
+    <category>transport</category>
+    <icon image="features/pois/transport_port.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal</help>
+    <point/>
+    <tag k="amenity" v="ferry_terminal"/>
+    <input type="freetext" presence="always" category="" name="name" key="name" description="The name of the ferry terminal."/>
+    <input type="freetext" presence="always" category="" name="Operator" key="operator" description="The operator of the ferry terminal." priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Cargo" name="Cargo" key="cargo" description="The cargo shipped from here." priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- ========= Barriers ========= -->
+
+  <feature name="Bollard">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_bollard.n.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>
+
+    <point/>
+    <tag k="barrier" v="bollard"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Gate">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_gate.n.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help>
+
+    <point/>
+    <tag k="barrier" v="gate"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Lift Gate">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_lift_gate.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dlift_gate</help>
+    <point/>
+    <tag k="barrier" v="lift_gate"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Kissing Gate">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_kissing_gate.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dkissing_gate</help>
+    <point/>
+    <tag k="barrier" v="kissing_gate"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <feature name="Cycle Barrier">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_cycle_barrier.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help>
+
+    <point/>
+    <tag k="barrier" v="cycle_barrier"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Big Concrete Blocks">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_blocks.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help>
+
+    <point/>
+    <tag k="barrier" v="block"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Cattle Grid">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_cattle_grid.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help>
+
+    <point/>
+    <tag k="barrier" v="cattle_grid"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Toll Booth">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_toll_booth.n.24.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth</help>
+
+    <point/>
+    <tag k="barrier" v="toll_booth"/>
+    <tagSet ref="fee"/>
+    <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Stile">
+    <category>barrier</category>
+    <icon image="features/pois/barrier_stile.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dstile</help>
+    <point/>
+    <tag k="barrier" v="stile"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Turning circle">
+    <category>transport</category>
+    <icon image="features/pois/transport_turning_circle.n.24.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle</help>
+    <point/>
+    <tag k="highway" v="turning_circle"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Traffic calming">
+
+    <category>transport</category>
+    <icon image="icons/speed_hump_16.png"/>
+    <help>http://wiki.openstreetmap.org/wiki/Key:traffic%3Dcalming</help>
+    <point/>
+    <!-- Warning: creates "traffic_calming=*" by default, but it's the best we can do. Steve Bennett-->
+    <tag k="traffic_calming" v="*"/>
+    <input type="choice" key="traffic_calming" name="Obstacle type" category="Traffic calming" presence="onTagMatch">
+      <choice value="yes" text="Unspecified"/>
+      <choice value="bump" text="Short bump" description="A sharp speed bump, typically slowing cars to 15 kph or less."/>
+      <choice value="hump" text="Speed hump" description="A gentler, longer bump, typically slowing cars to 30 kph or less."/>
+      <choice value="cushion" text="Speed cushion" description="A narrow speed bump allowing emergency vehicles and buses to pass without slowing."/>
+      <choice value="table" text="Speed table" description="A very long speed hump allowing the whole wheelbase to rest on top."/>
+      <choice value="chicane" text="Chicane" description="A set of obstacles causing vehicles to weave through."/>
+      <choice value="rumble_strip" text="Rumble strip" description="A series of very small bumps causing vibration or noise."/>
+      <choice value="choker" text="Choker" description="An artificial narrowing of the road."/>
+    </input>
+
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <!-- ========= Entertainment ========= -->
+
+  <feature name="Pub">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_pub.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub</help>
+    <point/>
+    <tag k="amenity" v="pub"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="wifi"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bar">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_bar.n.24.png">
+      ${name}
+    </icon>
+    <point/>
+    <tag k="amenity" v="bar"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="wifi"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Restaurant">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_restaurant.n.24.png">
+      ${name}
+    </icon>
+    <point/>
+    <tag k="amenity" v="restaurant"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="cuisine"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Cafe">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_cafe.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe</help>
+    <point/>
+    <tag k="amenity" v="cafe"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="cuisine"/>
+    <inputSet ref="wifi"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Fast Food">
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_fastfood.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food</help>
+    <point/>
+    <tag k="amenity" v="fast_food"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="cuisine"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- ========= Shops ========= -->
+
+  <feature name="Small Convenience Store">
+    <category>shopping</category>
+    <icon image="features/pois/shopping_convenience.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience</help>
+    <point/>
+    <tag k="shop" v="convenience"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Supermarket">
+    <category>shopping</category>
+    <icon image="features/pois/shopping_supermarket.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>
+    <point/>
+    <tag k="shop" v="supermarket"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Alcohol shop">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_alcohol.n.24.png"/>
+    <tag k="shop" v="alcohol"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bakery">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_bakery.n.24.png"/>
+    <tag k="shop" v="bakery"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bike shop">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_bicycle.n.24.png"/>
+    <tag k="shop" v="bicycle"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Bookshop">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_book.n.24.png"/>
+    <tag k="shop" v="book"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Butcher">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_butcher.n.24.png"/>
+    <tag k="shop" v="butcher"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Car repair">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_car_repair.n.24.png"/>
+    <tag k="shop" v="car_repair"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Clothes shop">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_clothes.n.24.png"/>
+    <tag k="shop" v="clothes"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Confectionery">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_confectionery.n.24.png"/>
+    <tag k="shop" v="confectionery"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="DIY">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_diy.n.24.png"/>
+    <tag k="shop" v="doityourself"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Fishmonger">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_fish.n.24.png"/>
+    <tag k="shop" v="fishmonger"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Garden centre">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_garden_centre.n.24.png"/>
+    <tag k="shop" v="garden_centre"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Gift shop">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_gift.n.24.png"/>
+    <tag k="shop" v="gift"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Greengrocer">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_greengrocer.n.24.png"/>
+    <tag k="shop" v="greengrocer"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hairdresser">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_hairdresser.n.24.png"/>
+    <tag k="shop" v="hairdresser"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hifi shop">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_hifi.n.24.png"/>
+    <tag k="shop" v="hifi"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Jewellery">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_jewelry.n.24.png"/>
+    <tag k="shop" v="jewelry"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Laundrette">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_laundrette.n.24.png"/>
+    <tag k="shop" v="laundry"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Motorbike shop">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_motorcycle.n.24.png"/>
+    <tag k="shop" v="motorcycle"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Music shop">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_music.n.24.png"/>
+    <tag k="shop" v="music"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Pharmacy">
+    <category>shopping</category>
+    <icon image="features/pois/health_pharmacy.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Pharmacy</help>
+    <point/>
+    <tag k="amenity" v="pharmacy"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <input type="checkbox" category="Amenity" presence="always" description="Does this pharmacy sell prescription drugs?" name="Dispensing" key="dispensing" layout="horizontal"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- **************** Agriculture *************** -->
+  <feature name="Farm">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="farm"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Farmyard">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="farmyard"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Farmland">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="farmland"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Field">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="meadow"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Orchard">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="orchard"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Vineyard">
+    <category>agriculture</category>
+    <icon image="features/pois/landuse_grass.n.24.png"/>
+    <area/>
+    <tag k="landuse" v="vineyard"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- ************************************************************************
+       Relations
+       ************************************************************************ -->
+
+  <feature name="Turn restriction">
+    <category>advanced</category>
+    <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>
+    <relation/>
+    <tag k="type" v="restriction"/>
+    <input type="choice" category="Restrictions" presence="always" name="Type" key="restriction" description="What's the restriction?" layout="horizontal" priority="high">
+      <choice value="no_left_turn"      text="No left turn"/>
+      <choice value="no_right_turn"     text="No right turn"/>
+      <choice value="no_u_turn"         text="No U turns"/>
+      <choice value="no_straight_on"    text="No straight on"/>
+      <choice value="only_left_turn"    text="Left turn only"/>
+      <choice value="only_right_turn"   text="Right turn only"/>
+      <choice value="only_straight_on"  text="Straight on only"/>
+    </input>
+    <input type="choice" category="Restrictions" presence="always" name="Except" key="except" description="Are any vehicles exempt?" layout="horizontal">
+      <choice value="psv"      text="Bus"/>
+      <choice value="bicycle"  text="Bicycle"/>
+      <choice value="motorcar" text="Car"/>
+      <choice value="hgv"      text="HGV"/>
+    </input>
+    <input type="freetext" category="Restrictions" presence="always" name="Start day"  key="day_on"   description="What day of the week does it start?" layout="horizontal" priority="low"/>
+    <input type="freetext" category="Restrictions" presence="always" name="Start time" key="hour_on"  description="What time of day does it start?"     layout="horizontal" priority="low"/>
+    <input type="freetext" category="Restrictions" presence="always" name="End day"    key="day_off"  description="What day of the week does it end?"   layout="horizontal" priority="lowest"/>
+    <input type="freetext" category="Restrictions" presence="always" name="End time"   key="hour_off" description="What time of day does it end?"       layout="horizontal" priority="lowest"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Multipolygon">
+    <category>advanced</category>
+    <relation/>
+    <tag k="type" v="multipolygon"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <!-- cycle stuff -->
+  <feature name="National Cycle Network">
+    <category>paths</category>
+    <icon image="features/cycle__ncn.png" background="red" foreground="white">
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br/>
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="network" v="ncn"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Regional Cycle Network">
+    <category>paths</category>
+    <icon image="features/cycle__rcn.png" background="cyan" foreground="white">
+      <font size="14pt"><b>${ref}</b></font><br/>
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="network" v="rcn"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Local Cycle Network">
+    <category>paths</category>
+    <icon image="features/cycle__lcn.png" background="blue" foreground="white">
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br/>
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="network" v="lcn"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <!-- paths -->
+  <feature name="Long Distance Path">
+    <category>paths</category>
+    <icon image="features/paths__footway.png" background="green" foreground="white">
+      <font size="14pt">
+        <b>${ref}</b>
+      </font>
+      <br/>
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="route" v="foot"/>
+
+    <inputSet ref="route"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <!-- public transit routes -->
+  <feature name="Bus Route">
+    <category>transport</category>
+    <icon image="features/transport__bus.png">
+      <font size="12pt">
+        ${operator} <b>${ref}</b>
+      </font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="route" v="bus"/>
+
+    <inputSet ref="route"/>
+    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the bus service" priority="low"/>
+    <input type="freetext" presence="always" category="Naming" name="Network" key="network" description="The network of the bus service" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Tram Route">
+    <category>transport</category>
+    <icon image="features/transport__tram.png">
+      <font size="12pt">
+        ${operator} <b>${reg}</b>
+      </font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="route" v="tram"/>
+
+    <inputSet ref="route"/>
+    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the tram service" priority="low"/>
+    <input type="freetext" presence="always" category="Naming"